Projects
Multimedia
LiVES
Sign Up
Log In
Username
Password
We truncated the diff of some files because they were too big. If you want to see the full diff for every file,
click here
.
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
Expand all
Collapse all
Changes of Revision 30
View file
LiVES.changes
Changed
@@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Sat Dec 19 15:20:05 UTC 2015 - avvissu@yandex.ru + +- Update to 2.4.6: + * see: /usr/share/doc/packages/lives/ChangeLog +- Fix build with gtk2 ( lives-2.4.6_gtk2.patch) +- Remove support for transcode_encoder + +------------------------------------------------------------------- Sun Nov 29 12:52:19 UTC 2015 - avvissu@yandex.ru - Update to 2.4.4:
View file
LiVES.spec
Changed
@@ -20,7 +20,7 @@ %define soname 0 Name: LiVES -Version: 2.4.4 +Version: 2.4.6 Release: 0 Summary: Video Editor and VJ Tool License: GPL-2.0+ @@ -29,6 +29,8 @@ Source0: http://lives-video.com/releases/%{name}-%{version}.tar.bz2 Source99: LiVES-rpmlintrc Patch0: LiVES-redefinition_of_typedef.patch +# PATCH-FIX-UPSTREAM gtk2.patch [sf#209] avvissu@yandex.ru -- Suppress remaining deprecation warnings +Patch1: lives-2.4.6_gtk2.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: bison @@ -143,6 +145,7 @@ %prep %setup -q -n lives-%{version} #%patch0 -p1 +%patch1 -p1 # fix wrong EOL sed -i 's/\r$//' weed-docs/*.txt @@ -391,7 +394,6 @@ %{_libdir}/lives/plugins/encoders/pdf_encoder %{_libdir}/lives/plugins/encoders/qtutils_encoder %{_libdir}/lives/plugins/encoders/sswf_encoder -%{_libdir}/lives/plugins/encoders/transcode_encoder %{_libdir}/lives/plugins/encoders/x264_encoder %dir %{_libdir}/lives/plugins/playback %dir %{_libdir}/lives/plugins/playback/audiostream
View file
lives-2.4.6_gtk2.patch
Added
@@ -0,0 +1,17 @@ +diff -U 3 -dHrN lives-2.4.6.orig/src/widget-helper.c lives-2.4.6/src/widget-helper.c +--- lives-2.4.6.orig/src/widget-helper.c 2015-12-18 16:57:33.000000000 +0300 ++++ lives-2.4.6/src/widget-helper.c 2015-12-19 21:41:30.517902642 +0300 +@@ -1363,9 +1363,13 @@ + LIVES_INLINE LiVESWidget *lives_dialog_get_action_area(LiVESDialog *dialog) { + #ifdef GUI_GTK + #if GTK_CHECK_VERSION(2,14,0) ++#ifdef G_GNUC_BEGIN_IGNORE_DEPRECATIONS + G_GNUC_BEGIN_IGNORE_DEPRECATIONS ++#endif + return gtk_dialog_get_action_area(LIVES_DIALOG(dialog)); ++#ifdef G_GNUC_END_IGNORE_DEPRECATIONS + G_GNUC_END_IGNORE_DEPRECATIONS ++#endif + #else + return LIVES_DIALOG(dialog)->vbox; + #endif
View file
LiVES-2.4.4.tar.bz2/lives-plugins/plugins/encoders/transcode_encoder
Deleted
@@ -1,294 +0,0 @@ -#!/usr/bin/perl - -# (c) G. Finch (salsaman) - -# released under the GNU GPL 3 or later -# see file COPYING or www.gnu.org for details - - -####################################################################### -# LiVES transcode plugin v1.5 -####################################################################### - -if (!defined($standalone)) { - my $smogrify; - if ($^O eq "MSWin32") { - $smogrify="smogrify"; - } - else { - $smogrify=`which smogrify`; - chomp($smogrify); - } - if ($smogrify ne "") { - require $smogrify; - } -} -else { - $command=$ARGV[0]; -} - - -####################################################################### -# version history - -# 1.1 gf - changed get_image_size so it takes a parameter ($file) -# 1.2 gf - add more formats, clean up syntax -# 1.3 - add debug code $DEBUG_ENCODERS for monitoring -# 1.4 changed pref audio_encode_quality to encoder_acodec -# 1.5 updated to transcode 1.0.1 -# 1.6 allow encoding of png; update --use_rgb to -V rgb -# 1.7 set options to enable/disable flip and swap - -if ($command eq "version") { - print "transcode encoder plugin v1.7\n"; - exit 0; -} - - -if ($command eq "init") { - # perform any initialisation needed - # On error, print error message and exit 1 - # otherwise exit 0 - - if (&location("transcode") eq "") { - print "Transcode was not found. Please install transcode and try again."; - exit 1; - } - - # end init code - print "initialised\n"; - exit 0; -} - - - -if ($command eq "get_capabilities") { - # return capabilities - this is a bitmap field - # bit 0 - takes extra parameters (using RFX request) - # bit 1 - unused - # bit 2 - can encode png - # bit 3 - not pure perl - print "4\n"; - exit 0; -} - - - -if ($command eq "get_formats") { - # for each format: - - # return format_name|display_name|audio_types|restrictions|extension| - - # audio types are: 0 - cannot encode audio, 1 - can encode using - # mp3, 2 - can encode using pcm, 3 - can encode using pcm and mp3 - - # restrictions: currently the only one implemented is 'fps=xx.yy' which - # means "can only encode at xx.yy frames per second" - # - otherwise set it to 'none' - - print "mjpeg|mjpeg|3|none|avi|\n"; - print "mpeg4|mpeg4|3|none|mpg|\n"; - print "wmv2|wmv2|3|none|wmv|\n"; - - exit 0; -} - - -if ($command eq "get_rfx") { - # nice example of how to give the user a choice of options - - # mandatory section - print "<define>\n"; - print "|1.7\n"; - print "</define>\n"; - - # mandatory section - print "<language_code>\n"; - print "0xF0\n"; - print "</language_code>\n"; - - # optional section - print "<params>\n"; - print "flip|_Flip images vertically|bool|1|0\n"; - print "swap|_Swap Red/Blue channels|bool|1|0\n"; - print "</params>\n"; - - print "<paramwindow>\n"; - print "layout|\"Adjust these values if the resulting video comes out wrong\"|\n"; - print "layout|\$p0|\n"; - print "layout|\$p1|\n"; - print "</paramwindow>\n"; - - -} - - - -if ($command eq "encode") { - # encode - $encoder_command="transcode"; - - # make tombstone file - transcode should pass this to ffmpeg but doesn't - open OUT,"> comments"; - print OUT "INAM $title\n"; - print OUT "IART $author\n"; - print OUT "ICMT $comment\n"; - close OUT; - - $flip=$ARGV[13]; - $swap=$ARGV[14]; - - if ($flip) { - $flipopt=" -z"; - } - else { - $flipopt=""; - } - - if ($swap) { - $swapopt=" -k"; - } - else { - $swapopt=""; - } - - - # make a list of the frames to encode - unlink "list"; - for ($i=$start;$i<=$end;$i++) { - $name=&mkname($i); - $syscom="echo $name$img_ext >> list"; - system $syscom; - } - - $err=">/dev/null 2>&1"; - if (defined($DEBUG_ENCODERS)) { - $err="1>&2"; - } - - - #transcode seems to get the fps wrong sometimes, let's help it - $fps=$fps*1.; - - if ($fps>23.9760&&$fps<23.9761) { - $fps="0,1"; - } - elsif ($fps==24) { - $fps="0,2"; - } - elsif ($fps==25) { - $fps="0,3"; - } - elsif ($fps>29.9700&&$fps<29.9701) { - $fps="0,4"; - } - elsif ($fps eq "30") { - $fps="0,5"; - } - elsif ($fps eq "50") { - $fps="0,6"; - } - elsif ($fps>59.9400&&$fps<59.9401) { - $fps="0,7"; - } - elsif ($fps eq "60") { - $fps="0,8"; - } - elsif ($fps==1) { - $fps="0,9"; - } - elsif ($fps==5) { - $fps="0,10";
View file
LiVES-2.4.4.tar.bz2/ChangeLog -> LiVES-2.4.6.tar.bz2/ChangeLog
Changed
@@ -1,3 +1,45 @@ +Version 2.4.6 (19 December 2015) +-------------------------------- +Fix crashes and compatibility issues with gtk+ >= 3.16 +Fix a bug with missing clips when reloading layouts. +Minor GUI improvements. +Minor compilation fixes. +Updates to French translation (thanks Jean-Marc). + + + + + + + + + + + + +Version 2.4.5 (2 December 2015) +------------------------------- +Fix for undo after downsampling video (regression). +Fix regression in resizing when encoding. +Set default encoder to multi_encoder3 if python version >= 3. +Fix some message translation issues in dialog windows. +Fix missing audio issue after loading new audio for a clip. +mplayer2 compatibility fix for ffmpeg_encoder. +Minor fix for compiling without OSC. +Remove support for transcode_encoder. + + + + + + + + + + + + + Version 2.4.4 (22 November 2015) -------------------------------- Fix regression in audio resampling with sox.
View file
LiVES-2.4.4.tar.bz2/LiVES.doxygen -> LiVES-2.4.6.tar.bz2/LiVES.doxygen
Changed
@@ -38,7 +38,7 @@ # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = 2.4.4 +PROJECT_NUMBER = 2.4.6 # 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
View file
LiVES-2.4.4.tar.bz2/Makefile.in -> LiVES-2.4.6.tar.bz2/Makefile.in
Changed
@@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -80,12 +90,6 @@ host_triplet = @host@ target_triplet = @target@ subdir = . -DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \ - $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/configure $(am__configure_deps) mkinstalldirs \ - $(top_srcdir)/intl/Makefile.in ABOUT-NLS COPYING compile \ - config.guess config.rpath config.sub depcomp install-sh \ - missing ltmain.sh ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \ @@ -109,6 +113,8 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \ + $(am__configure_deps) $(am__DIST_COMMON) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ configure.lineno config.status.lineno mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -199,6 +205,10 @@ CTAGS = ctags CSCOPE = cscope DIST_SUBDIRS = libOSC intl libweed src m4 lives-plugins po resources +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/intl/Makefile.in \ + ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS README \ + compile config.guess config.rpath config.sub depcomp \ + install-sh ltmain.sh missing mkinstalldirs DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) @@ -380,6 +390,8 @@ OPENCV_CFLAGS = @OPENCV_CFLAGS@ OPENCV_LIBS = @OPENCV_LIBS@ OPENCV_LIBS_ONLY_L = @OPENCV_LIBS_ONLY_L@ +ORC_CFLAGS = @ORC_CFLAGS@ +ORC_LIBS = @ORC_LIBS@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -563,7 +575,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -804,15 +815,15 @@ $(am__post_remove_distdir) dist-tarZ: distdir - @echo WARNING: "Support for shar distribution archives is" \ - "deprecated." >&2 + @echo WARNING: "Support for distribution archives compressed with" \ + "legacy program 'compress' is deprecated." >&2 @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z $(am__post_remove_distdir) dist-shar: distdir - @echo WARNING: "Support for distribution archives compressed with" \ - "legacy program 'compress' is deprecated." >&2 + @echo WARNING: "Support for shar distribution archives is" \ + "deprecated." >&2 @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz $(am__post_remove_distdir) @@ -848,18 +859,18 @@ esac chmod -R a-w $(distdir) chmod u+w $(distdir) - mkdir $(distdir)/_build $(distdir)/_inst + mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst chmod a-w $(distdir) test -d $(distdir)/_build || exit 0; \ dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ && am__cwd=`pwd` \ - && $(am__cd) $(distdir)/_build \ - && ../configure \ + && $(am__cd) $(distdir)/_build/sub \ + && ../../configure \ --with-included-gettext \ $(AM_DISTCHECK_CONFIGURE_FLAGS) \ $(DISTCHECK_CONFIGURE_FLAGS) \ - --srcdir=.. --prefix="$$dc_install_base" \ + --srcdir=../.. --prefix="$$dc_install_base" \ && $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) dvi \ && $(MAKE) $(AM_MAKEFLAGS) check \ @@ -1043,6 +1054,8 @@ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ uninstall-am uninstall-docDATA uninstall-local +.PRECIOUS: Makefile + @HAVE_DOXYGEN_TRUE@docs-doxygen: @HAVE_DOXYGEN_TRUE@ $(DOXYGEN) LiVES.doxygen
View file
LiVES-2.4.4.tar.bz2/README -> LiVES-2.4.6.tar.bz2/README
Changed
@@ -64,16 +64,16 @@ If you got LiVES as a tar.gz or tar.bz2, at a terminal prompt, enter the following: - bzip2 -d LiVES-2.4.4.tar.bz2 + bzip2 -d LiVES-2.4.6.tar.bz2 or, - gzip -d LiVES-2.4.4.tar.gz + gzip -d LiVES-2.4.6.tar.gz depending on which version you have. Then: - tar xvf LIVES-2.4.4.tar + tar xvf LIVES-2.4.6.tar - cd lives-2.4.4 + cd lives-2.4.6
View file
LiVES-2.4.4.tar.bz2/aclocal.m4 -> LiVES-2.4.6.tar.bz2/aclocal.m4
Changed
@@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.14.1 -*- Autoconf -*- +# generated automatically by aclocal 1.15 -*- Autoconf -*- -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -180,7 +180,62 @@ fi[]dnl ])# PKG_CHECK_MODULES -# Copyright (C) 2002-2013 Free Software Foundation, Inc. + +# PKG_INSTALLDIR(DIRECTORY) +# ------------------------- +# Substitutes the variable pkgconfigdir as the location where a module +# should install pkg-config .pc files. By default the directory is +# $libdir/pkgconfig, but the default can be changed by passing +# DIRECTORY. The user can override through the --with-pkgconfigdir +# parameter. +AC_DEFUN([PKG_INSTALLDIR], +[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])]) +m4_pushdef([pkg_description], + [pkg-config installation directory @<:@]pkg_default[@:>@]) +AC_ARG_WITH([pkgconfigdir], + [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],, + [with_pkgconfigdir=]pkg_default) +AC_SUBST([pkgconfigdir], [$with_pkgconfigdir]) +m4_popdef([pkg_default]) +m4_popdef([pkg_description]) +]) dnl PKG_INSTALLDIR + + +# PKG_NOARCH_INSTALLDIR(DIRECTORY) +# ------------------------- +# Substitutes the variable noarch_pkgconfigdir as the location where a +# module should install arch-independent pkg-config .pc files. By +# default the directory is $datadir/pkgconfig, but the default can be +# changed by passing DIRECTORY. The user can override through the +# --with-noarch-pkgconfigdir parameter. +AC_DEFUN([PKG_NOARCH_INSTALLDIR], +[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])]) +m4_pushdef([pkg_description], + [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@]) +AC_ARG_WITH([noarch-pkgconfigdir], + [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],, + [with_noarch_pkgconfigdir=]pkg_default) +AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir]) +m4_popdef([pkg_default]) +m4_popdef([pkg_description]) +]) dnl PKG_NOARCH_INSTALLDIR + + +# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE, +# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +# ------------------------------------------- +# Retrieves the value of the pkg-config variable for the given module. +AC_DEFUN([PKG_CHECK_VAR], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl + +_PKG_CONFIG([$1], [variable="][$3]["], [$2]) +AS_VAR_COPY([$1], [pkg_cv_][$1]) + +AS_VAR_IF([$1], [""], [$5], [$4])dnl +])# PKG_CHECK_VAR + +# Copyright (C) 2002-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -192,10 +247,10 @@ # generated from the m4 files accompanying Automake X.Y. # (This private macro should not be called outside this file.) AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.14' +[am__api_version='1.15' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.14.1], [], +m4_if([$1], [1.15], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -211,14 +266,14 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.14.1])dnl +[AM_AUTOMAKE_VERSION([1.15])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # Figure out how to run the assembler. -*- Autoconf -*- -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -238,7 +293,7 @@ # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -283,15 +338,14 @@ # configured tree to be moved without reconfiguration. AC_DEFUN([AM_AUX_DIR_EXPAND], -[dnl Rely on autoconf to set up CDPATH properly. -AC_PREREQ([2.50])dnl -# expand $ac_aux_dir to an absolute path -am_aux_dir=`cd $ac_aux_dir && pwd` +[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl +# Expand $ac_aux_dir to an absolute path. +am_aux_dir=`cd "$ac_aux_dir" && pwd` ]) # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997-2013 Free Software Foundation, Inc. +# Copyright (C) 1997-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -322,7 +376,7 @@ Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -513,7 +567,7 @@ # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -589,7 +643,7 @@ # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -679,8 +733,8 @@ # <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html> # <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html> AC_SUBST([mkdir_p], ['$(MKDIR_P)']) -# We need awk for the "check" target. The system "awk" is bad on -# some platforms. +# We need awk for the "check" target (and possibly the TAP driver). The +# system "awk" is bad on some platforms. AC_REQUIRE([AC_PROG_AWK])dnl AC_REQUIRE([AC_PROG_MAKE_SET])dnl AC_REQUIRE([AM_SET_LEADING_DOT])dnl @@ -753,7 +807,11 @@ END AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) fi -fi]) +fi +dnl The trailing newline in this macro's definition is deliberate, for +dnl backward compatibility and to allow trailing 'dnl'-style comments +dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841. +]) dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further @@ -782,7 +840,7 @@ done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -793,7 +851,7 @@ # Define $install_sh. AC_DEFUN([AM_PROG_INSTALL_SH], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -if test x"${install_sh}" != xset; then +if test x"${install_sh+set}" != xset; then case $am_aux_dir in *\ * | *\ *)
View file
LiVES-2.4.4.tar.bz2/build-lives-rfx-plugin -> LiVES-2.4.6.tar.bz2/build-lives-rfx-plugin
Changed
@@ -78,7 +78,7 @@ } -$builder_version="2.4.4"; +$builder_version="2.4.6"; if ($in_channels==0&&$properties&0x0004) { #batch mode generator
View file
LiVES-2.4.4.tar.bz2/compile -> LiVES-2.4.6.tar.bz2/compile
Changed
@@ -3,7 +3,7 @@ scriptversion=2012-10-14.11; # UTC -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # Written by Tom Tromey <tromey@cygnus.com>. # # This program is free software; you can redistribute it and/or modify
View file
LiVES-2.4.4.tar.bz2/config.guess -> LiVES-2.4.6.tar.bz2/config.guess
Changed
@@ -1,8 +1,8 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright 1992-2013 Free Software Foundation, Inc. +# Copyright 1992-2014 Free Software Foundation, Inc. -timestamp='2013-06-10' +timestamp='2014-03-23' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -50,7 +50,7 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright 1992-2013 Free Software Foundation, Inc. +Copyright 1992-2014 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -149,7 +149,7 @@ LIBC=gnu #endif EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'` ;; esac @@ -826,7 +826,7 @@ *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; - i*:MSYS*:*) + *:MSYS*:*) echo ${UNAME_MACHINE}-pc-msys exit ;; i*:windows32*:*) @@ -969,10 +969,10 @@ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } ;; - or1k:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + openrisc*:Linux:*:*) + echo or1k-unknown-linux-${LIBC} exit ;; - or32:Linux:*:*) + or32:Linux:*:* | or1k*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; padre:Linux:*:*) @@ -1260,16 +1260,26 @@ if test "$UNAME_PROCESSOR" = unknown ; then UNAME_PROCESSOR=powerpc fi - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then - if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null - then - case $UNAME_PROCESSOR in - i386) UNAME_PROCESSOR=x86_64 ;; - powerpc) UNAME_PROCESSOR=powerpc64 ;; - esac + if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + case $UNAME_PROCESSOR in + i386) UNAME_PROCESSOR=x86_64 ;; + powerpc) UNAME_PROCESSOR=powerpc64 ;; + esac + fi fi + elif test "$UNAME_PROCESSOR" = i386 ; then + # Avoid executing cc on OS X 10.9, as it ships with a stub + # that puts up a graphical alert prompting to install + # developer tools. Any system running Mac OS X 10.7 or + # later (Darwin 11 and later) is required to have a 64-bit + # processor. This is not true of the ARM version of Darwin + # that Apple uses in portable devices. + UNAME_PROCESSOR=x86_64 fi echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} exit ;; @@ -1361,154 +1371,6 @@ exit ;; esac -eval $set_cc_for_build -cat >$dummy.c <<EOF -#ifdef _SEQUENT_ -# include <sys/types.h> -# include <sys/utsname.h> -#endif -main () -{ -#if defined (sony) -#if defined (MIPSEB) - /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed, - I don't know.... */ - printf ("mips-sony-bsd\n"); exit (0); -#else -#include <sys/param.h> - printf ("m68k-sony-newsos%s\n", -#ifdef NEWSOS4 - "4" -#else - "" -#endif - ); exit (0); -#endif -#endif - -#if defined (__arm) && defined (__acorn) && defined (__unix) - printf ("arm-acorn-riscix\n"); exit (0); -#endif - -#if defined (hp300) && !defined (hpux) - printf ("m68k-hp-bsd\n"); exit (0); -#endif - -#if defined (NeXT) -#if !defined (__ARCHITECTURE__) -#define __ARCHITECTURE__ "m68k" -#endif - int version; - version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`; - if (version < 4) - printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); - else - printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version); - exit (0); -#endif - -#if defined (MULTIMAX) || defined (n16) -#if defined (UMAXV) - printf ("ns32k-encore-sysv\n"); exit (0); -#else -#if defined (CMU) - printf ("ns32k-encore-mach\n"); exit (0); -#else - printf ("ns32k-encore-bsd\n"); exit (0); -#endif -#endif -#endif - -#if defined (__386BSD__) - printf ("i386-pc-bsd\n"); exit (0); -#endif - -#if defined (sequent) -#if defined (i386) - printf ("i386-sequent-dynix\n"); exit (0); -#endif -#if defined (ns32000) - printf ("ns32k-sequent-dynix\n"); exit (0); -#endif -#endif - -#if defined (_SEQUENT_) - struct utsname un; - - uname(&un); - - if (strncmp(un.version, "V2", 2) == 0) { - printf ("i386-sequent-ptx2\n"); exit (0); - } - if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */ - printf ("i386-sequent-ptx1\n"); exit (0); - } - printf ("i386-sequent-ptx\n"); exit (0); - -#endif - -#if defined (vax) -# if !defined (ultrix) -# include <sys/param.h> -# if defined (BSD) -# if BSD == 43 - printf ("vax-dec-bsd4.3\n"); exit (0); -# else -# if BSD == 199006 - printf ("vax-dec-bsd4.3reno\n"); exit (0); -# else - printf ("vax-dec-bsd\n"); exit (0); -# endif -# endif -# else - printf ("vax-dec-bsd\n"); exit (0); -# endif -# else - printf ("vax-dec-ultrix\n"); exit (0); -# endif -#endif - -#if defined (alliant) && defined (i860)
View file
LiVES-2.4.4.tar.bz2/config.sub -> LiVES-2.4.6.tar.bz2/config.sub
Changed
@@ -1,8 +1,8 @@ #! /bin/sh # Configuration validation subroutine script. -# Copyright 1992-2013 Free Software Foundation, Inc. +# Copyright 1992-2014 Free Software Foundation, Inc. -timestamp='2013-08-10' +timestamp='2014-09-11' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -68,7 +68,7 @@ version="\ GNU config.sub ($timestamp) -Copyright 1992-2013 Free Software Foundation, Inc. +Copyright 1992-2014 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -265,6 +265,7 @@ | hexagon \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ + | k1om \ | le32 | le64 \ | lm32 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ @@ -282,8 +283,10 @@ | mips64vr5900 | mips64vr5900el \ | mipsisa32 | mipsisa32el \ | mipsisa32r2 | mipsisa32r2el \ + | mipsisa32r6 | mipsisa32r6el \ | mipsisa64 | mipsisa64el \ | mipsisa64r2 | mipsisa64r2el \ + | mipsisa64r6 | mipsisa64r6el \ | mipsisa64sb1 | mipsisa64sb1el \ | mipsisa64sr71k | mipsisa64sr71kel \ | mipsr5900 | mipsr5900el \ @@ -295,11 +298,11 @@ | nds32 | nds32le | nds32be \ | nios | nios2 | nios2eb | nios2el \ | ns16k | ns32k \ - | open8 \ - | or1k | or32 \ + | open8 | or1k | or1knd | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle \ | pyramid \ + | riscv32 | riscv64 \ | rl78 | rx \ | score \ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ @@ -324,7 +327,7 @@ c6x) basic_machine=tic6x-unknown ;; - m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip) + m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip) basic_machine=$basic_machine-unknown os=-none ;; @@ -381,6 +384,7 @@ | hexagon-* \ | i*86-* | i860-* | i960-* | ia64-* \ | ip2k-* | iq2000-* \ + | k1om-* \ | le32-* | le64-* \ | lm32-* \ | m32c-* | m32r-* | m32rle-* \ @@ -400,8 +404,10 @@ | mips64vr5900-* | mips64vr5900el-* \ | mipsisa32-* | mipsisa32el-* \ | mipsisa32r2-* | mipsisa32r2el-* \ + | mipsisa32r6-* | mipsisa32r6el-* \ | mipsisa64-* | mipsisa64el-* \ | mipsisa64r2-* | mipsisa64r2el-* \ + | mipsisa64r6-* | mipsisa64r6el-* \ | mipsisa64sb1-* | mipsisa64sb1el-* \ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ | mipsr5900-* | mipsr5900el-* \ @@ -413,6 +419,7 @@ | nios-* | nios2-* | nios2eb-* | nios2el-* \ | none-* | np1-* | ns16k-* | ns32k-* \ | open8-* \ + | or1k*-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ @@ -822,6 +829,10 @@ basic_machine=powerpc-unknown os=-morphos ;; + moxiebox) + basic_machine=moxie-unknown + os=-moxiebox + ;; msdos) basic_machine=i386-pc os=-msdos @@ -1367,14 +1378,14 @@ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ | -linux-newlib* | -linux-musl* | -linux-uclibc* \ - | -uxpv* | -beos* | -mpeix* | -udk* \ + | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*) + | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1592,9 +1603,6 @@ mips*-*) os=-elf ;; - or1k-*) - os=-elf - ;; or32-*) os=-coff ;;
View file
LiVES-2.4.4.tar.bz2/configure -> LiVES-2.4.6.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.4.4. +# Generated by GNU Autoconf 2.69 for LiVES 2.4.6. # # 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.4.4' -PACKAGE_STRING='LiVES 2.4.4' +PACKAGE_VERSION='2.4.6' +PACKAGE_STRING='LiVES 2.4.6' PACKAGE_BUGREPORT='https://sourceforge.net/p/lives/bugs/' PACKAGE_URL='' @@ -667,10 +667,16 @@ ENABLE_LDVGRAB_TRUE HAVE_FREI0R_FALSE HAVE_FREI0R_TRUE +ENABLE_LIBORC_FALSE +ENABLE_LIBORC_TRUE +HAVE_LIBORC_FALSE +HAVE_LIBORC_TRUE ENABLE_LIBOIL_FALSE ENABLE_LIBOIL_TRUE HAVE_LIBOIL_FALSE HAVE_LIBOIL_TRUE +ORC_LIBS +ORC_CFLAGS OIL_LIBS OIL_CFLAGS HAVE_PROJECTM_FALSE @@ -1149,6 +1155,8 @@ LIBPROJECTM_LIBS OIL_CFLAGS OIL_LIBS +ORC_CFLAGS +ORC_LIBS WEED_CFLAGS WEED_LIBS WEED_SLICE_CFLAGS @@ -1699,7 +1707,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.4.4 to adapt to many kinds of systems. +\`configure' configures LiVES 2.4.6 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1770,7 +1778,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of LiVES 2.4.4:";; + short | recursive ) echo "Configuration of LiVES 2.4.6:";; esac cat <<\_ACEOF @@ -1943,6 +1951,8 @@ linker flags for LIBPROJECTM, overriding pkg-config OIL_CFLAGS C compiler flags for OIL, overriding pkg-config OIL_LIBS linker flags for OIL, overriding pkg-config + ORC_CFLAGS C compiler flags for ORC, overriding pkg-config + ORC_LIBS linker flags for ORC, overriding pkg-config WEED_CFLAGS C compiler flags for WEED, overriding pkg-config WEED_LIBS linker flags for WEED, overriding pkg-config WEED_SLICE_CFLAGS @@ -2028,7 +2038,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -LiVES configure 2.4.4 +LiVES configure 2.4.6 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2755,7 +2765,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.4.4, which was +It was created by LiVES $as_me 2.4.6, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3250,7 +3260,7 @@ -am__api_version='1.14' +am__api_version='1.15' # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or @@ -3422,8 +3432,8 @@ ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` -# expand $ac_aux_dir to an absolute path -am_aux_dir=`cd $ac_aux_dir && pwd` +# Expand $ac_aux_dir to an absolute path. +am_aux_dir=`cd "$ac_aux_dir" && pwd` if test x"${MISSING+set}" != xset; then case $am_aux_dir in @@ -3442,7 +3452,7 @@ $as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;} fi -if test x"${install_sh}" != xset; then +if test x"${install_sh+set}" != xset; then case $am_aux_dir in *\ * | *\ *) install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; @@ -3736,7 +3746,7 @@ # Define the identity of the package. PACKAGE='lives' - VERSION='2.4.4' + VERSION='2.4.6' cat >>confdefs.h <<_ACEOF @@ -3770,8 +3780,8 @@ # <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html> mkdir_p='$(MKDIR_P)' -# We need awk for the "check" target. The system "awk" is bad on -# some platforms. +# We need awk for the "check" target (and possibly the TAP driver). The +# system "awk" is bad on some platforms. # Always define AMTAR for backward compatibility. Yes, it's still used # in the wild :-( We should find a proper way to deprecate it ... AMTAR='$${TAR-tar}' @@ -3830,6 +3840,7 @@ fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } # Check whether --enable-maintainer-mode was given. @@ -28024,6 +28035,8 @@ HAVE_LIBOIL=false +HAVE_LIBORC=false + # Check whether --enable-liboil was given. if test "${enable_liboil+set}" = set; then : enableval=$enable_liboil; disable_liboil=yes @@ -28104,6 +28117,84 @@ fi + +if test "$HAVE_LIBOIL" = "false"; then + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ORC" >&5 +$as_echo_n "checking for ORC... " >&6; } + +if test -n "$ORC_CFLAGS"; then + pkg_cv_ORC_CFLAGS="$ORC_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"orc-0.4\""; } >&5 + ($PKG_CONFIG --exists --print-errors "orc-0.4") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_ORC_CFLAGS=`$PKG_CONFIG --cflags "orc-0.4" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$ORC_LIBS"; then + pkg_cv_ORC_LIBS="$ORC_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"orc-0.4\""; } >&5 + ($PKG_CONFIG --exists --print-errors "orc-0.4") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_ORC_LIBS=`$PKG_CONFIG --libs "orc-0.4" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried
View file
LiVES-2.4.4.tar.bz2/configure.ac -> LiVES-2.4.6.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.4.4,https://sourceforge.net/p/lives/bugs/) +AC_INIT(LiVES,2.4.6,https://sourceforge.net/p/lives/bugs/) AC_CANONICAL_HOST AC_CANONICAL_TARGET @@ -817,6 +817,8 @@ HAVE_LIBOIL=false +HAVE_LIBORC=false + AC_ARG_ENABLE( liboil, [ --disable-liboil Disable liboil support.] , disable_liboil=yes) if test "x$disable_liboil" != "xyes" ; then @@ -824,11 +826,22 @@ PKG_CHECK_MODULES(OIL,liboil-0.3 >= 0.3.9,HAVE_LIBOIL=true,HAVE_LIBOIL=false) AC_SUBST(OIL_CFLAGS) AC_SUBST(OIL_LIBS) + +if test "$HAVE_LIBOIL" = "false"; then +PKG_CHECK_MODULES(ORC,orc-0.4,HAVE_LIBORC=true,HAVE_LIBORC=false) +AC_SUBST(ORC_CFLAGS) +AC_SUBST(ORC_LIBS) +fi + + fi AM_CONDITIONAL(HAVE_LIBOIL,$HAVE_LIBOIL) AM_CONDITIONAL(ENABLE_LIBOIL,$HAVE_LIBOIL) +AM_CONDITIONAL(HAVE_LIBORC,$HAVE_LIBORC) +AM_CONDITIONAL(ENABLE_LIBORC,$HAVE_LIBORC) + HAVE_FREI0R=false
View file
LiVES-2.4.4.tar.bz2/depcomp -> LiVES-2.4.6.tar.bz2/depcomp
Changed
@@ -3,7 +3,7 @@ scriptversion=2013-05-30.07; # UTC -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by
View file
LiVES-2.4.4.tar.bz2/install-sh -> LiVES-2.4.6.tar.bz2/install-sh
Changed
@@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2011-11-20.07; # UTC +scriptversion=2013-12-25.23; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -41,19 +41,15 @@ # This script is compatible with the BSD install script, but was written # from scratch. +tab=' ' nl=' ' -IFS=" "" $nl" +IFS=" $tab$nl" -# set DOITPROG to echo to test this script +# Set DOITPROG to "echo" to test this script. -# Don't use :- since 4.3BSD and earlier shells don't like it. doit=${DOITPROG-} -if test -z "$doit"; then - doit_exec=exec -else - doit_exec=$doit -fi +doit_exec=${doit:-exec} # Put in absolute file names if you don't have them in your path; # or use environment vars. @@ -68,17 +64,6 @@ rmprog=${RMPROG-rm} stripprog=${STRIPPROG-strip} -posix_glob='?' -initialize_posix_glob=' - test "$posix_glob" != "?" || { - if (set -f) 2>/dev/null; then - posix_glob= - else - posix_glob=: - fi - } -' - posix_mkdir= # Desired mode of installed file. @@ -97,7 +82,7 @@ dst_arg= copy_on_change=false -no_target_directory= +is_target_a_directory=possibly usage="\ Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE @@ -137,46 +122,57 @@ -d) dir_arg=true;; -g) chgrpcmd="$chgrpprog $2" - shift;; + shift;; --help) echo "$usage"; exit $?;; -m) mode=$2 - case $mode in - *' '* | *' '* | *' -'* | *'*'* | *'?'* | *'['*) - echo "$0: invalid mode: $mode" >&2 - exit 1;; - esac - shift;; + case $mode in + *' '* | *"$tab"* | *"$nl"* | *'*'* | *'?'* | *'['*) + echo "$0: invalid mode: $mode" >&2 + exit 1;; + esac + shift;; -o) chowncmd="$chownprog $2" - shift;; + shift;; -s) stripcmd=$stripprog;; - -t) dst_arg=$2 - # Protect names problematic for 'test' and other utilities. - case $dst_arg in - -* | [=\(\)!]) dst_arg=./$dst_arg;; - esac - shift;; + -t) + is_target_a_directory=always + dst_arg=$2 + # Protect names problematic for 'test' and other utilities. + case $dst_arg in + -* | [=\(\)!]) dst_arg=./$dst_arg;; + esac + shift;; - -T) no_target_directory=true;; + -T) is_target_a_directory=never;; --version) echo "$0 $scriptversion"; exit $?;; - --) shift - break;; + --) shift + break;; - -*) echo "$0: invalid option: $1" >&2 - exit 1;; + -*) echo "$0: invalid option: $1" >&2 + exit 1;; *) break;; esac shift done +# We allow the use of options -d and -T together, by making -d +# take the precedence; this is for compatibility with GNU install. + +if test -n "$dir_arg"; then + if test -n "$dst_arg"; then + echo "$0: target directory not allowed when installing a directory." >&2 + exit 1 + fi +fi + if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then # When -d is used, all remaining arguments are directories to create. # When -t is used, the destination is already specified. @@ -208,6 +204,15 @@ fi if test -z "$dir_arg"; then + if test $# -gt 1 || test "$is_target_a_directory" = always; then + if test ! -d "$dst_arg"; then + echo "$0: $dst_arg: Is not a directory." >&2 + exit 1 + fi + fi +fi + +if test -z "$dir_arg"; then do_exit='(exit $ret); exit $ret' trap "ret=129; $do_exit" 1 trap "ret=130; $do_exit" 2 @@ -223,16 +228,16 @@ *[0-7]) if test -z "$stripcmd"; then - u_plus_rw= + u_plus_rw= else - u_plus_rw='% 200' + u_plus_rw='% 200' fi cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;; *) if test -z "$stripcmd"; then - u_plus_rw= + u_plus_rw= else - u_plus_rw=,u+rw + u_plus_rw=,u+rw fi cp_umask=$mode$u_plus_rw;; esac @@ -269,41 +274,15 @@ # If destination is a directory, append the input filename; won't work # if double slashes aren't ignored. if test -d "$dst"; then - if test -n "$no_target_directory"; then - echo "$0: $dst_arg: Is a directory" >&2 - exit 1 + if test "$is_target_a_directory" = never; then + echo "$0: $dst_arg: Is a directory" >&2 + exit 1 fi dstdir=$dst dst=$dstdir/`basename "$src"` dstdir_status=0 else - # Prefer dirname, but fall back on a substitute if dirname fails. - dstdir=` - (dirname "$dst") 2>/dev/null || - expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$dst" : 'X\(//\)[^/]' \| \ - X"$dst" : 'X\(//\)$' \| \ - X"$dst" : 'X\(/\)' \| . 2>/dev/null || - echo X"$dst" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/
View file
LiVES-2.4.4.tar.bz2/libOSC/Makefile.in -> LiVES-2.4.6.tar.bz2/libOSC/Makefile.in
Changed
@@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -80,9 +90,6 @@ host_triplet = @host@ target_triplet = @target@ subdir = libOSC -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/mkinstalldirs $(top_srcdir)/depcomp AUTHORS NEWS \ - README ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \ @@ -106,6 +113,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -244,6 +252,8 @@ ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp \ + $(top_srcdir)/mkinstalldirs AUTHORS NEWS README DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -409,6 +419,8 @@ OPENCV_CFLAGS = @OPENCV_CFLAGS@ OPENCV_LIBS = @OPENCV_LIBS@ OPENCV_LIBS_ONLY_L = @OPENCV_LIBS_ONLY_L@ +ORC_CFLAGS = @ORC_CFLAGS@ +ORC_LIBS = @ORC_LIBS@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -573,7 +585,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu libOSC/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu libOSC/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -1024,6 +1035,8 @@ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ tags tags-am uninstall uninstall-am uninstall-libLTLIBRARIES +.PRECIOUS: Makefile + # 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.
View file
LiVES-2.4.4.tar.bz2/libOSC/client/Makefile.in -> LiVES-2.4.6.tar.bz2/libOSC/client/Makefile.in
Changed
@@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -80,8 +90,6 @@ host_triplet = @host@ target_triplet = @target@ subdir = libOSC/client -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/mkinstalldirs $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \ @@ -105,6 +113,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -211,6 +220,8 @@ done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp \ + $(top_srcdir)/mkinstalldirs DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ @@ -351,6 +362,8 @@ OPENCV_CFLAGS = @OPENCV_CFLAGS@ OPENCV_LIBS = @OPENCV_LIBS@ OPENCV_LIBS_ONLY_L = @OPENCV_LIBS_ONLY_L@ +ORC_CFLAGS = @ORC_CFLAGS@ +ORC_LIBS = @ORC_LIBS@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -495,7 +508,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu libOSC/client/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu libOSC/client/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -808,6 +820,8 @@ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ tags tags-am uninstall uninstall-am uninstall-libLTLIBRARIES +.PRECIOUS: Makefile + # 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.
View file
LiVES-2.4.4.tar.bz2/libOSC/sendOSC/Makefile.in -> LiVES-2.4.6.tar.bz2/libOSC/sendOSC/Makefile.in
Changed
@@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -81,8 +91,6 @@ target_triplet = @target@ @ENABLE_OSC_TRUE@sendOSC_PROGRAMS = sendOSC$(EXEEXT) subdir = libOSC/sendOSC -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/mkinstalldirs $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \ @@ -106,6 +114,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -183,6 +192,8 @@ done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp \ + $(top_srcdir)/mkinstalldirs DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ @@ -323,6 +334,8 @@ OPENCV_CFLAGS = @OPENCV_CFLAGS@ OPENCV_LIBS = @OPENCV_LIBS@ OPENCV_LIBS_ONLY_L = @OPENCV_LIBS_ONLY_L@ +ORC_CFLAGS = @ORC_CFLAGS@ +ORC_LIBS = @ORC_LIBS@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -466,7 +479,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu libOSC/sendOSC/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu libOSC/sendOSC/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -810,6 +822,8 @@ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ tags tags-am uninstall uninstall-am uninstall-sendOSCPROGRAMS +.PRECIOUS: Makefile + @ENABLE_OSC_TRUE@install-exec-local: @ENABLE_OSC_TRUE@ $(MKDIR_P) "$(DESTDIR)$(bindir)"
View file
LiVES-2.4.4.tar.bz2/liblives.doxygen -> LiVES-2.4.6.tar.bz2/liblives.doxygen
Changed
@@ -38,7 +38,7 @@ # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = 2.4.4-svn +PROJECT_NUMBER = 2.4.6 # 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
View file
LiVES-2.4.4.tar.bz2/libweed/Makefile.in -> LiVES-2.4.6.tar.bz2/libweed/Makefile.in
Changed
@@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -27,7 +27,17 @@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -92,9 +102,6 @@ host_triplet = @host@ target_triplet = @target@ subdir = libweed -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/mkinstalldirs $(top_srcdir)/depcomp \ - $(libweedinclude_HEADERS) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \ @@ -118,6 +125,8 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(libweedinclude_HEADERS) \ + $(am__DIST_COMMON) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -260,6 +269,8 @@ done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp \ + $(top_srcdir)/mkinstalldirs DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ @@ -400,6 +411,8 @@ OPENCV_CFLAGS = @OPENCV_CFLAGS@ OPENCV_LIBS = @OPENCV_LIBS@ OPENCV_LIBS_ONLY_L = @OPENCV_LIBS_ONLY_L@ +ORC_CFLAGS = @ORC_CFLAGS@ +ORC_LIBS = @ORC_LIBS@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -565,7 +578,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu libweed/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu libweed/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -940,6 +952,8 @@ uninstall-am uninstall-libLTLIBRARIES \ uninstall-libweedincludeHEADERS uninstall-local +.PRECIOUS: Makefile + install-data-local: make docs-doxygen
View file
LiVES-2.4.4.tar.bz2/libweed/weed-compat.h -> LiVES-2.4.6.tar.bz2/libweed/weed-compat.h
Changed
@@ -80,7 +80,7 @@ switch (fourcc) { - // RGB formats + // RGB formats case 0x32524742: // BGR3 case 0x33524742: // BGR3 - tested and OK @@ -103,7 +103,7 @@ break; - // YUV packed formats + // YUV packed formats case 0x56595549: // IUYV if (interlaced!=NULL) *interlaced=1; @@ -133,7 +133,7 @@ return WEED_PALETTE_A8; - // YUV planar formats + // YUV planar formats case 0x41565559: // YUVA return WEED_PALETTE_YUVA4444P; break; @@ -161,7 +161,7 @@ return WEED_PALETTE_YUV444P; - // known formats we cannot use + // known formats we cannot use case 0x50424752: // RGBP - palettised RGB case 0x4f424752: // RGB0 - 15 or 16 bit RGB case 0x51424752: // RGBQ - 15 or 16 bit RGB @@ -177,7 +177,7 @@ case 0x30343449: // I440 - 440 planar palette case 0x30343450: // J440 - 440 planar palette unclamped - // no match + // no match default: return WEED_PALETTE_END; } @@ -600,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:
View file
LiVES-2.4.4.tar.bz2/libweed/weed-gslice.c -> LiVES-2.4.6.tar.bz2/libweed/weed-gslice.c
Changed
@@ -414,7 +414,7 @@ void weed_init(int api, weed_malloc_f _mallocf, weed_free_f _freef, weed_memcpy_f _memcpyf, weed_memset_f _memsetf) { switch (api) { - // higher API versions may use different functions, or add to them + // higher API versions may use different functions, or add to them case 100: case 110:
View file
LiVES-2.4.4.tar.bz2/libweed/weed.c -> LiVES-2.4.6.tar.bz2/libweed/weed.c
Changed
@@ -396,7 +396,7 @@ switch (api) { - // higher API versions may use different functions, or add to them + // higher API versions may use different functions, or add to them case 100: case 110:
View file
LiVES-2.4.4.tar.bz2/lives-plugins/Makefile.in -> LiVES-2.4.6.tar.bz2/lives-plugins/Makefile.in
Changed
@@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,7 +14,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -79,8 +89,6 @@ host_triplet = @host@ target_triplet = @target@ subdir = lives-plugins -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/mkinstalldirs ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \ @@ -104,6 +112,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -162,6 +171,7 @@ ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/mkinstalldirs DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -327,6 +337,8 @@ OPENCV_CFLAGS = @OPENCV_CFLAGS@ OPENCV_LIBS = @OPENCV_LIBS@ OPENCV_LIBS_ONLY_L = @OPENCV_LIBS_ONLY_L@ +ORC_CFLAGS = @ORC_CFLAGS@ +ORC_LIBS = @ORC_LIBS@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -462,7 +474,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lives-plugins/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu lives-plugins/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -757,6 +768,8 @@ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ ps ps-am tags tags-am uninstall uninstall-am +.PRECIOUS: Makefile + # 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.
View file
LiVES-2.4.4.tar.bz2/lives-plugins/icons/Makefile.in -> LiVES-2.4.6.tar.bz2/lives-plugins/icons/Makefile.in
Changed
@@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -80,8 +90,6 @@ host_triplet = @host@ target_triplet = @target@ subdir = lives-plugins/icons -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/mkinstalldirs README ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \ @@ -105,6 +113,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -157,6 +166,8 @@ am__installdirs = "$(DESTDIR)$(iconsdir)" DATA = $(icons_DATA) am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/mkinstalldirs \ + README DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ @@ -297,6 +308,8 @@ OPENCV_CFLAGS = @OPENCV_CFLAGS@ OPENCV_LIBS = @OPENCV_LIBS@ OPENCV_LIBS_ONLY_L = @OPENCV_LIBS_ONLY_L@ +ORC_CFLAGS = @ORC_CFLAGS@ +ORC_LIBS = @ORC_LIBS@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -457,7 +470,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lives-plugins/icons/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu lives-plugins/icons/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -654,6 +666,8 @@ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ ps ps-am tags-am uninstall uninstall-am uninstall-iconsDATA +.PRECIOUS: Makefile + install-exec-am: /bin/rm -rf "$(DESTDIR)$(datadir)/$(PACKAGE)/"*
View file
LiVES-2.4.4.tar.bz2/lives-plugins/marcos-encoders/Makefile.in -> LiVES-2.4.6.tar.bz2/lives-plugins/marcos-encoders/Makefile.in
Changed
@@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -17,7 +17,17 @@ # VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -82,8 +92,6 @@ host_triplet = @host@ target_triplet = @target@ subdir = lives-plugins/marcos-encoders -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/mkinstalldirs ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \ @@ -107,6 +115,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -159,6 +168,7 @@ am__installdirs = "$(DESTDIR)$(marcosencodersdir)" DATA = $(marcosencoders_DATA) am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/mkinstalldirs DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ @@ -299,6 +309,8 @@ OPENCV_CFLAGS = @OPENCV_CFLAGS@ OPENCV_LIBS = @OPENCV_LIBS@ OPENCV_LIBS_ONLY_L = @OPENCV_LIBS_ONLY_L@ +ORC_CFLAGS = @ORC_CFLAGS@ +ORC_LIBS = @ORC_LIBS@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -452,7 +464,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lives-plugins/marcos-encoders/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu lives-plugins/marcos-encoders/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -653,6 +664,8 @@ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ tags-am uninstall uninstall-am uninstall-marcosencodersDATA +.PRECIOUS: Makefile + install-data-hook: for encoder in $(marcosencoders_DATA) ; do chmod a+rx "$(DESTDIR)$(marcosencodersdir)/$${encoder}" ; done
View file
LiVES-2.4.4.tar.bz2/lives-plugins/marcos-encoders/lives_theora_encoder -> LiVES-2.4.6.tar.bz2/lives-plugins/marcos-encoders/lives_theora_encoder
Changed
@@ -22,7 +22,7 @@ See my vids at http://amv.reimeika.ca ! """ -version = '0.1.7' +version = '0.1.8' import os if os.name == 'nt': convert = 'convert.exe' @@ -402,9 +402,17 @@ fpsnum = fps.split('/')[0] fpsden = fps.split('/')[1] - mplayer_opts = '-mf type=%s:fps=%s ' % (ext[1:], - eval('float('+fpsnum+')/'+fpsden)) + \ - '-vf hqdn3d=2:1:3,pp=va:128:8/ha:128:8/dr,dsize=%s -vo yuv4mpeg -ao null -nosound' % aspect + + if mplayer != mplayer2: + mplayer_opts = '-mf type=%s:fps=%s ' % (ext[1:], + eval('float('+fpsnum+')/'+fpsden)) + \ + '-vf hqdn3d=2:1:3,pp=va:128:8/ha:128:8/dr,dsize=%s -vo yuv4mpeg -ao null -nosound' % aspect + + else: + mplayer_opts = '-mf type=%s:fps=%s ' % (ext[1:], + eval('float('+fpsnum+')/'+fpsden)) + \ + '-vf hqdn3d=2:1:3,dsize=%s -vo yuv4mpeg -ao null -nosound' % aspect + if img_dir != work_dir and not enhance: source_dir = img_dir @@ -861,4 +869,6 @@ tweaked audio quality settings. 28 Jun 2007 : 0.1.5 : handles paths with spaces appropriately (thanks Gabriel). + +2015 : 0.1.8 : remove -pp for mplayer2 (they removed it, duh) """
View file
LiVES-2.4.4.tar.bz2/lives-plugins/marcos-encoders/lives_theora_encoder3 -> LiVES-2.4.6.tar.bz2/lives-plugins/marcos-encoders/lives_theora_encoder3
Changed
@@ -402,9 +402,17 @@ fpsnum = fps.split('/')[0] fpsden = fps.split('/')[1] - mplayer_opts = '-mf type=%s:fps=%s ' % (ext[1:], - eval('float('+fpsnum+')/'+fpsden)) + \ - '-vf hqdn3d=2:1:3,pp=va:128:8/ha:128:8/dr,dsize=%s -vo yuv4mpeg -ao null -nosound' % aspect + + if mplayer != mplayer2: + mplayer_opts = '-mf type=%s:fps=%s ' % (ext[1:], + eval('float('+fpsnum+')/'+fpsden)) + \ + '-vf hqdn3d=2:1:3,pp=va:128:8/ha:128:8/dr,dsize=%s -vo yuv4mpeg -ao null -nosound' % aspect + + else: + mplayer_opts = '-mf type=%s:fps=%s ' % (ext[1:], + eval('float('+fpsnum+')/'+fpsden)) + \ + '-vf hqdn3d=2:1:3,dsize=%s -vo yuv4mpeg -ao null -nosound' % aspect + if img_dir != work_dir and not enhance: source_dir = img_dir
View file
LiVES-2.4.4.tar.bz2/lives-plugins/plugins/Makefile.in -> LiVES-2.4.6.tar.bz2/lives-plugins/plugins/Makefile.in
Changed
@@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,7 +14,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -79,8 +89,6 @@ host_triplet = @host@ target_triplet = @target@ subdir = lives-plugins/plugins -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/mkinstalldirs ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \ @@ -104,6 +112,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -162,6 +171,7 @@ ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/mkinstalldirs DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -327,6 +337,8 @@ OPENCV_CFLAGS = @OPENCV_CFLAGS@ OPENCV_LIBS = @OPENCV_LIBS@ OPENCV_LIBS_ONLY_L = @OPENCV_LIBS_ONLY_L@ +ORC_CFLAGS = @ORC_CFLAGS@ +ORC_LIBS = @ORC_LIBS@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -463,7 +475,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lives-plugins/plugins/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu lives-plugins/plugins/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -758,6 +769,8 @@ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ ps ps-am tags tags-am uninstall uninstall-am +.PRECIOUS: Makefile + # 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.
View file
LiVES-2.4.4.tar.bz2/lives-plugins/plugins/decoders/Makefile.in -> LiVES-2.4.6.tar.bz2/lives-plugins/plugins/decoders/Makefile.in
Changed
@@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -93,8 +103,6 @@ @HAVE_AVCODEC_TRUE@@HAVE_AVFORMAT_INTERNAL_H_TRUE@@HAVE_AVFORMAT_TRUE@@HAVE_AVUTIL_TRUE@am__append_12 = -DHAVE_AVFORMAT_INTERNAL_H=1 @HAVE_AVCODEC_TRUE@@HAVE_AVFORMAT_TRUE@@HAVE_AVUTIL_TRUE@@HAVE_AV_SET_PTS_INFO_TRUE@am__append_13 = -DHAVE_AV_SET_PTS_INFO=1 subdir = lives-plugins/plugins/decoders -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/mkinstalldirs $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \ @@ -118,6 +126,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -301,6 +310,8 @@ done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp \ + $(top_srcdir)/mkinstalldirs DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ @@ -441,6 +452,8 @@ OPENCV_CFLAGS = @OPENCV_CFLAGS@ OPENCV_LIBS = @OPENCV_LIBS@ OPENCV_LIBS_ONLY_L = @OPENCV_LIBS_ONLY_L@ +ORC_CFLAGS = @ORC_CFLAGS@ +ORC_LIBS = @ORC_LIBS@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -647,7 +660,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lives-plugins/plugins/decoders/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu lives-plugins/plugins/decoders/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -1044,6 +1056,8 @@ pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ uninstall-decoderpluginslibLTLIBRARIES +.PRECIOUS: Makefile + # 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.
View file
LiVES-2.4.4.tar.bz2/lives-plugins/plugins/decoders/avformat_decoder.c -> LiVES-2.4.6.tar.bz2/lives-plugins/plugins/decoders/avformat_decoder.c
Changed
@@ -420,158 +420,158 @@ break; - /* case CODEC_TYPE_SUBTITLE: + /* case CODEC_TYPE_SUBTITLE: + + + + 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 ); + } + } + 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( 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" ); - } + if( cc->codec_type == CODEC_TYPE_DATA ) + psz_type = "data"; - 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 ); - } + 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; - psz_type = "subtitle"; - break; - */ - - // default: - - /* - #ifdef HAVE_FFMPEG_CODEC_ATTACHMENT - if( cc->codec_type == CODEC_TYPE_ATTACHMENT ) + #ifdef HAVE_FFMPEG_CODEC_ATTACHMENT + if( cc->codec_type != CODEC_TYPE_ATTACHMENT ) + #endif { - 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; - - #ifdef HAVE_FFMPEG_CODEC_ATTACHMENT - if( cc->codec_type != CODEC_TYPE_ATTACHMENT ) - #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]; -
View file
LiVES-2.4.4.tar.bz2/lives-plugins/plugins/decoders/mpegts_decoder.c -> LiVES-2.4.6.tar.bz2/lives-plugins/plugins/decoders/mpegts_decoder.c
Changed
@@ -1211,8 +1211,8 @@ } } break; - /**********************************************/ - /* PES packing parsing */ + /**********************************************/ + /* PES packing parsing */ case MPEGTS_PESHEADER: len = PES_HEADER_SIZE - pes->data_index; if (len < 0)
View file
LiVES-2.4.4.tar.bz2/lives-plugins/plugins/effects/Makefile.in -> LiVES-2.4.6.tar.bz2/lives-plugins/plugins/effects/Makefile.in
Changed
@@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,7 +14,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -79,8 +89,6 @@ host_triplet = @host@ target_triplet = @target@ subdir = lives-plugins/plugins/effects -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/mkinstalldirs ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \ @@ -104,6 +112,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -162,6 +171,7 @@ ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/mkinstalldirs DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -327,6 +337,8 @@ OPENCV_CFLAGS = @OPENCV_CFLAGS@ OPENCV_LIBS = @OPENCV_LIBS@ OPENCV_LIBS_ONLY_L = @OPENCV_LIBS_ONLY_L@ +ORC_CFLAGS = @ORC_CFLAGS@ +ORC_LIBS = @ORC_LIBS@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -462,7 +474,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lives-plugins/plugins/effects/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu lives-plugins/plugins/effects/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -757,6 +768,8 @@ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ ps ps-am tags tags-am uninstall uninstall-am +.PRECIOUS: Makefile + # 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.
View file
LiVES-2.4.4.tar.bz2/lives-plugins/plugins/effects/RFXscripts/Makefile.in -> LiVES-2.4.6.tar.bz2/lives-plugins/plugins/effects/RFXscripts/Makefile.in
Changed
@@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -18,7 +18,17 @@ #ls -1 | grep -v Makefile.am | sed "s/$/ \\\\/g" >> Makefile.am VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -83,8 +93,6 @@ host_triplet = @host@ target_triplet = @target@ subdir = lives-plugins/plugins/effects/RFXscripts -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/mkinstalldirs ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \ @@ -108,6 +116,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -160,6 +169,7 @@ am__installdirs = "$(DESTDIR)$(RFXscriptsdir)" DATA = $(RFXscripts_DATA) am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/mkinstalldirs DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ @@ -300,6 +310,8 @@ OPENCV_CFLAGS = @OPENCV_CFLAGS@ OPENCV_LIBS = @OPENCV_LIBS@ OPENCV_LIBS_ONLY_L = @OPENCV_LIBS_ONLY_L@ +ORC_CFLAGS = @ORC_CFLAGS@ +ORC_LIBS = @ORC_LIBS@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -437,7 +449,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lives-plugins/plugins/effects/RFXscripts/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu lives-plugins/plugins/effects/RFXscripts/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -635,6 +646,8 @@ mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \ uninstall-RFXscriptsDATA uninstall-am +.PRECIOUS: Makefile + install-exec-am: "$(top_srcdir)/mkinstalldirs" \
View file
LiVES-2.4.4.tar.bz2/lives-plugins/plugins/effects/compound/Makefile.in -> LiVES-2.4.6.tar.bz2/lives-plugins/plugins/effects/compound/Makefile.in
Changed
@@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -17,7 +17,17 @@ # VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -82,8 +92,6 @@ host_triplet = @host@ target_triplet = @target@ subdir = lives-plugins/plugins/effects/compound -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/mkinstalldirs ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \ @@ -107,6 +115,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -159,6 +168,7 @@ am__installdirs = "$(DESTDIR)$(compoundscriptsdir)" DATA = $(compoundscripts_DATA) am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/mkinstalldirs DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ @@ -299,6 +309,8 @@ OPENCV_CFLAGS = @OPENCV_CFLAGS@ OPENCV_LIBS = @OPENCV_LIBS@ OPENCV_LIBS_ONLY_L = @OPENCV_LIBS_ONLY_L@ +ORC_CFLAGS = @ORC_CFLAGS@ +ORC_LIBS = @ORC_LIBS@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -436,7 +448,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lives-plugins/plugins/effects/compound/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu lives-plugins/plugins/effects/compound/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -636,6 +647,8 @@ mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \ uninstall-am uninstall-compoundscriptsDATA +.PRECIOUS: Makefile + install-data-local: cp -rf icons/ "$(DESTDIR)$(compoundscriptsdir)"
View file
LiVES-2.4.4.tar.bz2/lives-plugins/plugins/encoders/Makefile.am -> LiVES-2.4.6.tar.bz2/lives-plugins/plugins/encoders/Makefile.am
Changed
@@ -11,7 +11,6 @@ multi_encoder3 \ qtutils_encoder \ sswf_encoder \ -transcode_encoder \ pdf_encoder \ x264_encoder
View file
LiVES-2.4.4.tar.bz2/lives-plugins/plugins/encoders/Makefile.in -> LiVES-2.4.6.tar.bz2/lives-plugins/plugins/encoders/Makefile.in
Changed
@@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -18,7 +18,17 @@ #ls -1 | grep -v Makefile.am | sed "s/$/ \\\\/g" >> Makefile.am VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -83,8 +93,6 @@ host_triplet = @host@ target_triplet = @target@ subdir = lives-plugins/plugins/encoders -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/mkinstalldirs COPYING ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \ @@ -108,6 +116,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -160,6 +169,8 @@ am__installdirs = "$(DESTDIR)$(encoderdir)" DATA = $(encoder_DATA) am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/mkinstalldirs \ + COPYING DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ @@ -300,6 +311,8 @@ OPENCV_CFLAGS = @OPENCV_CFLAGS@ OPENCV_LIBS = @OPENCV_LIBS@ OPENCV_LIBS_ONLY_L = @OPENCV_LIBS_ONLY_L@ +ORC_CFLAGS = @ORC_CFLAGS@ +ORC_LIBS = @ORC_LIBS@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -428,7 +441,6 @@ multi_encoder3 \ qtutils_encoder \ sswf_encoder \ -transcode_encoder \ pdf_encoder \ x264_encoder @@ -448,7 +460,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lives-plugins/plugins/encoders/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu lives-plugins/plugins/encoders/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -649,6 +660,8 @@ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ tags-am uninstall uninstall-am uninstall-encoderDATA +.PRECIOUS: Makefile + install-data-hook: chmod +x $(DESTDIR)$(encoderdir)/*
View file
LiVES-2.4.4.tar.bz2/lives-plugins/plugins/encoders/ffmpeg_encoder -> LiVES-2.4.6.tar.bz2/lives-plugins/plugins/encoders/ffmpeg_encoder
Changed
@@ -1,6 +1,6 @@ #!/usr/bin/perl -# (c) G. Finch (salsaman) 2009 - 2014 +# (c) G. Finch (salsaman) 2009 - 2015 # released under the GNU GPL 3 or later # see file COPYING or www.gnu.org for details @@ -18,6 +18,7 @@ # v 2.8 always prompt for threads # v 2.9 check for avconv, change -quality to -qscale # v 2.10 move -meta options after png/audio +# v 2.11 change fussy order of -pass option ####################################################################### if (!defined($standalone)) { @@ -39,7 +40,7 @@ if ($command eq "version") { - print "ffmpeg encoder plugin v2.10\n"; + print "ffmpeg encoder plugin v2.11\n"; exit 0; } @@ -313,7 +314,7 @@ elsif ($otype eq "3gp") { $passfile="passfile"; for $pass (1,2) { - $syscom="$encoder_command -strict 1 -pass $pass -y -r $fps -f image2 -i %8d$img_ext $audio_com -t $vid_length $vcodec \"$nfile\" $err"; + $syscom="$encoder_command -strict 1 -y -r $fps -f image2 -i %8d$img_ext $audio_com -t $vid_length $vcodec -pass $pass \"$nfile\" $err"; if (defined($DEBUG_ENCODERS)) { print STDERR "ffmpeg_encoder command is: $syscom\n"; } @@ -332,7 +333,7 @@ if ($otype eq "webmh") { for $pass (1,2) { if ($ffver>=52) { - $syscom="$encoder_command -pass $pass $threads -y -r $fps -f image2 -i %8d$img_ext $audio_com -t $vid_length $vcodec -metadata comment=\"$comment\" -metadata author=\"$author\" -metadata title=\"$title\" \"$nfile\" $err"; + $syscom="$encoder_command $threads -y -r $fps -f image2 -i %8d$img_ext $audio_com -t $vid_length $vcodec -metadata comment=\"$comment\" -metadata author=\"$author\" -metadata title=\"$title\" -pass $pass \"$nfile\" $err"; } else { $syscom="$encoder_command -pass $pass $threads -comment \"$comment\" -author \"$author\" -title \"$title\" -y -r $fps -f image2 -i %8d$img_ext $audio_com -t $vid_length $vcodec \"$nfile\" $err";
View file
LiVES-2.4.4.tar.bz2/lives-plugins/plugins/encoders/mjpegtools_encoder -> LiVES-2.4.6.tar.bz2/lives-plugins/plugins/encoders/mjpegtools_encoder
Changed
@@ -29,6 +29,7 @@ #0.98 checked handling for "," radix (thanks Doug) #0.99 Allow selection of aspect ratio for custom2 format (Doug). #1.0 use --no-constraints, optimise for multi-cpus (salsaman) +#1.1 fix error in framerate for vcd-ntsc # TODO: # check all formats for aspect ratios, block sizes and frame rates @@ -55,7 +56,7 @@ if ($command eq "version") { - print "mjpegtools encoder plugin v1.0\n"; + print "mjpegtools encoder plugin v1.1\n"; exit 0; } @@ -128,7 +129,7 @@ #vcd print "vcd_pal|vcd (PAL)|4|arate=32000;44100;48000,fps=25,aspect=1:1;4:3;16:9;2.21:1,hblock=16,vblock=16|mpg|\n"; - print "vcd_ntsc|vcd (NTSC)|4|arate=32000;44100;48000,fps=30000:10001,aspect=1:1;4:3;16:9;2.21:1,hblock=16,vblock=16|mpg|\n"; + print "vcd_ntsc|vcd (NTSC)|4|arate=32000;44100;48000,fps=30000:1001,aspect=1:1;4:3;16:9;2.21:1,hblock=16,vblock=16|mpg|\n"; #svcd print "svcd_pal|svcd (PAL)|4|arate=32000;44100;48000,fps=25,aspect=1:1;4:3;16:9;2.21:1,hblock=16,vblock=16|mpg|\n";
View file
LiVES-2.4.4.tar.bz2/lives-plugins/plugins/playback/Makefile.in -> LiVES-2.4.6.tar.bz2/lives-plugins/plugins/playback/Makefile.in
Changed
@@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,7 +14,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -79,8 +89,6 @@ host_triplet = @host@ target_triplet = @target@ subdir = lives-plugins/plugins/playback -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/mkinstalldirs ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \ @@ -104,6 +112,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -162,6 +171,7 @@ ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/mkinstalldirs DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -327,6 +337,8 @@ OPENCV_CFLAGS = @OPENCV_CFLAGS@ OPENCV_LIBS = @OPENCV_LIBS@ OPENCV_LIBS_ONLY_L = @OPENCV_LIBS_ONLY_L@ +ORC_CFLAGS = @ORC_CFLAGS@ +ORC_LIBS = @ORC_LIBS@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -463,7 +475,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lives-plugins/plugins/playback/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu lives-plugins/plugins/playback/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -758,6 +769,8 @@ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ ps ps-am tags tags-am uninstall uninstall-am +.PRECIOUS: Makefile + # 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.
View file
LiVES-2.4.4.tar.bz2/lives-plugins/plugins/playback/audiostream/Makefile.in -> LiVES-2.4.6.tar.bz2/lives-plugins/plugins/playback/audiostream/Makefile.in
Changed
@@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -18,7 +18,17 @@ #ls -1 | grep -v Makefile.am | sed "s/$/ \\\\/g" >> Makefile.am VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -83,8 +93,6 @@ host_triplet = @host@ target_triplet = @target@ subdir = lives-plugins/plugins/playback/audiostream -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/mkinstalldirs ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \ @@ -108,6 +116,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -160,6 +169,7 @@ am__installdirs = "$(DESTDIR)$(astreamdir)" DATA = $(astream_DATA) am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/mkinstalldirs DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ @@ -300,6 +310,8 @@ OPENCV_CFLAGS = @OPENCV_CFLAGS@ OPENCV_LIBS = @OPENCV_LIBS@ OPENCV_LIBS_ONLY_L = @OPENCV_LIBS_ONLY_L@ +ORC_CFLAGS = @ORC_CFLAGS@ +ORC_LIBS = @ORC_LIBS@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -437,7 +449,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lives-plugins/plugins/playback/audiostream/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu lives-plugins/plugins/playback/audiostream/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -638,6 +649,8 @@ mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \ uninstall-am uninstall-astreamDATA +.PRECIOUS: Makefile + install-data-hook: chmod +x "$(DESTDIR)$(astreamdir)/"*
View file
LiVES-2.4.4.tar.bz2/lives-plugins/plugins/playback/video/Makefile.in -> LiVES-2.4.6.tar.bz2/lives-plugins/plugins/playback/video/Makefile.in
Changed
@@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -86,8 +96,6 @@ @HAVE_GLEE_TRUE@@HAVE_GLU_TRUE@@HAVE_OPENGL_TRUE@@HAVE_SYSTEM_WEED_FALSE@@HAVE_X11_TRUE@@HAVE_XRENDER_TRUE@am__append_5 = $(shared_ldflags) @HAVE_GLEE_TRUE@@HAVE_GLU_TRUE@@HAVE_OPENGL_TRUE@@HAVE_SYSTEM_WEED_PLUGIN_TRUE@@HAVE_X11_TRUE@@HAVE_XRENDER_TRUE@am__append_6 = -DHAVE_SYSTEM_WEED_PLUGIN_H subdir = lives-plugins/plugins/playback/video -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/mkinstalldirs $(top_srcdir)/depcomp COPYING ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \ @@ -111,6 +119,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -311,6 +320,8 @@ done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp \ + $(top_srcdir)/mkinstalldirs COPYING DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ @@ -451,6 +462,8 @@ OPENCV_CFLAGS = @OPENCV_CFLAGS@ OPENCV_LIBS = @OPENCV_LIBS@ OPENCV_LIBS_ONLY_L = @OPENCV_LIBS_ONLY_L@ +ORC_CFLAGS = @ORC_CFLAGS@ +ORC_LIBS = @ORC_LIBS@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -651,7 +664,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lives-plugins/plugins/playback/video/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu lives-plugins/plugins/playback/video/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -1067,6 +1079,8 @@ tags tags-am uninstall uninstall-am \ uninstall-videopluginslibLTLIBRARIES +.PRECIOUS: Makefile + # 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.
View file
LiVES-2.4.4.tar.bz2/lives-plugins/themes/Makefile.in -> LiVES-2.4.6.tar.bz2/lives-plugins/themes/Makefile.in
Changed
@@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -80,8 +90,6 @@ host_triplet = @host@ target_triplet = @target@ subdir = lives-plugins/themes -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/mkinstalldirs ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \ @@ -105,6 +113,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -192,6 +201,7 @@ ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/mkinstalldirs DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -357,6 +367,8 @@ OPENCV_CFLAGS = @OPENCV_CFLAGS@ OPENCV_LIBS = @OPENCV_LIBS@ OPENCV_LIBS_ONLY_L = @OPENCV_LIBS_ONLY_L@ +ORC_CFLAGS = @ORC_CFLAGS@ +ORC_LIBS = @ORC_LIBS@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -501,7 +513,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lives-plugins/themes/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu lives-plugins/themes/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -821,6 +832,8 @@ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ uninstall-am uninstall-themesDATA +.PRECIOUS: Makefile + # 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.
View file
LiVES-2.4.4.tar.bz2/lives-plugins/themes/camera/Makefile.in -> LiVES-2.4.6.tar.bz2/lives-plugins/themes/camera/Makefile.in
Changed
@@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -80,8 +90,6 @@ host_triplet = @host@ target_triplet = @target@ subdir = lives-plugins/themes/camera -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/mkinstalldirs ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \ @@ -105,6 +113,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -157,6 +166,7 @@ am__installdirs = "$(DESTDIR)$(themesdir)" DATA = $(themes_DATA) am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/mkinstalldirs DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ @@ -297,6 +307,8 @@ OPENCV_CFLAGS = @OPENCV_CFLAGS@ OPENCV_LIBS = @OPENCV_LIBS@ OPENCV_LIBS_ONLY_L = @OPENCV_LIBS_ONLY_L@ +ORC_CFLAGS = @ORC_CFLAGS@ +ORC_LIBS = @ORC_LIBS@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -438,7 +450,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lives-plugins/themes/camera/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu lives-plugins/themes/camera/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -637,6 +648,8 @@ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ ps ps-am tags-am uninstall uninstall-am uninstall-themesDATA +.PRECIOUS: Makefile + # 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.
View file
LiVES-2.4.4.tar.bz2/lives-plugins/themes/crayons-bright/Makefile.in -> LiVES-2.4.6.tar.bz2/lives-plugins/themes/crayons-bright/Makefile.in
Changed
@@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -80,8 +90,6 @@ host_triplet = @host@ target_triplet = @target@ subdir = lives-plugins/themes/crayons-bright -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/mkinstalldirs ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \ @@ -105,6 +113,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -157,6 +166,7 @@ am__installdirs = "$(DESTDIR)$(themesdir)" DATA = $(themes_DATA) am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/mkinstalldirs DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ @@ -297,6 +307,8 @@ OPENCV_CFLAGS = @OPENCV_CFLAGS@ OPENCV_LIBS = @OPENCV_LIBS@ OPENCV_LIBS_ONLY_L = @OPENCV_LIBS_ONLY_L@ +ORC_CFLAGS = @ORC_CFLAGS@ +ORC_LIBS = @ORC_LIBS@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -438,7 +450,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lives-plugins/themes/crayons-bright/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu lives-plugins/themes/crayons-bright/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -637,6 +648,8 @@ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ ps ps-am tags-am uninstall uninstall-am uninstall-themesDATA +.PRECIOUS: Makefile + # 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.
View file
LiVES-2.4.4.tar.bz2/lives-plugins/themes/crayons/Makefile.in -> LiVES-2.4.6.tar.bz2/lives-plugins/themes/crayons/Makefile.in
Changed
@@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -80,8 +90,6 @@ host_triplet = @host@ target_triplet = @target@ subdir = lives-plugins/themes/crayons -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/mkinstalldirs ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \ @@ -105,6 +113,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -157,6 +166,7 @@ am__installdirs = "$(DESTDIR)$(themesdir)" DATA = $(themes_DATA) am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/mkinstalldirs DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ @@ -297,6 +307,8 @@ OPENCV_CFLAGS = @OPENCV_CFLAGS@ OPENCV_LIBS = @OPENCV_LIBS@ OPENCV_LIBS_ONLY_L = @OPENCV_LIBS_ONLY_L@ +ORC_CFLAGS = @ORC_CFLAGS@ +ORC_LIBS = @ORC_LIBS@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -438,7 +450,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lives-plugins/themes/crayons/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu lives-plugins/themes/crayons/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -637,6 +648,8 @@ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ ps ps-am tags-am uninstall uninstall-am uninstall-themesDATA +.PRECIOUS: Makefile + # 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.
View file
LiVES-2.4.4.tar.bz2/lives-plugins/themes/cutting_room/Makefile.in -> LiVES-2.4.6.tar.bz2/lives-plugins/themes/cutting_room/Makefile.in
Changed
@@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -80,8 +90,6 @@ host_triplet = @host@ target_triplet = @target@ subdir = lives-plugins/themes/cutting_room -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/mkinstalldirs ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \ @@ -105,6 +113,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -157,6 +166,7 @@ am__installdirs = "$(DESTDIR)$(themesdir)" DATA = $(themes_DATA) am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/mkinstalldirs DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ @@ -297,6 +307,8 @@ OPENCV_CFLAGS = @OPENCV_CFLAGS@ OPENCV_LIBS = @OPENCV_LIBS@ OPENCV_LIBS_ONLY_L = @OPENCV_LIBS_ONLY_L@ +ORC_CFLAGS = @ORC_CFLAGS@ +ORC_LIBS = @ORC_LIBS@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -438,7 +450,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lives-plugins/themes/cutting_room/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu lives-plugins/themes/cutting_room/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -637,6 +648,8 @@ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ ps ps-am tags-am uninstall uninstall-am uninstall-themesDATA +.PRECIOUS: Makefile + # 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.
View file
LiVES-2.4.4.tar.bz2/lives-plugins/themes/editor/Makefile.in -> LiVES-2.4.6.tar.bz2/lives-plugins/themes/editor/Makefile.in
Changed
@@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -80,8 +90,6 @@ host_triplet = @host@ target_triplet = @target@ subdir = lives-plugins/themes/editor -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/mkinstalldirs ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \ @@ -105,6 +113,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -157,6 +166,7 @@ am__installdirs = "$(DESTDIR)$(themesdir)" DATA = $(themes_DATA) am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/mkinstalldirs DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ @@ -297,6 +307,8 @@ OPENCV_CFLAGS = @OPENCV_CFLAGS@ OPENCV_LIBS = @OPENCV_LIBS@ OPENCV_LIBS_ONLY_L = @OPENCV_LIBS_ONLY_L@ +ORC_CFLAGS = @ORC_CFLAGS@ +ORC_LIBS = @ORC_LIBS@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -438,7 +450,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lives-plugins/themes/editor/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu lives-plugins/themes/editor/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -637,6 +648,8 @@ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ ps ps-am tags-am uninstall uninstall-am uninstall-themesDATA +.PRECIOUS: Makefile + # 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.
View file
LiVES-2.4.4.tar.bz2/lives-plugins/themes/pinks/Makefile.in -> LiVES-2.4.6.tar.bz2/lives-plugins/themes/pinks/Makefile.in
Changed
@@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -80,8 +90,6 @@ host_triplet = @host@ target_triplet = @target@ subdir = lives-plugins/themes/pinks -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/mkinstalldirs ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \ @@ -105,6 +113,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -157,6 +166,7 @@ am__installdirs = "$(DESTDIR)$(themesdir)" DATA = $(themes_DATA) am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/mkinstalldirs DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ @@ -297,6 +307,8 @@ OPENCV_CFLAGS = @OPENCV_CFLAGS@ OPENCV_LIBS = @OPENCV_LIBS@ OPENCV_LIBS_ONLY_L = @OPENCV_LIBS_ONLY_L@ +ORC_CFLAGS = @ORC_CFLAGS@ +ORC_LIBS = @ORC_LIBS@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -438,7 +450,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lives-plugins/themes/pinks/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu lives-plugins/themes/pinks/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -637,6 +648,8 @@ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ ps ps-am tags-am uninstall uninstall-am uninstall-themesDATA +.PRECIOUS: Makefile + # 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.
View file
LiVES-2.4.4.tar.bz2/lives-plugins/weed-plugins/Makefile.in -> LiVES-2.4.6.tar.bz2/lives-plugins/weed-plugins/Makefile.in
Changed
@@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -87,8 +97,6 @@ @HAVE_SYSTEM_WEED_PLUGIN_TRUE@am__append_4 = -DHAVE_SYSTEM_WEED_PLUGIN_H @HAVE_SYSTEM_WEED_COMPAT_TRUE@am__append_5 = -DHAVE_SYSTEM_WEED_COMPAT subdir = lives-plugins/weed-plugins -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/mkinstalldirs $(top_srcdir)/depcomp COPYING ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \ @@ -112,6 +120,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -491,6 +500,8 @@ ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp \ + $(top_srcdir)/mkinstalldirs COPYING DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -656,6 +667,8 @@ OPENCV_CFLAGS = @OPENCV_CFLAGS@ OPENCV_LIBS = @OPENCV_LIBS@ OPENCV_LIBS_ONLY_L = @OPENCV_LIBS_ONLY_L@ +ORC_CFLAGS = @ORC_CFLAGS@ +ORC_LIBS = @ORC_LIBS@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -910,7 +923,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lives-plugins/weed-plugins/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu lives-plugins/weed-plugins/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -1871,6 +1883,8 @@ uninstall-libvispluginslibLTLIBRARIES \ uninstall-opencvlibLTLIBRARIES uninstall-projectMLTLIBRARIES +.PRECIOUS: Makefile + install-data-local: $(MKDIR_P) "$(DESTDIR)$(fxpluginslibdir)"
View file
LiVES-2.4.4.tar.bz2/lives-plugins/weed-plugins/cairo/Makefile.in -> LiVES-2.4.6.tar.bz2/lives-plugins/weed-plugins/cairo/Makefile.in
Changed
@@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -17,7 +17,17 @@ # Process this with automake to create Makefile.in VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -83,8 +93,6 @@ target_triplet = @target@ @HAVE_SYSTEM_WEED_COMPAT_TRUE@am__append_1 = -DHAVE_SYSTEM_WEED_COMPAT subdir = lives-plugins/weed-plugins/cairo -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/mkinstalldirs $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \ @@ -108,6 +116,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -207,6 +216,8 @@ done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp \ + $(top_srcdir)/mkinstalldirs DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ @@ -347,6 +358,8 @@ OPENCV_CFLAGS = @OPENCV_CFLAGS@ OPENCV_LIBS = @OPENCV_LIBS@ OPENCV_LIBS_ONLY_L = @OPENCV_LIBS_ONLY_L@ +ORC_CFLAGS = @ORC_CFLAGS@ +ORC_LIBS = @ORC_LIBS@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -500,7 +513,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lives-plugins/weed-plugins/cairo/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu lives-plugins/weed-plugins/cairo/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -800,6 +812,8 @@ tags tags-am uninstall uninstall-am \ uninstall-fxpluginslibLTLIBRARIES +.PRECIOUS: Makefile + install-data-local: mkdir -p "$(DESTDIR)$(fxpluginslibdir)"
View file
LiVES-2.4.4.tar.bz2/lives-plugins/weed-plugins/edge.c -> LiVES-2.4.6.tar.bz2/lives-plugins/weed-plugins/edge.c
Changed
@@ -1,6 +1,6 @@ // edge.c // weed plugin -// (c) G. Finch (salsaman) 2005 +// (c) G. Finch (salsaman) 2005 - 2015 // // released under the GNU GPL 3 or later // see file COPYING or www.gnu.org for details
View file
LiVES-2.4.4.tar.bz2/lives-plugins/weed-plugins/fg_bg_removal.c -> LiVES-2.4.6.tar.bz2/lives-plugins/weed-plugins/fg_bg_removal.c
Changed
@@ -207,7 +207,7 @@ dest[j]=(uint8_t)((uint8_t)((fastrand(sdata)&0x7f00)>>8)+(dest[j+1]=(uint8_t)((fastrand(sdata)&0x7f00)>>8))); //R & G dest[j+2]=(uint8_t)0; //B break; - // + // case 2: // blue glow dest[j]=dest[j+1]=(uint8_t)((fastrand(sdata)&0xff00)>>8); //R&G
View file
LiVES-2.4.4.tar.bz2/lives-plugins/weed-plugins/gdk/Makefile.in -> LiVES-2.4.6.tar.bz2/lives-plugins/weed-plugins/gdk/Makefile.in
Changed
@@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -17,7 +17,17 @@ # Process this with automake to create Makefile.in VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -83,8 +93,6 @@ target_triplet = @target@ @HAVE_SYSTEM_WEED_COMPAT_TRUE@am__append_1 = -DHAVE_SYSTEM_WEED_COMPAT subdir = lives-plugins/weed-plugins/gdk -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/mkinstalldirs $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \ @@ -108,6 +116,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -253,6 +262,8 @@ done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp \ + $(top_srcdir)/mkinstalldirs DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ @@ -393,6 +404,8 @@ OPENCV_CFLAGS = @OPENCV_CFLAGS@ OPENCV_LIBS = @OPENCV_LIBS@ OPENCV_LIBS_ONLY_L = @OPENCV_LIBS_ONLY_L@ +ORC_CFLAGS = @ORC_CFLAGS@ +ORC_LIBS = @ORC_LIBS@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -557,7 +570,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lives-plugins/weed-plugins/gdk/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu lives-plugins/weed-plugins/gdk/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -906,6 +918,8 @@ tags tags-am uninstall uninstall-am \ uninstall-fxpluginslibLTLIBRARIES +.PRECIOUS: Makefile + install-data-local: mkdir -p "$(DESTDIR)$(fxpluginslibdir)"
View file
LiVES-2.4.4.tar.bz2/lives-plugins/weed-plugins/haip.c -> LiVES-2.4.6.tar.bz2/lives-plugins/weed-plugins/haip.c
Changed
@@ -117,7 +117,7 @@ } -inline int calc_luma(unsigned char *pt) { +static inline int calc_luma(unsigned char *pt) { return (Y_R[pt[0]]+Y_G[pt[1]]+Y_B[pt[2]])>>8; }
View file
LiVES-2.4.4.tar.bz2/lives-plugins/weed-plugins/slide_over.c -> LiVES-2.4.6.tar.bz2/lives-plugins/weed-plugins/slide_over.c
Changed
@@ -47,7 +47,7 @@ } -inline int pick_direction(weed_timecode_t tc) { +static inline int pick_direction(weed_timecode_t tc) { fastrand_val=tc&0xFFFFFFFF; return ((fastrand()>>24)&0x03)+1; }
View file
LiVES-2.4.4.tar.bz2/lives-plugins/weed-plugins/textfun.c -> LiVES-2.4.6.tar.bz2/lives-plugins/weed-plugins/textfun.c
Changed
@@ -211,7 +211,7 @@ else weed_memset(dst,0,3); break; case 2: - // greyscale + // greyscale case 3: // colour blocks if (fontrow&(1<<i)) weed_memcpy(dst,fillval,3);
View file
LiVES-2.4.4.tar.bz2/lives-plugins/weed-plugins/weed-plugin-utils.c -> LiVES-2.4.6.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) { +static 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; }
View file
LiVES-2.4.4.tar.bz2/ltmain.sh -> LiVES-2.4.6.tar.bz2/ltmain.sh
Changed
@@ -70,7 +70,7 @@ # compiler: $LTCC # compiler flags: $LTCFLAGS # linker: $LD (gnu? $with_gnu_ld) -# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1.7ubuntu1 +# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1.11 # automake: $automake_version # autoconf: $autoconf_version # @@ -80,7 +80,7 @@ PROGRAM=libtool PACKAGE=libtool -VERSION="2.4.2 Debian-2.4.2-1.7ubuntu1" +VERSION="2.4.2 Debian-2.4.2-1.11" TIMESTAMP="" package_revision=1.3337
View file
LiVES-2.4.4.tar.bz2/m4/Makefile.in -> LiVES-2.4.6.tar.bz2/m4/Makefile.in
Changed
@@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,7 +14,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -79,8 +89,6 @@ host_triplet = @host@ target_triplet = @target@ subdir = m4 -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/mkinstalldirs ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \ @@ -104,6 +112,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -127,6 +136,7 @@ *) (install-info --version) >/dev/null 2>&1;; \ esac am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/mkinstalldirs DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ @@ -267,6 +277,8 @@ OPENCV_CFLAGS = @OPENCV_CFLAGS@ OPENCV_LIBS = @OPENCV_LIBS@ OPENCV_LIBS_ONLY_L = @OPENCV_LIBS_ONLY_L@ +ORC_CFLAGS = @ORC_CFLAGS@ +ORC_LIBS = @ORC_LIBS@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -402,7 +414,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu m4/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu m4/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -577,6 +588,8 @@ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ tags-am uninstall uninstall-am +.PRECIOUS: Makefile + # 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.
View file
LiVES-2.4.4.tar.bz2/missing -> LiVES-2.4.6.tar.bz2/missing
Changed
@@ -3,7 +3,7 @@ scriptversion=2013-10-28.13; # UTC -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify
View file
LiVES-2.4.4.tar.bz2/po/ar.po -> LiVES-2.4.6.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-11-22 18:03-0300\n" +"POT-Creation-Date: 2015-12-19 08:17-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" @@ -90,80 +90,80 @@ msgid "Preserving set.\n" msgstr "الحفاظ على ضبط\n" -#: src/main.c:701 +#: src/main.c:700 msgid "Resizing" msgstr "غيّر حجم" -#: src/main.c:708 +#: src/main.c:707 msgid "_Resize All Frames" msgstr "غيّر حجم جميع الإطارات" #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter") -#: src/main.c:958 +#: src/main.c:957 msgid "Any" msgstr "أيّ" #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified") -#: src/main.c:960 +#: src/main.c:959 msgid "None" msgstr "بدون" #. TRANSLATORS: text saying "recommended", for plugin names, etc. -#: src/main.c:962 +#: src/main.c:961 msgid "recommended" msgstr "مستحسن" #. TRANSLATORS: text saying "disabled", (as in "not enabled") -#: src/main.c:964 +#: src/main.c:963 msgid "disabled !" msgstr "معطّل !" #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected -#: src/main.c:966 +#: src/main.c:965 msgid "**The current layout**" msgstr "**التخطيط الحالي**" #. TRANSLATORS: adjective for "Built in" type effects -#: src/main.c:968 +#: src/main.c:967 msgid "Builtin" msgstr "مُضمَّن" #. TRANSLATORS: adjective for "Custom" type effects -#: src/main.c:970 +#: src/main.c:969 msgid "Custom" msgstr "مخصص" #. TRANSLATORS: adjective for "Test" type effects -#: src/main.c:972 +#: src/main.c:971 msgid "Test" msgstr "اختبار" -#: src/main.c:1117 +#: src/main.c:1116 msgid "Foreground" msgstr "" -#: src/main.c:1118 +#: src/main.c:1117 #, fuzzy msgid "Background" msgstr "_خلفية بيضاء" -#: src/main.c:1634 +#: src/main.c:1644 msgid "Loading realtime effect plugins..." msgstr "تحميل إضافات مؤثرات الوقت الحقيقي..." -#: src/main.c:1700 +#: src/main.c:1710 msgid "Starting jack audio server..." msgstr "بدء خادوم جاك الصوت..." -#: src/main.c:1702 +#: src/main.c:1712 msgid "Starting jack transport server..." msgstr "بدء خادوم نقل جاك" -#: src/main.c:1703 +#: src/main.c:1713 msgid "Connecting to jack transport server..." msgstr "يتصل بخادوم نقل جاك" -#: src/main.c:1733 +#: src/main.c:1743 #, c-format msgid "" "\n" @@ -175,116 +175,126 @@ "Alternatively, try to start lives with either \"lives -jackopts 16\", or " msgstr "" -#: src/main.c:1768 +#: src/main.c:1778 msgid "Starting pulse audio server..." msgstr "بدء خادوم بالص-اوديو..." -#: src/main.c:1835 +#: src/main.c:1845 msgid "Checking optional dependencies:" msgstr "التحقق من إكتشاف التبعيات" -#: src/main.c:1836 +#: src/main.c:1846 msgid "mplayer...detected..." msgstr "تم العثور علي mplayer" -#: src/main.c:1837 +#: src/main.c:1847 msgid "mplayer...NOT DETECTED..." msgstr "لم يتم العثور علي mplayer" -#: src/main.c:1838 +#: src/main.c:1848 #, fuzzy msgid "mplayer2...detected..." msgstr "تم العثور علي mplayer" -#: src/main.c:1839 +#: src/main.c:1849 #, fuzzy msgid "mplayer2...NOT DETECTED..." msgstr "لم يتم العثور علي mplayer" -#: src/main.c:1840 +#: src/main.c:1851 +#, fuzzy +msgid "mpv...detected..." +msgstr "تم العثور علي mplayer" + +#: src/main.c:1852 +#, fuzzy +msgid "mpv...NOT DETECTED..." +msgstr "لم يتم العثور علي mplayer" + +#: src/main.c:1854 msgid "convert...detected..." msgstr "تم العثور علي convert" -#: src/main.c:1841 +#: src/main.c:1855 msgid "convert...NOT DETECTED..." msgstr "لم يتم العثور علي convert" -#: src/main.c:1842 +#: src/main.c:1856 msgid "composite...detected..." msgstr "تم العثور علي composite" -#: src/main.c:1843 +#: src/main.c:1857 msgid "composite...NOT DETECTED..." msgstr "لم يتم العثور علي composite" -#: src/main.c:1844 +#: src/main.c:1858 msgid "sox...detected\n" msgstr "تم العثور على .'sox'\n" -#: src/main.c:1845 +#: src/main.c:1859 msgid "sox...NOT DETECTED\n" msgstr "لم يتم العثور على .'sox'\n" -#: src/main.c:1846 +#: src/main.c:1860 #, fuzzy msgid "cdda2wav/icedax...detected..." msgstr "إكتشاف...'cdda2wav'..." -#: src/main.c:1847 +#: src/main.c:1861 #, fuzzy msgid "cdda2wav/icedax...NOT DETECTED..." msgstr "عدم إكتشاف...'cdda2wav'..." -#: src/main.c:1848 +#: src/main.c:1862 msgid "jackd...detected..." msgstr "إكتشاف ...جاك..."
View file
LiVES-2.4.4.tar.bz2/po/ca.po -> LiVES-2.4.6.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-11-22 18:03-0300\n" +"POT-Creation-Date: 2015-12-19 08:17-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" @@ -90,80 +90,80 @@ msgid "Preserving set.\n" msgstr "Grup de seguretat.\n" -#: src/main.c:701 +#: src/main.c:700 msgid "Resizing" msgstr "Redimensionat" -#: src/main.c:708 +#: src/main.c:707 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:958 +#: src/main.c:957 msgid "Any" msgstr "qualsevol" #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified") -#: src/main.c:960 +#: src/main.c:959 msgid "None" msgstr "Cap" #. TRANSLATORS: text saying "recommended", for plugin names, etc. -#: src/main.c:962 +#: src/main.c:961 msgid "recommended" msgstr "Recomanat" #. TRANSLATORS: text saying "disabled", (as in "not enabled") -#: src/main.c:964 +#: src/main.c:963 msgid "disabled !" msgstr "Espatllat" #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected -#: src/main.c:966 +#: src/main.c:965 msgid "**The current layout**" msgstr "**El disseny actual**" #. TRANSLATORS: adjective for "Built in" type effects -#: src/main.c:968 +#: src/main.c:967 msgid "Builtin" msgstr "Incorporat" #. TRANSLATORS: adjective for "Custom" type effects -#: src/main.c:970 +#: src/main.c:969 msgid "Custom" msgstr "Personalitzat" #. TRANSLATORS: adjective for "Test" type effects -#: src/main.c:972 +#: src/main.c:971 msgid "Test" msgstr "Comprova" -#: src/main.c:1117 +#: src/main.c:1116 msgid "Foreground" msgstr "" -#: src/main.c:1118 +#: src/main.c:1117 #, fuzzy msgid "Background" msgstr "_Inici" -#: src/main.c:1634 +#: src/main.c:1644 msgid "Loading realtime effect plugins..." msgstr "Carregant connexió d'efectes reals" -#: src/main.c:1700 +#: src/main.c:1710 msgid "Starting jack audio server..." msgstr "Començant connexió de servidor d'audio jack..." -#: src/main.c:1702 +#: src/main.c:1712 msgid "Starting jack transport server..." msgstr "" -#: src/main.c:1703 +#: src/main.c:1713 msgid "Connecting to jack transport server..." msgstr "" -#: src/main.c:1733 +#: src/main.c:1743 #, c-format msgid "" "\n" @@ -175,116 +175,126 @@ "Alternatively, try to start lives with either \"lives -jackopts 16\", or " msgstr "" -#: src/main.c:1768 +#: src/main.c:1778 msgid "Starting pulse audio server..." msgstr "Començant servidor d'audio pulsant..." -#: src/main.c:1835 +#: src/main.c:1845 msgid "Checking optional dependencies:" msgstr "Comprovant dependències opcionals:" -#: src/main.c:1836 +#: src/main.c:1846 msgid "mplayer...detected..." msgstr "mplayer...detectat..." -#: src/main.c:1837 +#: src/main.c:1847 msgid "mplayer...NOT DETECTED..." msgstr "mplayer...NO S'HA DETECTAT..." -#: src/main.c:1838 +#: src/main.c:1848 #, fuzzy msgid "mplayer2...detected..." msgstr "mplayer...detectat..." -#: src/main.c:1839 +#: src/main.c:1849 #, fuzzy msgid "mplayer2...NOT DETECTED..." msgstr "mplayer...NO S'HA DETECTAT..." -#: src/main.c:1840 +#: src/main.c:1851 +#, fuzzy +msgid "mpv...detected..." +msgstr "mplayer...detectat..." + +#: src/main.c:1852 +#, fuzzy +msgid "mpv...NOT DETECTED..." +msgstr "mplayer...NO S'HA DETECTAT..." + +#: src/main.c:1854 msgid "convert...detected..." msgstr "detectat convertidor" -#: src/main.c:1841 +#: src/main.c:1855 msgid "convert...NOT DETECTED..." msgstr "NO S'HA DETECTAT convertidor" -#: src/main.c:1842 +#: src/main.c:1856 msgid "composite...detected..." msgstr "detectada composició" -#: src/main.c:1843 +#: src/main.c:1857 msgid "composite...NOT DETECTED..." msgstr "NO S'HA DETECTAT composició" -#: src/main.c:1844 +#: src/main.c:1858 msgid "sox...detected\n" msgstr "sox...detectat...\n" -#: src/main.c:1845 +#: src/main.c:1859 msgid "sox...NOT DETECTED\n" msgstr "sox...NO S'HA DETECTAT...\n" -#: src/main.c:1846 +#: src/main.c:1860 #, fuzzy msgid "cdda2wav/icedax...detected..." msgstr "cdda2wav...detectat..." -#: src/main.c:1847 +#: src/main.c:1861 #, fuzzy msgid "cdda2wav/icedax...NOT DETECTED..." msgstr "cdda2wav...NO S'HA DETECTAT..." -#: src/main.c:1848 +#: src/main.c:1862 msgid "jackd...detected..." msgstr "jackd...detectat..."
View file
LiVES-2.4.4.tar.bz2/po/cs.po -> LiVES-2.4.6.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-11-22 18:03-0300\n" +"POT-Creation-Date: 2015-12-19 08:17-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" @@ -89,80 +89,80 @@ msgid "Preserving set.\n" msgstr "Zachování nastavení.\n" -#: src/main.c:701 +#: src/main.c:700 msgid "Resizing" msgstr "Měním velikost" -#: src/main.c:708 +#: src/main.c:707 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:958 +#: src/main.c:957 msgid "Any" msgstr "Libovolný" #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified") -#: src/main.c:960 +#: src/main.c:959 msgid "None" msgstr "Žádný" #. TRANSLATORS: text saying "recommended", for plugin names, etc. -#: src/main.c:962 +#: src/main.c:961 msgid "recommended" msgstr "doporučeno" #. TRANSLATORS: text saying "disabled", (as in "not enabled") -#: src/main.c:964 +#: src/main.c:963 msgid "disabled !" msgstr "zakázáno!" #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected -#: src/main.c:966 +#: src/main.c:965 msgid "**The current layout**" msgstr "**Bieżący układ**" #. TRANSLATORS: adjective for "Built in" type effects -#: src/main.c:968 +#: src/main.c:967 msgid "Builtin" msgstr "Vestavěno" #. TRANSLATORS: adjective for "Custom" type effects -#: src/main.c:970 +#: src/main.c:969 msgid "Custom" msgstr "Vlastní" #. TRANSLATORS: adjective for "Test" type effects -#: src/main.c:972 +#: src/main.c:971 msgid "Test" msgstr "Test" -#: src/main.c:1117 +#: src/main.c:1116 msgid "Foreground" msgstr "" -#: src/main.c:1118 +#: src/main.c:1117 #, fuzzy msgid "Background" msgstr "_Prázdné pozadí" -#: src/main.c:1634 +#: src/main.c:1644 msgid "Loading realtime effect plugins..." msgstr "Načítám pluginy pro efekty v reálném času..." -#: src/main.c:1700 +#: src/main.c:1710 msgid "Starting jack audio server..." msgstr "Spouštím zvukový server JACK..." -#: src/main.c:1702 +#: src/main.c:1712 msgid "Starting jack transport server..." msgstr "" -#: src/main.c:1703 +#: src/main.c:1713 msgid "Connecting to jack transport server..." msgstr "" -#: src/main.c:1733 +#: src/main.c:1743 #, c-format msgid "" "\n" @@ -174,116 +174,126 @@ "Alternatively, try to start lives with either \"lives -jackopts 16\", or " msgstr "" -#: src/main.c:1768 +#: src/main.c:1778 msgid "Starting pulse audio server..." msgstr "" -#: src/main.c:1835 +#: src/main.c:1845 msgid "Checking optional dependencies:" msgstr "Kontrola dodatečných závislostí:" -#: src/main.c:1836 +#: src/main.c:1846 msgid "mplayer...detected..." msgstr "mplayer... nalezen..." -#: src/main.c:1837 +#: src/main.c:1847 msgid "mplayer...NOT DETECTED..." msgstr "mplayer... NENALEZEN..." -#: src/main.c:1838 +#: src/main.c:1848 #, fuzzy msgid "mplayer2...detected..." msgstr "mplayer... nalezen..." -#: src/main.c:1839 +#: src/main.c:1849 #, fuzzy msgid "mplayer2...NOT DETECTED..." msgstr "mplayer... NENALEZEN..." -#: src/main.c:1840 +#: src/main.c:1851 +#, fuzzy +msgid "mpv...detected..." +msgstr "mplayer... nalezen..." + +#: src/main.c:1852 +#, fuzzy +msgid "mpv...NOT DETECTED..." +msgstr "mplayer... NENALEZEN..." + +#: src/main.c:1854 msgid "convert...detected..." msgstr "convert... nalezen..." -#: src/main.c:1841 +#: src/main.c:1855 msgid "convert...NOT DETECTED..." msgstr "convert... NENALEZEN..." -#: src/main.c:1842 +#: src/main.c:1856 msgid "composite...detected..." msgstr "composite... nalezen..." -#: src/main.c:1843 +#: src/main.c:1857 msgid "composite...NOT DETECTED..." msgstr "composite... NENALEZEN..." -#: src/main.c:1844 +#: src/main.c:1858 msgid "sox...detected\n" msgstr "sox... nalezen\n" -#: src/main.c:1845 +#: src/main.c:1859 msgid "sox...NOT DETECTED\n" msgstr "sox... NENALEZEN\n" -#: src/main.c:1846 +#: src/main.c:1860 #, fuzzy msgid "cdda2wav/icedax...detected..." msgstr "cdda2wav... nalezen..." -#: src/main.c:1847 +#: src/main.c:1861 #, fuzzy msgid "cdda2wav/icedax...NOT DETECTED..." msgstr "cdda2wav... NENALEZEN..." -#: src/main.c:1848 +#: src/main.c:1862 msgid "jackd...detected..." msgstr "jackd... nalezen..."
View file
LiVES-2.4.4.tar.bz2/po/da.po -> LiVES-2.4.6.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-11-22 18:03-0300\n" +"POT-Creation-Date: 2015-12-19 08:17-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" @@ -76,80 +76,80 @@ msgid "Preserving set.\n" msgstr "" -#: src/main.c:701 +#: src/main.c:700 msgid "Resizing" msgstr "Ændrer størrelse" -#: src/main.c:708 +#: src/main.c:707 msgid "_Resize All Frames" msgstr "" #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter") -#: src/main.c:958 +#: src/main.c:957 msgid "Any" msgstr "Enhver" #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified") -#: src/main.c:960 +#: src/main.c:959 msgid "None" msgstr "Ingen" #. TRANSLATORS: text saying "recommended", for plugin names, etc. -#: src/main.c:962 +#: src/main.c:961 msgid "recommended" msgstr "anbefalet" #. TRANSLATORS: text saying "disabled", (as in "not enabled") -#: src/main.c:964 +#: src/main.c:963 msgid "disabled !" msgstr "" #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected -#: src/main.c:966 +#: src/main.c:965 msgid "**The current layout**" msgstr "" #. TRANSLATORS: adjective for "Built in" type effects -#: src/main.c:968 +#: src/main.c:967 msgid "Builtin" msgstr "Indbygget" #. TRANSLATORS: adjective for "Custom" type effects -#: src/main.c:970 +#: src/main.c:969 msgid "Custom" msgstr "Brugerdefineret" #. TRANSLATORS: adjective for "Test" type effects -#: src/main.c:972 +#: src/main.c:971 msgid "Test" msgstr "Test" -#: src/main.c:1117 +#: src/main.c:1116 msgid "Foreground" msgstr "" -#: src/main.c:1118 +#: src/main.c:1117 #, fuzzy msgid "Background" msgstr "_Start farve" -#: src/main.c:1634 +#: src/main.c:1644 msgid "Loading realtime effect plugins..." msgstr "" -#: src/main.c:1700 +#: src/main.c:1710 msgid "Starting jack audio server..." msgstr "" -#: src/main.c:1702 +#: src/main.c:1712 msgid "Starting jack transport server..." msgstr "" -#: src/main.c:1703 +#: src/main.c:1713 msgid "Connecting to jack transport server..." msgstr "" -#: src/main.c:1733 +#: src/main.c:1743 #, c-format msgid "" "\n" @@ -161,112 +161,120 @@ "Alternatively, try to start lives with either \"lives -jackopts 16\", or " msgstr "" -#: src/main.c:1768 +#: src/main.c:1778 msgid "Starting pulse audio server..." msgstr "" -#: src/main.c:1835 +#: src/main.c:1845 msgid "Checking optional dependencies:" msgstr "" -#: src/main.c:1836 +#: src/main.c:1846 msgid "mplayer...detected..." msgstr "" -#: src/main.c:1837 +#: src/main.c:1847 msgid "mplayer...NOT DETECTED..." msgstr "" -#: src/main.c:1838 +#: src/main.c:1848 msgid "mplayer2...detected..." msgstr "" -#: src/main.c:1839 +#: src/main.c:1849 msgid "mplayer2...NOT DETECTED..." msgstr "" -#: src/main.c:1840 +#: src/main.c:1851 +msgid "mpv...detected..." +msgstr "" + +#: src/main.c:1852 +msgid "mpv...NOT DETECTED..." +msgstr "" + +#: src/main.c:1854 msgid "convert...detected..." msgstr "" -#: src/main.c:1841 +#: src/main.c:1855 msgid "convert...NOT DETECTED..." msgstr "" -#: src/main.c:1842 +#: src/main.c:1856 msgid "composite...detected..." msgstr "" -#: src/main.c:1843 +#: src/main.c:1857 msgid "composite...NOT DETECTED..." msgstr "" -#: src/main.c:1844 +#: src/main.c:1858 msgid "sox...detected\n" msgstr "" -#: src/main.c:1845 +#: src/main.c:1859 msgid "sox...NOT DETECTED\n" msgstr "" -#: src/main.c:1846 +#: src/main.c:1860 msgid "cdda2wav/icedax...detected..." msgstr "" -#: src/main.c:1847 +#: src/main.c:1861 msgid "cdda2wav/icedax...NOT DETECTED..." msgstr "" -#: src/main.c:1848 +#: src/main.c:1862 msgid "jackd...detected..." msgstr "" -#: src/main.c:1849 +#: src/main.c:1863 msgid "jackd...NOT DETECTED..." msgstr "" -#: src/main.c:1850
View file
LiVES-2.4.4.tar.bz2/po/de_DE.po -> LiVES-2.4.6.tar.bz2/po/de_DE.po
Changed
@@ -2,7 +2,7 @@ msgstr "" "Project-Id-Version: Lives 0.9.5\n" "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n" -"POT-Creation-Date: 2015-11-22 18:03-0300\n" +"POT-Creation-Date: 2015-12-19 08:17-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" @@ -88,79 +88,79 @@ msgid "Preserving set.\n" msgstr "Set wird erhalten.\n" -#: src/main.c:701 +#: src/main.c:700 msgid "Resizing" msgstr "Skalieren" -#: src/main.c:708 +#: src/main.c:707 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:958 +#: src/main.c:957 msgid "Any" msgstr "Beliebig" #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified") -#: src/main.c:960 +#: src/main.c:959 msgid "None" msgstr "Kein(e)" #. TRANSLATORS: text saying "recommended", for plugin names, etc. -#: src/main.c:962 +#: src/main.c:961 msgid "recommended" msgstr "empfohlen" #. TRANSLATORS: text saying "disabled", (as in "not enabled") -#: src/main.c:964 +#: src/main.c:963 msgid "disabled !" msgstr "deaktiviert!" #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected -#: src/main.c:966 +#: src/main.c:965 msgid "**The current layout**" msgstr "**Momentanes Layout**" #. TRANSLATORS: adjective for "Built in" type effects -#: src/main.c:968 +#: src/main.c:967 msgid "Builtin" msgstr "Eingebaut" #. TRANSLATORS: adjective for "Custom" type effects -#: src/main.c:970 +#: src/main.c:969 msgid "Custom" msgstr "Benutzerdefiniert" #. TRANSLATORS: adjective for "Test" type effects -#: src/main.c:972 +#: src/main.c:971 msgid "Test" msgstr "Test" -#: src/main.c:1117 +#: src/main.c:1116 msgid "Foreground" msgstr "Vordergrund" -#: src/main.c:1118 +#: src/main.c:1117 msgid "Background" msgstr "Hintergrund" -#: src/main.c:1634 +#: src/main.c:1644 msgid "Loading realtime effect plugins..." msgstr "Lade Echtzeit-Effekt Plugins..." -#: src/main.c:1700 +#: src/main.c:1710 msgid "Starting jack audio server..." msgstr "Jack Audio Server wird gestartet..." -#: src/main.c:1702 +#: src/main.c:1712 msgid "Starting jack transport server..." msgstr "Jack Transport Server wird gestartet..." -#: src/main.c:1703 +#: src/main.c:1713 msgid "Connecting to jack transport server..." msgstr "Verbindung zum Jack Transport Server wird hergestellt..." -#: src/main.c:1733 +#: src/main.c:1743 #, c-format msgid "" "\n" @@ -181,116 +181,126 @@ "Alternativ, Versuchen Sie LiVES entweder mit der Option \"-jackopts 16\" zu " "starten, oder " -#: src/main.c:1768 +#: src/main.c:1778 msgid "Starting pulse audio server..." msgstr "PulseAudio Server wird gestartet..." -#: src/main.c:1835 +#: src/main.c:1845 msgid "Checking optional dependencies:" msgstr "Optionale Abhängigkeiten werden überprüft:" -#: src/main.c:1836 +#: src/main.c:1846 msgid "mplayer...detected..." msgstr "mplayer...gefunden..." -#: src/main.c:1837 +#: src/main.c:1847 msgid "mplayer...NOT DETECTED..." msgstr "mplayer...NICHT GEFUNDEN..." -#: src/main.c:1838 +#: src/main.c:1848 #, fuzzy msgid "mplayer2...detected..." msgstr "mplayer...gefunden..." -#: src/main.c:1839 +#: src/main.c:1849 #, fuzzy msgid "mplayer2...NOT DETECTED..." msgstr "mplayer...NICHT GEFUNDEN..." -#: src/main.c:1840 +#: src/main.c:1851 +#, fuzzy +msgid "mpv...detected..." +msgstr "mplayer...gefunden..." + +#: src/main.c:1852 +#, fuzzy +msgid "mpv...NOT DETECTED..." +msgstr "mplayer...NICHT GEFUNDEN..." + +#: src/main.c:1854 msgid "convert...detected..." msgstr "convert...gefunden..." -#: src/main.c:1841 +#: src/main.c:1855 msgid "convert...NOT DETECTED..." msgstr "convert...NICHT GEFUNDEN..." -#: src/main.c:1842 +#: src/main.c:1856 msgid "composite...detected..." msgstr "composite...gefunden..." -#: src/main.c:1843 +#: src/main.c:1857 msgid "composite...NOT DETECTED..." msgstr "composite...NICHT GEFUNDEN..." -#: src/main.c:1844 +#: src/main.c:1858 msgid "sox...detected\n" msgstr "sox...gefunden\n" -#: src/main.c:1845 +#: src/main.c:1859 msgid "sox...NOT DETECTED\n" msgstr "sox...NICHT GEFUNDEN\n" -#: src/main.c:1846 +#: src/main.c:1860 #, fuzzy msgid "cdda2wav/icedax...detected..." msgstr "cdda2wav...gefunden..." -#: src/main.c:1847 +#: src/main.c:1861 #, fuzzy msgid "cdda2wav/icedax...NOT DETECTED..." msgstr "cdda2wav...NICHT GEFUNDEN..." -#: src/main.c:1848 +#: src/main.c:1862 msgid "jackd...detected..." msgstr "jackd...gefunden..." -#: src/main.c:1849
View file
LiVES-2.4.4.tar.bz2/po/en_GB.po -> LiVES-2.4.6.tar.bz2/po/en_GB.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-11-22 18:03-0300\n" +"POT-Creation-Date: 2015-12-19 08:17-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" @@ -95,79 +95,79 @@ msgid "Preserving set.\n" msgstr "Preserving set.\n" -#: src/main.c:701 +#: src/main.c:700 msgid "Resizing" msgstr "Resizing" -#: src/main.c:708 +#: src/main.c:707 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:958 +#: src/main.c:957 msgid "Any" msgstr "Any" #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified") -#: src/main.c:960 +#: src/main.c:959 msgid "None" msgstr "None" #. TRANSLATORS: text saying "recommended", for plugin names, etc. -#: src/main.c:962 +#: src/main.c:961 msgid "recommended" msgstr "recommended" #. TRANSLATORS: text saying "disabled", (as in "not enabled") -#: src/main.c:964 +#: src/main.c:963 msgid "disabled !" msgstr "disabled !" #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected -#: src/main.c:966 +#: src/main.c:965 msgid "**The current layout**" msgstr "**The current layout**" #. TRANSLATORS: adjective for "Built in" type effects -#: src/main.c:968 +#: src/main.c:967 msgid "Builtin" msgstr "Builtin" #. TRANSLATORS: adjective for "Custom" type effects -#: src/main.c:970 +#: src/main.c:969 msgid "Custom" msgstr "Custom" #. TRANSLATORS: adjective for "Test" type effects -#: src/main.c:972 +#: src/main.c:971 msgid "Test" msgstr "Test" -#: src/main.c:1117 +#: src/main.c:1116 msgid "Foreground" msgstr "Foreground" -#: src/main.c:1118 +#: src/main.c:1117 msgid "Background" msgstr "Background" -#: src/main.c:1634 +#: src/main.c:1644 msgid "Loading realtime effect plugins..." msgstr "Loading realtime effect plugins..." -#: src/main.c:1700 +#: src/main.c:1710 msgid "Starting jack audio server..." msgstr "Starting jack audio server..." -#: src/main.c:1702 +#: src/main.c:1712 msgid "Starting jack transport server..." msgstr "Starting jack transport server..." -#: src/main.c:1703 +#: src/main.c:1713 msgid "Connecting to jack transport server..." msgstr "Connecting to jack transport server..." -#: src/main.c:1733 +#: src/main.c:1743 #, c-format msgid "" "\n" @@ -186,116 +186,126 @@ "\n" "Alternatively, try to start lives with either \"lives -jackopts 16\", or " -#: src/main.c:1768 +#: src/main.c:1778 msgid "Starting pulse audio server..." msgstr "Starting pulse audio server..." -#: src/main.c:1835 +#: src/main.c:1845 msgid "Checking optional dependencies:" msgstr "Checking optional dependencies:" -#: src/main.c:1836 +#: src/main.c:1846 msgid "mplayer...detected..." msgstr "mplayer...detected..." -#: src/main.c:1837 +#: src/main.c:1847 msgid "mplayer...NOT DETECTED..." msgstr "mplayer...NOT DETECTED..." -#: src/main.c:1838 +#: src/main.c:1848 #, fuzzy msgid "mplayer2...detected..." msgstr "mplayer...detected..." -#: src/main.c:1839 +#: src/main.c:1849 #, fuzzy msgid "mplayer2...NOT DETECTED..." msgstr "mplayer...NOT DETECTED..." -#: src/main.c:1840 +#: src/main.c:1851 +#, fuzzy +msgid "mpv...detected..." +msgstr "mplayer...detected..." + +#: src/main.c:1852 +#, fuzzy +msgid "mpv...NOT DETECTED..." +msgstr "mplayer...NOT DETECTED..." + +#: src/main.c:1854 msgid "convert...detected..." msgstr "convert...detected..." -#: src/main.c:1841 +#: src/main.c:1855 msgid "convert...NOT DETECTED..." msgstr "convert...NOT DETECTED..." -#: src/main.c:1842 +#: src/main.c:1856 msgid "composite...detected..." msgstr "composite...detected..." -#: src/main.c:1843 +#: src/main.c:1857 msgid "composite...NOT DETECTED..." msgstr "composite...NOT DETECTED..." -#: src/main.c:1844 +#: src/main.c:1858 msgid "sox...detected\n" msgstr "sox...detected\n" -#: src/main.c:1845 +#: src/main.c:1859 msgid "sox...NOT DETECTED\n" msgstr "sox...NOT DETECTED\n" -#: src/main.c:1846 +#: src/main.c:1860 #, fuzzy msgid "cdda2wav/icedax...detected..." msgstr "cdda2wav...detected..." -#: src/main.c:1847 +#: src/main.c:1861 #, fuzzy msgid "cdda2wav/icedax...NOT DETECTED..." msgstr "cdda2wav...NOT DETECTED..." -#: src/main.c:1848 +#: src/main.c:1862 msgid "jackd...detected..." msgstr "jackd...detected..." -#: src/main.c:1849
View file
LiVES-2.4.4.tar.bz2/po/es.po -> LiVES-2.4.6.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-11-22 18:03-0300\n" +"POT-Creation-Date: 2015-12-19 08:17-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" @@ -95,79 +95,79 @@ msgid "Preserving set.\n" msgstr "Preservando el conjunto.\n" -#: src/main.c:701 +#: src/main.c:700 msgid "Resizing" msgstr "Redimensionando" -#: src/main.c:708 +#: src/main.c:707 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:958 +#: src/main.c:957 msgid "Any" msgstr "Cualquiera" #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified") -#: src/main.c:960 +#: src/main.c:959 msgid "None" msgstr "Ninguno" #. TRANSLATORS: text saying "recommended", for plugin names, etc. -#: src/main.c:962 +#: src/main.c:961 msgid "recommended" msgstr "recomendado" #. TRANSLATORS: text saying "disabled", (as in "not enabled") -#: src/main.c:964 +#: src/main.c:963 msgid "disabled !" msgstr "desactivado" #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected -#: src/main.c:966 +#: src/main.c:965 msgid "**The current layout**" msgstr "**La disposición actual**" #. TRANSLATORS: adjective for "Built in" type effects -#: src/main.c:968 +#: src/main.c:967 msgid "Builtin" msgstr "Integrado" #. TRANSLATORS: adjective for "Custom" type effects -#: src/main.c:970 +#: src/main.c:969 msgid "Custom" msgstr "Personalizado" #. TRANSLATORS: adjective for "Test" type effects -#: src/main.c:972 +#: src/main.c:971 msgid "Test" msgstr "Prueba" -#: src/main.c:1117 +#: src/main.c:1116 msgid "Foreground" msgstr "Frente" -#: src/main.c:1118 +#: src/main.c:1117 msgid "Background" msgstr "Fondo" -#: src/main.c:1634 +#: src/main.c:1644 msgid "Loading realtime effect plugins..." msgstr "Cargando complementos de efectos en tiempo real..." -#: src/main.c:1700 +#: src/main.c:1710 msgid "Starting jack audio server..." msgstr "Iniciando el servidor de audio jack..." -#: src/main.c:1702 +#: src/main.c:1712 msgid "Starting jack transport server..." msgstr "" -#: src/main.c:1703 +#: src/main.c:1713 msgid "Connecting to jack transport server..." msgstr "" -#: src/main.c:1733 +#: src/main.c:1743 #, c-format msgid "" "\n" @@ -179,116 +179,126 @@ "Alternatively, try to start lives with either \"lives -jackopts 16\", or " msgstr "" -#: src/main.c:1768 +#: src/main.c:1778 msgid "Starting pulse audio server..." msgstr "Iniciando servidor PulseAudio..." -#: src/main.c:1835 +#: src/main.c:1845 msgid "Checking optional dependencies:" msgstr "Comprobando dependencias opcionales:" -#: src/main.c:1836 +#: src/main.c:1846 msgid "mplayer...detected..." msgstr "mplayer... detectado..." -#: src/main.c:1837 +#: src/main.c:1847 msgid "mplayer...NOT DETECTED..." msgstr "mplayer... NO DETECTADO..." -#: src/main.c:1838 +#: src/main.c:1848 #, fuzzy msgid "mplayer2...detected..." msgstr "mplayer... detectado..." -#: src/main.c:1839 +#: src/main.c:1849 #, fuzzy msgid "mplayer2...NOT DETECTED..." msgstr "mplayer... NO DETECTADO..." -#: src/main.c:1840 +#: src/main.c:1851 +#, fuzzy +msgid "mpv...detected..." +msgstr "mplayer... detectado..." + +#: src/main.c:1852 +#, fuzzy +msgid "mpv...NOT DETECTED..." +msgstr "mplayer... NO DETECTADO..." + +#: src/main.c:1854 msgid "convert...detected..." msgstr "convert... Detectado..." -#: src/main.c:1841 +#: src/main.c:1855 msgid "convert...NOT DETECTED..." msgstr "convert... NO DETECTADO..." -#: src/main.c:1842 +#: src/main.c:1856 msgid "composite...detected..." msgstr "composite... detectado..." -#: src/main.c:1843 +#: src/main.c:1857 msgid "composite...NOT DETECTED..." msgstr "composite... NO DETECTADO..." -#: src/main.c:1844 +#: src/main.c:1858 msgid "sox...detected\n" msgstr "sox... detectado\n" -#: src/main.c:1845 +#: src/main.c:1859 msgid "sox...NOT DETECTED\n" msgstr "sox... NO DETECTADO\n" -#: src/main.c:1846 +#: src/main.c:1860 #, fuzzy msgid "cdda2wav/icedax...detected..." msgstr "cdda2wav... detectado..." -#: src/main.c:1847 +#: src/main.c:1861 #, fuzzy msgid "cdda2wav/icedax...NOT DETECTED..." msgstr "cdda2wav... NO DETECTADO..." -#: src/main.c:1848 +#: src/main.c:1862 msgid "jackd...detected..." msgstr "jackd... detectado..." -#: src/main.c:1849
View file
LiVES-2.4.4.tar.bz2/po/et.po -> LiVES-2.4.6.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-11-22 18:03-0300\n" +"POT-Creation-Date: 2015-12-19 08:17-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" @@ -90,80 +90,80 @@ msgid "Preserving set.\n" msgstr "Valiku säilitamine.\n" -#: src/main.c:701 +#: src/main.c:700 msgid "Resizing" msgstr "Mõõtmete muutmine" -#: src/main.c:708 +#: src/main.c:707 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:958 +#: src/main.c:957 msgid "Any" msgstr "Kõik" #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified") -#: src/main.c:960 +#: src/main.c:959 msgid "None" msgstr "Pole" #. TRANSLATORS: text saying "recommended", for plugin names, etc. -#: src/main.c:962 +#: src/main.c:961 msgid "recommended" msgstr "soovitatav" #. TRANSLATORS: text saying "disabled", (as in "not enabled") -#: src/main.c:964 +#: src/main.c:963 msgid "disabled !" msgstr "keelatud !" #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected -#: src/main.c:966 +#: src/main.c:965 msgid "**The current layout**" msgstr "**Praegune skeem**" #. TRANSLATORS: adjective for "Built in" type effects -#: src/main.c:968 +#: src/main.c:967 msgid "Builtin" msgstr "Sisseehitatud" #. TRANSLATORS: adjective for "Custom" type effects -#: src/main.c:970 +#: src/main.c:969 msgid "Custom" msgstr "Kohandatud" #. TRANSLATORS: adjective for "Test" type effects -#: src/main.c:972 +#: src/main.c:971 msgid "Test" msgstr "Testi" -#: src/main.c:1117 +#: src/main.c:1116 msgid "Foreground" msgstr "" -#: src/main.c:1118 +#: src/main.c:1117 #, fuzzy msgid "Background" msgstr "_Alusta" -#: src/main.c:1634 +#: src/main.c:1644 msgid "Loading realtime effect plugins..." msgstr "Laen reaalaja efektide pluginaid..." -#: src/main.c:1700 +#: src/main.c:1710 msgid "Starting jack audio server..." msgstr "Heli serveri jack käivitamine..." -#: src/main.c:1702 +#: src/main.c:1712 msgid "Starting jack transport server..." msgstr "" -#: src/main.c:1703 +#: src/main.c:1713 msgid "Connecting to jack transport server..." msgstr "" -#: src/main.c:1733 +#: src/main.c:1743 #, c-format msgid "" "\n" @@ -175,116 +175,126 @@ "Alternatively, try to start lives with either \"lives -jackopts 16\", or " msgstr "" -#: src/main.c:1768 +#: src/main.c:1778 msgid "Starting pulse audio server..." msgstr "Heli serveri pulse käivitamine..." -#: src/main.c:1835 +#: src/main.c:1845 msgid "Checking optional dependencies:" msgstr "" -#: src/main.c:1836 +#: src/main.c:1846 msgid "mplayer...detected..." msgstr "mplayer...tuvastatud..." -#: src/main.c:1837 +#: src/main.c:1847 msgid "mplayer...NOT DETECTED..." msgstr "mplayer...ei tuvastatud..." -#: src/main.c:1838 +#: src/main.c:1848 #, fuzzy msgid "mplayer2...detected..." msgstr "mplayer...tuvastatud..." -#: src/main.c:1839 +#: src/main.c:1849 #, fuzzy msgid "mplayer2...NOT DETECTED..." msgstr "mplayer...ei tuvastatud..." -#: src/main.c:1840 +#: src/main.c:1851 +#, fuzzy +msgid "mpv...detected..." +msgstr "mplayer...tuvastatud..." + +#: src/main.c:1852 +#, fuzzy +msgid "mpv...NOT DETECTED..." +msgstr "mplayer...ei tuvastatud..." + +#: src/main.c:1854 msgid "convert...detected..." msgstr "konverdi...tuvastatud..." -#: src/main.c:1841 +#: src/main.c:1855 msgid "convert...NOT DETECTED..." msgstr "konversioon...ei tuvastatud..." -#: src/main.c:1842 +#: src/main.c:1856 msgid "composite...detected..." msgstr "komposiit...tuvastatud.." -#: src/main.c:1843 +#: src/main.c:1857 msgid "composite...NOT DETECTED..." msgstr "komposiit...ei tuvastatud..." -#: src/main.c:1844 +#: src/main.c:1858 msgid "sox...detected\n" msgstr "sox...tuvastatud\n" -#: src/main.c:1845 +#: src/main.c:1859 msgid "sox...NOT DETECTED\n" msgstr "sox...ei tuvastatud\n" -#: src/main.c:1846 +#: src/main.c:1860 #, fuzzy msgid "cdda2wav/icedax...detected..." msgstr "konverdi...tuvastatud..." -#: src/main.c:1847 +#: src/main.c:1861 #, fuzzy msgid "cdda2wav/icedax...NOT DETECTED..." msgstr "konversioon...ei tuvastatud..." -#: src/main.c:1848 +#: src/main.c:1862 msgid "jackd...detected..." msgstr ""
View file
LiVES-2.4.4.tar.bz2/po/fi.po -> LiVES-2.4.6.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-11-22 18:03-0300\n" +"POT-Creation-Date: 2015-12-19 08:17-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" @@ -96,80 +96,80 @@ msgid "Preserving set.\n" msgstr "Säilytetään leikesarja.\n" -#: src/main.c:701 +#: src/main.c:700 msgid "Resizing" msgstr "Koon muutos" -#: src/main.c:708 +#: src/main.c:707 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:958 +#: src/main.c:957 msgid "Any" msgstr "Mikä tahansa" #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified") -#: src/main.c:960 +#: src/main.c:959 msgid "None" msgstr "Ei mitään" #. TRANSLATORS: text saying "recommended", for plugin names, etc. -#: src/main.c:962 +#: src/main.c:961 msgid "recommended" msgstr "suositeltu" #. TRANSLATORS: text saying "disabled", (as in "not enabled") -#: src/main.c:964 +#: src/main.c:963 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:966 +#: src/main.c:965 msgid "**The current layout**" msgstr "**Nykyinen asettelu**" #. TRANSLATORS: adjective for "Built in" type effects -#: src/main.c:968 +#: src/main.c:967 msgid "Builtin" msgstr "" #. TRANSLATORS: adjective for "Custom" type effects -#: src/main.c:970 +#: src/main.c:969 msgid "Custom" msgstr "Mukauta" #. TRANSLATORS: adjective for "Test" type effects -#: src/main.c:972 +#: src/main.c:971 msgid "Test" msgstr "Kokeile" -#: src/main.c:1117 +#: src/main.c:1116 msgid "Foreground" msgstr "" -#: src/main.c:1118 +#: src/main.c:1117 #, fuzzy msgid "Background" msgstr "P_imennä tausta" -#: src/main.c:1634 +#: src/main.c:1644 msgid "Loading realtime effect plugins..." msgstr "Ladataan reaaliaikaiset tehosteliitännäiset..." -#: src/main.c:1700 +#: src/main.c:1710 msgid "Starting jack audio server..." msgstr "Käynnistetään jack-äänipalvelin..." -#: src/main.c:1702 +#: src/main.c:1712 msgid "Starting jack transport server..." msgstr "Käynnistetään jack-välityspalvelin..." -#: src/main.c:1703 +#: src/main.c:1713 msgid "Connecting to jack transport server..." msgstr "Yhdistetään jack-välityspalvelimeen..." -#: src/main.c:1733 +#: src/main.c:1743 #, c-format msgid "" "\n" @@ -181,116 +181,126 @@ "Alternatively, try to start lives with either \"lives -jackopts 16\", or " msgstr "" -#: src/main.c:1768 +#: src/main.c:1778 msgid "Starting pulse audio server..." msgstr "Käynnistetään pulse audio -palvelin..." -#: src/main.c:1835 +#: src/main.c:1845 msgid "Checking optional dependencies:" msgstr "Tarkistetaan valinnaiset riippuvuudet:" -#: src/main.c:1836 +#: src/main.c:1846 msgid "mplayer...detected..." msgstr "mplayer...havaittu..." -#: src/main.c:1837 +#: src/main.c:1847 msgid "mplayer...NOT DETECTED..." msgstr "mplayer...EI HAVAITTU..." -#: src/main.c:1838 +#: src/main.c:1848 #, fuzzy msgid "mplayer2...detected..." msgstr "mplayer...havaittu..." -#: src/main.c:1839 +#: src/main.c:1849 #, fuzzy msgid "mplayer2...NOT DETECTED..." msgstr "mplayer...EI HAVAITTU..." -#: src/main.c:1840 +#: src/main.c:1851 +#, fuzzy +msgid "mpv...detected..." +msgstr "mplayer...havaittu..." + +#: src/main.c:1852 +#, fuzzy +msgid "mpv...NOT DETECTED..." +msgstr "mplayer...EI HAVAITTU..." + +#: src/main.c:1854 msgid "convert...detected..." msgstr "convert...havaittu..." -#: src/main.c:1841 +#: src/main.c:1855 msgid "convert...NOT DETECTED..." msgstr "convert...EI HAVAITTU..." -#: src/main.c:1842 +#: src/main.c:1856 msgid "composite...detected..." msgstr "composite...havaittu..." -#: src/main.c:1843 +#: src/main.c:1857 msgid "composite...NOT DETECTED..." msgstr "composite...EI HAVAITTU..." -#: src/main.c:1844 +#: src/main.c:1858 msgid "sox...detected\n" msgstr "sox...havaittu\n" -#: src/main.c:1845 +#: src/main.c:1859 msgid "sox...NOT DETECTED\n" msgstr "sox...EI HAVAITTU\n" -#: src/main.c:1846 +#: src/main.c:1860 #, fuzzy msgid "cdda2wav/icedax...detected..." msgstr "cdda2wav...havaittu..." -#: src/main.c:1847 +#: src/main.c:1861 #, fuzzy msgid "cdda2wav/icedax...NOT DETECTED..." msgstr "cdda2wav...EI HAVAITTU..." -#: src/main.c:1848 +#: src/main.c:1862 msgid "jackd...detected..." msgstr "jackd...havaittu..."
View file
LiVES-2.4.4.tar.bz2/po/fr.po -> LiVES-2.4.6.tar.bz2/po/fr.po
Changed
@@ -9,16 +9,16 @@ msgstr "" "Project-Id-Version: fr\n" "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n" -"POT-Creation-Date: 2015-11-22 18:03-0300\n" -"PO-Revision-Date: 2015-04-13 18:06+0000\n" -"Last-Translator: Jean Marc <Unknown>\n" +"POT-Creation-Date: 2015-12-19 08:17-0300\n" +"PO-Revision-Date: 2015-11-25 22:11+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: 2015-05-03 15:41+0000\n" -"X-Generator: Launchpad (build 17474)\n" +"X-Launchpad-Export-Date: 2015-12-19 11:12+0000\n" +"X-Generator: Launchpad (build 17865)\n" "X-Poedit-Country: FRANCE\n" "X-Poedit-Language: French\n" @@ -94,79 +94,79 @@ msgid "Preserving set.\n" msgstr "Marque positionnée.\n" -#: src/main.c:701 +#: src/main.c:700 msgid "Resizing" msgstr "Recadrage" -#: src/main.c:708 +#: src/main.c:707 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:958 +#: src/main.c:957 msgid "Any" msgstr "Tous" #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified") -#: src/main.c:960 +#: src/main.c:959 msgid "None" msgstr "Aucun" #. TRANSLATORS: text saying "recommended", for plugin names, etc. -#: src/main.c:962 +#: src/main.c:961 msgid "recommended" msgstr "recommandé" #. TRANSLATORS: text saying "disabled", (as in "not enabled") -#: src/main.c:964 +#: src/main.c:963 msgid "disabled !" msgstr "désactivé !" #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected -#: src/main.c:966 +#: src/main.c:965 msgid "**The current layout**" msgstr "**La configuration actuelle**" #. TRANSLATORS: adjective for "Built in" type effects -#: src/main.c:968 +#: src/main.c:967 msgid "Builtin" msgstr "Intégré" #. TRANSLATORS: adjective for "Custom" type effects -#: src/main.c:970 +#: src/main.c:969 msgid "Custom" msgstr "Personnalisé" #. TRANSLATORS: adjective for "Test" type effects -#: src/main.c:972 +#: src/main.c:971 msgid "Test" msgstr "Essai" -#: src/main.c:1117 +#: src/main.c:1116 msgid "Foreground" msgstr "Premier plan" -#: src/main.c:1118 +#: src/main.c:1117 msgid "Background" msgstr "Arrière plan" -#: src/main.c:1634 +#: src/main.c:1644 msgid "Loading realtime effect plugins..." msgstr "Chargement des greffons d'effets en temps réel…" -#: src/main.c:1700 +#: src/main.c:1710 msgid "Starting jack audio server..." msgstr "Démarrage du serveur audio jack..." -#: src/main.c:1702 +#: src/main.c:1712 msgid "Starting jack transport server..." msgstr "Démarrage du serveur de transport jack..." -#: src/main.c:1703 +#: src/main.c:1713 msgid "Connecting to jack transport server..." msgstr "Connexion au serveur de transport jack..." -#: src/main.c:1733 +#: src/main.c:1743 #, c-format msgid "" "\n" @@ -178,116 +178,124 @@ "Alternatively, try to start lives with either \"lives -jackopts 16\", or " msgstr "" -#: src/main.c:1768 +#: src/main.c:1778 msgid "Starting pulse audio server..." msgstr "Initialisation du serveur audio pulse..." -#: src/main.c:1835 +#: src/main.c:1845 msgid "Checking optional dependencies:" msgstr "Vérification des dépendances optionnelles :" -#: src/main.c:1836 +#: src/main.c:1846 msgid "mplayer...detected..." msgstr "mplayer... détecté..." -#: src/main.c:1837 +#: src/main.c:1847 msgid "mplayer...NOT DETECTED..." msgstr "mplayer... NON DÉTECTÉ..." -#: src/main.c:1838 -#, fuzzy +#: src/main.c:1848 msgid "mplayer2...detected..." +msgstr "" + +#: src/main.c:1849 +msgid "mplayer2...NOT DETECTED..." +msgstr "" + +#: src/main.c:1851 +#, fuzzy +msgid "mpv...detected..." msgstr "mplayer... détecté..." -#: src/main.c:1839 +#: src/main.c:1852 #, fuzzy -msgid "mplayer2...NOT DETECTED..." +msgid "mpv...NOT DETECTED..." msgstr "mplayer... NON DÉTECTÉ..." -#: src/main.c:1840 +#: src/main.c:1854 msgid "convert...detected..." msgstr "convert... détecté..." -#: src/main.c:1841 +#: src/main.c:1855 msgid "convert...NOT DETECTED..." msgstr "convert... NON DÉTECTÉ..." -#: src/main.c:1842 +#: src/main.c:1856 msgid "composite...detected..." msgstr "composite... détecté..." -#: src/main.c:1843 +#: src/main.c:1857 msgid "composite...NOT DETECTED..." msgstr "composite... NON DÉTECTÉ..." -#: src/main.c:1844 +#: src/main.c:1858 msgid "sox...detected\n" msgstr "sox... détecté\n" -#: src/main.c:1845 +#: src/main.c:1859 msgid "sox...NOT DETECTED\n" msgstr "sox... NON DÉTECTÉ\n" -#: src/main.c:1846 +#: src/main.c:1860 #, fuzzy msgid "cdda2wav/icedax...detected..." msgstr "cdda2wav... détecté..."
View file
LiVES-2.4.4.tar.bz2/po/gl.po -> LiVES-2.4.6.tar.bz2/po/gl.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-11-22 18:03-0300\n" +"POT-Creation-Date: 2015-12-19 08:17-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" @@ -90,79 +90,79 @@ msgid "Preserving set.\n" msgstr "Preservar o conxunto.\n" -#: src/main.c:701 +#: src/main.c:700 msgid "Resizing" msgstr "Redimensionando" -#: src/main.c:708 +#: src/main.c:707 msgid "_Resize All Frames" msgstr "_Redimensionar todos os fotogramas" #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter") -#: src/main.c:958 +#: src/main.c:957 msgid "Any" msgstr "Calquera" #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified") -#: src/main.c:960 +#: src/main.c:959 msgid "None" msgstr "Ningún" #. TRANSLATORS: text saying "recommended", for plugin names, etc. -#: src/main.c:962 +#: src/main.c:961 msgid "recommended" msgstr "recomendado" #. TRANSLATORS: text saying "disabled", (as in "not enabled") -#: src/main.c:964 +#: src/main.c:963 msgid "disabled !" msgstr "desactivado !" #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected -#: src/main.c:966 +#: src/main.c:965 msgid "**The current layout**" msgstr "** O esquema actual **" #. TRANSLATORS: adjective for "Built in" type effects -#: src/main.c:968 +#: src/main.c:967 msgid "Builtin" msgstr "Incorporado" #. TRANSLATORS: adjective for "Custom" type effects -#: src/main.c:970 +#: src/main.c:969 msgid "Custom" msgstr "Personalizado" #. TRANSLATORS: adjective for "Test" type effects -#: src/main.c:972 +#: src/main.c:971 msgid "Test" msgstr "Proba" -#: src/main.c:1117 +#: src/main.c:1116 msgid "Foreground" msgstr "Primeiro plano" -#: src/main.c:1118 +#: src/main.c:1117 msgid "Background" msgstr "Fondo" -#: src/main.c:1634 +#: src/main.c:1644 msgid "Loading realtime effect plugins..." msgstr "Cargando complementos de efectos en tempo real..." -#: src/main.c:1700 +#: src/main.c:1710 msgid "Starting jack audio server..." msgstr "Iniciando o servidor de son jack..." -#: src/main.c:1702 +#: src/main.c:1712 msgid "Starting jack transport server..." msgstr "Iniciando o servidor de transporte jack..." -#: src/main.c:1703 +#: src/main.c:1713 msgid "Connecting to jack transport server..." msgstr "Conectando co servidor de transporte jack..." -#: src/main.c:1733 +#: src/main.c:1743 #, c-format msgid "" "\n" @@ -174,116 +174,126 @@ "Alternatively, try to start lives with either \"lives -jackopts 16\", or " msgstr "" -#: src/main.c:1768 +#: src/main.c:1778 msgid "Starting pulse audio server..." msgstr "Iniciando o servidor pulse audio..." -#: src/main.c:1835 +#: src/main.c:1845 msgid "Checking optional dependencies:" msgstr "Comprobando as dependencias opcionais:" -#: src/main.c:1836 +#: src/main.c:1846 msgid "mplayer...detected..." msgstr "mplayer...detectado..." -#: src/main.c:1837 +#: src/main.c:1847 msgid "mplayer...NOT DETECTED..." msgstr "mplayer...NON DETECTADO..." -#: src/main.c:1838 +#: src/main.c:1848 #, fuzzy msgid "mplayer2...detected..." msgstr "mplayer...detectado..." -#: src/main.c:1839 +#: src/main.c:1849 #, fuzzy msgid "mplayer2...NOT DETECTED..." msgstr "mplayer...NON DETECTADO..." -#: src/main.c:1840 +#: src/main.c:1851 +#, fuzzy +msgid "mpv...detected..." +msgstr "mplayer...detectado..." + +#: src/main.c:1852 +#, fuzzy +msgid "mpv...NOT DETECTED..." +msgstr "mplayer...NON DETECTADO..." + +#: src/main.c:1854 msgid "convert...detected..." msgstr "convert...detectado..." -#: src/main.c:1841 +#: src/main.c:1855 msgid "convert...NOT DETECTED..." msgstr "convert...NON DETECTADO..." -#: src/main.c:1842 +#: src/main.c:1856 msgid "composite...detected..." msgstr "composite...detectados..." -#: src/main.c:1843 +#: src/main.c:1857 msgid "composite...NOT DETECTED..." msgstr "composite...NON DETECTADO..." -#: src/main.c:1844 +#: src/main.c:1858 msgid "sox...detected\n" msgstr "sox...detectado\n" -#: src/main.c:1845 +#: src/main.c:1859 msgid "sox...NOT DETECTED\n" msgstr "sox...NON DETECTADO\n" -#: src/main.c:1846 +#: src/main.c:1860 #, fuzzy msgid "cdda2wav/icedax...detected..." msgstr "cdda2wav...detectado..." -#: src/main.c:1847 +#: src/main.c:1861 #, fuzzy msgid "cdda2wav/icedax...NOT DETECTED..." msgstr "cdda2wav...NON DETECTADO..." -#: src/main.c:1848 +#: src/main.c:1862 msgid "jackd...detected..." msgstr "jackd...detectado..." -#: src/main.c:1849
View file
LiVES-2.4.4.tar.bz2/po/he.po -> LiVES-2.4.6.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-11-22 18:03-0300\n" +"POT-Creation-Date: 2015-12-19 08:17-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" @@ -95,80 +95,80 @@ msgid "Preserving set.\n" msgstr "מתבצע שימור האוסף.\n" -#: src/main.c:701 +#: src/main.c:700 msgid "Resizing" msgstr "שינוי גודל" -#: src/main.c:708 +#: src/main.c:707 msgid "_Resize All Frames" msgstr "_שינוי גודל כל השקופיות" #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter") -#: src/main.c:958 +#: src/main.c:957 msgid "Any" msgstr "הכל" #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified") -#: src/main.c:960 +#: src/main.c:959 msgid "None" msgstr "ללא" #. TRANSLATORS: text saying "recommended", for plugin names, etc. -#: src/main.c:962 +#: src/main.c:961 msgid "recommended" msgstr "מומלץ" #. TRANSLATORS: text saying "disabled", (as in "not enabled") -#: src/main.c:964 +#: src/main.c:963 msgid "disabled !" msgstr "נוטרל !" #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected -#: src/main.c:966 +#: src/main.c:965 msgid "**The current layout**" msgstr "**הפריסה הנוכחית**" #. TRANSLATORS: adjective for "Built in" type effects -#: src/main.c:968 +#: src/main.c:967 msgid "Builtin" msgstr "מובנה" #. TRANSLATORS: adjective for "Custom" type effects -#: src/main.c:970 +#: src/main.c:969 msgid "Custom" msgstr "מותאם אישית" #. TRANSLATORS: adjective for "Test" type effects -#: src/main.c:972 +#: src/main.c:971 msgid "Test" msgstr "בדיקה" -#: src/main.c:1117 +#: src/main.c:1116 msgid "Foreground" msgstr "" -#: src/main.c:1118 +#: src/main.c:1117 #, fuzzy msgid "Background" msgstr "רקע _שחור" -#: src/main.c:1634 +#: src/main.c:1644 msgid "Loading realtime effect plugins..." msgstr "מתבצעת טעינת תוספים לאפקטים בזמן אמת..." -#: src/main.c:1700 +#: src/main.c:1710 msgid "Starting jack audio server..." msgstr "מתבצעת הפעלת שרת השמע jack..." -#: src/main.c:1702 +#: src/main.c:1712 msgid "Starting jack transport server..." msgstr "מפעיל את שרת התעבורה של jack..." -#: src/main.c:1703 +#: src/main.c:1713 msgid "Connecting to jack transport server..." msgstr "מתחבר לשרת התעבורה של jack..." -#: src/main.c:1733 +#: src/main.c:1743 #, c-format msgid "" "\n" @@ -180,116 +180,126 @@ "Alternatively, try to start lives with either \"lives -jackopts 16\", or " msgstr "" -#: src/main.c:1768 +#: src/main.c:1778 msgid "Starting pulse audio server..." msgstr "מפעיל את שרת השמע Pulse..." -#: src/main.c:1835 +#: src/main.c:1845 msgid "Checking optional dependencies:" msgstr "מתבצעת בדיקת חבילות תלות אפשריות:" -#: src/main.c:1836 +#: src/main.c:1846 msgid "mplayer...detected..." msgstr "mplayer...זוהה..." -#: src/main.c:1837 +#: src/main.c:1847 msgid "mplayer...NOT DETECTED..." msgstr "mplayer...לא זוהה..." -#: src/main.c:1838 +#: src/main.c:1848 #, fuzzy msgid "mplayer2...detected..." msgstr "mplayer...זוהה..." -#: src/main.c:1839 +#: src/main.c:1849 #, fuzzy msgid "mplayer2...NOT DETECTED..." msgstr "mplayer...לא זוהה..." -#: src/main.c:1840 +#: src/main.c:1851 +#, fuzzy +msgid "mpv...detected..." +msgstr "mplayer...זוהה..." + +#: src/main.c:1852 +#, fuzzy +msgid "mpv...NOT DETECTED..." +msgstr "mplayer...לא זוהה..." + +#: src/main.c:1854 msgid "convert...detected..." msgstr "convert...זוהה..." -#: src/main.c:1841 +#: src/main.c:1855 msgid "convert...NOT DETECTED..." msgstr "convert...לא זוהה..." -#: src/main.c:1842 +#: src/main.c:1856 msgid "composite...detected..." msgstr "composite...זוהה..." -#: src/main.c:1843 +#: src/main.c:1857 msgid "composite...NOT DETECTED..." msgstr "composite...לא זוהה..." -#: src/main.c:1844 +#: src/main.c:1858 msgid "sox...detected\n" msgstr "sox...זוהה...\n" -#: src/main.c:1845 +#: src/main.c:1859 msgid "sox...NOT DETECTED\n" msgstr "sox...לא זוהה...\n" -#: src/main.c:1846 +#: src/main.c:1860 #, fuzzy msgid "cdda2wav/icedax...detected..." msgstr "cdda2wav...זוהה" -#: src/main.c:1847 +#: src/main.c:1861 #, fuzzy msgid "cdda2wav/icedax...NOT DETECTED..." msgstr "cdda2wav...לא זוהה" -#: src/main.c:1848 +#: src/main.c:1862 msgid "jackd...detected..." msgstr "jackd...זוהה..."
View file
LiVES-2.4.4.tar.bz2/po/hr.po -> LiVES-2.4.6.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-11-22 18:03-0300\n" +"POT-Creation-Date: 2015-12-19 08:17-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" @@ -90,80 +90,80 @@ msgid "Preserving set.\n" msgstr "Očuvanje set.\n" -#: src/main.c:701 +#: src/main.c:700 msgid "Resizing" msgstr "Promjena veličine" -#: src/main.c:708 +#: src/main.c:707 msgid "_Resize All Frames" msgstr "" #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter") -#: src/main.c:958 +#: src/main.c:957 msgid "Any" msgstr "Bilo koji" #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified") -#: src/main.c:960 +#: src/main.c:959 msgid "None" msgstr "Nijedan" #. TRANSLATORS: text saying "recommended", for plugin names, etc. -#: src/main.c:962 +#: src/main.c:961 msgid "recommended" msgstr "preporučeno" #. TRANSLATORS: text saying "disabled", (as in "not enabled") -#: src/main.c:964 +#: src/main.c:963 msgid "disabled !" msgstr "isključeno !" #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected -#: src/main.c:966 +#: src/main.c:965 msgid "**The current layout**" msgstr "**Trenutni izgled**" #. TRANSLATORS: adjective for "Built in" type effects -#: src/main.c:968 +#: src/main.c:967 msgid "Builtin" msgstr "" #. TRANSLATORS: adjective for "Custom" type effects -#: src/main.c:970 +#: src/main.c:969 msgid "Custom" msgstr "" #. TRANSLATORS: adjective for "Test" type effects -#: src/main.c:972 +#: src/main.c:971 msgid "Test" msgstr "" -#: src/main.c:1117 +#: src/main.c:1116 msgid "Foreground" msgstr "" -#: src/main.c:1118 +#: src/main.c:1117 #, fuzzy msgid "Background" msgstr "_Zanemari promjene" -#: src/main.c:1634 +#: src/main.c:1644 msgid "Loading realtime effect plugins..." msgstr "Učitavanje stvarnom efekt čep..." -#: src/main.c:1700 +#: src/main.c:1710 msgid "Starting jack audio server..." msgstr "Pokrećem jack audio poslužitelj..." -#: src/main.c:1702 +#: src/main.c:1712 msgid "Starting jack transport server..." msgstr "Pokrećem jack transport server..." -#: src/main.c:1703 +#: src/main.c:1713 msgid "Connecting to jack transport server..." msgstr "Spajanje na jack transport server..." -#: src/main.c:1733 +#: src/main.c:1743 #, c-format msgid "" "\n" @@ -175,116 +175,126 @@ "Alternatively, try to start lives with either \"lives -jackopts 16\", or " msgstr "" -#: src/main.c:1768 +#: src/main.c:1778 msgid "Starting pulse audio server..." msgstr "Pokrećem pulse audio poslužitelj..." -#: src/main.c:1835 +#: src/main.c:1845 msgid "Checking optional dependencies:" msgstr "Provjera izborno ovisnosti:" -#: src/main.c:1836 +#: src/main.c:1846 msgid "mplayer...detected..." msgstr "mplayer...pronađen..." -#: src/main.c:1837 +#: src/main.c:1847 msgid "mplayer...NOT DETECTED..." msgstr "mplayer...NIJE PRONAĐEN..." -#: src/main.c:1838 +#: src/main.c:1848 #, fuzzy msgid "mplayer2...detected..." msgstr "mplayer...pronađen..." -#: src/main.c:1839 +#: src/main.c:1849 #, fuzzy msgid "mplayer2...NOT DETECTED..." msgstr "mplayer...NIJE PRONAĐEN..." -#: src/main.c:1840 +#: src/main.c:1851 +#, fuzzy +msgid "mpv...detected..." +msgstr "mplayer...pronađen..." + +#: src/main.c:1852 +#, fuzzy +msgid "mpv...NOT DETECTED..." +msgstr "mplayer...NIJE PRONAĐEN..." + +#: src/main.c:1854 msgid "convert...detected..." msgstr "convert...pronađen..." -#: src/main.c:1841 +#: src/main.c:1855 msgid "convert...NOT DETECTED..." msgstr "convert...NIJE PRONAĐEN..." -#: src/main.c:1842 +#: src/main.c:1856 msgid "composite...detected..." msgstr "composite...otkriti..." -#: src/main.c:1843 +#: src/main.c:1857 msgid "composite...NOT DETECTED..." msgstr "composite...NIJE OTKRIVENA..." -#: src/main.c:1844 +#: src/main.c:1858 msgid "sox...detected\n" msgstr "sox...pronađen\n" -#: src/main.c:1845 +#: src/main.c:1859 msgid "sox...NOT DETECTED\n" msgstr "sox...NIJE PRONAĐEN...\n" -#: src/main.c:1846 +#: src/main.c:1860 #, fuzzy msgid "cdda2wav/icedax...detected..." msgstr "cdda2wav...pronađen..." -#: src/main.c:1847 +#: src/main.c:1861 #, fuzzy msgid "cdda2wav/icedax...NOT DETECTED..." msgstr "cdda2wav...NIJE PRONAĐEN..." -#: src/main.c:1848 +#: src/main.c:1862 msgid "jackd...detected..." msgstr "jackd...pronađen..."
View file
LiVES-2.4.4.tar.bz2/po/hu.po -> LiVES-2.4.6.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-11-22 18:03-0300\n" +"POT-Creation-Date: 2015-12-19 08:17-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" @@ -90,80 +90,80 @@ msgid "Preserving set.\n" msgstr "Tartós beállítás.\n" -#: src/main.c:701 +#: src/main.c:700 msgid "Resizing" msgstr "Átméretezés" -#: src/main.c:708 +#: src/main.c:707 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:958 +#: src/main.c:957 msgid "Any" msgstr "Bármely" #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified") -#: src/main.c:960 +#: src/main.c:959 msgid "None" msgstr "Nincs" #. TRANSLATORS: text saying "recommended", for plugin names, etc. -#: src/main.c:962 +#: src/main.c:961 msgid "recommended" msgstr "ajánlott" #. TRANSLATORS: text saying "disabled", (as in "not enabled") -#: src/main.c:964 +#: src/main.c:963 msgid "disabled !" msgstr "tíltva!" #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected -#: src/main.c:966 +#: src/main.c:965 msgid "**The current layout**" msgstr "**A jelenlegi kimenet**" #. TRANSLATORS: adjective for "Built in" type effects -#: src/main.c:968 +#: src/main.c:967 msgid "Builtin" msgstr "Beépített" #. TRANSLATORS: adjective for "Custom" type effects -#: src/main.c:970 +#: src/main.c:969 msgid "Custom" msgstr "Egyéni" #. TRANSLATORS: adjective for "Test" type effects -#: src/main.c:972 +#: src/main.c:971 msgid "Test" msgstr "Teszt" -#: src/main.c:1117 +#: src/main.c:1116 msgid "Foreground" msgstr "" -#: src/main.c:1118 +#: src/main.c:1117 #, fuzzy msgid "Background" msgstr "_Üres háttér" -#: src/main.c:1634 +#: src/main.c:1644 msgid "Loading realtime effect plugins..." msgstr "Az azonnali effektek betöltése..." -#: src/main.c:1700 +#: src/main.c:1710 msgid "Starting jack audio server..." msgstr "Jack audió szerver indítása" -#: src/main.c:1702 +#: src/main.c:1712 msgid "Starting jack transport server..." msgstr "" -#: src/main.c:1703 +#: src/main.c:1713 msgid "Connecting to jack transport server..." msgstr "" -#: src/main.c:1733 +#: src/main.c:1743 #, c-format msgid "" "\n" @@ -175,116 +175,126 @@ "Alternatively, try to start lives with either \"lives -jackopts 16\", or " msgstr "" -#: src/main.c:1768 +#: src/main.c:1778 msgid "Starting pulse audio server..." msgstr "Pulse audio szerver indítása..." -#: src/main.c:1835 +#: src/main.c:1845 msgid "Checking optional dependencies:" msgstr "Ajánlott függőségek ellenőrzése" -#: src/main.c:1836 +#: src/main.c:1846 msgid "mplayer...detected..." msgstr "mplayer...megtalálva" -#: src/main.c:1837 +#: src/main.c:1847 msgid "mplayer...NOT DETECTED..." msgstr "mplayer...NEM TALÁLOM.." -#: src/main.c:1838 +#: src/main.c:1848 #, fuzzy msgid "mplayer2...detected..." msgstr "mplayer...megtalálva" -#: src/main.c:1839 +#: src/main.c:1849 #, fuzzy msgid "mplayer2...NOT DETECTED..." msgstr "mplayer...NEM TALÁLOM.." -#: src/main.c:1840 +#: src/main.c:1851 +#, fuzzy +msgid "mpv...detected..." +msgstr "mplayer...megtalálva" + +#: src/main.c:1852 +#, fuzzy +msgid "mpv...NOT DETECTED..." +msgstr "mplayer...NEM TALÁLOM.." + +#: src/main.c:1854 msgid "convert...detected..." msgstr "convert...megtalálva" -#: src/main.c:1841 +#: src/main.c:1855 msgid "convert...NOT DETECTED..." msgstr "convert...NEM TALÁLOM" -#: src/main.c:1842 +#: src/main.c:1856 msgid "composite...detected..." msgstr "composite...megtalálva..." -#: src/main.c:1843 +#: src/main.c:1857 msgid "composite...NOT DETECTED..." msgstr "composite...NEM TALÁLOM" -#: src/main.c:1844 +#: src/main.c:1858 msgid "sox...detected\n" msgstr "sox...megtalálva\n" -#: src/main.c:1845 +#: src/main.c:1859 msgid "sox...NOT DETECTED\n" msgstr "sox...NEM TALÁLOM\n" -#: src/main.c:1846 +#: src/main.c:1860 #, fuzzy msgid "cdda2wav/icedax...detected..." msgstr "cdda2wav...megtalálva..." -#: src/main.c:1847 +#: src/main.c:1861 #, fuzzy msgid "cdda2wav/icedax...NOT DETECTED..." msgstr "cdda2wav...NEM TALÁLOM..." -#: src/main.c:1848 +#: src/main.c:1862 msgid "jackd...detected..." msgstr "jackd...megtalálva..."
View file
LiVES-2.4.4.tar.bz2/po/it.po -> LiVES-2.4.6.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-11-22 18:03-0300\n" +"POT-Creation-Date: 2015-12-19 08:17-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" @@ -90,80 +90,80 @@ msgid "Preserving set.\n" msgstr "Preservazione del set in corso.\n" -#: src/main.c:701 +#: src/main.c:700 msgid "Resizing" msgstr "Ridimensionamento" -#: src/main.c:708 +#: src/main.c:707 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:958 +#: src/main.c:957 msgid "Any" msgstr "Qualsiasi" #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified") -#: src/main.c:960 +#: src/main.c:959 msgid "None" msgstr "Nessuno" #. TRANSLATORS: text saying "recommended", for plugin names, etc. -#: src/main.c:962 +#: src/main.c:961 msgid "recommended" msgstr "consigliato" #. TRANSLATORS: text saying "disabled", (as in "not enabled") -#: src/main.c:964 +#: src/main.c:963 msgid "disabled !" msgstr "disabilitato !" #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected -#: src/main.c:966 +#: src/main.c:965 msgid "**The current layout**" msgstr "**Il layout corrente**" #. TRANSLATORS: adjective for "Built in" type effects -#: src/main.c:968 +#: src/main.c:967 msgid "Builtin" msgstr "Integrato" #. TRANSLATORS: adjective for "Custom" type effects -#: src/main.c:970 +#: src/main.c:969 msgid "Custom" msgstr "Personalizzato" #. TRANSLATORS: adjective for "Test" type effects -#: src/main.c:972 +#: src/main.c:971 msgid "Test" msgstr "Test" -#: src/main.c:1117 +#: src/main.c:1116 msgid "Foreground" msgstr "" -#: src/main.c:1118 +#: src/main.c:1117 #, fuzzy msgid "Background" msgstr "Sfondo _Vuoto" -#: src/main.c:1634 +#: src/main.c:1644 msgid "Loading realtime effect plugins..." msgstr "Caricamento dei plugin degli effetti in tempo reale in corso..." -#: src/main.c:1700 +#: src/main.c:1710 msgid "Starting jack audio server..." msgstr "Avvio del server audio jack in corso..." -#: src/main.c:1702 +#: src/main.c:1712 msgid "Starting jack transport server..." msgstr "" -#: src/main.c:1703 +#: src/main.c:1713 msgid "Connecting to jack transport server..." msgstr "" -#: src/main.c:1733 +#: src/main.c:1743 #, c-format msgid "" "\n" @@ -175,116 +175,126 @@ "Alternatively, try to start lives with either \"lives -jackopts 16\", or " msgstr "" -#: src/main.c:1768 +#: src/main.c:1778 msgid "Starting pulse audio server..." msgstr "Avviando il server audio pulse..." -#: src/main.c:1835 +#: src/main.c:1845 msgid "Checking optional dependencies:" msgstr "Controllo delle dipendenze opzionali in corso:" -#: src/main.c:1836 +#: src/main.c:1846 msgid "mplayer...detected..." msgstr "mplayer...rilevato..." -#: src/main.c:1837 +#: src/main.c:1847 msgid "mplayer...NOT DETECTED..." msgstr "mplayer...NON RILEVATO..." -#: src/main.c:1838 +#: src/main.c:1848 #, fuzzy msgid "mplayer2...detected..." msgstr "mplayer...rilevato..." -#: src/main.c:1839 +#: src/main.c:1849 #, fuzzy msgid "mplayer2...NOT DETECTED..." msgstr "mplayer...NON RILEVATO..." -#: src/main.c:1840 +#: src/main.c:1851 +#, fuzzy +msgid "mpv...detected..." +msgstr "mplayer...rilevato..." + +#: src/main.c:1852 +#, fuzzy +msgid "mpv...NOT DETECTED..." +msgstr "mplayer...NON RILEVATO..." + +#: src/main.c:1854 msgid "convert...detected..." msgstr "convert...rilevato..." -#: src/main.c:1841 +#: src/main.c:1855 msgid "convert...NOT DETECTED..." msgstr "convert...NON RILEVATO..." -#: src/main.c:1842 +#: src/main.c:1856 msgid "composite...detected..." msgstr "composite...rilevato..." -#: src/main.c:1843 +#: src/main.c:1857 msgid "composite...NOT DETECTED..." msgstr "composite...NON RILEVATO..." -#: src/main.c:1844 +#: src/main.c:1858 msgid "sox...detected\n" msgstr "sox...rilevato...\n" -#: src/main.c:1845 +#: src/main.c:1859 msgid "sox...NOT DETECTED\n" msgstr "sox...NON RILEVATO...\n" -#: src/main.c:1846 +#: src/main.c:1860 #, fuzzy msgid "cdda2wav/icedax...detected..." msgstr "cdda2wav...rilevato..." -#: src/main.c:1847 +#: src/main.c:1861 #, fuzzy msgid "cdda2wav/icedax...NOT DETECTED..." msgstr "cdda2wav...NON RILEVATO..." -#: src/main.c:1848 +#: src/main.c:1862 msgid "jackd...detected..." msgstr "jackd...rilevato..."
View file
LiVES-2.4.4.tar.bz2/po/ja.po -> LiVES-2.4.6.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-11-22 18:03-0300\n" +"POT-Creation-Date: 2015-12-19 08:17-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" @@ -90,80 +90,80 @@ msgid "Preserving set.\n" msgstr "セットの保護\n" -#: src/main.c:701 +#: src/main.c:700 msgid "Resizing" msgstr "リサイズ" -#: src/main.c:708 +#: src/main.c:707 msgid "_Resize All Frames" msgstr "全フレームのリサイズ(_R)" #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter") -#: src/main.c:958 +#: src/main.c:957 msgid "Any" msgstr "任意" #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified") -#: src/main.c:960 +#: src/main.c:959 msgid "None" msgstr "なし" #. TRANSLATORS: text saying "recommended", for plugin names, etc. -#: src/main.c:962 +#: src/main.c:961 msgid "recommended" msgstr "推奨" #. TRANSLATORS: text saying "disabled", (as in "not enabled") -#: src/main.c:964 +#: src/main.c:963 msgid "disabled !" msgstr "使用不能！" #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected -#: src/main.c:966 +#: src/main.c:965 msgid "**The current layout**" msgstr "**現在のレイアウト**" #. TRANSLATORS: adjective for "Built in" type effects -#: src/main.c:968 +#: src/main.c:967 msgid "Builtin" msgstr "ビルトイン" #. TRANSLATORS: adjective for "Custom" type effects -#: src/main.c:970 +#: src/main.c:969 msgid "Custom" msgstr "カスタム" #. TRANSLATORS: adjective for "Test" type effects -#: src/main.c:972 +#: src/main.c:971 msgid "Test" msgstr "テスト" -#: src/main.c:1117 +#: src/main.c:1116 msgid "Foreground" msgstr "" -#: src/main.c:1118 +#: src/main.c:1117 #, fuzzy msgid "Background" msgstr "空白のバックグラウンド(_B)" -#: src/main.c:1634 +#: src/main.c:1644 msgid "Loading realtime effect plugins..." msgstr "リアルタイムエフェクトプラグインを読み込み中..." -#: src/main.c:1700 +#: src/main.c:1710 msgid "Starting jack audio server..." msgstr "JACKサーバーの音声機能を開始しています..." -#: src/main.c:1702 +#: src/main.c:1712 msgid "Starting jack transport server..." msgstr "JACKサーバーのトランスポート機能を開始しています..." -#: src/main.c:1703 +#: src/main.c:1713 msgid "Connecting to jack transport server..." msgstr "JACKサーバーのトランスポート機能に接続しています..." -#: src/main.c:1733 +#: src/main.c:1743 #, c-format msgid "" "\n" @@ -175,116 +175,126 @@ "Alternatively, try to start lives with either \"lives -jackopts 16\", or " msgstr "" -#: src/main.c:1768 +#: src/main.c:1778 msgid "Starting pulse audio server..." msgstr "PulseAudioサーバーを開始しています..." -#: src/main.c:1835 +#: src/main.c:1845 msgid "Checking optional dependencies:" msgstr "必ずしも必要ではない依存関係を確認しています:" -#: src/main.c:1836 +#: src/main.c:1846 msgid "mplayer...detected..." msgstr "mplayerが見つかりました..." -#: src/main.c:1837 +#: src/main.c:1847 msgid "mplayer...NOT DETECTED..." msgstr "mplayerは見つかりませんでした..." -#: src/main.c:1838 +#: src/main.c:1848 #, fuzzy msgid "mplayer2...detected..." msgstr "mplayerが見つかりました..." -#: src/main.c:1839 +#: src/main.c:1849 #, fuzzy msgid "mplayer2...NOT DETECTED..." msgstr "mplayerは見つかりませんでした..." -#: src/main.c:1840 +#: src/main.c:1851 +#, fuzzy +msgid "mpv...detected..." +msgstr "mplayerが見つかりました..." + +#: src/main.c:1852 +#, fuzzy +msgid "mpv...NOT DETECTED..." +msgstr "mplayerは見つかりませんでした..." + +#: src/main.c:1854 msgid "convert...detected..." msgstr "convertが見つかりました..." -#: src/main.c:1841 +#: src/main.c:1855 msgid "convert...NOT DETECTED..." msgstr "convertは見つかりませんでした..." -#: src/main.c:1842 +#: src/main.c:1856 msgid "composite...detected..." msgstr "compositeが見つかりました..." -#: src/main.c:1843 +#: src/main.c:1857 msgid "composite...NOT DETECTED..." msgstr "compositeは見つかりませんでした..." -#: src/main.c:1844 +#: src/main.c:1858 msgid "sox...detected\n" msgstr "soxが見つかりました\n" -#: src/main.c:1845 +#: src/main.c:1859 msgid "sox...NOT DETECTED\n" msgstr "soxは見つかりませんでした\n" -#: src/main.c:1846 +#: src/main.c:1860 #, fuzzy msgid "cdda2wav/icedax...detected..." msgstr "cdda2wavが見つかりました..." -#: src/main.c:1847 +#: src/main.c:1861 #, fuzzy msgid "cdda2wav/icedax...NOT DETECTED..." msgstr "cdda2wavは見つかりませんでした..." -#: src/main.c:1848 +#: src/main.c:1862 msgid "jackd...detected..." msgstr "jackdが見つかりました..."
View file
LiVES-2.4.4.tar.bz2/po/lives.pot -> LiVES-2.4.6.tar.bz2/po/lives.pot
Changed
@@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: lives 2.4.4\n" +"Project-Id-Version: lives 2.4.6\n" "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n" -"POT-Creation-Date: 2015-11-22 18:03-0300\n" +"POT-Creation-Date: 2015-12-19 08:17-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" @@ -75,79 +75,79 @@ msgid "Preserving set.\n" msgstr "" -#: src/main.c:701 +#: src/main.c:700 msgid "Resizing" msgstr "" -#: src/main.c:708 +#: src/main.c:707 msgid "_Resize All Frames" msgstr "" #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter") -#: src/main.c:958 +#: src/main.c:957 msgid "Any" msgstr "" #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified") -#: src/main.c:960 +#: src/main.c:959 msgid "None" msgstr "" #. TRANSLATORS: text saying "recommended", for plugin names, etc. -#: src/main.c:962 +#: src/main.c:961 msgid "recommended" msgstr "" #. TRANSLATORS: text saying "disabled", (as in "not enabled") -#: src/main.c:964 +#: src/main.c:963 msgid "disabled !" msgstr "" #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected -#: src/main.c:966 +#: src/main.c:965 msgid "**The current layout**" msgstr "" #. TRANSLATORS: adjective for "Built in" type effects -#: src/main.c:968 +#: src/main.c:967 msgid "Builtin" msgstr "" #. TRANSLATORS: adjective for "Custom" type effects -#: src/main.c:970 +#: src/main.c:969 msgid "Custom" msgstr "" #. TRANSLATORS: adjective for "Test" type effects -#: src/main.c:972 +#: src/main.c:971 msgid "Test" msgstr "" -#: src/main.c:1117 +#: src/main.c:1116 msgid "Foreground" msgstr "" -#: src/main.c:1118 +#: src/main.c:1117 msgid "Background" msgstr "" -#: src/main.c:1634 +#: src/main.c:1644 msgid "Loading realtime effect plugins..." msgstr "" -#: src/main.c:1700 +#: src/main.c:1710 msgid "Starting jack audio server..." msgstr "" -#: src/main.c:1702 +#: src/main.c:1712 msgid "Starting jack transport server..." msgstr "" -#: src/main.c:1703 +#: src/main.c:1713 msgid "Connecting to jack transport server..." msgstr "" -#: src/main.c:1733 +#: src/main.c:1743 #, c-format msgid "" "\n" @@ -159,112 +159,120 @@ "Alternatively, try to start lives with either \"lives -jackopts 16\", or " msgstr "" -#: src/main.c:1768 +#: src/main.c:1778 msgid "Starting pulse audio server..." msgstr "" -#: src/main.c:1835 +#: src/main.c:1845 msgid "Checking optional dependencies:" msgstr "" -#: src/main.c:1836 +#: src/main.c:1846 msgid "mplayer...detected..." msgstr "" -#: src/main.c:1837 +#: src/main.c:1847 msgid "mplayer...NOT DETECTED..." msgstr "" -#: src/main.c:1838 +#: src/main.c:1848 msgid "mplayer2...detected..." msgstr "" -#: src/main.c:1839 +#: src/main.c:1849 msgid "mplayer2...NOT DETECTED..." msgstr "" -#: src/main.c:1840 +#: src/main.c:1851 +msgid "mpv...detected..." +msgstr "" + +#: src/main.c:1852 +msgid "mpv...NOT DETECTED..." +msgstr "" + +#: src/main.c:1854 msgid "convert...detected..." msgstr "" -#: src/main.c:1841 +#: src/main.c:1855 msgid "convert...NOT DETECTED..." msgstr "" -#: src/main.c:1842 +#: src/main.c:1856 msgid "composite...detected..." msgstr "" -#: src/main.c:1843 +#: src/main.c:1857 msgid "composite...NOT DETECTED..." msgstr "" -#: src/main.c:1844 +#: src/main.c:1858 msgid "sox...detected\n" msgstr "" -#: src/main.c:1845 +#: src/main.c:1859 msgid "sox...NOT DETECTED\n" msgstr "" -#: src/main.c:1846 +#: src/main.c:1860 msgid "cdda2wav/icedax...detected..." msgstr "" -#: src/main.c:1847 +#: src/main.c:1861 msgid "cdda2wav/icedax...NOT DETECTED..." msgstr "" -#: src/main.c:1848 +#: src/main.c:1862 msgid "jackd...detected..." msgstr "" -#: src/main.c:1849 +#: src/main.c:1863 msgid "jackd...NOT DETECTED..." msgstr ""
View file
LiVES-2.4.4.tar.bz2/po/nl_NL.po -> LiVES-2.4.6.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-11-22 18:03-0300\n" +"POT-Creation-Date: 2015-12-19 08:17-0300\n" "PO-Revision-Date: 2013-03-14 12:31+0000\n" "Last-Translator: Launchpad Translations Administrators <Unknown>\n" "Language-Team: \n" @@ -73,80 +73,80 @@ msgid "Preserving set.\n" msgstr "" -#: src/main.c:701 +#: src/main.c:700 msgid "Resizing" msgstr "Grootte aanpassen" -#: src/main.c:708 +#: src/main.c:707 msgid "_Resize All Frames" msgstr "" #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter") -#: src/main.c:958 +#: src/main.c:957 msgid "Any" msgstr "" #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified") -#: src/main.c:960 +#: src/main.c:959 msgid "None" msgstr "" #. TRANSLATORS: text saying "recommended", for plugin names, etc. -#: src/main.c:962 +#: src/main.c:961 msgid "recommended" msgstr "" #. TRANSLATORS: text saying "disabled", (as in "not enabled") -#: src/main.c:964 +#: src/main.c:963 msgid "disabled !" msgstr "" #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected -#: src/main.c:966 +#: src/main.c:965 msgid "**The current layout**" msgstr "" #. TRANSLATORS: adjective for "Built in" type effects -#: src/main.c:968 +#: src/main.c:967 msgid "Builtin" msgstr "" #. TRANSLATORS: adjective for "Custom" type effects -#: src/main.c:970 +#: src/main.c:969 msgid "Custom" msgstr "" #. TRANSLATORS: adjective for "Test" type effects -#: src/main.c:972 +#: src/main.c:971 msgid "Test" msgstr "" -#: src/main.c:1117 +#: src/main.c:1116 msgid "Foreground" msgstr "" -#: src/main.c:1118 +#: src/main.c:1117 #, fuzzy msgid "Background" msgstr "Vervagen" -#: src/main.c:1634 +#: src/main.c:1644 msgid "Loading realtime effect plugins..." msgstr "" -#: src/main.c:1700 +#: src/main.c:1710 msgid "Starting jack audio server..." msgstr "" -#: src/main.c:1702 +#: src/main.c:1712 msgid "Starting jack transport server..." msgstr "" -#: src/main.c:1703 +#: src/main.c:1713 msgid "Connecting to jack transport server..." msgstr "" -#: src/main.c:1733 +#: src/main.c:1743 #, c-format msgid "" "\n" @@ -158,112 +158,120 @@ "Alternatively, try to start lives with either \"lives -jackopts 16\", or " msgstr "" -#: src/main.c:1768 +#: src/main.c:1778 msgid "Starting pulse audio server..." msgstr "" -#: src/main.c:1835 +#: src/main.c:1845 msgid "Checking optional dependencies:" msgstr "" -#: src/main.c:1836 +#: src/main.c:1846 msgid "mplayer...detected..." msgstr "" -#: src/main.c:1837 +#: src/main.c:1847 msgid "mplayer...NOT DETECTED..." msgstr "" -#: src/main.c:1838 +#: src/main.c:1848 msgid "mplayer2...detected..." msgstr "" -#: src/main.c:1839 +#: src/main.c:1849 msgid "mplayer2...NOT DETECTED..." msgstr "" -#: src/main.c:1840 +#: src/main.c:1851 +msgid "mpv...detected..." +msgstr "" + +#: src/main.c:1852 +msgid "mpv...NOT DETECTED..." +msgstr "" + +#: src/main.c:1854 msgid "convert...detected..." msgstr "" -#: src/main.c:1841 +#: src/main.c:1855 msgid "convert...NOT DETECTED..." msgstr "" -#: src/main.c:1842 +#: src/main.c:1856 msgid "composite...detected..." msgstr "" -#: src/main.c:1843 +#: src/main.c:1857 msgid "composite...NOT DETECTED..." msgstr "" -#: src/main.c:1844 +#: src/main.c:1858 msgid "sox...detected\n" msgstr "" -#: src/main.c:1845 +#: src/main.c:1859 msgid "sox...NOT DETECTED\n" msgstr "" -#: src/main.c:1846 +#: src/main.c:1860 msgid "cdda2wav/icedax...detected..." msgstr "" -#: src/main.c:1847 +#: src/main.c:1861 msgid "cdda2wav/icedax...NOT DETECTED..." msgstr "" -#: src/main.c:1848 +#: src/main.c:1862 msgid "jackd...detected..." msgstr "" -#: src/main.c:1849 +#: src/main.c:1863 msgid "jackd...NOT DETECTED..." msgstr "" -#: src/main.c:1850
View file
LiVES-2.4.4.tar.bz2/po/oc.po -> LiVES-2.4.6.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-11-22 18:03-0300\n" +"POT-Creation-Date: 2015-12-19 08:17-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" @@ -78,80 +78,80 @@ msgid "Preserving set.\n" msgstr "Marca posicionada.\n" -#: src/main.c:701 +#: src/main.c:700 msgid "Resizing" msgstr "Requadratge" -#: src/main.c:708 +#: src/main.c:707 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:958 +#: src/main.c:957 msgid "Any" msgstr "Quin que siá" #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified") -#: src/main.c:960 +#: src/main.c:959 msgid "None" msgstr "Pas cap" #. TRANSLATORS: text saying "recommended", for plugin names, etc. -#: src/main.c:962 +#: src/main.c:961 msgid "recommended" msgstr "recomandat" #. TRANSLATORS: text saying "disabled", (as in "not enabled") -#: src/main.c:964 +#: src/main.c:963 msgid "disabled !" msgstr "desactivat !" #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected -#: src/main.c:966 +#: src/main.c:965 msgid "**The current layout**" msgstr "**La configuracion actuala**" #. TRANSLATORS: adjective for "Built in" type effects -#: src/main.c:968 +#: src/main.c:967 msgid "Builtin" msgstr "Integrat" #. TRANSLATORS: adjective for "Custom" type effects -#: src/main.c:970 +#: src/main.c:969 msgid "Custom" msgstr "Personalizat" #. TRANSLATORS: adjective for "Test" type effects -#: src/main.c:972 +#: src/main.c:971 msgid "Test" msgstr "Testar" -#: src/main.c:1117 +#: src/main.c:1116 msgid "Foreground" msgstr "" -#: src/main.c:1118 +#: src/main.c:1117 #, fuzzy msgid "Background" msgstr "_Aviar" -#: src/main.c:1634 +#: src/main.c:1644 msgid "Loading realtime effect plugins..." msgstr "Cargament dels plugins d'efièches en temps real" -#: src/main.c:1700 +#: src/main.c:1710 msgid "Starting jack audio server..." msgstr "Aviada del servidor àudio jack..." -#: src/main.c:1702 +#: src/main.c:1712 msgid "Starting jack transport server..." msgstr "" -#: src/main.c:1703 +#: src/main.c:1713 msgid "Connecting to jack transport server..." msgstr "" -#: src/main.c:1733 +#: src/main.c:1743 #, c-format msgid "" "\n" @@ -163,116 +163,126 @@ "Alternatively, try to start lives with either \"lives -jackopts 16\", or " msgstr "" -#: src/main.c:1768 +#: src/main.c:1778 msgid "Starting pulse audio server..." msgstr "Inicializacion del servidor àudio pulse..." -#: src/main.c:1835 +#: src/main.c:1845 msgid "Checking optional dependencies:" msgstr "Verificacion de las dependéncias opcionalas :" -#: src/main.c:1836 +#: src/main.c:1846 msgid "mplayer...detected..." msgstr "mplayer....detectat..." -#: src/main.c:1837 +#: src/main.c:1847 msgid "mplayer...NOT DETECTED..." msgstr "mplayer...PAS DETECTAT..." -#: src/main.c:1838 +#: src/main.c:1848 #, fuzzy msgid "mplayer2...detected..." msgstr "mplayer....detectat..." -#: src/main.c:1839 +#: src/main.c:1849 #, fuzzy msgid "mplayer2...NOT DETECTED..." msgstr "mplayer...PAS DETECTAT..." -#: src/main.c:1840 +#: src/main.c:1851 +#, fuzzy +msgid "mpv...detected..." +msgstr "mplayer....detectat..." + +#: src/main.c:1852 +#, fuzzy +msgid "mpv...NOT DETECTED..." +msgstr "mplayer...PAS DETECTAT..." + +#: src/main.c:1854 msgid "convert...detected..." msgstr "convert...detectat..." -#: src/main.c:1841 +#: src/main.c:1855 msgid "convert...NOT DETECTED..." msgstr "convert...PAS DETECTAT..." -#: src/main.c:1842 +#: src/main.c:1856 msgid "composite...detected..." msgstr "composite...detectat..." -#: src/main.c:1843 +#: src/main.c:1857 msgid "composite...NOT DETECTED..." msgstr "composite...PAS DETECTAT..." -#: src/main.c:1844 +#: src/main.c:1858 msgid "sox...detected\n" msgstr "sox...detectat\n" -#: src/main.c:1845 +#: src/main.c:1859 msgid "sox...NOT DETECTED\n" msgstr "sox...PAS DETECTAT\n" -#: src/main.c:1846 +#: src/main.c:1860 #, fuzzy msgid "cdda2wav/icedax...detected..." msgstr "cdda2wav...detectat..." -#: src/main.c:1847 +#: src/main.c:1861 #, fuzzy msgid "cdda2wav/icedax...NOT DETECTED..." msgstr "cdda2wav...PAS DETECTAT..." -#: src/main.c:1848 +#: src/main.c:1862 msgid "jackd...detected..." msgstr "jackd...detectat..."
View file
LiVES-2.4.4.tar.bz2/po/pl.po -> LiVES-2.4.6.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-11-22 18:03-0300\n" +"POT-Creation-Date: 2015-12-19 08:17-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" @@ -90,80 +90,80 @@ msgid "Preserving set.\n" msgstr "" -#: src/main.c:701 +#: src/main.c:700 msgid "Resizing" msgstr "Skalowanie" -#: src/main.c:708 +#: src/main.c:707 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:958 +#: src/main.c:957 msgid "Any" msgstr "Dowolny" #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified") -#: src/main.c:960 +#: src/main.c:959 msgid "None" msgstr "Brak" #. TRANSLATORS: text saying "recommended", for plugin names, etc. -#: src/main.c:962 +#: src/main.c:961 msgid "recommended" msgstr "zalecane" #. TRANSLATORS: text saying "disabled", (as in "not enabled") -#: src/main.c:964 +#: src/main.c:963 msgid "disabled !" msgstr "niepełnosprawnych !" #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected -#: src/main.c:966 +#: src/main.c:965 msgid "**The current layout**" msgstr "**Obecny układ**" #. TRANSLATORS: adjective for "Built in" type effects -#: src/main.c:968 +#: src/main.c:967 msgid "Builtin" msgstr "Wbudowane" #. TRANSLATORS: adjective for "Custom" type effects -#: src/main.c:970 +#: src/main.c:969 msgid "Custom" msgstr "Własne" #. TRANSLATORS: adjective for "Test" type effects -#: src/main.c:972 +#: src/main.c:971 msgid "Test" msgstr "Przetestuj" -#: src/main.c:1117 +#: src/main.c:1116 msgid "Foreground" msgstr "" -#: src/main.c:1118 +#: src/main.c:1117 #, fuzzy msgid "Background" msgstr "_Uruchom" -#: src/main.c:1634 +#: src/main.c:1644 msgid "Loading realtime effect plugins..." msgstr "" -#: src/main.c:1700 +#: src/main.c:1710 msgid "Starting jack audio server..." msgstr "" -#: src/main.c:1702 +#: src/main.c:1712 msgid "Starting jack transport server..." msgstr "" -#: src/main.c:1703 +#: src/main.c:1713 msgid "Connecting to jack transport server..." msgstr "" -#: src/main.c:1733 +#: src/main.c:1743 #, c-format msgid "" "\n" @@ -175,116 +175,126 @@ "Alternatively, try to start lives with either \"lives -jackopts 16\", or " msgstr "" -#: src/main.c:1768 +#: src/main.c:1778 msgid "Starting pulse audio server..." msgstr "Uruchamianie serwera pulse audio" -#: src/main.c:1835 +#: src/main.c:1845 msgid "Checking optional dependencies:" msgstr "Sprawdzanie zależności opcjonalne:" -#: src/main.c:1836 +#: src/main.c:1846 msgid "mplayer...detected..." msgstr "mplayer... wykryto..." -#: src/main.c:1837 +#: src/main.c:1847 msgid "mplayer...NOT DETECTED..." msgstr "mplayer...NIE WYKRYTO..." -#: src/main.c:1838 +#: src/main.c:1848 #, fuzzy msgid "mplayer2...detected..." msgstr "mplayer... wykryto..." -#: src/main.c:1839 +#: src/main.c:1849 #, fuzzy msgid "mplayer2...NOT DETECTED..." msgstr "mplayer...NIE WYKRYTO..." -#: src/main.c:1840 +#: src/main.c:1851 +#, fuzzy +msgid "mpv...detected..." +msgstr "mplayer... wykryto..." + +#: src/main.c:1852 +#, fuzzy +msgid "mpv...NOT DETECTED..." +msgstr "mplayer...NIE WYKRYTO..." + +#: src/main.c:1854 msgid "convert...detected..." msgstr "convert...wykrytych..." -#: src/main.c:1841 +#: src/main.c:1855 msgid "convert...NOT DETECTED..." msgstr "convert...NIE WYKRYTO..." -#: src/main.c:1842 +#: src/main.c:1856 msgid "composite...detected..." msgstr "composite...wykrytych..." -#: src/main.c:1843 +#: src/main.c:1857 msgid "composite...NOT DETECTED..." msgstr "composite...NIE WYKRYTO..." -#: src/main.c:1844 +#: src/main.c:1858 msgid "sox...detected\n" msgstr "sox...wykrytych\n" -#: src/main.c:1845 +#: src/main.c:1859 msgid "sox...NOT DETECTED\n" msgstr "sox...NIE WYKRYTO\n" -#: src/main.c:1846 +#: src/main.c:1860 #, fuzzy msgid "cdda2wav/icedax...detected..." msgstr "cdda2wav...wykrytych..." -#: src/main.c:1847 +#: src/main.c:1861 #, fuzzy msgid "cdda2wav/icedax...NOT DETECTED..." msgstr "cdda2wav...NIE WYKRYTO..." -#: src/main.c:1848 +#: src/main.c:1862 msgid "jackd...detected..." msgstr "jackd...wykrytych..."
View file
LiVES-2.4.4.tar.bz2/po/pms.po -> LiVES-2.4.6.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-11-22 18:03-0300\n" +"POT-Creation-Date: 2015-12-19 08:17-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" @@ -90,79 +90,79 @@ msgid "Preserving set.\n" msgstr "Preservassion j'anpostassion\n" -#: src/main.c:701 +#: src/main.c:700 msgid "Resizing" msgstr "Ardimensionament" -#: src/main.c:708 +#: src/main.c:707 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:958 +#: src/main.c:957 msgid "Any" msgstr "qualsëssìa" #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified") -#: src/main.c:960 +#: src/main.c:959 msgid "None" msgstr "Gnun" #. TRANSLATORS: text saying "recommended", for plugin names, etc. -#: src/main.c:962 +#: src/main.c:961 msgid "recommended" msgstr "consejà" #. TRANSLATORS: text saying "disabled", (as in "not enabled") -#: src/main.c:964 +#: src/main.c:963 msgid "disabled !" msgstr "dësativà" #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected -#: src/main.c:966 +#: src/main.c:965 msgid "**The current layout**" msgstr "**L'atual formà**" #. TRANSLATORS: adjective for "Built in" type effects -#: src/main.c:968 +#: src/main.c:967 msgid "Builtin" msgstr "Antregà" #. TRANSLATORS: adjective for "Custom" type effects -#: src/main.c:970 +#: src/main.c:969 msgid "Custom" msgstr "Personaj" #. TRANSLATORS: adjective for "Test" type effects -#: src/main.c:972 +#: src/main.c:971 msgid "Test" msgstr "Test" -#: src/main.c:1117 +#: src/main.c:1116 msgid "Foreground" msgstr "Prim pian" -#: src/main.c:1118 +#: src/main.c:1117 msgid "Background" msgstr "Drefond" -#: src/main.c:1634 +#: src/main.c:1644 msgid "Loading realtime effect plugins..." msgstr "Caria dle gionte për j'efet an temp-real..." -#: src/main.c:1700 +#: src/main.c:1710 msgid "Starting jack audio server..." msgstr "Andi dël jack audio server..." -#: src/main.c:1702 +#: src/main.c:1712 msgid "Starting jack transport server..." msgstr "Andi dël jack transport server..." -#: src/main.c:1703 +#: src/main.c:1713 msgid "Connecting to jack transport server..." msgstr "Conession al jack transport server..." -#: src/main.c:1733 +#: src/main.c:1743 #, c-format msgid "" "\n" @@ -181,116 +181,126 @@ "\n" "Dësnò, ch'a preuva a nandiè lives con tute le doe \"lives - jackopts 16\", o " -#: src/main.c:1768 +#: src/main.c:1778 msgid "Starting pulse audio server..." msgstr "Andi dël pulse audio server..." -#: src/main.c:1835 +#: src/main.c:1845 msgid "Checking optional dependencies:" msgstr "Contròl dependense opsionaj:" -#: src/main.c:1836 +#: src/main.c:1846 msgid "mplayer...detected..." msgstr "mplayer...trovà..." -#: src/main.c:1837 +#: src/main.c:1847 msgid "mplayer...NOT DETECTED..." msgstr "mplayer...NEN TROVÀ" -#: src/main.c:1838 +#: src/main.c:1848 #, fuzzy msgid "mplayer2...detected..." msgstr "mplayer...trovà..." -#: src/main.c:1839 +#: src/main.c:1849 #, fuzzy msgid "mplayer2...NOT DETECTED..." msgstr "mplayer...NEN TROVÀ" -#: src/main.c:1840 +#: src/main.c:1851 +#, fuzzy +msgid "mpv...detected..." +msgstr "mplayer...trovà..." + +#: src/main.c:1852 +#, fuzzy +msgid "mpv...NOT DETECTED..." +msgstr "mplayer...NEN TROVÀ" + +#: src/main.c:1854 msgid "convert...detected..." msgstr "convert...trovà..." -#: src/main.c:1841 +#: src/main.c:1855 msgid "convert...NOT DETECTED..." msgstr "convert...NEN TROVÀ..." -#: src/main.c:1842 +#: src/main.c:1856 msgid "composite...detected..." msgstr "composite...TROVÀ..." -#: src/main.c:1843 +#: src/main.c:1857 msgid "composite...NOT DETECTED..." msgstr "composite...NEN TROVÀ..." -#: src/main.c:1844 +#: src/main.c:1858 msgid "sox...detected\n" msgstr "sox...TROVÀ\n" -#: src/main.c:1845 +#: src/main.c:1859 msgid "sox...NOT DETECTED\n" msgstr "sox...NEN TROVÀ\n" -#: src/main.c:1846 +#: src/main.c:1860 #, fuzzy msgid "cdda2wav/icedax...detected..." msgstr "cdda2wav...TROVÀ..." -#: src/main.c:1847 +#: src/main.c:1861 #, fuzzy msgid "cdda2wav/icedax...NOT DETECTED..." msgstr "cdda2wav...NEN TROVÀ..." -#: src/main.c:1848 +#: src/main.c:1862 msgid "jackd...detected..." msgstr "jackd...TROVÀ..." -#: src/main.c:1849
View file
LiVES-2.4.4.tar.bz2/po/pt.po -> LiVES-2.4.6.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-11-22 18:03-0300\n" +"POT-Creation-Date: 2015-12-19 08:17-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" @@ -84,80 +84,80 @@ msgid "Preserving set.\n" msgstr "Preservando set.\n" -#: src/main.c:701 +#: src/main.c:700 msgid "Resizing" msgstr "A redimensionar" -#: src/main.c:708 +#: src/main.c:707 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:958 +#: src/main.c:957 msgid "Any" msgstr "Qualquer" #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified") -#: src/main.c:960 +#: src/main.c:959 msgid "None" msgstr "Nenhum" #. TRANSLATORS: text saying "recommended", for plugin names, etc. -#: src/main.c:962 +#: src/main.c:961 msgid "recommended" msgstr "recomendado" #. TRANSLATORS: text saying "disabled", (as in "not enabled") -#: src/main.c:964 +#: src/main.c:963 msgid "disabled !" msgstr "desactivado!" #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected -#: src/main.c:966 +#: src/main.c:965 msgid "**The current layout**" msgstr "**O layout atual**" #. TRANSLATORS: adjective for "Built in" type effects -#: src/main.c:968 +#: src/main.c:967 msgid "Builtin" msgstr "Builtin" #. TRANSLATORS: adjective for "Custom" type effects -#: src/main.c:970 +#: src/main.c:969 msgid "Custom" msgstr "Customizado" #. TRANSLATORS: adjective for "Test" type effects -#: src/main.c:972 +#: src/main.c:971 msgid "Test" msgstr "Teste" -#: src/main.c:1117 +#: src/main.c:1116 msgid "Foreground" msgstr "" -#: src/main.c:1118 +#: src/main.c:1117 #, fuzzy msgid "Background" msgstr "Fundo _Branco" -#: src/main.c:1634 +#: src/main.c:1644 msgid "Loading realtime effect plugins..." msgstr "A carregar plugins de efeito em tempo real..." -#: src/main.c:1700 +#: src/main.c:1710 msgid "Starting jack audio server..." msgstr "A iniciar servidor de jack audio..." -#: src/main.c:1702 +#: src/main.c:1712 msgid "Starting jack transport server..." msgstr "" -#: src/main.c:1703 +#: src/main.c:1713 msgid "Connecting to jack transport server..." msgstr "" -#: src/main.c:1733 +#: src/main.c:1743 #, c-format msgid "" "\n" @@ -169,116 +169,126 @@ "Alternatively, try to start lives with either \"lives -jackopts 16\", or " msgstr "" -#: src/main.c:1768 +#: src/main.c:1778 msgid "Starting pulse audio server..." msgstr "" -#: src/main.c:1835 +#: src/main.c:1845 msgid "Checking optional dependencies:" msgstr "A verificar as dependências opcionais:" -#: src/main.c:1836 +#: src/main.c:1846 msgid "mplayer...detected..." msgstr "mplayer...detectado..." -#: src/main.c:1837 +#: src/main.c:1847 msgid "mplayer...NOT DETECTED..." msgstr "mplayer...NÃO DETECTADO..." -#: src/main.c:1838 +#: src/main.c:1848 #, fuzzy msgid "mplayer2...detected..." msgstr "mplayer...detectado..." -#: src/main.c:1839 +#: src/main.c:1849 #, fuzzy msgid "mplayer2...NOT DETECTED..." msgstr "mplayer...NÃO DETECTADO..." -#: src/main.c:1840 +#: src/main.c:1851 +#, fuzzy +msgid "mpv...detected..." +msgstr "mplayer...detectado..." + +#: src/main.c:1852 +#, fuzzy +msgid "mpv...NOT DETECTED..." +msgstr "mplayer...NÃO DETECTADO..." + +#: src/main.c:1854 msgid "convert...detected..." msgstr "convert...detectado..." -#: src/main.c:1841 +#: src/main.c:1855 msgid "convert...NOT DETECTED..." msgstr "convert...NÃO DETECTADO..." -#: src/main.c:1842 +#: src/main.c:1856 msgid "composite...detected..." msgstr "composite...detectado..." -#: src/main.c:1843 +#: src/main.c:1857 msgid "composite...NOT DETECTED..." msgstr "composite...NÃO DETECTADO..." -#: src/main.c:1844 +#: src/main.c:1858 msgid "sox...detected\n" msgstr "sox...detectado\n" -#: src/main.c:1845 +#: src/main.c:1859 msgid "sox...NOT DETECTED\n" msgstr "sox...NÃO DETECTADO...\n" -#: src/main.c:1846 +#: src/main.c:1860 #, fuzzy msgid "cdda2wav/icedax...detected..." msgstr "cdda2wav...detectado..." -#: src/main.c:1847 +#: src/main.c:1861 #, fuzzy msgid "cdda2wav/icedax...NOT DETECTED..." msgstr "cdda2wav...NÃO DETECTADO..." -#: src/main.c:1848 +#: src/main.c:1862 msgid "jackd...detected..." msgstr "jackd...detectado..."
View file
LiVES-2.4.4.tar.bz2/po/pt_BR.po -> LiVES-2.4.6.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-11-22 18:03-0300\n" +"POT-Creation-Date: 2015-12-19 08:17-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" @@ -87,80 +87,80 @@ msgid "Preserving set.\n" msgstr "Preservando set.\n" -#: src/main.c:701 +#: src/main.c:700 msgid "Resizing" msgstr "Redimensionando" -#: src/main.c:708 +#: src/main.c:707 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:958 +#: src/main.c:957 msgid "Any" msgstr "Qualquer" #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified") -#: src/main.c:960 +#: src/main.c:959 msgid "None" msgstr "Nenhum" #. TRANSLATORS: text saying "recommended", for plugin names, etc. -#: src/main.c:962 +#: src/main.c:961 msgid "recommended" msgstr "recomendado" #. TRANSLATORS: text saying "disabled", (as in "not enabled") -#: src/main.c:964 +#: src/main.c:963 msgid "disabled !" msgstr "desativado!" #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected -#: src/main.c:966 +#: src/main.c:965 msgid "**The current layout**" msgstr "**Layout atual**" #. TRANSLATORS: adjective for "Built in" type effects -#: src/main.c:968 +#: src/main.c:967 msgid "Builtin" msgstr "Builtin" #. TRANSLATORS: adjective for "Custom" type effects -#: src/main.c:970 +#: src/main.c:969 msgid "Custom" msgstr "Customizado" #. TRANSLATORS: adjective for "Test" type effects -#: src/main.c:972 +#: src/main.c:971 msgid "Test" msgstr "Teste" -#: src/main.c:1117 +#: src/main.c:1116 msgid "Foreground" msgstr "" -#: src/main.c:1118 +#: src/main.c:1117 #, fuzzy msgid "Background" msgstr "Fundo _Branco" -#: src/main.c:1634 +#: src/main.c:1644 msgid "Loading realtime effect plugins..." msgstr "Carregando plugins de efeitos em tempo real..." -#: src/main.c:1700 +#: src/main.c:1710 msgid "Starting jack audio server..." msgstr "Iniciando servidor de áudio jack..." -#: src/main.c:1702 +#: src/main.c:1712 msgid "Starting jack transport server..." msgstr "Iniciando o servidor jack de transporte..." -#: src/main.c:1703 +#: src/main.c:1713 msgid "Connecting to jack transport server..." msgstr "Conectando ao servidor jack de transporte..." -#: src/main.c:1733 +#: src/main.c:1743 #, c-format msgid "" "\n" @@ -172,116 +172,126 @@ "Alternatively, try to start lives with either \"lives -jackopts 16\", or " msgstr "" -#: src/main.c:1768 +#: src/main.c:1778 msgid "Starting pulse audio server..." msgstr "Iniciando o servidor pulse audio..." -#: src/main.c:1835 +#: src/main.c:1845 msgid "Checking optional dependencies:" msgstr "Checando dependências opcionais:" -#: src/main.c:1836 +#: src/main.c:1846 msgid "mplayer...detected..." msgstr "mplayer...detectado..." -#: src/main.c:1837 +#: src/main.c:1847 msgid "mplayer...NOT DETECTED..." msgstr "mplayer...NÃO DETECTADO..." -#: src/main.c:1838 +#: src/main.c:1848 #, fuzzy msgid "mplayer2...detected..." msgstr "mplayer...detectado..." -#: src/main.c:1839 +#: src/main.c:1849 #, fuzzy msgid "mplayer2...NOT DETECTED..." msgstr "mplayer...NÃO DETECTADO..." -#: src/main.c:1840 +#: src/main.c:1851 +#, fuzzy +msgid "mpv...detected..." +msgstr "mplayer...detectado..." + +#: src/main.c:1852 +#, fuzzy +msgid "mpv...NOT DETECTED..." +msgstr "mplayer...NÃO DETECTADO..." + +#: src/main.c:1854 msgid "convert...detected..." msgstr "convert...detectado..." -#: src/main.c:1841 +#: src/main.c:1855 msgid "convert...NOT DETECTED..." msgstr "convert...NÃO DETECTADO..." -#: src/main.c:1842 +#: src/main.c:1856 msgid "composite...detected..." msgstr "composite...detectado..." -#: src/main.c:1843 +#: src/main.c:1857 msgid "composite...NOT DETECTED..." msgstr "composite...NÃO DETECTADO..." -#: src/main.c:1844 +#: src/main.c:1858 msgid "sox...detected\n" msgstr "sox...detectado\n" -#: src/main.c:1845 +#: src/main.c:1859 msgid "sox...NOT DETECTED\n" msgstr "sox...NÃO DETECTADO...\n" -#: src/main.c:1846 +#: src/main.c:1860 #, fuzzy msgid "cdda2wav/icedax...detected..." msgstr "cdda2wav...detectado..." -#: src/main.c:1847 +#: src/main.c:1861 #, fuzzy msgid "cdda2wav/icedax...NOT DETECTED..." msgstr "cdda2wav...NÃO DETECTADO..." -#: src/main.c:1848 +#: src/main.c:1862 msgid "jackd...detected..." msgstr "jackd...detectado..."
View file
LiVES-2.4.4.tar.bz2/po/ro.po -> LiVES-2.4.6.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-11-22 18:03-0300\n" +"POT-Creation-Date: 2015-12-19 08:17-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" @@ -91,80 +91,80 @@ msgid "Preserving set.\n" msgstr "Păstrarea set.\n" -#: src/main.c:701 +#: src/main.c:700 msgid "Resizing" msgstr "Redimensionare" -#: src/main.c:708 +#: src/main.c:707 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:958 +#: src/main.c:957 msgid "Any" msgstr "Orice" #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified") -#: src/main.c:960 +#: src/main.c:959 msgid "None" msgstr "Nimic" #. TRANSLATORS: text saying "recommended", for plugin names, etc. -#: src/main.c:962 +#: src/main.c:961 msgid "recommended" msgstr "recomandat" #. TRANSLATORS: text saying "disabled", (as in "not enabled") -#: src/main.c:964 +#: src/main.c:963 msgid "disabled !" msgstr "dezactivat !" #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected -#: src/main.c:966 +#: src/main.c:965 msgid "**The current layout**" msgstr "** Structura actuală **" #. TRANSLATORS: adjective for "Built in" type effects -#: src/main.c:968 +#: src/main.c:967 msgid "Builtin" msgstr "" #. TRANSLATORS: adjective for "Custom" type effects -#: src/main.c:970 +#: src/main.c:969 msgid "Custom" msgstr "" #. TRANSLATORS: adjective for "Test" type effects -#: src/main.c:972 +#: src/main.c:971 msgid "Test" msgstr "" -#: src/main.c:1117 +#: src/main.c:1116 msgid "Foreground" msgstr "" -#: src/main.c:1118 +#: src/main.c:1117 #, fuzzy msgid "Background" msgstr "_Ignoră schimbările" -#: src/main.c:1634 +#: src/main.c:1644 msgid "Loading realtime effect plugins..." msgstr "Se incarcă modulele de efecte in timp real..." -#: src/main.c:1700 +#: src/main.c:1710 msgid "Starting jack audio server..." msgstr "Pornirea serverului audio jack..." -#: src/main.c:1702 +#: src/main.c:1712 msgid "Starting jack transport server..." msgstr "" -#: src/main.c:1703 +#: src/main.c:1713 msgid "Connecting to jack transport server..." msgstr "" -#: src/main.c:1733 +#: src/main.c:1743 #, c-format msgid "" "\n" @@ -176,116 +176,126 @@ "Alternatively, try to start lives with either \"lives -jackopts 16\", or " msgstr "" -#: src/main.c:1768 +#: src/main.c:1778 msgid "Starting pulse audio server..." msgstr "Pornirea serverului audio pulse..." -#: src/main.c:1835 +#: src/main.c:1845 msgid "Checking optional dependencies:" msgstr "Verificarea dependenţelor opţionale:" -#: src/main.c:1836 +#: src/main.c:1846 msgid "mplayer...detected..." msgstr "mplayer...a fost detectat..." -#: src/main.c:1837 +#: src/main.c:1847 msgid "mplayer...NOT DETECTED..." msgstr "mplayer... nu a fost detectat..." -#: src/main.c:1838 +#: src/main.c:1848 #, fuzzy msgid "mplayer2...detected..." msgstr "mplayer...a fost detectat..." -#: src/main.c:1839 +#: src/main.c:1849 #, fuzzy msgid "mplayer2...NOT DETECTED..." msgstr "mplayer... nu a fost detectat..." -#: src/main.c:1840 +#: src/main.c:1851 +#, fuzzy +msgid "mpv...detected..." +msgstr "mplayer...a fost detectat..." + +#: src/main.c:1852 +#, fuzzy +msgid "mpv...NOT DETECTED..." +msgstr "mplayer... nu a fost detectat..." + +#: src/main.c:1854 msgid "convert...detected..." msgstr "convert...detectat..." -#: src/main.c:1841 +#: src/main.c:1855 msgid "convert...NOT DETECTED..." msgstr "convert...NU A FOST DETECTAT..." -#: src/main.c:1842 +#: src/main.c:1856 msgid "composite...detected..." msgstr "composite...detectat..." -#: src/main.c:1843 +#: src/main.c:1857 msgid "composite...NOT DETECTED..." msgstr "composite...NU A FOST DETECTAT..." -#: src/main.c:1844 +#: src/main.c:1858 msgid "sox...detected\n" msgstr "sox...detectat\n" -#: src/main.c:1845 +#: src/main.c:1859 msgid "sox...NOT DETECTED\n" msgstr "sox...NU A FOST DETECTAT\n" -#: src/main.c:1846 +#: src/main.c:1860 #, fuzzy msgid "cdda2wav/icedax...detected..." msgstr "cdda2wav...detectat..." -#: src/main.c:1847 +#: src/main.c:1861 #, fuzzy msgid "cdda2wav/icedax...NOT DETECTED..." msgstr "cdda2wav...NU A FOST DETECTAT..." -#: src/main.c:1848 +#: src/main.c:1862 msgid "jackd...detected..." msgstr "jackd...detectat..."
View file
LiVES-2.4.4.tar.bz2/po/ru.po -> LiVES-2.4.6.tar.bz2/po/ru.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-11-22 18:03-0300\n" +"POT-Creation-Date: 2015-12-19 08:17-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" @@ -95,79 +95,79 @@ msgid "Preserving set.\n" msgstr "Сохранение сборки.\n" -#: src/main.c:701 +#: src/main.c:700 msgid "Resizing" msgstr "Масштабирование" -#: src/main.c:708 +#: src/main.c:707 msgid "_Resize All Frames" msgstr "_Масштабировать все кадры" #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter") -#: src/main.c:958 +#: src/main.c:957 msgid "Any" msgstr "Любой" #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified") -#: src/main.c:960 +#: src/main.c:959 msgid "None" msgstr "Нет" #. TRANSLATORS: text saying "recommended", for plugin names, etc. -#: src/main.c:962 +#: src/main.c:961 msgid "recommended" msgstr "рекомендуемые" #. TRANSLATORS: text saying "disabled", (as in "not enabled") -#: src/main.c:964 +#: src/main.c:963 msgid "disabled !" msgstr "отключено!" #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected -#: src/main.c:966 +#: src/main.c:965 msgid "**The current layout**" msgstr "Текущее размещение" #. TRANSLATORS: adjective for "Built in" type effects -#: src/main.c:968 +#: src/main.c:967 msgid "Builtin" msgstr "Встроенный" #. TRANSLATORS: adjective for "Custom" type effects -#: src/main.c:970 +#: src/main.c:969 msgid "Custom" msgstr "Настраиваемый" #. TRANSLATORS: adjective for "Test" type effects -#: src/main.c:972 +#: src/main.c:971 msgid "Test" msgstr "Тест" -#: src/main.c:1117 +#: src/main.c:1116 msgid "Foreground" msgstr "Передний план" -#: src/main.c:1118 +#: src/main.c:1117 msgid "Background" msgstr "Фон" -#: src/main.c:1634 +#: src/main.c:1644 msgid "Loading realtime effect plugins..." msgstr "Загрузка плагина эффектов реального времени..." -#: src/main.c:1700 +#: src/main.c:1710 msgid "Starting jack audio server..." msgstr "Запуск звукового сервера jack..." -#: src/main.c:1702 +#: src/main.c:1712 msgid "Starting jack transport server..." msgstr "Запуск передающего сервера jack..." -#: src/main.c:1703 +#: src/main.c:1713 msgid "Connecting to jack transport server..." msgstr "Подключение к передающему jack-серверу..." -#: src/main.c:1733 +#: src/main.c:1743 #, c-format msgid "" "\n" @@ -188,116 +188,126 @@ "Также, вы можете попробовать запустить программу таким образом \"lives -" "jackopts 16\" или " -#: src/main.c:1768 +#: src/main.c:1778 msgid "Starting pulse audio server..." msgstr "Запуск сервера pulse audio..." -#: src/main.c:1835 +#: src/main.c:1845 msgid "Checking optional dependencies:" msgstr "Проверка опциональных зависимостей:" -#: src/main.c:1836 +#: src/main.c:1846 msgid "mplayer...detected..." msgstr "mplayer...обнаружен..." -#: src/main.c:1837 +#: src/main.c:1847 msgid "mplayer...NOT DETECTED..." msgstr "mplayer...НЕ ОБНАРУЖЕН..." -#: src/main.c:1838 +#: src/main.c:1848 #, fuzzy msgid "mplayer2...detected..." msgstr "mplayer...обнаружен..." -#: src/main.c:1839 +#: src/main.c:1849 #, fuzzy msgid "mplayer2...NOT DETECTED..." msgstr "mplayer...НЕ ОБНАРУЖЕН..." -#: src/main.c:1840 +#: src/main.c:1851 +#, fuzzy +msgid "mpv...detected..." +msgstr "mplayer...обнаружен..." + +#: src/main.c:1852 +#, fuzzy +msgid "mpv...NOT DETECTED..." +msgstr "mplayer...НЕ ОБНАРУЖЕН..." + +#: src/main.c:1854 msgid "convert...detected..." msgstr "convert...обнаружен..." -#: src/main.c:1841 +#: src/main.c:1855 msgid "convert...NOT DETECTED..." msgstr "convert...НЕ ОБНАРУЖЕН..." -#: src/main.c:1842 +#: src/main.c:1856 msgid "composite...detected..." msgstr "composite...обнаружен..." -#: src/main.c:1843 +#: src/main.c:1857 msgid "composite...NOT DETECTED..." msgstr "composite...НЕ ОБНАРУЖЕН..." -#: src/main.c:1844 +#: src/main.c:1858 msgid "sox...detected\n" msgstr "sox...обнаружен...\n" -#: src/main.c:1845 +#: src/main.c:1859 msgid "sox...NOT DETECTED\n" msgstr "sox...НЕ ОБНАРУЖЕН...\n" -#: src/main.c:1846 +#: src/main.c:1860 #, fuzzy msgid "cdda2wav/icedax...detected..." msgstr "cdda2wav...обнаружен..." -#: src/main.c:1847 +#: src/main.c:1861 #, fuzzy msgid "cdda2wav/icedax...NOT DETECTED..." msgstr "cdda2wav...НЕ ОБНАРУЖЕН..." -#: src/main.c:1848 +#: src/main.c:1862 msgid "jackd...detected..." msgstr "jackd...обнаружен..." -#: src/main.c:1849
View file
LiVES-2.4.4.tar.bz2/po/sk.po -> LiVES-2.4.6.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-11-22 18:03-0300\n" +"POT-Creation-Date: 2015-12-19 08:17-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" @@ -95,80 +95,80 @@ msgid "Preserving set.\n" msgstr "Nastavenie zachovania.\n" -#: src/main.c:701 +#: src/main.c:700 msgid "Resizing" msgstr "Zmena veľkosti" -#: src/main.c:708 +#: src/main.c:707 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:958 +#: src/main.c:957 msgid "Any" msgstr "Ktorýkoľvek" #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified") -#: src/main.c:960 +#: src/main.c:959 msgid "None" msgstr "Žiaden" #. TRANSLATORS: text saying "recommended", for plugin names, etc. -#: src/main.c:962 +#: src/main.c:961 msgid "recommended" msgstr "doporučené" #. TRANSLATORS: text saying "disabled", (as in "not enabled") -#: src/main.c:964 +#: src/main.c:963 msgid "disabled !" msgstr "zakázané !" #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected -#: src/main.c:966 +#: src/main.c:965 msgid "**The current layout**" msgstr "**Súčasné rozloženie**" #. TRANSLATORS: adjective for "Built in" type effects -#: src/main.c:968 +#: src/main.c:967 msgid "Builtin" msgstr "Vstavané" #. TRANSLATORS: adjective for "Custom" type effects -#: src/main.c:970 +#: src/main.c:969 msgid "Custom" msgstr "Vlastné" #. TRANSLATORS: adjective for "Test" type effects -#: src/main.c:972 +#: src/main.c:971 msgid "Test" msgstr "Otestovať" -#: src/main.c:1117 +#: src/main.c:1116 msgid "Foreground" msgstr "" -#: src/main.c:1118 +#: src/main.c:1117 #, fuzzy msgid "Background" msgstr "_Prázdne pozadie" -#: src/main.c:1634 +#: src/main.c:1644 msgid "Loading realtime effect plugins..." msgstr "Načítavam efekt rozšírenia v réálnom čase..." -#: src/main.c:1700 +#: src/main.c:1710 msgid "Starting jack audio server..." msgstr "Spúšťam zvukový server jack..." -#: src/main.c:1702 +#: src/main.c:1712 msgid "Starting jack transport server..." msgstr "" -#: src/main.c:1703 +#: src/main.c:1713 msgid "Connecting to jack transport server..." msgstr "" -#: src/main.c:1733 +#: src/main.c:1743 #, c-format msgid "" "\n" @@ -180,116 +180,126 @@ "Alternatively, try to start lives with either \"lives -jackopts 16\", or " msgstr "" -#: src/main.c:1768 +#: src/main.c:1778 msgid "Starting pulse audio server..." msgstr "Spúšťam pulse audio server..." -#: src/main.c:1835 +#: src/main.c:1845 msgid "Checking optional dependencies:" msgstr "Kontrola dodatočných záavislostí:" -#: src/main.c:1836 +#: src/main.c:1846 msgid "mplayer...detected..." msgstr "mplayer...nájdený..." -#: src/main.c:1837 +#: src/main.c:1847 msgid "mplayer...NOT DETECTED..." msgstr "mplayer...NENÁJDENÝ..." -#: src/main.c:1838 +#: src/main.c:1848 #, fuzzy msgid "mplayer2...detected..." msgstr "mplayer...nájdený..." -#: src/main.c:1839 +#: src/main.c:1849 #, fuzzy msgid "mplayer2...NOT DETECTED..." msgstr "mplayer...NENÁJDENÝ..." -#: src/main.c:1840 +#: src/main.c:1851 +#, fuzzy +msgid "mpv...detected..." +msgstr "mplayer...nájdený..." + +#: src/main.c:1852 +#, fuzzy +msgid "mpv...NOT DETECTED..." +msgstr "mplayer...NENÁJDENÝ..." + +#: src/main.c:1854 msgid "convert...detected..." msgstr "convert...nájdený..." -#: src/main.c:1841 +#: src/main.c:1855 msgid "convert...NOT DETECTED..." msgstr "convert...NENÁJDENÝ..." -#: src/main.c:1842 +#: src/main.c:1856 msgid "composite...detected..." msgstr "composite...nájdený..." -#: src/main.c:1843 +#: src/main.c:1857 msgid "composite...NOT DETECTED..." msgstr "composite...NENÁJDENÝ..." -#: src/main.c:1844 +#: src/main.c:1858 msgid "sox...detected\n" msgstr "sox...nájdený\n" -#: src/main.c:1845 +#: src/main.c:1859 msgid "sox...NOT DETECTED\n" msgstr "sox...NENÁJDENÝ\n" -#: src/main.c:1846 +#: src/main.c:1860 #, fuzzy msgid "cdda2wav/icedax...detected..." msgstr "cdda2wav...nájdený..." -#: src/main.c:1847 +#: src/main.c:1861 #, fuzzy msgid "cdda2wav/icedax...NOT DETECTED..." msgstr "cdda2wav...NENÁJDENÝ..." -#: src/main.c:1848 +#: src/main.c:1862 msgid "jackd...detected..." msgstr "jackd...nájdený..."
View file
LiVES-2.4.4.tar.bz2/po/te.po -> LiVES-2.4.6.tar.bz2/po/te.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-11-22 18:03-0300\n" +"POT-Creation-Date: 2015-12-19 08:17-0300\n" "PO-Revision-Date: 2013-03-14 12:31+0000\n" "Last-Translator: Launchpad Translations Administrators <Unknown>\n" "Language-Team: Telugu <indlinux-telugu@lists.sourceforge.net>\n" @@ -77,80 +77,80 @@ msgid "Preserving set.\n" msgstr "" -#: src/main.c:701 +#: src/main.c:700 msgid "Resizing" msgstr "పరిమాణం మార్చుట" -#: src/main.c:708 +#: src/main.c:707 msgid "_Resize All Frames" msgstr "అన్ని చట్రాల పరిమాణం మార్చు (_R)" #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter") -#: src/main.c:958 +#: src/main.c:957 msgid "Any" msgstr "ఏదైనా" #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified") -#: src/main.c:960 +#: src/main.c:959 msgid "None" msgstr "ఏదీ వద్దు" #. TRANSLATORS: text saying "recommended", for plugin names, etc. -#: src/main.c:962 +#: src/main.c:961 msgid "recommended" msgstr "సిఫారసుచేయబడింది" #. TRANSLATORS: text saying "disabled", (as in "not enabled") -#: src/main.c:964 +#: src/main.c:963 msgid "disabled !" msgstr "" #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected -#: src/main.c:966 +#: src/main.c:965 msgid "**The current layout**" msgstr "" #. TRANSLATORS: adjective for "Built in" type effects -#: src/main.c:968 +#: src/main.c:967 msgid "Builtin" msgstr "నిర్మితమైన" #. TRANSLATORS: adjective for "Custom" type effects -#: src/main.c:970 +#: src/main.c:969 msgid "Custom" msgstr "మలచిన" #. TRANSLATORS: adjective for "Test" type effects -#: src/main.c:972 +#: src/main.c:971 msgid "Test" msgstr "పరిశీలన" -#: src/main.c:1117 +#: src/main.c:1116 msgid "Foreground" msgstr "" -#: src/main.c:1118 +#: src/main.c:1117 #, fuzzy msgid "Background" msgstr "_ప్రారంభం" -#: src/main.c:1634 +#: src/main.c:1644 msgid "Loading realtime effect plugins..." msgstr "" -#: src/main.c:1700 +#: src/main.c:1710 msgid "Starting jack audio server..." msgstr "" -#: src/main.c:1702 +#: src/main.c:1712 msgid "Starting jack transport server..." msgstr "" -#: src/main.c:1703 +#: src/main.c:1713 msgid "Connecting to jack transport server..." msgstr "" -#: src/main.c:1733 +#: src/main.c:1743 #, c-format msgid "" "\n" @@ -162,112 +162,120 @@ "Alternatively, try to start lives with either \"lives -jackopts 16\", or " msgstr "" -#: src/main.c:1768 +#: src/main.c:1778 msgid "Starting pulse audio server..." msgstr "" -#: src/main.c:1835 +#: src/main.c:1845 msgid "Checking optional dependencies:" msgstr "" -#: src/main.c:1836 +#: src/main.c:1846 msgid "mplayer...detected..." msgstr "" -#: src/main.c:1837 +#: src/main.c:1847 msgid "mplayer...NOT DETECTED..." msgstr "" -#: src/main.c:1838 +#: src/main.c:1848 msgid "mplayer2...detected..." msgstr "" -#: src/main.c:1839 +#: src/main.c:1849 msgid "mplayer2...NOT DETECTED..." msgstr "" -#: src/main.c:1840 +#: src/main.c:1851 +msgid "mpv...detected..." +msgstr "" + +#: src/main.c:1852 +msgid "mpv...NOT DETECTED..." +msgstr "" + +#: src/main.c:1854 msgid "convert...detected..." msgstr "" -#: src/main.c:1841 +#: src/main.c:1855 msgid "convert...NOT DETECTED..." msgstr "" -#: src/main.c:1842 +#: src/main.c:1856 msgid "composite...detected..." msgstr "" -#: src/main.c:1843 +#: src/main.c:1857 msgid "composite...NOT DETECTED..." msgstr "" -#: src/main.c:1844 +#: src/main.c:1858 msgid "sox...detected\n" msgstr "" -#: src/main.c:1845 +#: src/main.c:1859 msgid "sox...NOT DETECTED\n" msgstr "" -#: src/main.c:1846 +#: src/main.c:1860 msgid "cdda2wav/icedax...detected..." msgstr "" -#: src/main.c:1847 +#: src/main.c:1861 msgid "cdda2wav/icedax...NOT DETECTED..." msgstr "" -#: src/main.c:1848 +#: src/main.c:1862 msgid "jackd...detected..." msgstr "" -#: src/main.c:1849 +#: src/main.c:1863 msgid "jackd...NOT DETECTED..." msgstr "" -#: src/main.c:1850
View file
LiVES-2.4.4.tar.bz2/po/tr.po -> LiVES-2.4.6.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-11-22 18:03-0300\n" +"POT-Creation-Date: 2015-12-19 08:17-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" @@ -91,80 +91,80 @@ msgid "Preserving set.\n" msgstr "Koruma ayarları.\n" -#: src/main.c:701 +#: src/main.c:700 msgid "Resizing" msgstr "Yeniden boyutlandırma" -#: src/main.c:708 +#: src/main.c:707 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:958 +#: src/main.c:957 msgid "Any" msgstr "Herhangi" #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified") -#: src/main.c:960 +#: src/main.c:959 msgid "None" msgstr "Boş" #. TRANSLATORS: text saying "recommended", for plugin names, etc. -#: src/main.c:962 +#: src/main.c:961 msgid "recommended" msgstr "tavsiye" #. TRANSLATORS: text saying "disabled", (as in "not enabled") -#: src/main.c:964 +#: src/main.c:963 msgid "disabled !" msgstr "Engelli!" #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected -#: src/main.c:966 +#: src/main.c:965 msgid "**The current layout**" msgstr "**Mevcut yerleşim düzeni**" #. TRANSLATORS: adjective for "Built in" type effects -#: src/main.c:968 +#: src/main.c:967 msgid "Builtin" msgstr "Yapısal" #. TRANSLATORS: adjective for "Custom" type effects -#: src/main.c:970 +#: src/main.c:969 msgid "Custom" msgstr "Özel" #. TRANSLATORS: adjective for "Test" type effects -#: src/main.c:972 +#: src/main.c:971 msgid "Test" msgstr "Sınama" -#: src/main.c:1117 +#: src/main.c:1116 msgid "Foreground" msgstr "" -#: src/main.c:1118 +#: src/main.c:1117 #, fuzzy msgid "Background" msgstr "_Boş arkaplan" -#: src/main.c:1634 +#: src/main.c:1644 msgid "Loading realtime effect plugins..." msgstr "Gerçek zaman efekt eklentileri yükleniyor" -#: src/main.c:1700 +#: src/main.c:1710 msgid "Starting jack audio server..." msgstr "Jack audio sunucusu başlıyor..." -#: src/main.c:1702 +#: src/main.c:1712 msgid "Starting jack transport server..." msgstr "Jack taşıma sunucusu başlıyor" -#: src/main.c:1703 +#: src/main.c:1713 msgid "Connecting to jack transport server..." msgstr "Jack taşıma sunucusuna bağlanılıyor" -#: src/main.c:1733 +#: src/main.c:1743 #, c-format msgid "" "\n" @@ -176,116 +176,126 @@ "Alternatively, try to start lives with either \"lives -jackopts 16\", or " msgstr "" -#: src/main.c:1768 +#: src/main.c:1778 msgid "Starting pulse audio server..." msgstr "Pulse audio sunucusu başlıyor" -#: src/main.c:1835 +#: src/main.c:1845 msgid "Checking optional dependencies:" msgstr "Isteğe bağlı bağımlılıkları denetleme:" -#: src/main.c:1836 +#: src/main.c:1846 msgid "mplayer...detected..." msgstr "mplayer ... bulundu ..." -#: src/main.c:1837 +#: src/main.c:1847 msgid "mplayer...NOT DETECTED..." msgstr "mplayer ... BULUNAMADI ..." -#: src/main.c:1838 +#: src/main.c:1848 #, fuzzy msgid "mplayer2...detected..." msgstr "mplayer ... bulundu ..." -#: src/main.c:1839 +#: src/main.c:1849 #, fuzzy msgid "mplayer2...NOT DETECTED..." msgstr "mplayer ... BULUNAMADI ..." -#: src/main.c:1840 +#: src/main.c:1851 +#, fuzzy +msgid "mpv...detected..." +msgstr "mplayer ... bulundu ..." + +#: src/main.c:1852 +#, fuzzy +msgid "mpv...NOT DETECTED..." +msgstr "mplayer ... BULUNAMADI ..." + +#: src/main.c:1854 msgid "convert...detected..." msgstr "convert...bulundu..." -#: src/main.c:1841 +#: src/main.c:1855 msgid "convert...NOT DETECTED..." msgstr "convert...BULUNAMADI..." -#: src/main.c:1842 +#: src/main.c:1856 msgid "composite...detected..." msgstr "composite ... bulundu ..." -#: src/main.c:1843 +#: src/main.c:1857 msgid "composite...NOT DETECTED..." msgstr "composite ... BULUNAMADI ..." -#: src/main.c:1844 +#: src/main.c:1858 msgid "sox...detected\n" msgstr "sox...bulundu\n" -#: src/main.c:1845 +#: src/main.c:1859 msgid "sox...NOT DETECTED\n" msgstr "sox...BULUNAMADI\n" -#: src/main.c:1846 +#: src/main.c:1860 #, fuzzy msgid "cdda2wav/icedax...detected..." msgstr "cdda2wav...bulundu..." -#: src/main.c:1847 +#: src/main.c:1861 #, fuzzy msgid "cdda2wav/icedax...NOT DETECTED..." msgstr "cdda2wav...BULUNAMADI..." -#: src/main.c:1848 +#: src/main.c:1862 msgid "jackd...detected..." msgstr "jackd...bulundu..."
View file
LiVES-2.4.4.tar.bz2/po/ug.po -> LiVES-2.4.6.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-11-22 18:03-0300\n" +"POT-Creation-Date: 2015-12-19 08:17-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" @@ -76,80 +76,80 @@ msgid "Preserving set.\n" msgstr "" -#: src/main.c:701 +#: src/main.c:700 msgid "Resizing" msgstr "" -#: src/main.c:708 +#: src/main.c:707 msgid "_Resize All Frames" msgstr "" #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter") -#: src/main.c:958 +#: src/main.c:957 msgid "Any" msgstr "خالىغان" #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified") -#: src/main.c:960 +#: src/main.c:959 msgid "None" msgstr "يوق" #. TRANSLATORS: text saying "recommended", for plugin names, etc. -#: src/main.c:962 +#: src/main.c:961 msgid "recommended" msgstr "تەۋسىيە قىلغان" #. TRANSLATORS: text saying "disabled", (as in "not enabled") -#: src/main.c:964 +#: src/main.c:963 msgid "disabled !" msgstr "چەكلەنگەن!" #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected -#: src/main.c:966 +#: src/main.c:965 msgid "**The current layout**" msgstr "" #. TRANSLATORS: adjective for "Built in" type effects -#: src/main.c:968 +#: src/main.c:967 msgid "Builtin" msgstr "ئىچكى" #. TRANSLATORS: adjective for "Custom" type effects -#: src/main.c:970 +#: src/main.c:969 msgid "Custom" msgstr "ئىختىيارى" #. TRANSLATORS: adjective for "Test" type effects -#: src/main.c:972 +#: src/main.c:971 msgid "Test" msgstr "سىناق" -#: src/main.c:1117 +#: src/main.c:1116 msgid "Foreground" msgstr "" -#: src/main.c:1118 +#: src/main.c:1117 #, fuzzy msgid "Background" msgstr "باشلا(_S)" -#: src/main.c:1634 +#: src/main.c:1644 msgid "Loading realtime effect plugins..." msgstr "" -#: src/main.c:1700 +#: src/main.c:1710 msgid "Starting jack audio server..." msgstr "" -#: src/main.c:1702 +#: src/main.c:1712 msgid "Starting jack transport server..." msgstr "" -#: src/main.c:1703 +#: src/main.c:1713 msgid "Connecting to jack transport server..." msgstr "" -#: src/main.c:1733 +#: src/main.c:1743 #, c-format msgid "" "\n" @@ -161,112 +161,120 @@ "Alternatively, try to start lives with either \"lives -jackopts 16\", or " msgstr "" -#: src/main.c:1768 +#: src/main.c:1778 msgid "Starting pulse audio server..." msgstr "" -#: src/main.c:1835 +#: src/main.c:1845 msgid "Checking optional dependencies:" msgstr "" -#: src/main.c:1836 +#: src/main.c:1846 msgid "mplayer...detected..." msgstr "" -#: src/main.c:1837 +#: src/main.c:1847 msgid "mplayer...NOT DETECTED..." msgstr "" -#: src/main.c:1838 +#: src/main.c:1848 msgid "mplayer2...detected..." msgstr "" -#: src/main.c:1839 +#: src/main.c:1849 msgid "mplayer2...NOT DETECTED..." msgstr "" -#: src/main.c:1840 +#: src/main.c:1851 +msgid "mpv...detected..." +msgstr "" + +#: src/main.c:1852 +msgid "mpv...NOT DETECTED..." +msgstr "" + +#: src/main.c:1854 msgid "convert...detected..." msgstr "" -#: src/main.c:1841 +#: src/main.c:1855 msgid "convert...NOT DETECTED..." msgstr "" -#: src/main.c:1842 +#: src/main.c:1856 msgid "composite...detected..." msgstr "" -#: src/main.c:1843 +#: src/main.c:1857 msgid "composite...NOT DETECTED..." msgstr "" -#: src/main.c:1844 +#: src/main.c:1858 msgid "sox...detected\n" msgstr "" -#: src/main.c:1845 +#: src/main.c:1859 msgid "sox...NOT DETECTED\n" msgstr "" -#: src/main.c:1846 +#: src/main.c:1860 msgid "cdda2wav/icedax...detected..." msgstr "" -#: src/main.c:1847 +#: src/main.c:1861 msgid "cdda2wav/icedax...NOT DETECTED..." msgstr "" -#: src/main.c:1848 +#: src/main.c:1862 msgid "jackd...detected..." msgstr "" -#: src/main.c:1849 +#: src/main.c:1863 msgid "jackd...NOT DETECTED..." msgstr "" -#: src/main.c:1850
View file
LiVES-2.4.4.tar.bz2/po/uk.po -> LiVES-2.4.6.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-11-22 18:03-0300\n" +"POT-Creation-Date: 2015-12-19 08:17-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" @@ -96,79 +96,79 @@ msgid "Preserving set.\n" msgstr "Збереження набору.\n" -#: src/main.c:701 +#: src/main.c:700 msgid "Resizing" msgstr "Зміна розміру" -#: src/main.c:708 +#: src/main.c:707 msgid "_Resize All Frames" msgstr "_Змінити розміри всіх кадрів" #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter") -#: src/main.c:958 +#: src/main.c:957 msgid "Any" msgstr "Будь-який" #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified") -#: src/main.c:960 +#: src/main.c:959 msgid "None" msgstr "Жодного" #. TRANSLATORS: text saying "recommended", for plugin names, etc. -#: src/main.c:962 +#: src/main.c:961 msgid "recommended" msgstr "найліпший" #. TRANSLATORS: text saying "disabled", (as in "not enabled") -#: src/main.c:964 +#: src/main.c:963 msgid "disabled !" msgstr "вимкнено!" #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected -#: src/main.c:966 +#: src/main.c:965 msgid "**The current layout**" msgstr "**Поточне компонування**" #. TRANSLATORS: adjective for "Built in" type effects -#: src/main.c:968 +#: src/main.c:967 msgid "Builtin" msgstr "Вбудований" #. TRANSLATORS: adjective for "Custom" type effects -#: src/main.c:970 +#: src/main.c:969 msgid "Custom" msgstr "Нетиповий" #. TRANSLATORS: adjective for "Test" type effects -#: src/main.c:972 +#: src/main.c:971 msgid "Test" msgstr "Перевірити" -#: src/main.c:1117 +#: src/main.c:1116 msgid "Foreground" msgstr "Передній план" -#: src/main.c:1118 +#: src/main.c:1117 msgid "Background" msgstr "Тло" -#: src/main.c:1634 +#: src/main.c:1644 msgid "Loading realtime effect plugins..." msgstr "Завантаження додатків ефектів реального часу…" -#: src/main.c:1700 +#: src/main.c:1710 msgid "Starting jack audio server..." msgstr "Запуск звукового сервера jack…" -#: src/main.c:1702 +#: src/main.c:1712 msgid "Starting jack transport server..." msgstr "Запуск сервера передавання даних jack…" -#: src/main.c:1703 +#: src/main.c:1713 msgid "Connecting to jack transport server..." msgstr "Встановлення з’єднання з сервером передавання даних jack…" -#: src/main.c:1733 +#: src/main.c:1743 #, c-format msgid "" "\n" @@ -187,116 +187,126 @@ "\n" "Alternatively, try to start lives with either \"lives -jackopts 16\", or " -#: src/main.c:1768 +#: src/main.c:1778 msgid "Starting pulse audio server..." msgstr "Запуск звукового сервера PulseAudio…" -#: src/main.c:1835 +#: src/main.c:1845 msgid "Checking optional dependencies:" msgstr "Пошук додаткових залежностей:" -#: src/main.c:1836 +#: src/main.c:1846 msgid "mplayer...detected..." msgstr "mplayer… виявлено…" -#: src/main.c:1837 +#: src/main.c:1847 msgid "mplayer...NOT DETECTED..." msgstr "mplayer…НЕ ВИЯВЛЕНО…" -#: src/main.c:1838 +#: src/main.c:1848 #, fuzzy msgid "mplayer2...detected..." msgstr "mplayer… виявлено…" -#: src/main.c:1839 +#: src/main.c:1849 #, fuzzy msgid "mplayer2...NOT DETECTED..." msgstr "mplayer…НЕ ВИЯВЛЕНО…" -#: src/main.c:1840 +#: src/main.c:1851 +#, fuzzy +msgid "mpv...detected..." +msgstr "mplayer… виявлено…" + +#: src/main.c:1852 +#, fuzzy +msgid "mpv...NOT DETECTED..." +msgstr "mplayer…НЕ ВИЯВЛЕНО…" + +#: src/main.c:1854 msgid "convert...detected..." msgstr "convert…виявлено…" -#: src/main.c:1841 +#: src/main.c:1855 msgid "convert...NOT DETECTED..." msgstr "convert...НЕ ВИЯВЛЕНО…" -#: src/main.c:1842 +#: src/main.c:1856 msgid "composite...detected..." msgstr "composite…виявлено…" -#: src/main.c:1843 +#: src/main.c:1857 msgid "composite...NOT DETECTED..." msgstr "composite…НЕ ВИЯВЛЕНО…" -#: src/main.c:1844 +#: src/main.c:1858 msgid "sox...detected\n" msgstr "sox…виявлено\n" -#: src/main.c:1845 +#: src/main.c:1859 msgid "sox...NOT DETECTED\n" msgstr "sox…НЕ ВИЯВЛЕНО\n" -#: src/main.c:1846 +#: src/main.c:1860 #, fuzzy msgid "cdda2wav/icedax...detected..." msgstr "cdda2wav...виявлено..." -#: src/main.c:1847 +#: src/main.c:1861 #, fuzzy msgid "cdda2wav/icedax...NOT DETECTED..." msgstr "cdda2wav...НЕ ВИЯВЛЕНО..." -#: src/main.c:1848 +#: src/main.c:1862 msgid "jackd...detected..." msgstr "jackd…виявлено…" -#: src/main.c:1849
View file
LiVES-2.4.4.tar.bz2/po/uz.po -> LiVES-2.4.6.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-11-22 18:03-0300\n" +"POT-Creation-Date: 2015-12-19 08:17-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" @@ -96,80 +96,80 @@ msgid "Preserving set.\n" msgstr "Йиғилганларни сақлаш\n" -#: src/main.c:701 +#: src/main.c:700 msgid "Resizing" msgstr "Ҳажми ўзгартирилмоқда" -#: src/main.c:708 +#: src/main.c:707 msgid "_Resize All Frames" msgstr "Барча кадрларнинг _ҳажмини ўзгартириш" #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter") -#: src/main.c:958 +#: src/main.c:957 msgid "Any" msgstr "Исталган" #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified") -#: src/main.c:960 +#: src/main.c:959 msgid "None" msgstr "Йўқ" #. TRANSLATORS: text saying "recommended", for plugin names, etc. -#: src/main.c:962 +#: src/main.c:961 msgid "recommended" msgstr "тавсия қилинди" #. TRANSLATORS: text saying "disabled", (as in "not enabled") -#: src/main.c:964 +#: src/main.c:963 msgid "disabled !" msgstr "ўчирилди !" #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected -#: src/main.c:966 +#: src/main.c:965 msgid "**The current layout**" msgstr "**Жорий қатлам**" #. TRANSLATORS: adjective for "Built in" type effects -#: src/main.c:968 +#: src/main.c:967 msgid "Builtin" msgstr "" #. TRANSLATORS: adjective for "Custom" type effects -#: src/main.c:970 +#: src/main.c:969 msgid "Custom" msgstr "Бошқа" #. TRANSLATORS: adjective for "Test" type effects -#: src/main.c:972 +#: src/main.c:971 msgid "Test" msgstr "Синаш" -#: src/main.c:1117 +#: src/main.c:1116 msgid "Foreground" msgstr "" -#: src/main.c:1118 +#: src/main.c:1117 #, fuzzy msgid "Background" msgstr "Сўниш" -#: src/main.c:1634 +#: src/main.c:1644 msgid "Loading realtime effect plugins..." msgstr "Реал вақт эффект плагинлари юкланмоқда..." -#: src/main.c:1700 +#: src/main.c:1710 msgid "Starting jack audio server..." msgstr "Jack аудио сервер ишга туширилмоқда..." -#: src/main.c:1702 +#: src/main.c:1712 msgid "Starting jack transport server..." msgstr "Jack транспорт сервери ишга туширилмоқда..." -#: src/main.c:1703 +#: src/main.c:1713 msgid "Connecting to jack transport server..." msgstr "Jack транспорт серверига уланмоқда..." -#: src/main.c:1733 +#: src/main.c:1743 #, c-format msgid "" "\n" @@ -181,116 +181,126 @@ "Alternatively, try to start lives with either \"lives -jackopts 16\", or " msgstr "" -#: src/main.c:1768 +#: src/main.c:1778 msgid "Starting pulse audio server..." msgstr "Аудио сервер пульси ишга туширилмоқда..." -#: src/main.c:1835 +#: src/main.c:1845 msgid "Checking optional dependencies:" msgstr "" -#: src/main.c:1836 +#: src/main.c:1846 msgid "mplayer...detected..." msgstr "mplayer...аниқланди..." -#: src/main.c:1837 +#: src/main.c:1847 msgid "mplayer...NOT DETECTED..." msgstr "mplayer...АНИҚЛАНМАДИ..." -#: src/main.c:1838 +#: src/main.c:1848 #, fuzzy msgid "mplayer2...detected..." msgstr "mplayer...аниқланди..." -#: src/main.c:1839 +#: src/main.c:1849 #, fuzzy msgid "mplayer2...NOT DETECTED..." msgstr "mplayer...АНИҚЛАНМАДИ..." -#: src/main.c:1840 +#: src/main.c:1851 +#, fuzzy +msgid "mpv...detected..." +msgstr "mplayer...аниқланди..." + +#: src/main.c:1852 +#, fuzzy +msgid "mpv...NOT DETECTED..." +msgstr "mplayer...АНИҚЛАНМАДИ..." + +#: src/main.c:1854 msgid "convert...detected..." msgstr "конвертлаш...аниқланди..." -#: src/main.c:1841 +#: src/main.c:1855 msgid "convert...NOT DETECTED..." msgstr "конвертлаш...АНИҚЛАНМАДИ..." -#: src/main.c:1842 +#: src/main.c:1856 msgid "composite...detected..." msgstr "composite...аниқланди..." -#: src/main.c:1843 +#: src/main.c:1857 msgid "composite...NOT DETECTED..." msgstr "composite...АНИҚЛАНМАДИ..." -#: src/main.c:1844 +#: src/main.c:1858 msgid "sox...detected\n" msgstr "sox...аниқланди\n" -#: src/main.c:1845 +#: src/main.c:1859 msgid "sox...NOT DETECTED\n" msgstr "sox...АНИҚЛАНМАДИ\n" -#: src/main.c:1846 +#: src/main.c:1860 #, fuzzy msgid "cdda2wav/icedax...detected..." msgstr "cdda2wav...аниқланди..." -#: src/main.c:1847 +#: src/main.c:1861 #, fuzzy msgid "cdda2wav/icedax...NOT DETECTED..." msgstr "cdda2wav...АНИҚЛАНМАДИ..." -#: src/main.c:1848 +#: src/main.c:1862 msgid "jackd...detected..." msgstr "jackd...аниқланди..."
View file
LiVES-2.4.4.tar.bz2/po/zh_CN.po -> LiVES-2.4.6.tar.bz2/po/zh_CN.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-11-22 18:03-0300\n" +"POT-Creation-Date: 2015-12-19 08:17-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" @@ -88,79 +88,79 @@ msgid "Preserving set.\n" msgstr "正在保存场景。\n" -#: src/main.c:701 +#: src/main.c:700 msgid "Resizing" msgstr "正在调整尺寸" -#: src/main.c:708 +#: src/main.c:707 msgid "_Resize All Frames" msgstr "调整所有帧的尺寸(_R)" #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter") -#: src/main.c:958 +#: src/main.c:957 msgid "Any" msgstr "任意" #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified") -#: src/main.c:960 +#: src/main.c:959 msgid "None" msgstr "无" #. TRANSLATORS: text saying "recommended", for plugin names, etc. -#: src/main.c:962 +#: src/main.c:961 msgid "recommended" msgstr "推荐" #. TRANSLATORS: text saying "disabled", (as in "not enabled") -#: src/main.c:964 +#: src/main.c:963 msgid "disabled !" msgstr "已禁用 ！" #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected -#: src/main.c:966 +#: src/main.c:965 msgid "**The current layout**" msgstr "**当前的布局**" #. TRANSLATORS: adjective for "Built in" type effects -#: src/main.c:968 +#: src/main.c:967 msgid "Builtin" msgstr "内置" #. TRANSLATORS: adjective for "Custom" type effects -#: src/main.c:970 +#: src/main.c:969 msgid "Custom" msgstr "自定义" #. TRANSLATORS: adjective for "Test" type effects -#: src/main.c:972 +#: src/main.c:971 msgid "Test" msgstr "测试" -#: src/main.c:1117 +#: src/main.c:1116 msgid "Foreground" msgstr "" -#: src/main.c:1118 +#: src/main.c:1117 msgid "Background" msgstr "" -#: src/main.c:1634 +#: src/main.c:1644 msgid "Loading realtime effect plugins..." msgstr "正在加载实时效果插件..." -#: src/main.c:1700 +#: src/main.c:1710 msgid "Starting jack audio server..." msgstr "正在启动 jack 音频服务器..." -#: src/main.c:1702 +#: src/main.c:1712 msgid "Starting jack transport server..." msgstr "正在启动 jack 传输服务器..." -#: src/main.c:1703 +#: src/main.c:1713 msgid "Connecting to jack transport server..." msgstr "正在连接 jack 传输服务器..." -#: src/main.c:1733 +#: src/main.c:1743 #, c-format msgid "" "\n" @@ -179,116 +179,126 @@ "\n" "除此之外，尝试用启动命令行“lives -jackopts 16\"或 " -#: src/main.c:1768 +#: src/main.c:1778 msgid "Starting pulse audio server..." msgstr "正在开启 pulse 音频服务..." -#: src/main.c:1835 +#: src/main.c:1845 msgid "Checking optional dependencies:" msgstr "检查可选的依赖：" -#: src/main.c:1836 +#: src/main.c:1846 msgid "mplayer...detected..." msgstr "mplayer...发现..." -#: src/main.c:1837 +#: src/main.c:1847 msgid "mplayer...NOT DETECTED..." msgstr "mplayer...未发现..." -#: src/main.c:1838 +#: src/main.c:1848 #, fuzzy msgid "mplayer2...detected..." msgstr "mplayer...发现..." -#: src/main.c:1839 +#: src/main.c:1849 #, fuzzy msgid "mplayer2...NOT DETECTED..." msgstr "mplayer...未发现..." -#: src/main.c:1840 +#: src/main.c:1851 +#, fuzzy +msgid "mpv...detected..." +msgstr "mplayer...发现..." + +#: src/main.c:1852 +#, fuzzy +msgid "mpv...NOT DETECTED..." +msgstr "mplayer...未发现..." + +#: src/main.c:1854 msgid "convert...detected..." msgstr "convert...发现..." -#: src/main.c:1841 +#: src/main.c:1855 msgid "convert...NOT DETECTED..." msgstr "convert...未发现..." -#: src/main.c:1842 +#: src/main.c:1856 msgid "composite...detected..." msgstr "composite...发现..." -#: src/main.c:1843 +#: src/main.c:1857 msgid "composite...NOT DETECTED..." msgstr "composite...未发现..." -#: src/main.c:1844 +#: src/main.c:1858 msgid "sox...detected\n" msgstr "sox...发现\n" -#: src/main.c:1845 +#: src/main.c:1859 msgid "sox...NOT DETECTED\n" msgstr "sox...未发现\n" -#: src/main.c:1846 +#: src/main.c:1860 #, fuzzy msgid "cdda2wav/icedax...detected..." msgstr "cdda2wav...发现..." -#: src/main.c:1847 +#: src/main.c:1861 #, fuzzy msgid "cdda2wav/icedax...NOT DETECTED..." msgstr "cdda2wav...未发现..." -#: src/main.c:1848 +#: src/main.c:1862 msgid "jackd...detected..." msgstr "jackd...发现..." -#: src/main.c:1849
View file
LiVES-2.4.4.tar.bz2/resources/Makefile.in -> LiVES-2.4.6.tar.bz2/resources/Makefile.in
Changed
@@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -17,7 +17,17 @@ # VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -82,8 +92,6 @@ host_triplet = @host@ target_triplet = @target@ subdir = resources -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/mkinstalldirs ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \ @@ -107,6 +115,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -159,6 +168,7 @@ am__installdirs = "$(DESTDIR)$(resourcesdir)" DATA = $(resources_DATA) am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/mkinstalldirs DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ @@ -299,6 +309,8 @@ OPENCV_CFLAGS = @OPENCV_CFLAGS@ OPENCV_LIBS = @OPENCV_LIBS@ OPENCV_LIBS_ONLY_L = @OPENCV_LIBS_ONLY_L@ +ORC_CFLAGS = @ORC_CFLAGS@ +ORC_LIBS = @ORC_LIBS@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -436,7 +448,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu resources/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu resources/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -636,6 +647,8 @@ mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \ uninstall-am uninstall-resourcesDATA +.PRECIOUS: Makefile + # 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.
View file
LiVES-2.4.4.tar.bz2/smogrify -> LiVES-2.4.6.tar.bz2/smogrify
Changed
@@ -23,7 +23,7 @@ # Do not change these except for testing ! $background=1; -$version="2.4.4"; +$version="2.4.6"; #$dyneversion="LIVES-20091209"; ################################################################### @@ -409,6 +409,8 @@ &rc_set_if_not_set("show_button_icons","false"); + &rc_set_if_not_set("max_disp_vtracks",5); + $tmpdir=&rc_get("tempdir"); &write_bootstrap_file; &mktmpdir; @@ -1494,7 +1496,7 @@ my $wavhead=":nowaveheader"; -if ($file=~/:\/\//) { + if ($file=~/:\/\//) { $is_remote=2; #$wavhead=""; # need wav header, as user will probably finish by # quitting, thus we won't send full info @@ -1792,6 +1794,8 @@ } my $mp=&get_mplayer_location; + +## note does not function with mpv since it cannot convert to yuv4mpeg (complains about missing pixel_fmt) $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) { @@ -1809,6 +1813,7 @@ $cache=$ARGV[3]; $fifofile=$ARGV[4]; my $mp=&get_mplayer_location; +## note does not function with mpv since it cannot convert to yuv4mpeg (complains about missing pixel_fmt) $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) { @@ -2390,7 +2395,7 @@ $bgcolour="#000000"; } - $com="$smog_convert_command -size $owidthx$oheight\\! xc:$bgcolour $blankname >$nulfile 2>&1"; + $com="$smog_convert_command -size $owidth"."x$oheight\\! xc:$bgcolour $blankname >$nulfile 2>&1"; $smerr=smog_system($com); if ($smerr) { sig_system_error("$com",$smerr); @@ -2675,7 +2680,7 @@ $bgcolour="#000000"; } - $com="$smog_convert_command -size $owidthx$oheight\\! xc:$bgcolour $blankname>$nulfile 2>&1"; + $com="$smog_convert_command -size $owidth"."x$oheight\\! xc:$bgcolour $blankname>$nulfile 2>&1"; $smerr=smog_system($com); if ($smerr) { sig_system_error("$com",$smerr); @@ -2684,8 +2689,6 @@ } } - - while ($newframe!=0) { read IN,$val,4; $newframe=&getint($val); @@ -3390,7 +3393,7 @@ read IN,$height,128; close IN; } -@heights=split(/Height: /,$height); + @heights=split(/Height: /,$height); $height=$heights[1]; chomp($height); @@ -3399,7 +3402,7 @@ read IN,$bpp,128; close IN; } -@bpps=split(/Depth: /,$bpp); + @bpps=split(/Depth: /,$bpp); $bpp=$bpps[1]; chomp($bpp); @@ -3409,7 +3412,7 @@ read IN,$visual,128; close IN; } -@visuals=split(/Visual: /,$visual); + @visuals=split(/Visual: /,$visual); $visual=$visuals[1]; chomp($visual); @@ -4410,7 +4413,8 @@ for ($i=$start; $i<=$end; $i++) { $name=&mkname($i); if (-f "$curtmpdir/$name.bak") { - if ($param==0) { + if ($param==0 && -f "$curtmpdir/$name$img_ext") { +# file may not exist if we are undoing resample for example smog_rename("$curtmpdir/$name$img_ext","$curtmpdir/$name.mgk"); } smog_rename("$curtmpdir/$name.bak","$curtmpdir/$name$img_ext"); @@ -4716,7 +4720,7 @@ return if $panic; } else { if ($antialias eq "false") { - $com="$smog_convert_command +antialias -size $width"."x$height $img_prefix2\"$fromdir/$from$img_ext2\" -scale $widthx$height\\! $img_prefix\"$curtmpdir/$to$img_ext\" >$nulfile 2>&1"; + $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); @@ -4724,7 +4728,7 @@ return; } } else { - $com="$smog_convert_command -antialias -size $width"."x$height $img_prefix2\"$fromdir/$from$img_ext2\" -scale $widthx$height\\! $img_prefix\"$curtmpdir/$to$img_ext\" >$nulfile 2>&1"; + $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); @@ -4782,10 +4786,11 @@ # 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 $widthx$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 $widthx$height\\! $resize_prefix\"$name$resize_ext\" >$nulfile 2>&1"; + $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); @@ -4814,7 +4819,7 @@ #must unlink first in case $to is a symlink (when saving selection) unlink "$to"; - $com="$smog_composite_command -compose plus -dissolve 100 -geometry $iwidthx$iheight\\!+$xstart\\!+$ystart\\! \"$from\" $blankname \"$to\" >$nulfile 2>&1"; + $com="$smog_composite_command -compose plus -dissolve 100 -geometry $iwidth"."x$iheight\\!+$xstart\\!+$ystart\\! \"$from\" $blankname \"$to\" >$nulfile 2>&1"; $smerr=smog_system($com); if ($smerr) { sig_system_error("$com",$smerr); @@ -4881,9 +4886,9 @@ my($nheight)=$bottom-$top+1; if ($antialias eq "false") { - $com="$smog_convert_command -antialias -size $width"."x$height $input_prefix\"$name$input_ext\" -crop $nwidthx$nheight\\!+$left\\!+$top\\! -resize $widthx$height\\! $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\\!+$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 $nwidthx$nheight\\!+$left\\!+$top\\! -resize $widthx$height\\! $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\\!+$left\\!+$top\\! -resize $width"."x$height\\! $resize_prefix\"$name$resize_ext\" >$nulfile 2>&1"; } $smerror=smog_system($com); @@ -4913,9 +4918,9 @@ $antialias="false"; } if ($antialias eq "false") { - $com="$smog_convert_command +antialias -size $width"."x$height $input_prefix\"$name$input_ext\" -crop $nwidthx$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 $nwidthx$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"; } $smerror=smog_system($com); @@ -5054,6 +5059,8 @@ $endian=""; + $is_mpv=0; + if ($^O ne "MSWin32") { # try to force language to English $mplay_command="LANGUAGE=en LANG=en "; @@ -5071,6 +5078,11 @@ return; } + + if ((split(" ",$mplay_command))[0]=="mpv") { + $is_mpv=1; + } + $id_vid_form=""; if ($is_audio) { @@ -5128,30 +5140,47 @@ 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];
View file
LiVES-2.4.4.tar.bz2/src/Makefile.am -> LiVES-2.4.6.tar.bz2/src/Makefile.am
Changed
@@ -95,6 +95,18 @@ endif oil_CFLAGS = @OIL_CFLAGS@ -DENABLE_OIL=1 +else + +if ENABLE_LIBORC +if IS_MINGW +oil_LIBFLAGS = @ORC_LIBS@ +else +oil_LIBFLAGS = @ORC_LIBS@ -lorc-0.4 +endif +oil_CFLAGS = @ORC_CFLAGS@ -DENABLE_ORC=1 +endif + + endif
View file
LiVES-2.4.4.tar.bz2/src/Makefile.in -> LiVES-2.4.6.tar.bz2/src/Makefile.in
Changed
@@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -16,7 +16,17 @@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -87,8 +97,6 @@ @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 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \ @@ -112,6 +120,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -349,6 +358,8 @@ done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp \ + $(top_srcdir)/mkinstalldirs DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ @@ -489,6 +500,8 @@ OPENCV_CFLAGS = @OPENCV_CFLAGS@ OPENCV_LIBS = @OPENCV_LIBS@ OPENCV_LIBS_ONLY_L = @OPENCV_LIBS_ONLY_L@ +ORC_CFLAGS = @ORC_CFLAGS@ +ORC_LIBS = @ORC_LIBS@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -646,8 +659,11 @@ @ENABLE_JACK_TRUE@jack_CFLAGS = -DENABLE_JACK $(am__append_1) @ENABLE_JACK_TRUE@jack_SOURCES = jack.c jack.h @ENABLE_JACK_TRUE@jack_LDADD = -ljack +@ENABLE_LIBOIL_FALSE@@ENABLE_LIBORC_TRUE@@IS_MINGW_FALSE@oil_LIBFLAGS = @ORC_LIBS@ -lorc-0.4 +@ENABLE_LIBOIL_FALSE@@ENABLE_LIBORC_TRUE@@IS_MINGW_TRUE@oil_LIBFLAGS = @ORC_LIBS@ @ENABLE_LIBOIL_TRUE@@IS_MINGW_FALSE@oil_LIBFLAGS = @OIL_LIBS@ -loil-0.3 @ENABLE_LIBOIL_TRUE@@IS_MINGW_TRUE@oil_LIBFLAGS = @OIL_LIBS@ +@ENABLE_LIBOIL_FALSE@@ENABLE_LIBORC_TRUE@oil_CFLAGS = @ORC_CFLAGS@ -DENABLE_ORC=1 @ENABLE_LIBOIL_TRUE@oil_CFLAGS = @OIL_CFLAGS@ -DENABLE_OIL=1 @HAVE_ALSA_TRUE@alsa_LDADD = @ALSA_LIBS@ @HAVE_ALSA_TRUE@alsa_CFLAGS = @ALSA_CFLAGS@ -DALSA_MIDI=1 @@ -763,7 +779,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu src/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -1590,6 +1605,8 @@ tags tags-am uninstall uninstall-am uninstall-binPROGRAMS \ uninstall-libLTLIBRARIES uninstall-local +.PRECIOUS: Makefile + @BUILD_LIBLIVES_TRUE@install-exec-local: @BUILD_LIBLIVES_TRUE@ $(MKDIR_P) "$(DESTDIR)$(includedir)/liblives/"
View file
LiVES-2.4.4.tar.bz2/src/callbacks.c -> LiVES-2.4.6.tar.bz2/src/callbacks.c
Changed
@@ -96,6 +96,10 @@ mainw->multitrack->undo_mem=NULL; } + if (mainw->multi_opts.set&&!mainw->only_close&&mainw->multi_opts.aparam_view_list!=NULL) { + lives_list_free(mainw->multi_opts.aparam_view_list); + } + if (mainw->playing_file>-1) { mainw->ext_keyboard=FALSE; if (mainw->ext_playback) { @@ -5038,14 +5042,15 @@ reset_clipmenu(); lives_widget_set_sensitive(mainw->vj_load_set, FALSE); + lives_snprintf(mainw->set_name,128,"%s",set_name); + + // MUST set set_name before calling this recover_layout_map(MAX_FILES); 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); - lives_snprintf(mainw->set_name,128,"%s",set_name); - lives_notify(LIVES_OSC_NOTIFY_CLIPSET_OPENED,mainw->set_name); } @@ -5970,7 +5975,8 @@ if (!(height*width)) { // media preview - if (!capable->has_mplayer&&!capable->has_mplayer2) { + + if (!capable->has_mplayer&&!(capable->has_mplayer2||capable->has_mpv)) { char *msg; if (capable->has_identify) { msg=lives_strdup(_("\n\nYou need to install mplayer or mplayer2 to be able to preview this file.\n")); @@ -7930,7 +7936,8 @@ if (!lives_ascii_strncasecmp(a_type,"wav",3)) israw=0; - if (capable->has_mplayer||capable->has_mplayer2) { + + if (capable->has_mplayer||capable->has_mplayer2||capable->has_mpv) { if (read_file_details(file_name,TRUE)) { array=lives_strsplit(mainw->msg,"|",15); cfile->arate=atoi(array[9]); @@ -8033,8 +8040,12 @@ cfile->signed_endian=get_signed_endian(atoi(array[4]), atoi(array[5])); cfile->afilesize=strtol(array[6],NULL,10); lives_strfreev(array); + + if (cfile->undo_arate>0) cfile->arps=cfile->undo_arps/cfile->undo_arate*cfile->arate; + else cfile->arps=cfile->arate; } + if (cfile->afilesize==0) { d_print_failed(); @@ -8495,8 +8506,7 @@ widget_opts.expand=LIVES_EXPAND_DEFAULT; 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); + if (LIVES_IS_BUTTON_BOX(dialog_action_area)) lives_button_box_set_layout(LIVES_BUTTON_BOX(dialog_action_area), LIVES_BUTTONBOX_SPREAD); vbox = lives_dialog_get_content_area(LIVES_DIALOG(textwindow->dialog)); @@ -8588,7 +8598,7 @@ } switch (mainw->toy_type) { - // old status + // old status case LIVES_TOY_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); @@ -8924,11 +8934,9 @@ if (mainw->current_file==-1) { lives_painter_t *cr2=lives_painter_create(mainw->video_drawable); - 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_painter_fill(cr2); + lives_painter_render_background(mainw->video_draw,cr2,0,0, + lives_widget_get_allocation_width(mainw->video_draw), + lives_widget_get_allocation_height(mainw->video_draw)); lives_painter_destroy(cr2); } @@ -8976,11 +8984,10 @@ if (mainw->current_file==-1) { 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_painter_fill(cr2); + + lives_painter_render_background(mainw->laudio_draw,cr2,0,0, + lives_widget_get_allocation_width(mainw->video_draw), + lives_widget_get_allocation_height(mainw->video_draw)); lives_painter_destroy(cr2); } @@ -9020,15 +9027,11 @@ unblock_expose(); } - // 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_painter_fill(cr2); + lives_painter_render_background(mainw->raudio_draw,cr2,0,0, + lives_widget_get_allocation_width(mainw->video_draw), + lives_widget_get_allocation_height(mainw->video_draw)); lives_painter_destroy(cr2); } @@ -9261,9 +9264,12 @@ if (mainw->iochan==NULL) { // pause during effects processing or opening +#ifdef USE_MONOTONIC_TIME + xticks=(lives_get_monotonic_time()-mainw->origusecs)*U_SEC_RATIO; +#else gettimeofday(&tv, NULL); xticks=U_SECL*(tv.tv_sec-mainw->origsecs)+tv.tv_usec*U_SEC_RATIO-mainw->origusecs*U_SEC_RATIO; - +#endif if (!mainw->effects_paused) { mainw->timeout_ticks-=xticks; com=lives_strdup_printf("%s pause \"%s\"",prefs->backend_sync,cfile->handle); @@ -9375,8 +9381,12 @@ mainw->preview=TRUE; old_rte=mainw->rte; +#ifdef USE_MONOTONIC_TIME + xticks=(lives_get_monotonic_time()-mainw->origusecs)*U_SEC_RATIO; +#else gettimeofday(&tv, NULL); xticks=U_SECL*(tv.tv_sec-mainw->origsecs)+tv.tv_usec*U_SEC_RATIO-mainw->origusecs*U_SEC_RATIO; +#endif mainw->timeout_ticks-=xticks; if (mainw->internal_messaging) { @@ -9556,8 +9566,12 @@ unblock_expose(); lives_widget_queue_draw(mainw->LiVES); } +#ifdef USE_MONOTONIC_TIME + xticks=(lives_get_monotonic_time()-mainw->origusecs)*U_SEC_RATIO; +#else gettimeofday(&tv, NULL); xticks=U_SECL*(tv.tv_sec-mainw->origsecs)+tv.tv_usec*U_SEC_RATIO-mainw->origusecs*U_SEC_RATIO; +#endif mainw->timeout_ticks+=xticks; mainw->filter_map=filter_map; mainw->afilter_map=afilter_map;
View file
LiVES-2.4.4.tar.bz2/src/colourspace.c -> LiVES-2.4.6.tar.bz2/src/colourspace.c
Changed
@@ -96,14 +96,14 @@ static boolean unal_inited=FALSE; -LIVES_INLINE G_GNUC_CONST int get_rowstride_value(int rowstride) { +LIVES_INLINE __attribute__((__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 __attribute__((__const__)) int get_last_rowstride_value(int width, int nchans) { #ifdef GUI_GTK // from gdk pixbuf docs return width*(((nchans<<3)+7)>>3); @@ -117,7 +117,7 @@ lives_free(pixels); } -LIVES_INLINE G_GNUC_CONST uint8_t CLAMP0255(int32_t a) { +LIVES_INLINE __attribute__((__const__)) uint8_t CLAMP0255(int32_t a) { return a>255?255:(a<0)?0:a; } @@ -734,7 +734,7 @@ U_to_U=V_to_V=UVunclamped_to_UVclamped; } break; - // TODO - other subspaces + // TODO - other subspaces default: LIVES_ERROR("Invalid YUV subspace conversion"); } @@ -753,7 +753,7 @@ U_to_U=V_to_V=UVunclamped_to_UVclamped; } break; - // TODO - other subspaces + // TODO - other subspaces default: LIVES_ERROR("Invalid YUV subspace conversion"); } @@ -7319,6 +7319,8 @@ weed_set_voidptr_value(layer,"pixel_data", NULL); if (weed_plant_has_leaf(layer,"host_pixel_data_contiguous")) weed_leaf_delete(layer,"host_pixel_data_contiguous"); + if (weed_plant_has_leaf(layer,"host_pixbuf_src")) + weed_leaf_delete(layer,"host_pixbuf_src"); if (black_fill) { if (weed_plant_has_leaf(layer,"YUV_clamping")) clamping=weed_get_int_value(layer,"YUV_clamping",&error); @@ -8901,10 +8903,16 @@ return FALSE; } if (gusrc_array!=NULL) { - if (gusrc_array[0]!=NULL) lives_free(gusrc_array[0]); - if (!contig) { - lives_free(gusrc_array[1]); - lives_free(gusrc_array[2]); + if (weed_plant_has_leaf(layer,"host_pixbuf_src")&&weed_get_boolean_value(layer,"host_pixbuf_src",&error)==WEED_TRUE) { + LiVESPixbuf *pixbuf=(LiVESPixbuf *)weed_get_voidptr_value(layer,"host_pixbuf_src",&error); + weed_leaf_delete(layer,"host_pixbuf_src"); + lives_object_unref(pixbuf); + } else { + if (gusrc_array[0]!=NULL) lives_free(gusrc_array[0]); + if (!contig) { + lives_free(gusrc_array[1]); + lives_free(gusrc_array[2]); + } } lives_free(gusrc_array); } @@ -9015,11 +9023,17 @@ return FALSE; } if (gusrc_array!=NULL) { - if (gusrc_array[0]!=NULL) lives_free(gusrc_array[0]); - if (!contig) { - lives_free(gusrc_array[1]); - lives_free(gusrc_array[2]); - lives_free(gusrc_array[3]); + if (weed_plant_has_leaf(layer,"host_pixbuf_src")&&weed_get_boolean_value(layer,"host_pixbuf_src",&error)==WEED_TRUE) { + LiVESPixbuf *pixbuf=(LiVESPixbuf *)weed_get_voidptr_value(layer,"host_pixbuf_src",&error); + weed_leaf_delete(layer,"host_pixbuf_src"); + lives_object_unref(pixbuf); + } else { + if (gusrc_array[0]!=NULL) lives_free(gusrc_array[0]); + if (!contig) { + lives_free(gusrc_array[1]); + lives_free(gusrc_array[2]); + lives_free(gusrc_array[3]); + } } lives_free(gusrc_array); } @@ -9307,7 +9321,7 @@ convert_yuv888_to_argb_frame(gusrc,width,height,irowstride,orowstride,gudest,iclamped,-USE_THREADS); break; case WEED_PALETTE_YVU420P: - // convert to YUV420P, then fall through + // convert to YUV420P, then fall through case WEED_PALETTE_YUV420P: weed_set_int_value(layer,"current_palette",outpl); create_empty_pixel_data(layer,FALSE,TRUE); @@ -9555,7 +9569,7 @@ weed_set_voidptr_array(layer,"pixel_data",3,(void **)gusrc_array); lives_free(gusrc_array); } - // fall through + // fall through case WEED_PALETTE_YUV420P: weed_set_int_value(layer,"current_palette",outpl); gusrc_array=NULL; @@ -9586,10 +9600,16 @@ return FALSE; } if (gusrc_array!=NULL) { - if (gusrc_array[0]!=NULL) lives_free(gusrc_array[0]); - if (!contig) { - lives_free(gusrc_array[1]); - lives_free(gusrc_array[2]); + if (weed_plant_has_leaf(layer,"host_pixbuf_src")&&weed_get_boolean_value(layer,"host_pixbuf_src",&error)==WEED_TRUE) { + LiVESPixbuf *pixbuf=(LiVESPixbuf *)weed_get_voidptr_value(layer,"host_pixbuf_src",&error); + weed_leaf_delete(layer,"host_pixbuf_src"); + lives_object_unref(pixbuf); + } else { + if (gusrc_array[0]!=NULL) lives_free(gusrc_array[0]); + if (!contig) { + lives_free(gusrc_array[1]); + lives_free(gusrc_array[2]); + } } lives_free(gusrc_array); @@ -9709,10 +9729,16 @@ return FALSE; } if (gusrc_array!=NULL) { - if (gusrc_array[0]!=NULL) lives_free(gusrc_array[0]); - if (!contig) { - lives_free(gusrc_array[1]); - lives_free(gusrc_array[2]); + if (weed_plant_has_leaf(layer,"host_pixbuf_src")&&weed_get_boolean_value(layer,"host_pixbuf_src",&error)==WEED_TRUE) { + LiVESPixbuf *pixbuf=(LiVESPixbuf *)weed_get_voidptr_value(layer,"host_pixbuf_src",&error); + weed_leaf_delete(layer,"host_pixbuf_src"); + lives_object_unref(pixbuf); + } else { + if (gusrc_array[0]!=NULL) lives_free(gusrc_array[0]); + if (!contig) { + lives_free(gusrc_array[1]); + lives_free(gusrc_array[2]); + } } lives_free(gusrc_array); } @@ -9839,8 +9865,15 @@ weed_palette_get_name(outpl)); return FALSE; } - if (gusrc!=NULL) lives_free(gusrc); - + if (gusrc!=NULL) { + if (weed_plant_has_leaf(layer,"host_pixbuf_src")&&weed_get_boolean_value(layer,"host_pixbuf_src",&error)==WEED_TRUE) { + LiVESPixbuf *pixbuf=(LiVESPixbuf *)weed_get_voidptr_value(layer,"host_pixbuf_src",&error); + weed_leaf_delete(layer,"host_pixbuf_src"); + lives_object_unref(pixbuf); + } else { + lives_free(gusrc); + } + } if (weed_palette_is_rgb_palette(outpl)) { weed_leaf_delete(layer,"YUV_clamping"); @@ -9919,12 +9952,12 @@ -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, (LiVESPixbufDestroyNotify)lives_free_buffer, NULL); threaded_dialog_spin(); @@ -9943,7 +9976,7 @@ int height; int irowstride; int rowstride,orowstride; - uint8_t *pixel_data,*pixels,*end,*orig_pixel_data; + uint8_t *pixel_data,*pixels,*end; boolean cheat=FALSE,done; int n_channels; @@ -9953,7 +9986,8 @@
View file
LiVES-2.4.4.tar.bz2/src/dialogs.c -> LiVES-2.4.6.tar.bz2/src/dialogs.c
Changed
@@ -44,6 +44,8 @@ static volatile boolean dlg_thread_ready=FALSE; +static volatile boolean display_ready; + void on_warn_mask_toggled(LiVESToggleButton *togglebutton, livespointer user_data) { LiVESWidget *tbutton; @@ -164,7 +166,6 @@ int warn_mask_number, boolean is_blocking) { LiVESWidget *dialog; LiVESWidget *dialog_vbox; - LiVESWidget *dialog_action_area; LiVESWidget *label; LiVESWidget *cancelbutton=NULL; LiVESWidget *okbutton=NULL; @@ -172,7 +173,9 @@ LiVESAccelGroup *accel_group=LIVES_ACCEL_GROUP(lives_accel_group_new()); - char *textx,*form_text,*pad; + char *textx,*form_text,*pad,*mytext; + + mytext=lives_strdup(text); // because of translation issues switch (diat) { case LIVES_DIALOG_WARN: @@ -267,7 +270,9 @@ lives_container_set_border_width(LIVES_CONTAINER(dialog), widget_opts.border_width*2); } - textx=insert_newlines(text,MAX_MSG_WIDTH_CHARS); + textx=insert_newlines(mytext,MAX_MSG_WIDTH_CHARS); + + lives_free(mytext); pad=lives_strdup(""); if (strlen(textx) < MIN_MSG_WIDTH_CHARS) { @@ -312,10 +317,6 @@ NULL); } - 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 (cancelbutton != NULL) { lives_widget_set_can_focus(cancelbutton,TRUE); lives_widget_add_accelerator(cancelbutton, LIVES_WIDGET_CLICKED_SIGNAL, accel_group, @@ -433,7 +434,6 @@ // show Yes/No, returns TRUE if Yes LiVESWidget *warning; int response; - char *mytext; LiVESWindow *transient=NULL; if (prefs->show_gui) { @@ -441,9 +441,7 @@ else if (mainw->multitrack!=NULL&&mainw->multitrack->is_ready) transient=LIVES_WINDOW(mainw->multitrack->window); } - mytext=lives_strdup(text); // translation issues - warning=create_message_dialog(LIVES_DIALOG_YESNO,mytext,transient,0,TRUE); - if (mytext!=NULL) lives_free(mytext); + warning=create_message_dialog(LIVES_DIALOG_YESNO,text,transient,0,TRUE); response=lives_dialog_run(LIVES_DIALOG(warning)); lives_widget_destroy(warning); @@ -603,14 +601,11 @@ // show error box LiVESWidget *err_box; - char *mytext; int ret=LIVES_RESPONSE_NONE; if (prefs->warning_mask&warn_mask_number) return ret; - 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); + err_box=create_info_error_dialog(warn_mask_number==0?LIVES_DIALOG_ERROR:LIVES_DIALOG_WARN,text,transient,warn_mask_number,is_blocking); if (is_blocking) { ret=lives_dialog_run(LIVES_DIALOG(err_box)); @@ -628,13 +623,10 @@ // info box LiVESWidget *info_box; - char *mytext; int ret=LIVES_RESPONSE_NONE; - mytext=lives_strdup(text); - info_box=create_info_error_dialog(LIVES_DIALOG_INFO,mytext,transient,0,is_blocking); - if (mytext!=NULL) lives_free(mytext); + info_box=create_info_error_dialog(LIVES_DIALOG_INFO,text,transient,0,is_blocking); if (is_blocking) { ret=lives_dialog_run(LIVES_DIALOG(info_box)); @@ -953,9 +945,13 @@ static void cancel_process(boolean visible) { if (prefs->show_player_stats&&!visible&&mainw->fps_measure>0.) { // statistics +#ifdef USE_MONOTONIC_TIME + mainw->fps_measure/=((lives_get_monotonic_time()-mainw->origusecs)*U_SEC_RATIO)/U_SEC; +#else 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; +#endif } if (visible) { if (mainw->preview_box!=NULL&&!mainw->preview) lives_widget_set_tooltip_text(mainw->p_playbutton,_("Play all")); @@ -1022,8 +1018,12 @@ if (frames_done<=sfile->progress_end&&sfile->progress_end>0&&!mainw->effects_paused&& frames_done>0) { +#ifdef USE_MONOTONIC_TIME + mainw->currticks=(lives_get_monotonic_time()-mainw->origusecs)*U_SEC_RATIO; +#else gettimeofday(&tv, NULL); mainw->currticks=U_SECL*(tv.tv_sec-mainw->origsecs)+tv.tv_usec*U_SEC_RATIO-mainw->origusecs*U_SEC_RATIO; +#endif timesofar=(mainw->currticks-mainw->timeout_ticks)/U_SEC; disp_fraction(frames_done,sfile->progress_start,sfile->progress_end, @@ -1130,9 +1130,12 @@ // soundcard time is only updated after sending audio // so if we get the same value back we interpolate using the system clock +#ifdef USE_MONOTONIC_TIME + current_ticks=(lives_get_monotonic_time()-mainw->origusecs)*U_SEC_RATIO; +#else gettimeofday(&tv, NULL); current_ticks=U_SECL*(tv.tv_sec-mainw->origsecs)+tv.tv_usec*U_SEC_RATIO-mainw->origusecs*U_SEC_RATIO; - +#endif if (sc_ticks!=last_sc_ticks) { // calculate ratio soundcard rate:sys clock rate @@ -1172,8 +1175,12 @@ if (time_source==LIVES_TIME_SOURCE_NONE) { // get time from system clock +#ifdef USE_MONOTONIC_TIME + mainw->currticks=(lives_get_monotonic_time()-mainw->origusecs)*U_SEC_RATIO; +#else gettimeofday(&tv, NULL); mainw->currticks=U_SECL*(tv.tv_sec-mainw->origsecs)+tv.tv_usec*U_SEC_RATIO-mainw->origusecs*U_SEC_RATIO; +#endif if (LIVES_UNLIKELY(mainw->currticks<prev_ticks)) mainw->currticks=prev_ticks; time_source=LIVES_TIME_SOURCE_SYSTEM; prev_ticks=mainw->currticks; @@ -1199,7 +1206,7 @@ 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; + if (mainw->jackd->read_abuf>-1) mainw->jackd->abufs[mainw->jackd->read_abuf]->arate=cfile->arate*audio_stretch; } } } @@ -1225,7 +1232,7 @@ 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; + if (mainw->pulsed->read_abuf>-1) mainw->pulsed->abufs[mainw->pulsed->read_abuf]->arate=cfile->arate*audio_stretch; } } } @@ -1284,7 +1291,12 @@ cfile->frameno=calc_new_playback_position(mainw->current_file,mainw->startticks,&new_ticks); if (new_ticks!=mainw->startticks) { - show_frame=TRUE; + if (display_ready) { + show_frame=TRUE; +#ifdef USE_GDK_FRAME_CLOCK + display_ready=FALSE; +#endif + } mainw->startticks=new_ticks; } @@ -1373,8 +1385,12 @@ 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; +#ifdef USE_MONOTONIC_TIME + mainw->currticks=(lives_get_monotonic_time()-mainw->origusecs)*U_SEC_RATIO; +#else gettimeofday(&tv, NULL); mainw->currticks=U_SECL*(tv.tv_sec-mainw->origsecs)+tv.tv_usec*U_SEC_RATIO-mainw->origusecs*U_SEC_RATIO; +#endif 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)) { @@ -1449,6 +1465,14 @@
View file
LiVES-2.4.4.tar.bz2/src/effects-data.c -> LiVES-2.4.6.tar.bz2/src/effects-data.c
Changed
@@ -4728,13 +4728,14 @@ 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 *)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); + + lives_dialog_add_action_widget(LIVES_DIALOG(conxw.conx_dialog), conxw.acbutton, LIVES_RESPONSE_NONE); + lives_container_set_border_width(LIVES_CONTAINER(conxw.acbutton), widget_opts.border_width); + lives_widget_set_sensitive(conxw.acbutton,FALSE); lives_signal_connect(LIVES_GUI_OBJECT(conxw.acbutton), LIVES_WIDGET_CLICKED_SIGNAL, @@ -4746,7 +4747,9 @@ 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); + lives_dialog_add_action_widget(LIVES_DIALOG(conxw.conx_dialog), conxw.apbutton, LIVES_RESPONSE_NONE); + lives_container_set_border_width(LIVES_CONTAINER(conxw.apbutton), widget_opts.border_width); + lives_widget_set_sensitive(conxw.apbutton,FALSE); lives_signal_connect(LIVES_GUI_OBJECT(conxw.apbutton), LIVES_WIDGET_CLICKED_SIGNAL, @@ -4756,14 +4759,16 @@ } 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_dialog_add_action_widget(LIVES_DIALOG(conxw.conx_dialog), conxw.disconbutton, LIVES_RESPONSE_NONE); + lives_container_set_border_width(LIVES_CONTAINER(conxw.disconbutton), widget_opts.border_width); lives_widget_set_sensitive(conxw.disconbutton,FALSE); 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)); + abox = lives_dialog_get_action_area(LIVES_DIALOG(conxw.conx_dialog)); + if (LIVES_IS_BOX(abox)&&(conxw.num_alpha>0||conxw.num_params>0)) add_fill_to_box(LIVES_BOX(abox)); cbox = lives_dialog_get_content_area(LIVES_DIALOG(conxw.conx_dialog));
View file
LiVES-2.4.4.tar.bz2/src/effects-weed.c -> LiVES-2.4.6.tar.bz2/src/effects-weed.c
Changed
@@ -53,6 +53,17 @@ #define OIL_MEMCPY_MAX_BYTES 1024 // this can be tuned to provide optimal performance +#ifdef ENABLE_ORC +livespointer lives_memcpy(livespointer dest, livesconstpointer src, size_t n) { +#ifndef __cplusplus + if (n>=32&&n<=OIL_MEMCPY_MAX_BYTES) { + orc_memcpy((uint8_t *)dest,(const uint8_t *)src,n); + return dest; + } +#endif + return memcpy(dest,src,n); +} +#else #ifdef ENABLE_OIL livespointer lives_memcpy(livespointer dest, livesconstpointer src, size_t n) { #ifndef __cplusplus @@ -68,8 +79,9 @@ return memcpy(dest,src,n); } #endif +#endif -G_GNUC_MALLOC livespointer _lives_malloc(size_t size) { +__attribute__((__malloc__)) livespointer _lives_malloc(size_t size) { #ifdef __cplusplus #ifdef HAVE_OPENCV return fastMalloc(size); @@ -86,7 +98,7 @@ if (nptr) { if (ptr) { lives_memcpy(nptr,ptr,new_size); - _lives_free_normal(ptr); + lives_free(ptr); } } return nptr; @@ -96,7 +108,7 @@ } -void _lives_free_normal(livespointer ptr) { +void _lives_free(livespointer ptr) { #ifdef __cplusplus #ifdef HAVE_OPENCV fastFree(ptr); @@ -118,16 +130,6 @@ //g_print ("unlock %d\n",key); } -// 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 lives_free()) -void _lives_free_with_check(livespointer ptr) { - if (ptr==mainw->do_not_free) return; - _lives_free_normal(ptr); -} - -void _lives_free(livespointer ptr) { - (*mainw->free_fn)(ptr); -} livespointer lives_memset(livespointer s, int c, size_t n) { return memset(s,c,n); @@ -1212,20 +1214,30 @@ } -static boolean align(void **pixel_data, size_t alignment, int numplanes, int height, int *rowstrides, - int *contiguous) { +static boolean align_pixel_data(weed_plant_t *layer, size_t alignment) { #ifndef HAVE_POSIX_MEMALIGN return FALSE; #else // returns TRUE on success - int i; - int memerror; - boolean needs_change=FALSE; - uint8_t *npixel_data; - void **new_pixel_data; + void **pixel_data,**new_pixel_data; + uint8_t *npixel_data,zpixel_data=0; + int *rowstrides; + size_t size,totsize=0; + boolean needs_change=FALSE; + boolean can_contiguous=TRUE; + + int memerror,error; + + int numplanes,height; + + register int i; + + numplanes=weed_leaf_num_elements(layer,"rowstrides"); + pixel_data=weed_get_voidptr_array(layer,"pixel_data",&error); + for (i=0; i<numplanes; i++) { if (((uint64_t)(pixel_data[i]))%alignment==0) continue; needs_change=TRUE; @@ -1233,63 +1245,74 @@ if (!needs_change) return TRUE; + rowstrides=weed_get_int_array(layer,"rowstrides",&error); + height=weed_get_int_value(layer,"height",&error); + for (i=0; i<numplanes; i++) { size=height*rowstrides[i]; totsize+=CEIL(size,32); } - // try contiguous first - - - if ((memerror=posix_memalign((void **)&npixel_data,alignment,totsize))) return FALSE; + for (i=1; i<numplanes; i++) { + size=height*rowstrides[i]; + zpixel_data+=CEIL(size,32); + if (zpixel_data%alignment!=0) { + can_contiguous=FALSE; + break; + } + } new_pixel_data=(void **)lives_malloc(numplanes*(sizeof(void *))); - // recheck - needs_change=FALSE; - - for (i=0; i<numplanes; i++) { - if (((uint64_t)(pixel_data[i]))%alignment==0) continue; - needs_change=TRUE; - } + if (can_contiguous) { + // all planes can be set in contiguous block + if ((memerror=posix_memalign((void **)&npixel_data,alignment,totsize))) { + lives_free(new_pixel_data); + lives_free(pixel_data); + lives_free(rowstrides); + return FALSE; + } - if (!needs_change) { for (i=0; i<numplanes; i++) { - memcpy(npixel_data,pixel_data[i],height*rowstrides[i]); + lives_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++) { - if (i==0||!(*contiguous)) - lives_free(pixel_data[i]); - pixel_data[i]=new_pixel_data[i]; - } + weed_layer_pixel_data_free(layer); + + weed_set_voidptr_array(layer,"pixel_data",numplanes,new_pixel_data); + if (numplanes>1) weed_set_boolean_value(layer,"host_pixel_data_contiguous",WEED_TRUE); + else weed_set_boolean_value(layer,"host_pixel_data_contiguous",WEED_FALSE); lives_free(new_pixel_data); - if (numplanes>1) *contiguous=TRUE; - else *contiguous=FALSE; + lives_free(pixel_data); + lives_free(rowstrides); + return TRUE; } - lives_free(npixel_data); // non-contiguous 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]); + if ((memerror=posix_memalign((void **)&npixel_data,alignment,height*rowstrides[i]))) { + lives_free(new_pixel_data); + lives_free(pixel_data); + lives_free(rowstrides); + return FALSE; + } + lives_memcpy(npixel_data,pixel_data[i],height*rowstrides[i]); new_pixel_data[i]=npixel_data; } - for (i=0; i<numplanes; i++) { - if (i==0||!(*contiguous)) - lives_free(pixel_data[i]); - pixel_data[i]=new_pixel_data[i]; - } + weed_layer_pixel_data_free(layer); lives_free(new_pixel_data); - *contiguous=FALSE; + lives_free(pixel_data);
View file
LiVES-2.4.4.tar.bz2/src/effects.c -> LiVES-2.4.6.tar.bz2/src/effects.c
Changed
@@ -57,7 +57,7 @@ // return value should be free'd after use switch (cat) { - // main categories + // main categories case LIVES_FX_CAT_VIDEO_GENERATOR: if (!plural) return (lives_strdup(_("generator"))); else return (lives_strdup(_("Generators"))); @@ -105,7 +105,7 @@ else return (lives_strdup(_("Analysers"))); - // subcategories + // subcategories case LIVES_FX_CAT_AV_TRANSITION: if (!plural) return (lives_strdup(_("audio/video"))); else return (lives_strdup(_("Audio/Video Transitions")));
View file
LiVES-2.4.4.tar.bz2/src/events.c -> LiVES-2.4.6.tar.bz2/src/events.c
Changed
@@ -42,7 +42,7 @@ 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) { +__attribute__((__pure__)) void ** *get_event_pchains(void) { return pchains; } @@ -5150,6 +5150,79 @@ + + +LiVESWidget *add_video_options(LiVESWidget **spwidth, int defwidth, LiVESWidget **spheight, int defheight, + LiVESWidget **spfps, double deffps, boolean add_aspect) { + static lives_param_t aspect_width,aspect_height; + + LiVESWidget *vbox,*hbox,*label; + + LiVESWidget *frame = lives_frame_new(NULL); + + lives_container_set_border_width(LIVES_CONTAINER(frame), widget_opts.border_width); + + 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); + } + + 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); + + *spwidth = lives_standard_spin_button_new + (_("_Width"),TRUE,defwidth,4.,MAX_FRAME_WIDTH,4.,16.,0,LIVES_BOX(hbox),NULL); + + *spheight = lives_standard_spin_button_new + (_("_Height"),TRUE,defheight,4.,MAX_FRAME_WIDTH,4.,16.,0,LIVES_BOX(hbox),NULL); + + + // add aspect button ? + if (add_aspect) { + // add "aspectratio" widget + init_special(); + + aspect_width.widgets[0]=rdet->spinbutton_width; + 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)); + } + + hbox = lives_hbox_new(FALSE, 0); + lives_box_pack_start(LIVES_BOX(vbox), hbox, FALSE, FALSE, widget_opts.packing_height); + + *spfps = lives_standard_spin_button_new + (_("_Frames per second"),TRUE,deffps,1.,FPS_MAX,1.,10.,0,LIVES_BOX(hbox),NULL); + + return frame; +} + + + +LiVESWidget *add_audio_options(LiVESWidget **cbbackaudio, LiVESWidget **cbpertrack) { + LiVESWidget *hbox = lives_hbox_new(FALSE, 0); + + *cbbackaudio = lives_standard_check_button_new(_("Enable _backing audio track"),TRUE,LIVES_BOX(hbox),NULL); + + add_fill_to_box(LIVES_BOX(hbox)); + + *cbpertrack = lives_standard_check_button_new(_("Audio track _per video track"),TRUE,LIVES_BOX(hbox),NULL); + + return hbox; +} + + + + + + render_details *create_render_details(int type) { // type == 1 :: pre-save (specified) @@ -5157,14 +5230,11 @@ // type == 3 :: enter multitrack (!specified) // type == 4 :: change during multitrack (!specified) - static lives_param_t aspect_width,aspect_height; - LiVESWidget *label; LiVESWidget *top_vbox; LiVESWidget *dialog_vbox; LiVESWidget *scrollw; LiVESWidget *hbox; - LiVESWidget *vbox; LiVESWidget *frame; LiVESWidget *cancelbutton; LiVESWidget *alabel; @@ -5264,63 +5334,43 @@ lives_container_set_border_width(LIVES_CONTAINER(top_vbox), 0); - frame = lives_frame_new(NULL); + rdet->always_hbox = lives_hbox_new(TRUE, widget_opts.packing_width*2); + 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.")))); - 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); + lives_free(tmp); + lives_free(tmp2); - if (palette->style&STYLE_1) { - lives_widget_set_bg_color(frame, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back); - } + add_fill_to_box(LIVES_BOX(rdet->always_hbox)); - label = lives_standard_label_new(_("Video")); - lives_frame_set_label_widget(LIVES_FRAME(frame), label); + daa=lives_dialog_get_action_area(LIVES_DIALOG(rdet->dialog)); - hbox = lives_hbox_new(FALSE, widget_opts.packing_width*5); - lives_box_pack_start(LIVES_BOX(vbox), hbox, FALSE, FALSE, widget_opts.packing_height); + if (!LIVES_IS_BOX(daa)) { + lives_box_pack_start(LIVES_BOX(top_vbox), rdet->always_hbox, TRUE, TRUE, 0); + } - rdet->spinbutton_width = lives_standard_spin_button_new - (_("_Width"),TRUE,rdet->width,2.,MAX_FRAME_WIDTH,1.,16.,0,LIVES_BOX(hbox),NULL); + frame=add_video_options(&rdet->spinbutton_width,rdet->width,&rdet->spinbutton_height,rdet->height,&rdet->spinbutton_fps,rdet->fps,type==1); + if (type!=1) lives_box_pack_start(LIVES_BOX(top_vbox), frame, TRUE, TRUE, 0); 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) { - // add "aspectratio" widget - init_special(); - - aspect_width.widgets[0]=rdet->spinbutton_width; - 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)); - } - - - 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); - 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), 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(); @@ -5335,27 +5385,24 @@ 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); + hbox=add_audio_options(&rdet->backaudio_checkbutton,&rdet->pertrack_checkbutton); - add_fill_to_box(LIVES_BOX(hbox)); + lives_box_pack_start(LIVES_BOX(top_vbox), hbox, FALSE, FALSE, widget_opts.packing_height); lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(rdet->backaudio_checkbutton), prefs->mt_backaudio>0);
View file
LiVES-2.4.4.tar.bz2/src/events.h -> LiVES-2.4.6.tar.bz2/src/events.h
Changed
@@ -159,6 +159,12 @@ 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 *add_video_options(LiVESWidget **spwidth, int defwidth, LiVESWidget **spheight, int defheight, + LiVESWidget **spfps, double deffps, boolean add_aspect); + +LiVESWidget *add_audio_options(LiVESWidget **cbbackaudio, LiVESWidget **cbpertrack); + + //////////////////////////////////////////////////////////////// /// rendering
View file
LiVES-2.4.4.tar.bz2/src/framedraw.c -> LiVES-2.4.6.tar.bz2/src/framedraw.c
Changed
@@ -639,8 +639,6 @@ weed_timecode_t tc; - boolean needs_unlock=FALSE; - if (mainw->framedraw_frame>cfile->frames) mainw->framedraw_frame=cfile->frames; if (pixbuf==NULL) { @@ -662,17 +660,7 @@ 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=(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; - if (needs_unlock) pthread_mutex_unlock(&mainw->free_fn_mutex); + if (!pixbuf_to_layer(mainw->fd_layer_orig,pixbuf)) lives_object_unref(pixbuf); } @@ -689,8 +677,6 @@ 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); @@ -728,20 +714,11 @@ 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=(livespointer)lives_pixbuf_get_pixels_readonly(pixbuf); - pthread_mutex_lock(&mainw->free_fn_mutex); - needs_unlock=TRUE; - mainw->free_fn=_lives_free_with_check; + if (pixbuf!=NULL) { + // convert pixbuf back to layer (layer_to_pixbuf destroys it) + if (!pixbuf_to_layer(mainw->fd_layer,pixbuf)) lives_object_unref(pixbuf); } - lives_object_unref(pixbuf); - mainw->do_not_free=NULL; - mainw->free_fn=_lives_free_normal; - if (needs_unlock) pthread_mutex_unlock(&mainw->free_fn_mutex); - - }
View file
LiVES-2.4.4.tar.bz2/src/giw/giwled.c -> LiVES-2.4.6.tar.bz2/src/giw/giwled.c
Changed
@@ -56,6 +56,9 @@ gint *minimal_height, gint *natural_height); static gboolean giw_led_draw(GtkWidget *widget, cairo_t *cairo); +static void giw_led_style_updated(GtkWidget *widget); +static void giw_led_state_flags_changed(GtkWidget *widget, + GtkStateFlags previous_state); #else static gint giw_led_expose(GtkWidget *widget, GdkEventExpose *event); @@ -125,6 +128,8 @@ widget_class->get_preferred_width = giw_led_get_preferred_width; widget_class->get_preferred_height = giw_led_get_preferred_height; widget_class->draw = giw_led_draw; + widget_class->style_updated = giw_led_style_updated; + widget_class->state_flags_changed = giw_led_state_flags_changed; #else widget_class->expose_event = giw_led_expose; widget_class->size_request = giw_led_size_request; @@ -504,6 +509,17 @@ return FALSE; } +#if GTK_CHECK_VERSION(3,0,0) +static void +giw_led_style_updated(GtkWidget *widget) { + GTK_WIDGET_CLASS(giw_led_parent_class)->style_updated(widget); +} + +static void +giw_led_state_flags_changed(GtkWidget *widget,GtkStateFlags previous_state) { + gtk_widget_queue_draw(widget); +} +#endif static gint giw_led_button_press(GtkWidget *widget,
View file
LiVES-2.4.4.tar.bz2/src/giw/giwtimeline.c -> LiVES-2.4.6.tar.bz2/src/giw/giwtimeline.c
Changed
@@ -119,6 +119,7 @@ const gchar *text); + //G_DEFINE_TYPE (GiwTimeline, giw_timeline, GTK_TYPE_WIDGET) G_DEFINE_TYPE(GiwTimeline, giw_timeline, GTK_TYPE_SCALE); @@ -155,6 +156,7 @@ #endif + g_object_class_install_property(object_class, PROP_ORIENTATION, g_param_spec_enum("orientation", @@ -989,6 +991,9 @@ } } + + + static void giw_timeline_make_pixmap(GiwTimeline *timeline) { GtkWidget *widget = GTK_WIDGET(timeline);
View file
LiVES-2.4.4.tar.bz2/src/gui.c -> LiVES-2.4.6.tar.bz2/src/gui.c
Changed
@@ -318,7 +318,8 @@ } #endif #endif - lives_widget_get_bg_color(mainw->LiVES,&normal); + + lives_widget_get_bg_state_color(mainw->LiVES, LIVES_WIDGET_STATE_NORMAL, &normal); lives_widget_color_copy((LiVESWidgetColor *)(&palette->normal_back),&normal); lives_widget_get_fg_color(mainw->LiVES,&normal); @@ -439,8 +440,13 @@ lives_widget_show(mainw->open); + lives_widget_show(mainw->open_sel); + + // TODO - mpv + + // TODO: show these options, but give errors for no mplayer / mplayer2 + if (capable->has_mplayer||capable->has_mplayer2) { - lives_widget_show(mainw->open_sel); #ifdef ENABLE_DVD_GRAB lives_widget_show(mainw->open_vcd_menu); lives_widget_show(mainw->open_vcd_submenu); @@ -487,20 +493,22 @@ #ifdef HAVE_YUV4MPEG if (capable->has_dvgrab) { - lives_container_add(LIVES_CONTAINER(submenu), mainw->firewire); - lives_widget_show(mainw->firewire); + if (capable->has_mplayer||capable->has_mplayer2) { + lives_container_add(LIVES_CONTAINER(submenu), mainw->firewire); + lives_widget_show(mainw->firewire); - lives_signal_connect(LIVES_GUI_OBJECT(mainw->firewire), LIVES_WIDGET_ACTIVATE_SIGNAL, - LIVES_GUI_CALLBACK(on_live_fw_activate), - NULL); - } + lives_signal_connect(LIVES_GUI_OBJECT(mainw->firewire), LIVES_WIDGET_ACTIVATE_SIGNAL, + LIVES_GUI_CALLBACK(on_live_fw_activate), + NULL); + } - lives_container_add(LIVES_CONTAINER(submenu), mainw->tvdev); - lives_widget_show(mainw->tvdev); + lives_container_add(LIVES_CONTAINER(submenu), mainw->tvdev); + lives_widget_show(mainw->tvdev); - lives_signal_connect(LIVES_GUI_OBJECT(mainw->tvdev), LIVES_WIDGET_ACTIVATE_SIGNAL, - LIVES_GUI_CALLBACK(on_live_tvcard_activate), - NULL); + lives_signal_connect(LIVES_GUI_OBJECT(mainw->tvdev), LIVES_WIDGET_ACTIVATE_SIGNAL, + LIVES_GUI_CALLBACK(on_live_tvcard_activate), + NULL); + } #ifndef HAVE_UNICAP } // if (capable->has_mplayer) @@ -973,11 +981,14 @@ 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); + if (palette->style!=STYLE_PLAIN) { + 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); @@ -1981,7 +1992,9 @@ 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.")); - lives_widget_set_fg_color(t_label, LIVES_WIDGET_STATE_NORMAL, &palette->white); + if (palette->style&STYLE_1) { + 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_widget_show_all(mainw->tb_hbox); @@ -2138,7 +2151,9 @@ 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); + if (palette->style&STYLE_1) { + 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); @@ -2150,7 +2165,9 @@ 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); + if (palette->style&STYLE_1) { + 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); @@ -2245,7 +2262,7 @@ 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),SPBWIDTHCHARS); mainw->sel_label = lives_standard_label_new(NULL); if (palette->style&STYLE_1) { @@ -2276,11 +2293,11 @@ 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),SPBWIDTHCHARS); if (palette->style&STYLE_1&&palette->style&STYLE_2) { -#if !GTK_CHECK_VERSION(3,0,0) // background colour seems to be broken in gtk+3 !!! +#if !GTK_CHECK_VERSION(3,0,0) lives_widget_set_base_color(mainw->spinbutton_start, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back); lives_widget_set_base_color(mainw->spinbutton_start, LIVES_WIDGET_STATE_INSENSITIVE, &palette->normal_back); lives_widget_set_base_color(mainw->spinbutton_end, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back); @@ -3351,9 +3368,11 @@ 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))); + if (palette->style!=STYLE_PLAIN) { + 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))); + } } } @@ -3375,10 +3394,12 @@ } 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); + if (palette->style&STYLE_1) { + 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")); if (!mainw->preview) { lives_frame_set_label(LIVES_FRAME(mainw->playframe),_("Play")); @@ -3387,37 +3408,40 @@ } 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); + if (palette->style&STYLE_1) { + 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); lives_widget_set_fg_color(lives_frame_get_label_widget(LIVES_FRAME(mainw->frame1)), LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore); lives_widget_set_fg_color(lives_frame_get_label_widget(LIVES_FRAME(mainw->frame2)), LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore); - } - 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);
View file
LiVES-2.4.4.tar.bz2/src/interface.c -> LiVES-2.4.6.tar.bz2/src/interface.c
Changed
@@ -156,7 +156,6 @@ LiVESWidget *dialog_vbox; LiVESWidget *vbox2; LiVESWidget *vbox3; - LiVESWidget *dialog_action_area; LiVESWidget *details_arrow; LiVESAccelGroup *accel_group=LIVES_ACCEL_GROUP(lives_accel_group_new()); @@ -237,9 +236,6 @@ 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); - procw->stop_button = lives_button_new_with_mnemonic(_("_Enough")); // used only for open location and for audio recording procw->preview_button = lives_button_new_with_mnemonic(_("_Preview")); @@ -365,7 +361,7 @@ else title=lives_strdup(_("LiVES: - Multitrack details")); - filew->dialog = lives_standard_dialog_new(title,FALSE,DEF_DIALOG_WIDTH,DEF_DIALOG_HEIGHT); + filew->dialog = lives_standard_dialog_new(title,FALSE,-1,-1); lives_free(title); accel_group = LIVES_ACCEL_GROUP(lives_accel_group_new()); @@ -380,8 +376,9 @@ if (cfile->frames>0||is_mt) { vidframe = lives_frame_new(NULL); + lives_container_set_border_width(LIVES_CONTAINER(vidframe), widget_opts.border_width); - lives_box_pack_start(LIVES_BOX(dialog_vbox), vidframe, TRUE, TRUE, 0); + lives_box_pack_start(LIVES_BOX(dialog_vbox), vidframe, TRUE, TRUE, widget_opts.packing_height); if (palette->style&STYLE_1) { lives_widget_set_bg_color(vidframe, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back); } @@ -465,8 +462,9 @@ if (audio_channels>0) { laudframe = lives_frame_new(NULL); + lives_container_set_border_width(LIVES_CONTAINER(laudframe), widget_opts.border_width); - lives_box_pack_start(LIVES_BOX(dialog_vbox), laudframe, TRUE, TRUE, 0); + lives_box_pack_start(LIVES_BOX(dialog_vbox), laudframe, TRUE, TRUE, widget_opts.packing_height); if (palette->style&STYLE_1) { lives_widget_set_bg_color(laudframe, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back); } @@ -512,8 +510,9 @@ if (audio_channels>1) { raudframe = lives_frame_new(NULL); + lives_container_set_border_width(LIVES_CONTAINER(raudframe), widget_opts.border_width); - lives_box_pack_start(LIVES_BOX(dialog_vbox), raudframe, TRUE, TRUE, 0); + lives_box_pack_start(LIVES_BOX(dialog_vbox), raudframe, TRUE, TRUE, widget_opts.packing_height); if (palette->style&STYLE_1) { lives_widget_set_bg_color(raudframe, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back); } @@ -555,7 +554,7 @@ } 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); + if (LIVES_IS_BUTTON_BOX(dialog_action_area)) lives_button_box_set_layout(LIVES_BUTTON_BOX(dialog_action_area), LIVES_BUTTONBOX_SPREAD); okbutton = lives_button_new_from_stock(LIVES_STOCK_OK,NULL); lives_dialog_add_action_widget(LIVES_DIALOG(filew->dialog), okbutton, LIVES_RESPONSE_OK); @@ -599,7 +598,6 @@ LiVESWidget *create_encoder_prep_dialog(const char *text1, const char *text2, boolean opt_resize) { LiVESWidget *dialog; LiVESWidget *dialog_vbox; - LiVESWidget *dialog_action_area; LiVESWidget *cancelbutton; LiVESWidget *okbutton; LiVESWidget *checkbutton=NULL; @@ -667,8 +665,6 @@ } - 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); @@ -718,7 +714,6 @@ // general text window LiVESWidget *dialog_vbox; LiVESWidget *scrolledwindow; - LiVESWidget *dialog_action_area; LiVESWidget *okbutton; char *mytitle=lives_strdup(title); @@ -767,9 +762,6 @@ if (mytext!=NULL||mainw->iochan!=NULL) { LiVESWidget *savebutton; - 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_from_stock(LIVES_STOCK_CLOSE,_("_Close Window")); savebutton = lives_button_new_from_stock(LIVES_STOCK_SAVE,_("_Save to file")); @@ -805,7 +797,6 @@ LiVESWidget *table; LiVESWidget *radiobutton; LiVESWidget *vseparator; - LiVESWidget *dialog_action_area; LiVESWidget *cancelbutton; LiVESWidget *okbutton; @@ -926,10 +917,6 @@ (LiVESAttachOptions)(LIVES_FILL), (LiVESAttachOptions)(LIVES_FILL), 0, 0); - 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); - cancelbutton = lives_button_new_from_stock(LIVES_STOCK_CANCEL,NULL); lives_dialog_add_action_widget(LIVES_DIALOG(insertw->insert_dialog), cancelbutton, LIVES_RESPONSE_CANCEL); @@ -980,7 +967,6 @@ LiVESWidget *table; LiVESWidget *label; LiVESWidget *spinbutton; - LiVESWidget *dialog_action_area; LiVESWidget *cancelbutton; LiVESWidget *okbutton; @@ -1039,9 +1025,6 @@ (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); - cancelbutton = lives_button_new_from_stock(LIVES_STOCK_CANCEL,NULL); lives_dialog_add_action_widget(LIVES_DIALOG(opensel_dialog), cancelbutton, LIVES_RESPONSE_CANCEL); @@ -1075,7 +1058,6 @@ // type 2 is open youtube: - 3 fields:= URL, directory, file name LiVESWidget *dialog_vbox; - LiVESWidget *dialog_action_area; LiVESWidget *cancelbutton; LiVESWidget *okbutton; LiVESWidget *label; @@ -1186,11 +1168,6 @@ } - - 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,NULL); lives_widget_show(cancelbutton); lives_dialog_add_action_widget(LIVES_DIALOG(locw->dialog), cancelbutton, LIVES_RESPONSE_CANCEL); @@ -1242,7 +1219,6 @@ LiVESWidget *dialog_vbox; LiVESWidget *hbox; LiVESWidget *label; - LiVESWidget *dialog_action_area; LiVESWidget *cancelbutton; LiVESWidget *okbutton; LiVESWidget *set_combo; @@ -1384,10 +1360,6 @@ 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)); - - lives_button_box_set_layout(LIVES_BUTTON_BOX(dialog_action_area), LIVES_BUTTONBOX_END); - cancelbutton = lives_button_new_from_stock(LIVES_STOCK_CANCEL,NULL); if (!(type==4&&!mainw->interactive)) { @@ -1560,7 +1532,6 @@ LiVESWidget *dialog_vbox; LiVESWidget *hbox; LiVESWidget *spinbutton; - LiVESWidget *dialog_action_area; LiVESWidget *cancelbutton; LiVESWidget *okbutton; @@ -1622,7 +1593,7 @@ 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, + 5., 15., 1., 1.,0, LIVES_BOX(hbox),NULL); } else { spinbutton = lives_standard_spin_button_new(label_text,FALSE, 0., @@ -1791,9 +1762,6 @@ }
View file
LiVES-2.4.4.tar.bz2/src/keyboard.c -> LiVES-2.4.6.tar.bz2/src/keyboard.c
Changed
@@ -238,7 +238,7 @@ // up... if (keymod&NEEDS_TRANSLATION) { switch (unicode) { - // some keys need translating when a modifier is held down + // 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; @@ -265,7 +265,7 @@ // translate hardware code into gdk keyval, and call any accelerators if (keymod&NEEDS_TRANSLATION) { switch (unicode) { - // some keys need translating when a modifier is held down + // some keys need translating when a modifier is held down case (65) : unicode=LIVES_KEY_Space; break; @@ -353,7 +353,7 @@ unicode=LIVES_KEY_Page_Down; break; - // auto repeat keys + // auto repeat keys case (key_left) : case (key_left2): unicode=LIVES_KEY_Left;
View file
LiVES-2.4.4.tar.bz2/src/liblives.hpp -> LiVES-2.4.6.tar.bz2/src/liblives.hpp
Changed
@@ -24,7 +24,7 @@ /** Version number micro */ -#define LIVES_VERSION_MICRO 4 +#define LIVES_VERSION_MICRO 6 /** Macro to check if livesApp version is >= major.minor.micro
View file
LiVES-2.4.4.tar.bz2/src/lives-yuv4mpeg.c -> LiVES-2.4.6.tar.bz2/src/lives-yuv4mpeg.c
Changed
@@ -597,7 +597,7 @@ int response; char *com,*tmp; - char *fifofile=lives_strdup_printf("%s/tvpic.%d",prefs->tmpdir,capable->mainpid); + char *fifofile=lives_strdup_printf("%s/tvpic_%d.y4m",prefs->tmpdir,capable->mainpid); char *chanstr; char *devstr; @@ -741,7 +741,7 @@ int response; - char *fifofile=lives_strdup_printf("%s/firew.%d",prefs->tmpdir,capable->mainpid); + char *fifofile=lives_strdup_printf("%s/firew_%d.y4m",prefs->tmpdir,capable->mainpid); char *fname; LiVESWidget *card_dialog;
View file
LiVES-2.4.4.tar.bz2/src/main.c -> LiVES-2.4.6.tar.bz2/src/main.c
Changed
@@ -391,18 +391,19 @@ 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->do_not_free=NULL; + // TODO : deprecated in gtk+ 3.16+ 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.free=_lives_free; mainw->alt_vtable.calloc=NULL; mainw->alt_vtable.try_malloc=NULL; mainw->alt_vtable.try_realloc=NULL; lives_mem_set_vtable(&mainw->alt_vtable); + + prefs=(_prefs *)lives_malloc(sizeof(_prefs)); future_prefs=(_future_prefs *)lives_malloc(sizeof(_future_prefs)); @@ -425,8 +426,6 @@ 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 } @@ -1262,6 +1261,8 @@ prefs->perm_audio_reader=TRUE; + prefs->max_disp_vtracks=get_int_pref("max_disp_vtracks"); + ////////////////////////////////////////////////////////////////// weed_memory_init(); @@ -1333,6 +1334,12 @@ set_pref("video_open_command",prefs->video_open_command); } + if (!strlen(prefs->video_open_command)&&capable->has_mpv) { + get_location("mpv",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; @@ -1407,7 +1414,10 @@ if ((prefs->startup_phase==1||prefs->startup_phase==-1)&&capable->has_encoder_plugins&&capable->has_python) { LiVESList *ofmt_all=NULL; char **array; - lives_snprintf(prefs->encoder.name,52,"%s","multi_encoder"); + if (capable->python_version>=3000000) + lives_snprintf(prefs->encoder.name,52,"%s","multi_encoder3"); + else + lives_snprintf(prefs->encoder.name,52,"%s","multi_encoder"); // need to change the output format @@ -1837,6 +1847,10 @@ else d_print(_("mplayer...NOT DETECTED...")); if (capable->has_mplayer2) d_print(_("mplayer2...detected...")); else d_print(_("mplayer2...NOT DETECTED...")); +#ifdef ALLOW_MPV + if (capable->has_mpv) d_print(_("mpv...detected...")); + else d_print(_("mpv...NOT DETECTED...")); +#endif if (capable->has_convert) d_print(_("convert...detected...")); else d_print(_("convert...NOT DETECTED...")); if (capable->has_composite) d_print(_("composite...detected...")); @@ -2161,6 +2175,7 @@ // optional capable->has_mplayer=FALSE; capable->has_mplayer2=FALSE; + capable->has_mpv=FALSE; capable->has_convert=FALSE; capable->has_composite=FALSE; capable->has_identify=FALSE; @@ -2307,6 +2322,11 @@ get_location("mplayer2",string,256); if (strlen(string)) capable->has_mplayer2=TRUE; +#ifdef ALLOW_MPV + get_location("mpv",string,256); + if (strlen(string)) capable->has_mpv=TRUE; +#endif + #ifndef IS_MINGW get_location("convert",string,256); #else @@ -2568,12 +2588,12 @@ _("\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) { + if ((!capable->has_sox_sox||!capable->has_sox_play)&&!capable->has_mplayer&&!capable->has_mplayer2&&!capable->has_mpv) { 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)) { + if (!capable->has_sox_sox||(!capable->has_mplayer&&!capable->has_mplayer2&&!capable->has_mpv)) { startup_message_fatal( _("\nLiVES currently requires both 'mplayer' or 'mplayer2' and 'sox' to function. Please install these, and try again.\n")); } @@ -2858,6 +2878,10 @@ oil_init(); #endif +#ifdef ENABLE_ORC + orc_init(); +#endif + zargc=argc; zargv=argv; @@ -3705,11 +3729,7 @@ height); } else { - lives_painter_set_source_to_bg(cr,LIVES_WIDGET(image)); - - lives_painter_rectangle(cr,0,0, - rwidth, - rheight); + lives_painter_render_background(LIVES_WIDGET(image),cr,0,0,rwidth,rheight); } lives_painter_fill(cr); if (cairo==NULL) lives_painter_destroy(cr); @@ -4428,7 +4448,6 @@ LiVESPixbuf *pixbuf=NULL; - boolean do_not_free=TRUE; #ifndef NO_PROG_LOAD #ifdef GUI_GTK @@ -4513,21 +4532,7 @@ weed_set_int_value(layer,"current_palette",WEED_PALETTE_RGBA32); } 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=(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; - pthread_mutex_unlock(&mainw->free_fn_mutex); + if (!pixbuf_to_layer(layer,pixbuf)) lives_object_unref(pixbuf); return TRUE; @@ -5617,8 +5622,12 @@ check_layer_ready(mainw->frame_layer); return; } +#ifdef USE_MONOTONIC_TIME + mainw->currticks=(lives_get_monotonic_time()-mainw->origusecs)*U_SEC_RATIO; +#else gettimeofday(&tv, NULL); mainw->currticks=U_SECL*(tv.tv_sec-mainw->origsecs)+tv.tv_usec*U_SEC_RATIO-mainw->origusecs*U_SEC_RATIO; +#endif mainw->startticks=mainw->currticks+mainw->deltaticks; } @@ -6877,10 +6886,10 @@ reget_afilesize(mainw->current_file); /* if (cfile->afilesize>0&&cfile->achans==0) { - char *msgx=lives_strdup_printf("Audio file but no channels, %s",cfile->handle); - LIVES_WARN(msgx); - lives_free(msgx); - }*/ + char *msgx=lives_strdup_printf("Audio file but no channels, %s",cfile->handle); + LIVES_WARN(msgx); + lives_free(msgx); + }*/ }
View file
LiVES-2.4.4.tar.bz2/src/main.h -> LiVES-2.4.6.tar.bz2/src/main.h
Changed
@@ -240,6 +240,10 @@ #define HAVE_YUV4MPEG #endif +#ifdef ENABLE_ORC +#include <orc/orc.h> +#endif + #ifdef ENABLE_OIL #include <liboil/liboil.h> #endif @@ -679,6 +683,7 @@ boolean has_autolives; boolean has_mplayer; boolean has_mplayer2; + boolean has_mpv; boolean has_convert; boolean has_composite; boolean has_identify; @@ -1300,10 +1305,6 @@ livespointer _lives_realloc(livespointer ptr, size_t new_size); -/// values of mainw->free_fn -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); void subtitles_free(lives_clip_t *sfile);
View file
LiVES-2.4.4.tar.bz2/src/mainwindow.h -> LiVES-2.4.6.tar.bz2/src/mainwindow.h
Changed
@@ -46,6 +46,9 @@ #define CE_FRAME_HSPACE ((int)(420.*widget_opts.scale)) #endif +/// char width of start / end spinbuttons +#define SPBWIDTHCHARS 12 + #define MIN_SEPWIN_WIDTH 600 #define MIN_SEPWIN_HEIGHT 36 @@ -81,22 +84,22 @@ /// blank label to show so our message dialogs are not too small #define PROCW_STRETCHER " " -#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 ENC_DETAILS_WIN_H ((int)(640.*widget_opts.scale)) ///< horizontal size in pixels of the encoder output window +#define ENC_DETAILS_WIN_V ((int)(240.*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 -#define RFX_WINSIZE_H ((int)(mainw->scr_width>1024?(820.*widget_opts.scale):600)) +#define RFX_WINSIZE_H ((int)(mainw->scr_width>=1024?(820.*widget_opts.scale):640)) #define RFX_WINSIZE_V ((int)(480.*widget_opts.scale)) #define RFX_TEXT_SCROLL_HEIGHT ((int)(80.*widget_opts.scale)) ///< height of textview scrolled window #define DEF_BUTTON_WIDTH ((int)(80.*widget_opts.scale)) -#define DEF_DIALOG_WIDTH 640 -#define DEF_DIALOG_HEIGHT 480 +#define DEF_DIALOG_WIDTH RFX_WINSIZE_H +#define DEF_DIALOG_HEIGHT RFX_WINSIZE_V //////////////////////////////////////////////////////////////////////////////////////////////////////// @@ -985,13 +988,10 @@ double rec_avel; double rec_aseek; - 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
View file
LiVES-2.4.4.tar.bz2/src/merge.c -> LiVES-2.4.6.tar.bz2/src/merge.c
Changed
@@ -31,7 +31,6 @@ LiVESWidget *label; LiVESWidget *fit_button; LiVESWidget *transition_combo; - LiVESWidget *dialog_action_area; LiVESWidget *cancelbutton; LiVESWidget *okbutton; @@ -214,9 +213,6 @@ // 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); - cancelbutton = lives_button_new_from_stock(LIVES_STOCK_CANCEL,NULL); lives_dialog_add_action_widget(LIVES_DIALOG(merge_opts->merge_dialog), cancelbutton, LIVES_RESPONSE_CANCEL); lives_widget_set_can_focus(cancelbutton,TRUE);
View file
LiVES-2.4.4.tar.bz2/src/multitrack.c -> LiVES-2.4.6.tar.bz2/src/multitrack.c
Changed
@@ -80,6 +80,10 @@ static void paint_lines(lives_mt *mt, double currtime, boolean unpaint); +static int *update_layout_map(weed_plant_t *event_list); +static double *update_layout_map_audio(weed_plant_t *event_list); + + /// used to match clips from the event recorder with renumbered clips (without gaps) static int renumbered_clips[MAX_FILES+1]; static double lfps[MAX_FILES+1]; ///< table of layout fps @@ -548,7 +552,7 @@ } break; } - // fallthrough + // fallthrough case LIVES_CURSOR_AUDIO_BLOCK: pixbuf=lives_pixbuf_new(TRUE, width, height); trow=lives_pixbuf_get_rowstride(pixbuf); @@ -658,6 +662,22 @@ } +static void upd_layout_maps(weed_plant_t *event_list) { + int *layout_map; + double *layout_map_audio; + + // update layout maps for files from global layout map + layout_map=update_layout_map(event_list); + layout_map_audio=update_layout_map_audio(event_list); + + save_layout_map(layout_map,layout_map_audio,NULL,NULL); + + lives_free(layout_map); + lives_free(layout_map_audio); + +} + + static void renumber_from_backup_layout_numbering(lives_mt *mt) { // this is used only for crash recovery @@ -674,6 +694,9 @@ boolean isfirst=TRUE; char buf[256]; + // ensure file layouts are updated + upd_layout_maps(NULL); + fd=lives_open_buffered_rdonly(aload_file); if (fd!=-1) { @@ -715,7 +738,10 @@ // this is called from an idle funtion - if the specified amount of time has passed and // the clip has been altered + +#ifndef USE_MONOTONIC_TIME struct timeval otv; +#endif int fd; char *asave_file=lives_strdup_printf("%s/layout.%d.%d.%d",prefs->tmpdir,lives_getuid(),lives_getgid(),capable->mainpid); @@ -773,8 +799,12 @@ lives_free(asave_file); if (stime==0) { +#ifdef USE_MONOTONIC_TIME + stime=lives_get_monotonic_time()/1000000.; +#else gettimeofday(&otv, NULL); stime=otv.tv_sec; +#endif } mt->auto_back_time=stime; @@ -786,7 +816,10 @@ static boolean mt_auto_backup(livespointer user_data) { +#ifndef USE_MONOTONIC_TIME struct timeval otv; +#endif + int64_t stime,diff; lives_mt *mt=(lives_mt *)user_data; @@ -799,8 +832,12 @@ lives_source_remove(mt->idlefunc); mt->idlefunc=0; +#ifdef USE_MONOTONIC_TIME + stime=lives_get_monotonic_time()/1000000.; +#else gettimeofday(&otv, NULL); stime=otv.tv_sec; +#endif if (mt->auto_back_time==0) mt->auto_back_time=stime; @@ -984,8 +1021,6 @@ // x1 is start point of drawing area (in pixels), x2 is width of drawing area (in pixels) lives_painter_t *cr; - LiVESWidgetColor bgcolor; - weed_plant_t *event=block->start_event; weed_timecode_t tc=get_event_timecode(event); @@ -1038,8 +1073,6 @@ lives_painter_set_line_width(cr,1.); - lives_widget_get_bg_color(mt->window,&bgcolor); - 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; @@ -1191,10 +1224,12 @@ break; case BLOCK_SELECTED: lives_painter_new_path(cr); + + // TODO: render background 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., + 0., + 0., 0.6); lives_painter_rectangle(cr,offset_start, 0, offset_end-offset_start, lives_widget_get_allocation_height(eventbox)); lives_painter_fill(cr); @@ -1269,7 +1304,7 @@ end_tc=get_event_timecode(deinit_event); offset_start=(int)((start_tc/U_SEC-mt->tl_min)/tl_span*lives_widget_get_allocation_width(eventbox)+.5); - offset_end=(int)((end_tc/U_SEC-mt->tl_min)/tl_span*lives_widget_get_allocation_width(eventbox)+.5); + offset_end=(int)((end_tc/U_SEC-mt->tl_min+1./mt->fps)/tl_span*lives_widget_get_allocation_width(eventbox)+.5); if (offset_end<0||offset_start>lives_widget_get_allocation_width(eventbox)) { lives_free(in_params); @@ -1438,8 +1473,8 @@ draw_block(mt,cr,NULL,mt->block_selected,-1,-1); } - 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 (is_audio_eventbox(eventbox)&&mt->avol_init_event!=NULL&&mt->opts.aparam_view_list!=NULL) + draw_aparams(mt,eventbox,cr,mt->opts.aparam_view_list,mt->avol_init_event,startx,width); if (idlefunc>0) { mt->idlefunc=mt_idle_add(mt); @@ -1718,7 +1753,7 @@ void track_select(lives_mt *mt) { - LiVESWidget *labelbox,*label,*hbox,*dummy,*ahbox,*eventbox,*oeventbox,*checkbutton=NULL; + LiVESWidget *labelbox,*label,*hbox,*dummy,*ahbox,*arrow,*eventbox,*oeventbox,*checkbutton=NULL; weed_timecode_t tc; int hidden=0; @@ -1789,6 +1824,7 @@ label=(LiVESWidget *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox),"label"); hbox=(LiVESWidget *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox),"hbox"); ahbox=(LiVESWidget *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox),"ahbox"); + arrow=(LiVESWidget *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox),"arrow"); checkbutton=(LiVESWidget *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox), "checkbutton"); if (i==mt->current_track) { @@ -1802,7 +1838,10 @@ if (hbox!=NULL) { lives_widget_set_state(hbox,LIVES_WIDGET_STATE_PRELIGHT); } - if (ahbox!=NULL) lives_widget_set_state(ahbox,LIVES_WIDGET_STATE_PRELIGHT); + if (ahbox!=NULL) { + lives_widget_set_state(ahbox,LIVES_WIDGET_STATE_PRELIGHT); + lives_widget_set_state(arrow,LIVES_WIDGET_STATE_PRELIGHT); + } if (checkbutton!=NULL) { lives_widget_set_state(checkbutton,LIVES_WIDGET_STATE_NORMAL); lives_widget_queue_draw(checkbutton); @@ -1815,7 +1854,10 @@ if (labelbox!=NULL) lives_widget_set_state(labelbox,LIVES_WIDGET_STATE_NORMAL); if (label!=NULL) lives_widget_set_state(label,LIVES_WIDGET_STATE_NORMAL); if (hbox!=NULL) lives_widget_set_state(hbox,LIVES_WIDGET_STATE_NORMAL); - if (ahbox!=NULL) lives_widget_set_state(ahbox,LIVES_WIDGET_STATE_NORMAL); + if (ahbox!=NULL) { + lives_widget_set_state(ahbox,LIVES_WIDGET_STATE_NORMAL); + lives_widget_set_state(arrow,LIVES_WIDGET_STATE_NORMAL); + } if (checkbutton!=NULL) { lives_widget_set_state(checkbutton,LIVES_WIDGET_STATE_PRELIGHT); lives_widget_queue_draw(checkbutton); @@ -1824,6 +1866,7 @@ } }
View file
LiVES-2.4.4.tar.bz2/src/multitrack.h -> LiVES-2.4.6.tar.bz2/src/multitrack.h
Changed
@@ -36,6 +36,8 @@ #define TIMECODE_LENGTH 14 ///< length of timecode text entry, must be >12 +#define TIMELINE_TABLE_COLUMNS 40 + //////////////////////////////////////////////////////////////////////////////// #define BLOCK_DRAW_SIMPLE 1 @@ -52,8 +54,6 @@ typedef struct _lives_amixer_t lives_amixer_t; -#define MAX_DISP_VTRACKS 5 - typedef enum { MOUSE_MODE_MOVE, MOUSE_MODE_SELECT, @@ -175,6 +175,7 @@ boolean render_vidp; ///< render video boolean render_audp; ///< render audio boolean normalise_audp; ///< normalise audio + LiVESList *aparam_view_list; }; @@ -392,8 +393,6 @@ LiVESXDisplay *display; - LiVESList *aparam_view_list; - LiVESPixbuf *frame_pixbuf; LiVESList *cb_list; @@ -463,7 +462,6 @@ boolean is_rendering; ///< TRUE if we are in the process of rendering/pre-rendering to a clip, cf. mainw->is_rendering boolean pr_audio; ///< TRUE if we are in the process of prerendering audio to a clip - int max_disp_vtracks; int current_fx; boolean mt_frame_preview;
View file
LiVES-2.4.4.tar.bz2/src/omc-learn.c -> LiVES-2.4.6.tar.bz2/src/omc-learn.c
Changed
@@ -1073,6 +1073,11 @@ if (labelt!=NULL) lives_free(labelt); +#if !GTK_CHECK_VERSION(3,0,0) + if (palette->style&STYLE_1) { + lives_widget_set_fg_color(label, LIVES_WIDGET_STATE_NORMAL, &palette->black); + } +#endif omclw->tbl_currow++; @@ -1181,7 +1186,9 @@ lives_widget_show(mnode->treev1); +#if LIVES_TABLE_IS_GRID lives_widget_set_size_request(mnode->treev1,-1,TREE_ROW_HEIGHT); +#endif lives_table_attach(LIVES_TABLE(omclw->table), mnode->treev1, 1, 2, omclw->tbl_currow, omclw->tbl_currow+1, (LiVESAttachOptions)(0), @@ -1301,7 +1308,6 @@ static omclearn_w *create_omclearn_dialog(void) { LiVESWidget *ok_button; - LiVESWidget *hbuttonbox; LiVESWidget *scrolledwindow; int winsize_h,scr_width=mainw->scr_width; int winsize_v,scr_height=mainw->scr_height; @@ -1331,14 +1337,11 @@ 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_from_stock(LIVES_STOCK_CLEAR,_("Clear _unmatched")); + lives_widget_set_size_request(omclw->clear_button, DEF_BUTTON_WIDTH*4, -1); + lives_container_set_border_width(LIVES_CONTAINER(omclw->clear_button), widget_opts.border_width); - lives_container_add(LIVES_CONTAINER(hbuttonbox), omclw->clear_button); - + lives_dialog_add_action_widget(LIVES_DIALOG(omclw->dialog), omclw->clear_button, LIVES_RESPONSE_NONE); lives_signal_connect(LIVES_GUI_OBJECT(omclw->clear_button), LIVES_WIDGET_CLICKED_SIGNAL, LIVES_GUI_CALLBACK(clear_unmatched), @@ -1347,9 +1350,10 @@ lives_widget_set_sensitive(omclw->clear_button,FALSE); omclw->del_all_button = lives_button_new_from_stock(LIVES_STOCK_DELETE,_("_Delete all")); + lives_widget_set_size_request(omclw->del_all_button, DEF_BUTTON_WIDTH*4, -1); + lives_container_set_border_width(LIVES_CONTAINER(omclw->del_all_button), widget_opts.border_width); - lives_container_add(LIVES_CONTAINER(hbuttonbox), omclw->del_all_button); - + lives_dialog_add_action_widget(LIVES_DIALOG(omclw->dialog), omclw->del_all_button, LIVES_RESPONSE_NONE); lives_signal_connect(LIVES_GUI_OBJECT(omclw->del_all_button), LIVES_WIDGET_CLICKED_SIGNAL, LIVES_GUI_CALLBACK(del_all), @@ -1359,20 +1363,15 @@ ok_button = lives_button_new_from_stock(LIVES_STOCK_CLOSE,_("_Close Window")); + lives_widget_set_size_request(ok_button, DEF_BUTTON_WIDTH*4, -1); + lives_container_set_border_width(LIVES_CONTAINER(ok_button), widget_opts.border_width); - lives_container_add(LIVES_CONTAINER(hbuttonbox), ok_button); + lives_dialog_add_action_widget(LIVES_DIALOG(omclw->dialog), ok_button, LIVES_RESPONSE_OK); 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*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);
View file
LiVES-2.4.4.tar.bz2/src/osc.c -> LiVES-2.4.6.tar.bz2/src/osc.c
Changed
@@ -3527,7 +3527,7 @@ break; - // RGBA colorspace + // RGBA colorspace case WEED_COLORSPACE_RGBA: @@ -6660,7 +6660,7 @@ boolean lives_osc_cb_open_unicap(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) { #ifdef HAVE_UNICAP char devname[OSC_STRING_SIZE]; - int deint; + int deint=FALSE; char *boolstr;
View file
LiVES-2.4.4.tar.bz2/src/paramspecial.c -> LiVES-2.4.6.tar.bz2/src/paramspecial.c
Changed
@@ -273,7 +273,6 @@ slist=fileread; while (slist!=NULL) { if (param==(lives_param_t *)(slist->data)) { - LiVESList *clist; int epos; param->special_type=LIVES_PARAM_SPECIAL_TYPE_FILEREAD; @@ -288,9 +287,7 @@ if (box==NULL) return; - clist=lives_container_get_children(LIVES_CONTAINER(box)); - epos=lives_list_index(clist,param->widgets[0]); - lives_list_free(clist); + epos=get_box_child_index(LIVES_BOX(box),param->widgets[0]); 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);
View file
LiVES-2.4.4.tar.bz2/src/paramwindow.c -> LiVES-2.4.6.tar.bz2/src/paramwindow.c
Changed
@@ -727,7 +727,6 @@ // pbox != NULL: put params in box LiVESWidget *top_dialog_vbox=NULL; - LiVESWidget *dialog_action_area; LiVESWidget *cancelbutton; LiVESWidget *okbutton; LiVESWidget *resetbutton=NULL; @@ -885,7 +884,7 @@ // rendered fx preview LiVESWidget *hbox = lives_hbox_new(FALSE, 0); - lives_box_pack_start(LIVES_BOX(top_dialog_vbox), hbox, FALSE, FALSE, 0); + lives_box_pack_start(LIVES_BOX(top_dialog_vbox), hbox, TRUE, TRUE, 0); lives_widget_set_hexpand(hbox,TRUE); lives_widget_set_vexpand(hbox,TRUE); @@ -925,10 +924,8 @@ 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])); - 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_SIGNAL, fxw_accel_group, LIVES_KEY_Escape, (LiVESXModifierType)0, (LiVESAccelFlags)0); @@ -946,9 +943,8 @@ if (!has_param) lives_widget_set_sensitive(okbutton,FALSE); cancelbutton = lives_button_new_from_stock(LIVES_STOCK_CLOSE,_("_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); + if (rfx->status!=RFX_STATUS_WEED&&no_process) { + lives_widget_set_size_request(cancelbutton, DEF_BUTTON_WIDTH*4, -1); } if (rfx->status==RFX_STATUS_WEED) { resetbutton = lives_button_new_from_stock(LIVES_STOCK_REVERT_TO_SAVED,_("Reset")); @@ -2125,7 +2121,7 @@ cspace=weed_get_int_value(ptmpl,"colorspace",&error); switch (cspace) { - // TODO - other cspaces + // TODO - other cspaces case WEED_COLORSPACE_RGB: if (is_int) { if (weed_leaf_num_elements(ptmpl,"max")==3) {
View file
LiVES-2.4.4.tar.bz2/src/plugins.c -> LiVES-2.4.6.tar.bz2/src/plugins.c
Changed
@@ -1198,27 +1198,27 @@ 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 **)) + 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 char* ( *)(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; } } @@ -1251,18 +1251,18 @@ } // 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, 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->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; @@ -2444,18 +2444,18 @@ 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 *)) + 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 **)) + 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; } @@ -2467,12 +2467,12 @@ } // 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 **)) + 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->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)();
View file
LiVES-2.4.4.tar.bz2/src/preferences.c -> LiVES-2.4.6.tar.bz2/src/preferences.c
Changed
@@ -643,6 +643,7 @@ boolean mt_autoback_never=lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(prefsw->mt_autoback_never)); int mt_autoback_time=lives_spin_button_get_value(LIVES_SPIN_BUTTON(prefsw->spinbutton_mt_ab_time)); + int max_disp_vtracks=lives_spin_button_get_value(LIVES_SPIN_BUTTON(prefsw->spinbutton_max_disp_vtracks)); 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)); @@ -1463,6 +1464,12 @@ set_int_pref("mt_auto_back",mt_autoback_time); } + if (max_disp_vtracks!=prefs->max_disp_vtracks) { + prefs->max_disp_vtracks=max_disp_vtracks; + set_int_pref("max_disp_vtracks",max_disp_vtracks); + if (mainw->multitrack!=NULL) scroll_tracks(mainw->multitrack,mainw->multitrack->top_track,FALSE); + } + if (startup_ce&&future_prefs->startup_interface!=STARTUP_CE) { future_prefs->startup_interface=STARTUP_CE; set_int_pref("startup_interface",STARTUP_CE); @@ -2042,7 +2049,6 @@ LiVESWidget *hbox2; LiVESWidget *vbox; - LiVESWidget *dialog_action_area; LiVESWidget *dirbutton1; LiVESWidget *dirbutton2; LiVESWidget *dirbutton3; @@ -2407,56 +2413,23 @@ 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")); - 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); - - - // --- - 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); + frame=add_video_options(&prefsw->spinbutton_mt_def_width,prefs->mt_def_width,&prefsw->spinbutton_mt_def_height, + prefs->mt_def_height,&prefsw->spinbutton_mt_def_fps,prefs->mt_def_fps,FALSE); - 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); + lives_box_pack_start(LIVES_BOX(prefsw->vbox_right_multitrack), frame, FALSE, FALSE, widget_opts.packing_height); - hbox = lives_hbox_new(FALSE, 0); + hbox=add_audio_options(&prefsw->backaudio_checkbutton,&prefsw->pertrack_checkbutton); - 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); - - 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); - - // must be done after creating check buttons resaudw=create_resaudw(4, NULL, prefsw->vbox_right_multitrack); // --- @@ -2540,6 +2513,15 @@ 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); } + + + hbox2 = lives_hbox_new(FALSE, 0); + lives_box_pack_start(LIVES_BOX(prefsw->vbox_right_multitrack), hbox2, FALSE, FALSE, widget_opts.packing_height); + + prefsw->spinbutton_max_disp_vtracks=lives_standard_spin_button_new(_("Maximum number of visible tracks"), FALSE, prefs->max_disp_vtracks, + 5., 15., + 1., 1., 0, LIVES_BOX(hbox2),NULL); + // --- icon = lives_build_filename(prefs->prefix_dir, ICON_DIR, "pref_multitrack.png", NULL); pixbuf_multitrack = lives_pixbuf_new_from_file(icon, NULL); @@ -4271,14 +4253,14 @@ 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); // Preferences 'Revert' button prefsw->cancelbutton = lives_button_new_from_stock(LIVES_STOCK_REVERT_TO_SAVED,NULL); lives_widget_show(prefsw->cancelbutton); lives_dialog_add_action_widget(LIVES_DIALOG(prefsw->prefs_dialog), prefsw->cancelbutton, LIVES_RESPONSE_CANCEL); + lives_widget_set_size_request(prefsw->cancelbutton, DEF_BUTTON_WIDTH*2, -1); + lives_container_set_border_width(LIVES_CONTAINER(prefsw->cancelbutton), widget_opts.border_width); + lives_widget_set_can_focus(prefsw->cancelbutton,TRUE); @@ -4289,6 +4271,8 @@ prefsw->applybutton = lives_button_new_from_stock(LIVES_STOCK_APPLY,NULL); lives_widget_show(prefsw->applybutton); lives_dialog_add_action_widget(LIVES_DIALOG(prefsw->prefs_dialog), prefsw->applybutton, 0); + lives_widget_set_size_request(prefsw->applybutton, DEF_BUTTON_WIDTH*2, -1); + lives_container_set_border_width(LIVES_CONTAINER(prefsw->applybutton), widget_opts.border_width); lives_widget_set_can_focus_and_default(prefsw->applybutton); // Set 'Apply' button as inactive since there is no changes yet @@ -4298,6 +4282,8 @@ prefsw->closebutton = lives_button_new_from_stock(LIVES_STOCK_CLOSE,NULL); lives_widget_show(prefsw->closebutton); lives_dialog_add_action_widget(LIVES_DIALOG(prefsw->prefs_dialog), prefsw->closebutton, LIVES_RESPONSE_OK); + lives_widget_set_size_request(prefsw->closebutton, DEF_BUTTON_WIDTH*2, -1); + lives_container_set_border_width(LIVES_CONTAINER(prefsw->closebutton), widget_opts.border_width); lives_widget_set_can_focus_and_default(prefsw->closebutton); @@ -4390,6 +4376,9 @@ 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->spinbutton_max_disp_vtracks), 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),
View file
LiVES-2.4.4.tar.bz2/src/preferences.h -> LiVES-2.4.6.tar.bz2/src/preferences.h
Changed
@@ -348,6 +348,8 @@ boolean funky_widgets; + int max_disp_vtracks; + } _prefs; enum { @@ -397,7 +399,6 @@ LiVESWidget *vbox_right_effects; LiVESWidget *table_right_directories; LiVESWidget *vbox_right_warnings; - // LiVESWidget *vbox_right_warnings_outer; LiVESWidget *vbox_right_misc; LiVESWidget *vbox_right_themes; LiVESWidget *vbox_right_net; @@ -509,6 +510,7 @@ LiVESWidget *spinbutton_mt_def_fps; LiVESWidget *spinbutton_mt_undo_buf; LiVESWidget *spinbutton_mt_ab_time; + LiVESWidget *spinbutton_max_disp_vtracks; LiVESWidget *spinbutton_rec_gb; LiVESWidget *mt_autoback_every; LiVESWidget *mt_autoback_always;
View file
LiVES-2.4.4.tar.bz2/src/resample.c -> LiVES-2.4.6.tar.bz2/src/resample.c
Changed
@@ -1148,7 +1148,6 @@ LiVESWidget *combo4; LiVESWidget *combo5; LiVESWidget *combo6; - LiVESWidget *dialog_action_area; LiVESWidget *cancelbutton; LiVESWidget *okbutton; LiVESWidget *label; @@ -1241,6 +1240,7 @@ if (type==1) { frame = lives_frame_new(NULL); + lives_container_set_border_width(LIVES_CONTAINER(frame), widget_opts.border_width); lives_box_pack_start(LIVES_BOX(vboxx), frame, TRUE, TRUE, 0); @@ -1249,7 +1249,6 @@ } 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); @@ -1276,7 +1275,6 @@ 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); vbox = lives_vbox_new(FALSE, 0); @@ -1340,6 +1338,7 @@ if (type<9||type==11) { frame = lives_frame_new(NULL); + lives_container_set_border_width(LIVES_CONTAINER(frame), widget_opts.border_width); 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); @@ -1430,7 +1429,6 @@ 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); vbox = lives_vbox_new(FALSE, 0); @@ -1511,7 +1509,7 @@ if (type>7&&type!=11) { frame = lives_frame_new(NULL); - lives_widget_show(frame); + lives_container_set_border_width(LIVES_CONTAINER(frame), widget_opts.border_width); lives_box_pack_start(LIVES_BOX(vboxx), frame, TRUE, TRUE, 0); if (palette->style&STYLE_1) { @@ -1519,7 +1517,6 @@ } 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); @@ -1537,7 +1534,6 @@ 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); if (type!=6&&type!=7) { @@ -1554,7 +1550,6 @@ 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); @@ -1570,7 +1565,6 @@ 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); label=lives_standard_label_new(_("Click OK to begin recording, or Cancel to quit.")); @@ -1581,9 +1575,6 @@ 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,NULL); @@ -1664,7 +1655,6 @@ LiVESWidget *radiobutton2=NULL; LiVESWidget *spinbutton_pb_speed; LiVESWidget *spinbutton_pb_time=NULL; - LiVESWidget *dialog_action_area; LiVESWidget *cancelbutton; LiVESWidget *change_pb_ok; LiVESWidget *change_audio_speed; @@ -1753,9 +1743,6 @@ 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); - cancelbutton = lives_button_new_from_stock(LIVES_STOCK_CANCEL,NULL); lives_dialog_add_action_widget(LIVES_DIALOG(new_pb_speed), cancelbutton, LIVES_RESPONSE_CANCEL); lives_widget_set_can_focus(cancelbutton,TRUE);
View file
LiVES-2.4.4.tar.bz2/src/rfx-builder.c -> LiVES-2.4.6.tar.bz2/src/rfx-builder.c
Changed
@@ -81,7 +81,6 @@ // TODO - set mnemonic widgets for entries LiVESWidget *dialog_vbox; - LiVESWidget *dialog_action_area; LiVESWidget *hbox; LiVESWidget *label; LiVESWidget *okbutton; @@ -330,9 +329,6 @@ (_("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,NULL); lives_dialog_add_action_widget(LIVES_DIALOG(rfxbuilder->dialog), cancelbutton, LIVES_RESPONSE_CANCEL); @@ -509,7 +505,6 @@ void on_list_table_clicked(LiVESButton *button, livespointer user_data) { LiVESWidget *dialog; LiVESWidget *dialog_vbox; - LiVESWidget *dialog_action_area; LiVESWidget *hbox; LiVESWidget *button_box; @@ -552,6 +547,7 @@ } dialog = lives_standard_dialog_new(title,FALSE,RFX_WINSIZE_H*5/6,RFX_WINSIZE_V/4); + lives_widget_set_size_request(dialog,DEF_DIALOG_WIDTH,DEF_DIALOG_HEIGHT); if (title!=NULL) lives_free(title); lives_window_add_accel_group(LIVES_WINDOW(dialog), accel_group); @@ -596,7 +592,7 @@ 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, TRUE, TRUE, widget_opts.packing_height); scrolledwindow = lives_standard_scrolled_window_new(RFX_WINSIZE_H,RFX_WINSIZE_V/4,rfxbuilder->table); @@ -607,24 +603,30 @@ // button box on right button_box=lives_vbutton_box_new(); + lives_button_box_set_layout(LIVES_BUTTON_BOX(button_box), LIVES_BUTTONBOX_START); + 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); + lives_box_pack_start(LIVES_BOX(button_box), rfxbuilder->new_entry_button, FALSE, FALSE, widget_opts.packing_height); + lives_container_set_border_width(LIVES_CONTAINER(rfxbuilder->new_entry_button), widget_opts.border_width); 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); + lives_box_pack_start(LIVES_BOX(button_box), rfxbuilder->edit_entry_button, FALSE, FALSE, widget_opts.packing_height); + lives_container_set_border_width(LIVES_CONTAINER(rfxbuilder->edit_entry_button), widget_opts.border_width); 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); + lives_box_pack_start(LIVES_BOX(button_box), rfxbuilder->remove_entry_button, FALSE, FALSE, widget_opts.packing_height); + lives_container_set_border_width(LIVES_CONTAINER(rfxbuilder->remove_entry_button), widget_opts.border_width); 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); + lives_box_pack_start(LIVES_BOX(button_box), rfxbuilder->move_up_button, FALSE, FALSE, widget_opts.packing_height); + lives_container_set_border_width(LIVES_CONTAINER(rfxbuilder->move_up_button), widget_opts.border_width); 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_box_pack_start(LIVES_BOX(button_box), rfxbuilder->move_down_button, FALSE, FALSE, widget_opts.packing_height); + lives_container_set_border_width(LIVES_CONTAINER(rfxbuilder->move_down_button), widget_opts.border_width); lives_widget_set_sensitive(rfxbuilder->move_up_button,FALSE); lives_widget_set_sensitive(rfxbuilder->move_down_button,FALSE); @@ -641,9 +643,6 @@ } } - 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,NULL); lives_dialog_add_action_widget(LIVES_DIALOG(dialog), cancelbutton, LIVES_RESPONSE_CANCEL); @@ -972,7 +971,6 @@ void on_properties_clicked(LiVESButton *button, livespointer user_data) { LiVESWidget *dialog; LiVESWidget *dialog_vbox; - LiVESWidget *dialog_action_area; LiVESWidget *cancelbutton; LiVESWidget *okbutton; @@ -1006,8 +1004,6 @@ } } - 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,NULL); lives_dialog_add_action_widget(LIVES_DIALOG(dialog), cancelbutton, LIVES_RESPONSE_CANCEL); @@ -2792,7 +2788,6 @@ void on_code_clicked(LiVESButton *button, livespointer user_data) { LiVESWidget *dialog; LiVESWidget *dialog_vbox; - LiVESWidget *dialog_action_area; LiVESWidget *cancelbutton; LiVESWidget *okbutton; LiVESWidget *scrolledwindow; @@ -2900,9 +2895,6 @@ } } - 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,NULL); lives_dialog_add_action_widget(LIVES_DIALOG(dialog), cancelbutton, LIVES_RESPONSE_CANCEL); lives_widget_set_can_focus_and_default(cancelbutton); @@ -4126,7 +4118,6 @@ LiVESWidget *status_combo=NULL; LiVESWidget *status_combo_entry=NULL; LiVESWidget *dialog; - LiVESWidget *dialog_action_area; LiVESWidget *cancelbutton; LiVESList *status_list=NULL; @@ -4224,11 +4215,6 @@ 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); - cancelbutton = lives_button_new_from_stock(LIVES_STOCK_CANCEL,NULL); lives_dialog_add_action_widget(LIVES_DIALOG(dialog), cancelbutton, LIVES_RESPONSE_CANCEL);
View file
LiVES-2.4.4.tar.bz2/src/rte_window.c -> LiVES-2.4.6.tar.bz2/src/rte_window.c
Changed
@@ -1643,7 +1643,6 @@ weed_plant_t *filter; LiVESWidget *dialog; - LiVESWidget *dialog_action_area; LiVESWidget *vbox; LiVESWidget *hbox; @@ -1752,8 +1751,7 @@ lives_widget_set_can_focus_and_default(ok_button); lives_widget_grab_default(ok_button); - dialog_action_area = lives_dialog_get_action_area(LIVES_DIALOG(dialog)); - lives_button_box_set_button_width(LIVES_BUTTON_BOX(dialog_action_area), ok_button, DEF_BUTTON_WIDTH*4); + lives_widget_set_size_request(ok_button, DEF_BUTTON_WIDTH*4, -1); lives_signal_connect(LIVES_GUI_OBJECT(ok_button), LIVES_WIDGET_CLICKED_SIGNAL, LIVES_GUI_CALLBACK(lives_general_button_clicked), @@ -2503,7 +2501,7 @@ LiVESList *child_list; lives_rfx_t *rfx; - LiVESWidget *action_area; + LiVESWidget *content_area; int keyw=0,modew=0; int i; @@ -2517,18 +2515,16 @@ if (rfx->is_template||(key==keyw&&mode==modew)) { // rip out the contents 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(fx_dialog[1])))); - action_area=lives_dialog_get_action_area(LIVES_DIALOG(fx_dialog[1])); + content_area=lives_dialog_get_content_area(LIVES_DIALOG(fx_dialog[1])); + child_list=lives_container_get_children(LIVES_CONTAINER(content_area)); // remove focus from any widget we are ripping out - lives_container_set_focus_child(LIVES_CONTAINER(action_area),NULL); + lives_container_set_focus_child(LIVES_CONTAINER(content_area),NULL); 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); - } + // 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) lives_list_free(child_list); on_paramwindow_cancel_clicked(NULL,NULL); @@ -2668,7 +2664,7 @@ LiVESList *child_list; - LiVESWidget *pbox,*fxdialog,*cancelbutton,*action_area; + LiVESWidget *pbox,*fxdialog,*cancelbutton,*content_area; int error; int nchans; @@ -2765,17 +2761,16 @@ // redraw the window 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)); - + content_area=lives_dialog_get_content_area(LIVES_DIALOG(fx_dialog[1])); + child_list=lives_container_get_children(LIVES_CONTAINER(content_area)); + // remove focus from any widget we are ripping out + lives_container_set_focus_child(LIVES_CONTAINER(content_area),NULL); 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+ ???] - lives_widget_reparent(widget,mainw->invis); - } + // 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) lives_list_free(child_list);
View file
LiVES-2.4.4.tar.bz2/src/saveplay.c -> LiVES-2.4.6.tar.bz2/src/saveplay.c
Changed
@@ -926,12 +926,18 @@ // we got neither video nor audio... 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) { + + if (!capable->has_mplayer&&!capable->has_mplayer2&&!capable->has_mpv) { 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); + } else if (capable->has_mplayer2) { + get_location("mplayer2",loc,256); + } else if (capable->has_mpv) { + get_location("mpv",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")); } @@ -5273,7 +5279,6 @@ 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 } lives_free(check_handle);
View file
LiVES-2.4.4.tar.bz2/src/startup.c -> LiVES-2.4.6.tar.bz2/src/startup.c
Changed
@@ -706,6 +706,8 @@ // check for mplayer presence + // TODO: mpv + add_test(table,2,_("Checking for \"mplayer\" presence"),TRUE); @@ -737,6 +739,8 @@ add_test(table,3,_("Checking if mplayer can convert audio"),success2); + res=1; + if (success2) { if (capable->has_mplayer) { #ifndef IS_MINGW @@ -744,13 +748,22 @@ #else res=system("mplayer -ao help | grep pcm >NUL 2>&1"); #endif - } else { + } else if (capable->has_mplayer2) { #ifndef IS_MINGW res=system("LANG=en LANGUAGE=en mplayer2 -ao help | grep pcm >/dev/null 2>&1"); #else res=system("mplayer2 -ao help | grep pcm >NUL 2>&1"); #endif + } else { +#ifdef ALLOW_MPV +#ifndef IS_MINGW + res=system("LANG=en LANGUAGE=en mpv --ao help | grep pcm >/dev/null 2>&1"); +#else + res=system("mpv --ao help | grep pcm >NUL 2>&1"); +#endif +#endif } + if (res==0) { pass_test(table,3); } else { @@ -758,6 +771,7 @@ } } + // check if mplayer can decode to png/alpha rname=get_resource(""); @@ -770,6 +784,8 @@ lives_free(rname); + // TODO: mpv + add_test(table,4,_("Checking if mplayer can decode to png/alpha"),success2&&success4); success3=FALSE; @@ -841,6 +857,7 @@ add_test(table,5,_("Checking if mplayer can decode to jpeg"),success2); + res=1; if (success2) { if (capable->has_mplayer) { @@ -849,12 +866,20 @@ #else res=system("mplayer -vo help | grep -i \"jpeg file\" >NUL 2>&1"); #endif - } else { + } else if (capable->has_mplayer2) { #ifndef IS_MINGW res=system("LANG=en LANGUAGE=en mplayer2 -vo help | grep -i \"jpeg file\" >/dev/null 2>&1"); #else res=system("mplayer2 -vo help | grep -i \"jpeg file\" >NUL 2>&1"); #endif + } else { +#ifdef ALLOW_MPV +#ifndef IS_MINGW + res=system("LANG=en LANGUAGE=en mpv --vo help | grep -i \"image\" >/dev/null 2>&1"); +#else + res=system("mpv --vo help | grep -i \"image\" >NUL 2>&1"); +#endif +#endif } if (res==0) {
View file
LiVES-2.4.4.tar.bz2/src/stream.c -> LiVES-2.4.6.tar.bz2/src/stream.c
Changed
@@ -32,7 +32,7 @@ static char *hdr=NULL; static boolean fps_can_change; -static LIVES_INLINE G_GNUC_CONST int64_t abs64(int64_t a) { +static LIVES_INLINE __attribute__((__const__)) int64_t abs64(int64_t a) { return ((a>0)?a:-a); } @@ -753,8 +753,12 @@ // 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 +#ifdef USE_MONOTONIC_TIME + currticks=(lives_get_monotonic_time()-mainw->origusecs)*U_SEC_RATIO; +#else gettimeofday(&tv, NULL); currticks=U_SECL*(tv.tv_sec-mainw->origsecs)+tv.tv_usec*U_SEC_RATIO-mainw->origusecs*U_SEC_RATIO; +#endif if (mainw->record&&!mainw->record_paused) { if (has_last_delta_ticks&&(abs64(currticks-lstream->timecode))<last_delta_ticks) { // drop this frame
View file
LiVES-2.4.4.tar.bz2/src/utils.c -> LiVES-2.4.6.tar.bz2/src/utils.c
Changed
@@ -83,7 +83,7 @@ -static void reverse_bytes(uint8_t *out, const uint8_t *in, size_t count) { +static LIVES_INLINE void reverse_bytes(uint8_t *out, const uint8_t *in, size_t count) { register int i; for (i=0; i<count; i++) { out[i]=in[count-i-1]; @@ -1276,9 +1276,13 @@ /** return current (wallclock) time in ticks (units of 10 nanoseconds) */ -int64_t lives_get_current_ticks(void) { +LIVES_INLINE int64_t lives_get_current_ticks(void) { +#ifdef USE_MONOTONIC_TIME + return lives_get_monotonic_time()*U_SEC_RATIO; +#else gettimeofday(&tv, NULL); return U_SECL*tv.tv_sec+tv.tv_usec*U_SEC_RATIO; +#endif } @@ -1460,7 +1464,7 @@ -boolean is_realtime_aplayer(int ptype) { +LIVES_INLINE boolean is_realtime_aplayer(int ptype) { if (ptype==AUD_PLAYER_JACK||ptype==AUD_PLAYER_PULSE) return TRUE; return FALSE; } @@ -2698,36 +2702,33 @@ 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); - lives_painter_fill(cr); + lives_painter_render_background(mainw->laudio_draw,cr,0,0, + allocwidth, + allocheight); + 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); - lives_painter_fill(cr); + lives_painter_render_background(mainw->raudio_draw,cr,0,0, + allocwidth, + allocheight); + lives_painter_destroy(cr); } if (mainw->video_drawable!=NULL) { lives_painter_t *cr=lives_painter_create(mainw->video_drawable); - lives_painter_set_source_to_bg(cr,mainw->video_draw); - lives_painter_rectangle(cr,0,0, - allocwidth, - allocheight); - lives_painter_fill(cr); + lives_painter_render_background(mainw->video_draw,cr,0,0, + allocwidth, + allocheight); + lives_painter_destroy(cr); } @@ -5021,16 +5022,21 @@ // crude formating of strings, ensure a newline after every run of maxwidth chars // does not take into account for example utf8 multi byte chars + wchar_t utfsym; + char newline[]="\n"; char *retstr; - register int i; - int xtoffs; - boolean needsnl=FALSE; + + size_t runlen=0; size_t req_size=1; // for the terminating \0 size_t tlen; size_t nlen=strlen(newline); - size_t runlen=0; - wchar_t utfsym; + + int xtoffs; + + boolean needsnl=FALSE; + + register int i; if (text==NULL) return NULL; @@ -5066,6 +5072,8 @@ } + xtoffs=mbtowc(NULL,NULL,0); // reset read state + retstr=(char *)lives_malloc(req_size); req_size=0; // reuse as a ptr to offset in retstr runlen=0;
View file
LiVES-2.4.4.tar.bz2/src/videodev.c -> LiVES-2.4.6.tar.bz2/src/videodev.c
Changed
@@ -36,15 +36,21 @@ static boolean lives_wait_user_buffer(lives_vdev_t *ldev, unicap_data_buffer_t **buff, double timeout) { // wait for USER type buffer - int64_t stime,dtime,timer; +#ifndef USE_MONOTONIC_TIME struct timeval otv; +#endif + int64_t stime,dtime,timer; unicap_status_t status; int ncount; timer=timeout*1000000.; +#ifdef USE_MONOTONIC_TIME + stime=lives_get_monotonic_time()*U_SEC_RATIO; +#else gettimeofday(&otv,NULL); stime=otv.tv_sec*1000000+otv.tv_usec; +#endif while (1) { status=unicap_poll_buffer(ldev->handle,&ncount); @@ -58,9 +64,12 @@ return TRUE; } +#ifdef USE_MONOTONIC_TIME + dtime=lives_get_monotonic_time()*U_SEC_RATIO; +#else gettimeofday(&otv,NULL); dtime=otv.tv_sec*1000000+otv.tv_usec; - +#endif if (dtime-stime>timer) return FALSE; lives_usleep(prefs->sleep_time); @@ -74,18 +83,26 @@ static boolean lives_wait_system_buffer(lives_vdev_t *ldev, double timeout) { // wait for SYSTEM type buffer - int64_t stime,dtime,timer; +#ifndef USE_MONOTONIC_TIME struct timeval otv; +#endif + int64_t stime,dtime,timer; timer=timeout*1000000.; +#ifdef USE_MONOTONIC_TIME + stime=lives_get_monotonic_time()*U_SEC_RATIO; +#else gettimeofday(&otv,NULL); stime=otv.tv_sec*1000000+otv.tv_usec; - +#endif while (ldev->buffer_ready==0) { +#ifdef USE_MONOTONIC_TIME + dtime=lives_get_monotonic_time()*U_SEC_RATIO; +#else gettimeofday(&otv,NULL); dtime=otv.tv_sec*1000000+otv.tv_usec; - +#endif if (dtime-stime>timer) return FALSE; lives_usleep(prefs->sleep_time);
View file
LiVES-2.4.4.tar.bz2/src/widget-helper-gtk.h -> LiVES-2.4.6.tar.bz2/src/widget-helper-gtk.h
Changed
@@ -14,6 +14,7 @@ #define GTK_RADIO_MENU_BUG // a bug where gtk_radio_menu_item_set_active() does not update visually #define GTK_SUBMENU_SENS_BUG // a bug where setting a menuitem insensitive fails if it has a submenu +#define GTK_TEXT_VIEW_CSS_BUG // a bug where named textviews cannot be set by CSS #ifndef IS_MINGW @@ -108,8 +109,14 @@ #include "support.h" +#define USE_MONOTONIC_TIME +#define lives_get_monotonic_time() g_get_monotonic_time() +#if GTK_CHECK_VERSION(3,8,0) +#define USE_GDK_FRAME_CLOCK +#endif + /// Glib type stuff ////////////////////////////////////////// #ifndef G_ENCODE_VERSION #define G_ENCODE_VERSION(major,minor) ((major) << 16 | (minor) << 8) @@ -165,6 +172,8 @@ #define LIVES_MAXSIZE G_MAXSIZE #define LIVES_MAXFLOAT G_MAXFLOAT +#define LIVES_IS_RTL (gtk_widget_get_default_direction()==GTK_TEXT_DIR_RTL) + #define LIVES_GUI_CALLBACK(f) ((LiVESGuiCallback) (f)) #define lives_printerr(args...) g_printerr(args) @@ -312,6 +321,12 @@ #define LIVES_WIDGET_OBJECT(a) G_OBJECT(a) +#if GTK_CHECK_VERSION(3,0,0) +#define NO_MEM_OVERRIDE TRUE +#else +#define NO_MEM_OVERRIDE g_mem_is_system_malloc() +#endif + typedef GMemVTable LiVESMemVTable; typedef GIOChannel LiVESIOChannel; @@ -808,6 +823,11 @@ #define LIVES_IS_VBOX(widget) GTK_IS_VBOX(widget) #endif +#define LIVES_IS_BOX(widget) (LIVES_IS_HBOX(widget) || LIVES_IS_VBOX(widget)) + +#define LIVES_IS_TOOLBAR(widget) GTK_IS_TOOLBAR(widget) +#define LIVES_IS_EVENT_BOX(widget) GTK_IS_EVENT_BOX(widget) + #define LIVES_IS_COMBO(widget) GTK_IS_COMBO_BOX(widget) #define LIVES_IS_LABEL(widget) GTK_IS_LABEL(widget) #define LIVES_IS_BUTTON(widget) GTK_IS_BUTTON(widget) @@ -820,6 +840,7 @@ #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) +#define LIVES_IS_BUTTON_BOX(widget) GTK_IS_BUTTON_BOX(widget) // (image resize) interpolation types #define LIVES_INTERP_BEST GDK_INTERP_HYPER @@ -848,6 +869,8 @@ #define LIVES_STOCK_REVERT_TO_SAVED "document-revert" #define LIVES_STOCK_GO_BACK "go-previous" #define LIVES_STOCK_GO_FORWARD "go-next" +#define LIVES_STOCK_GO_UP "go-up" +#define LIVES_STOCK_GO_DOWN "go-down" #define LIVES_STOCK_REFRESH "view-refresh" #define LIVES_STOCK_MEDIA_PLAY "media-playback-start" #define LIVES_STOCK_MEDIA_STOP "media-playback-stop"
View file
LiVES-2.4.4.tar.bz2/src/widget-helper.c -> LiVES-2.4.6.tar.bz2/src/widget-helper.c
Changed
@@ -147,6 +147,42 @@ return FALSE; } + + + + + +LIVES_INLINE boolean lives_painter_render_background(LiVESWidget *widget, lives_painter_t *cr, double x, double y, double width, + double height) { +#ifdef PAINTER_CAIRO +#if GTK_CHECK_VERSION(3,0,0) + GtkStyleContext *ctx = gtk_widget_get_style_context(widget); + gtk_render_background(ctx,cr,x,y,width,height); +#else + LiVESWidgetColor color; + lives_widget_color_copy(&color,>k_widget_get_style(widget)->bg[lives_widget_get_state(widget)]); + +#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)); +#endif + lives_painter_rectangle(cr,x,y,width,height); + lives_painter_fill(cr); +#endif + return TRUE; +#endif + return FALSE; +} + + LIVES_INLINE boolean lives_painter_surface_destroy(lives_painter_surface_t *surf) { #ifdef PAINTER_CAIRO cairo_surface_destroy(surf); @@ -471,9 +507,13 @@ LIVES_INLINE boolean lives_mem_set_vtable(LiVESMemVTable *alt_vtable) { #ifdef GUI_GTK +#if GTK_CHECK_VERSION(3,0,0) + return FALSE; +#else g_mem_set_vtable(alt_vtable); return TRUE; #endif +#endif #ifdef GUI_QT static_alt_vtable = alt_vtable; @@ -812,7 +852,14 @@ LIVES_INLINE boolean lives_widget_reparent(LiVESWidget *widget, LiVESWidget *new_parent) { #ifdef GUI_GTK +#if GTK_CHECK_VERSION(3,14,0) + g_object_ref(widget); + gtk_container_remove(GTK_CONTAINER(gtk_widget_get_parent(widget)),widget); + gtk_container_add(GTK_CONTAINER(new_parent),widget); + g_object_unref(widget); +#else gtk_widget_reparent(widget,new_parent); +#endif return TRUE; #endif #ifdef GUI_QT @@ -868,10 +915,90 @@ } +#if GTK_CHECK_VERSION(3,16,0) +static char *make_random_string() { + char *str=malloc(32); + register int i; + + str[0]=str[1]=str[2]='X'; + + for (i=3; i<31; i++) str[i]=((lives_random()&15)+65); + str[31]=0; + return str; +} +#endif + +#include "giw/giwled.h" + 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) +#if GTK_CHECK_VERSION(3,16,0) + + GtkCssProvider *provider = gtk_css_provider_new(); + GtkStyleContext *ctx = gtk_widget_get_style_context(widget); + + char *widget_name,*wname; + char *colref; + char *css_string; + char *state_str; + + gtk_style_context_add_provider(ctx, GTK_STYLE_PROVIDER + (provider), GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); + + widget_name=g_strdup(gtk_widget_get_name(widget)); + + if (strncmp(widget_name,"XXX",3)) { + if (widget_name!=NULL) g_free(widget_name); + widget_name=make_random_string(); + gtk_widget_set_name(widget,widget_name); + } + + gtk_widget_set_name(widget,widget_name); + + colref=gdk_rgba_to_string(color); + +#ifdef GTK_TEXT_VIEW_CSS_BUG + if (GTK_IS_TEXT_VIEW(widget)) wname=g_strdup("GtkTextView"); + else { +#endif + switch (state) { + case GTK_STATE_FLAG_ACTIVE: + state_str=":active"; + break; + case GTK_STATE_FLAG_PRELIGHT: + state_str=":prelight"; + break; + case GTK_STATE_FLAG_SELECTED: + state_str=":selected"; + break; + case GTK_STATE_FLAG_INSENSITIVE: + state_str=":insensitive"; + break; + default: + state_str=""; + } + wname=g_strdup_printf("#%s%s",widget_name,state_str); + +#ifdef GTK_TEXT_VIEW_CSS_BUG + } +#endif + css_string=g_strdup_printf(" %s {\n background-color: %s;\n }\n }\n",wname,colref); + + gtk_css_provider_load_from_data(GTK_CSS_PROVIDER(provider), + css_string, + -1, NULL); + + g_free(colref); + g_free(widget_name); + g_free(wname); + + g_free(css_string); + g_object_unref(provider); + +#else gtk_widget_override_background_color(widget,state,color); +#endif #else gtk_widget_modify_bg(widget,state,color); #endif @@ -888,7 +1015,49 @@ LIVES_INLINE boolean lives_widget_set_fg_color(LiVESWidget *widget, LiVESWidgetState state, const LiVESWidgetColor *color) { #ifdef GUI_GTK #if GTK_CHECK_VERSION(3,0,0) +#if GTK_CHECK_VERSION(3,16,0) + + GtkCssProvider *provider = gtk_css_provider_new(); + GtkStyleContext *ctx = gtk_widget_get_style_context(widget); + + char *widget_name,*wname; + char *colref; + char *css_string; + + gtk_style_context_add_provider(ctx, GTK_STYLE_PROVIDER + (provider), GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); + + widget_name=g_strdup(gtk_widget_get_name(widget)); + + if (strncmp(widget_name,"XXX",3)) { + if (widget_name!=NULL) g_free(widget_name); + widget_name=make_random_string(); + gtk_widget_set_name(widget,widget_name); + } + + colref=gdk_rgba_to_string(color); + +#ifdef GTK_TEXT_VIEW_CSS_BUG + if (GTK_IS_TEXT_VIEW(widget)) wname=g_strdup("GtkTextView"); + else +#endif + wname=g_strdup_printf("#%s",widget_name); + + css_string=g_strdup_printf(" %s {\n color: %s;\n }\n }\n",wname,colref); + + gtk_css_provider_load_from_data(GTK_CSS_PROVIDER(provider), + css_string, + -1, NULL);
View file
LiVES-2.4.4.tar.bz2/src/widget-helper.h -> LiVES-2.4.6.tar.bz2/src/widget-helper.h
Changed
@@ -57,6 +57,8 @@ boolean lives_painter_stroke(lives_painter_t *); boolean lives_painter_clip(lives_painter_t *); +boolean lives_painter_render_background(LiVESWidget *, lives_painter_t *, double x, double y, double width, double height); + boolean lives_painter_set_source_rgb(lives_painter_t *, double red, double green, double blue); boolean lives_painter_set_source_rgba(lives_painter_t *, double red, double green, double blue, double alpha); @@ -88,7 +90,7 @@ // utils -void widget_helper_init(void); +boolean widget_helper_init(void); // object funcs. @@ -706,8 +708,6 @@ // compound functions (composed of basic functions) -void lives_painter_set_source_to_bg(lives_painter_t *, LiVESWidget *); - LiVESWidget *lives_standard_label_new(const char *text); LiVESWidget *lives_standard_label_new_with_mnemonic(const char *text, LiVESWidget *mnemonic_widget); @@ -749,7 +749,6 @@ LiVESWidget *lives_menu_add_separator(LiVESMenu *menu); void lives_widget_get_fg_color(LiVESWidget *, LiVESWidgetColor *); -void lives_widget_get_bg_color(LiVESWidget *, LiVESWidgetColor *); void lives_window_center(LiVESWindow *);
Locations
Projects
Search
Status Monitor
Help
Open Build Service
OBS Manuals
API Documentation
OBS Portal
Reporting a Bug
Contact
Mailing List
Forums
Chat (IRC)
Twitter
Open Build Service (OBS)
is an
openSUSE project
.