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 5
View file
LiVES.changes
Changed
@@ -1,4 +1,22 @@ ------------------------------------------------------------------- +Sun Jul 24 12:18:33 UTC 2011 - pascal.bleser@opensuse.org + +- update to 1.4.5: + * add -tmpdir startup option + * stop PAL formats reverting to NTSC in x264 encoder + * fix bug to add fewer blank lines to ~/.lives file + * do not show "Loaded subtitles" message when subtitles are not loaded + * instant opening of some .flv files + * move correct pointer (start or end) when the timeline is clicked in longer + files + * add video fade in/out effect + * fix frames being cut after applying effects in virtual clips + * clean up code for rendered effects post-processing + * clean up code for dynamic menu building + * front end stability fixes. + * mouse scroll now switches clips in the play window too + +------------------------------------------------------------------- Sun Jun 12 21:36:09 UTC 2011 - pascal.bleser@opensuse.org - update to 1.4.3:
View file
LiVES.spec
Changed
@@ -1,7 +1,7 @@ # vim: set ts=4 sw=4 et: Name: LiVES -Version: 1.4.3 +Version: 1.4.5 %define soname 0 Release: 1 Summary: Video Editor and VJ Tool @@ -158,6 +158,8 @@ %{_libdir}/lives/plugins/decoders/dv_decoder.la %{_libdir}/lives/plugins/decoders/ogg_decoder.so %{_libdir}/lives/plugins/decoders/ogg_decoder.la +%{_libdir}/lives/plugins/decoders/flv_decoder.so +%{_libdir}/lives/plugins/decoders/flv_decoder.la %dir %{_libdir}/lives/plugins/effects %dir %{_libdir}/lives/plugins/effects/realtime %dir %{_libdir}/lives/plugins/effects/realtime/weed @@ -269,6 +271,7 @@ %{_libdir}/lives/plugins/effects/rendered/edge_detect %{_libdir}/lives/plugins/effects/rendered/emboss %{_libdir}/lives/plugins/effects/rendered/enhance +%{_libdir}/lives/plugins/effects/rendered/fade_in_out %{_libdir}/lives/plugins/effects/rendered/flip %{_libdir}/lives/plugins/effects/rendered/flop %{_libdir}/lives/plugins/effects/rendered/frame_calculator
View file
LiVES-1.4.3.tar.bz2/ChangeLog -> LiVES-1.4.5.tar.bz2/ChangeLog
Changed
@@ -1,13 +1,38 @@ +Version 1.4.5 (23 July 2011) +--------------------------- +Add -tmpdir startup option. +Stop PAL formats reverting to NTSC in x264 encoder. * +Fix bug to add fewer blank lines to ~/.lives file. * +Do not show "Loaded subtitles" message when subtitles are not loaded. * +Instant opening of some .flv files. +Move correct pointer (start or end) when the timeline is clicked in longer files. * +Add video fade in/out effect. +Fix frames being cut after applying effects in virtual clips. * +Clean up code for rendered effects post-processing. * +Clean up code for dynamic menu building. +Front end stability fixes. +Mouse scroll now switches clips in the play window too. + + + + +Version 1.4.4 (13 June 2011) +---------------------------- +Fix compilation problem for missing linux/videodev.h + + + + Version 1.4.3 (11 June 2011) ---------------------------- -Fix important bug with audio shifting when leaving/rentering multitrack mode. * +Fix important bug with audio shifting when leaving/re-entering multitrack mode. * Add support for spacial multithreading in effects plugins. Fix antialias option in Preferences (regression). * Fix buttons in Frame Calculator (regression). * Fix updating of parameters with fileread textfields. * Add new oggstream playback plugin. Add new realtime effects: RGB_delay, YUV_delay and mask_overlay. -Updated translations to Brazilian Portuguese, German, Italian and Ukranian. +Updated translations to Brazilian Portuguese, German, Japanese and Ukranian.
View file
LiVES-1.4.3.tar.bz2/Makefile.in -> LiVES-1.4.5.tar.bz2/Makefile.in
Changed
@@ -212,6 +212,10 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ +LIBAVCODEC_CFLAGS = @LIBAVCODEC_CFLAGS@ +LIBAVCODEC_LIBS = @LIBAVCODEC_LIBS@ +LIBAVFORMAT_CFLAGS = @LIBAVFORMAT_CFLAGS@ +LIBAVFORMAT_LIBS = @LIBAVFORMAT_LIBS@ LIBDV_CFLAGS = @LIBDV_CFLAGS@ LIBDV_LIBS = @LIBDV_LIBS@ LIBICONV = @LIBICONV@ @@ -361,6 +365,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ +v4l1_INCFILE = @v4l1_INCFILE@ AUTOMAKE_OPTIONS = 1.7 @ENABLE_OSC_TRUE@OSC_SUBDIRS = libOSC MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure config.h.in \
View file
LiVES-1.4.3.tar.bz2/README -> LiVES-1.4.5.tar.bz2/README
Changed
@@ -63,16 +63,16 @@ If you got LiVES as a tar.gz or tar.bz2, at a terminal prompt, enter the following: - bzip2 -d LiVES-1.4.3.tar.bz2 + bzip2 -d LiVES-1.4.5.tar.bz2 or, - gzip -d LiVES-1.4.3.tar.gz + gzip -d LiVES-1.4.5.tar.gz depending on which version you have. Then: - tar xvf LIVES-1.4.3.tar + tar xvf LIVES-1.4.5.tar - cd lives-1.4.3 + cd lives-1.4.5
View file
LiVES-1.4.3.tar.bz2/aclocal.m4 -> LiVES-1.4.5.tar.bz2/aclocal.m4
Changed
@@ -156,7 +156,7 @@ Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. -_PKG_TEXT])dnl +_PKG_TEXT])[]dnl ]) elif test $pkg_failed = untried; then AC_MSG_RESULT([no]) @@ -167,7 +167,7 @@ _PKG_TEXT -To get pkg-config, see <http://pkg-config.freedesktop.org/>.])dnl +To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl ]) else $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
View file
LiVES-1.4.3.tar.bz2/build-lives-rfx-plugin -> LiVES-1.4.5.tar.bz2/build-lives-rfx-plugin
Changed
@@ -78,7 +78,7 @@ } -$builder_version="1.4.3"; +$builder_version="1.4.5"; if ($in_channels==0&&$properties&0x0004) { #batch mode generator
View file
LiVES-1.4.3.tar.bz2/configure -> LiVES-1.4.5.tar.bz2/configure
Changed
@@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.67 for LiVES 1.4.3. +# Generated by GNU Autoconf 2.67 for LiVES 1.4.5. # # Report bugs to <http://www.sourceforge.net/tracker/?group_id=64341&atid=507139>. # @@ -702,8 +702,8 @@ # Identity of this package. PACKAGE_NAME='LiVES' PACKAGE_TARNAME='lives' -PACKAGE_VERSION='1.4.3' -PACKAGE_STRING='LiVES 1.4.3' +PACKAGE_VERSION='1.4.5' +PACKAGE_STRING='LiVES 1.4.5' PACKAGE_BUGREPORT='http://www.sourceforge.net/tracker/?group_id=64341&atid=507139' PACKAGE_URL='' @@ -809,6 +809,7 @@ HAVE_LIBDV_TRUE LIBDV_LIBS LIBDV_CFLAGS +v4l1_INCFILE HAVE_LIBv4l1_FALSE HAVE_LIBv4l1_TRUE HAVE_UNICAP_FALSE @@ -819,6 +820,14 @@ HAVE_MJPEGTOOLS_TRUE MJPEGTOOLS_LIBS MJPEGTOOLS_CFLAGS +HAVE_AVFORMAT_FALSE +HAVE_AVFORMAT_TRUE +HAVE_AVCODEC_FALSE +HAVE_AVCODEC_TRUE +LIBAVFORMAT_LIBS +LIBAVFORMAT_CFLAGS +LIBAVCODEC_LIBS +LIBAVCODEC_CFLAGS FORCE_SDL_FALSE FORCE_SDL_TRUE HAVE_SDL_FALSE @@ -1061,6 +1070,7 @@ enable_vjack enable_glib_slice_allocator enable_sdl +enable_ffmpeg enable_mjpegtools enable_unicap enable_libvisual @@ -1090,6 +1100,10 @@ GLIB_LIBS SDL_CFLAGS SDL_LIBS +LIBAVCODEC_CFLAGS +LIBAVCODEC_LIBS +LIBAVFORMAT_CFLAGS +LIBAVFORMAT_LIBS MJPEGTOOLS_CFLAGS MJPEGTOOLS_LIBS UNICAP_CFLAGS @@ -1662,7 +1676,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures LiVES 1.4.3 to adapt to many kinds of systems. +\`configure' configures LiVES 1.4.5 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1733,7 +1747,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of LiVES 1.4.3:";; + short | recursive ) echo "Configuration of LiVES 1.4.5:";; esac cat <<\_ACEOF @@ -1765,6 +1779,7 @@ --disable-GIW Disable GTK+ Instrument Widgets. --enable-sdl Enable SDL playback plugin support without checking for it. --disable-sdl Disable SDL support. + --disable-ffmpeg Disable ffmpeg (avcodec) support. --disable-mjpegtools Disable mjpegtools (yuv4mpeg) support. --disable-unicap Disable unicap support. --disable-libvisual Disable libvisual support. @@ -1811,6 +1826,14 @@ GLIB_LIBS linker flags for GLIB, overriding pkg-config SDL_CFLAGS C compiler flags for SDL, overriding pkg-config SDL_LIBS linker flags for SDL, overriding pkg-config + LIBAVCODEC_CFLAGS + C compiler flags for LIBAVCODEC, overriding pkg-config + LIBAVCODEC_LIBS + linker flags for LIBAVCODEC, overriding pkg-config + LIBAVFORMAT_CFLAGS + C compiler flags for LIBAVFORMAT, overriding pkg-config + LIBAVFORMAT_LIBS + linker flags for LIBAVFORMAT, overriding pkg-config MJPEGTOOLS_CFLAGS C compiler flags for MJPEGTOOLS, overriding pkg-config MJPEGTOOLS_LIBS @@ -1923,7 +1946,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -LiVES configure 1.4.3 +LiVES configure 1.4.5 generated by GNU Autoconf 2.67 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2524,7 +2547,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by LiVES $as_me 1.4.3, which was +It was created by LiVES $as_me 1.4.5, which was generated by GNU Autoconf 2.67. Invocation command line was $ $0 $@ @@ -3456,7 +3479,7 @@ # Define the identity of the package. PACKAGE='lives' - VERSION='1.4.3' + VERSION='1.4.5' cat >>confdefs.h <<_ACEOF @@ -6158,13 +6181,13 @@ else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:6161: $ac_compile\"" >&5) + (eval echo "\"\$as_me:6184: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:6164: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:6187: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:6167: output\"" >&5) + (eval echo "\"\$as_me:6190: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -7369,7 +7392,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 7372 "configure"' > conftest.$ac_ext + echo '#line 7395 "configure"' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -8629,11 +8652,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8632: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8655: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8636: \$? = $ac_status" >&5 + echo "$as_me:8659: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -8968,11 +8991,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8971: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8994: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8975: \$? = $ac_status" >&5 + echo "$as_me:8998: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -9073,11 +9096,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9076: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9099: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:9080: \$? = $ac_status" >&5 + echo "$as_me:9103: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -9128,11 +9151,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
View file
LiVES-1.4.3.tar.bz2/configure.in -> LiVES-1.4.5.tar.bz2/configure.in
Changed
@@ -5,7 +5,7 @@ [m4_pattern_allow([^AC_.*])]) dnl IMPORTANT !! $version must also be set to exactly the same string in smogrify -AC_INIT(LiVES,1.4.3,http://www.sourceforge.net/tracker/?group_id=64341&atid=507139) +AC_INIT(LiVES,1.4.5,http://www.sourceforge.net/tracker/?group_id=64341&atid=507139) AC_CANONICAL_HOST AC_CANONICAL_TARGET @@ -345,6 +345,28 @@ AM_CONDITIONAL(FORCE_SDL,$FORCE_SDL) +HAVE_AVCODEC=false +HAVE_AVFORMAT=false + +AC_ARG_ENABLE( ffmpeg, [ --disable-ffmpeg Disable ffmpeg (avcodec) support.] , disable_ffmpeg=yes) +if test "x$disable_ffmpeg" != "xyes" ; then + +dnl check for avcodec, avformat + +PKG_CHECK_MODULES(LIBAVCODEC,libavcodec,HAVE_AVCODEC=true,HAVE_AVCODEC=false) +AC_SUBST(LIBAVCODEC_CFLAGS) +AC_SUBST(LIBAVCODEC_LIBS) + +PKG_CHECK_MODULES(LIBAVFORMAT,libavformat,HAVE_AVFORMAT=true,HAVE_AVFORMAT=false) +AC_SUBST(LIBAVFORMAT_CFLAGS) +AC_SUBST(LIBAVFORMAT_LIBS) + +fi + +AM_CONDITIONAL(HAVE_AVCODEC,$HAVE_AVCODEC) +AM_CONDITIONAL(HAVE_AVFORMAT,$HAVE_AVFORMAT) + + HAVE_MJPEGTOOLS=false AC_ARG_ENABLE( mjpegtools, [ --disable-mjpegtools Disable mjpegtools (yuv4mpeg) support.] , disable_mjpegtools=yes) @@ -373,7 +395,18 @@ dnl Check of -lv4l1 AC_CHECK_HEADERS(linux/videodev.h, HAVE_LIBv4l1=true, HAVE_LIBv4l1=false) +if test "$HAVE_LIBv4l1" = "true"; then +v4l1_INCFILE=1 +else +AC_CHECK_HEADERS(libv4l1-videodev.h, HAVE_LIBv4l1=true, HAVE_LIBv4l1=false) +if test "$HAVE_LIBv4l1" = "true"; then +v4l1_INCFILE=2 +fi +fi + AM_CONDITIONAL(HAVE_LIBv4l1,$HAVE_LIBv4l1) +AC_SUBST(v4l1_INCFILE) + HAVE_LIBDV=false
View file
LiVES-1.4.3.tar.bz2/libOSC/Makefile.in -> LiVES-1.4.5.tar.bz2/libOSC/Makefile.in
Changed
@@ -213,6 +213,10 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ +LIBAVCODEC_CFLAGS = @LIBAVCODEC_CFLAGS@ +LIBAVCODEC_LIBS = @LIBAVCODEC_LIBS@ +LIBAVFORMAT_CFLAGS = @LIBAVFORMAT_CFLAGS@ +LIBAVFORMAT_LIBS = @LIBAVFORMAT_LIBS@ LIBDV_CFLAGS = @LIBDV_CFLAGS@ LIBDV_LIBS = @LIBDV_LIBS@ LIBICONV = @LIBICONV@ @@ -362,6 +366,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ +v4l1_INCFILE = @v4l1_INCFILE@ DEBUG_CFLAGS = SUBDIRS = . client sendOSC INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/libOSC -I$(includedir)
View file
LiVES-1.4.3.tar.bz2/libOSC/client/Makefile.in -> LiVES-1.4.5.tar.bz2/libOSC/client/Makefile.in
Changed
@@ -158,6 +158,10 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ +LIBAVCODEC_CFLAGS = @LIBAVCODEC_CFLAGS@ +LIBAVCODEC_LIBS = @LIBAVCODEC_LIBS@ +LIBAVFORMAT_CFLAGS = @LIBAVFORMAT_CFLAGS@ +LIBAVFORMAT_LIBS = @LIBAVFORMAT_LIBS@ LIBDV_CFLAGS = @LIBDV_CFLAGS@ LIBDV_LIBS = @LIBDV_LIBS@ LIBICONV = @LIBICONV@ @@ -307,6 +311,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ +v4l1_INCFILE = @v4l1_INCFILE@ DEBUG_CFLAGS = OSC_CLIENT_LIB_FILE = libOSC_client.la ALL_LIB_OPTS = -export-dynamic
View file
LiVES-1.4.3.tar.bz2/libOSC/sendOSC/Makefile.in -> LiVES-1.4.5.tar.bz2/libOSC/sendOSC/Makefile.in
Changed
@@ -159,6 +159,10 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ +LIBAVCODEC_CFLAGS = @LIBAVCODEC_CFLAGS@ +LIBAVCODEC_LIBS = @LIBAVCODEC_LIBS@ +LIBAVFORMAT_CFLAGS = @LIBAVFORMAT_CFLAGS@ +LIBAVFORMAT_LIBS = @LIBAVFORMAT_LIBS@ LIBDV_CFLAGS = @LIBDV_CFLAGS@ LIBDV_LIBS = @LIBDV_LIBS@ LIBICONV = @LIBICONV@ @@ -308,6 +312,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ +v4l1_INCFILE = @v4l1_INCFILE@ @ENABLE_OSC_TRUE@sendOSC = sendOSC @ENABLE_OSC_TRUE@LIBOSCDIR = ../client @ENABLE_OSC_TRUE@sendOSCdir = $(bindir)
View file
LiVES-1.4.3.tar.bz2/libweed/Makefile.in -> LiVES-1.4.5.tar.bz2/libweed/Makefile.in
Changed
@@ -217,6 +217,10 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ +LIBAVCODEC_CFLAGS = @LIBAVCODEC_CFLAGS@ +LIBAVCODEC_LIBS = @LIBAVCODEC_LIBS@ +LIBAVFORMAT_CFLAGS = @LIBAVFORMAT_CFLAGS@ +LIBAVFORMAT_LIBS = @LIBAVFORMAT_LIBS@ LIBDV_CFLAGS = @LIBDV_CFLAGS@ LIBDV_LIBS = @LIBDV_LIBS@ LIBICONV = @LIBICONV@ @@ -366,6 +370,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ +v4l1_INCFILE = @v4l1_INCFILE@ WEED_SO_VERSION = 0:5:0 @IS_DARWIN_FALSE@extra_ldflags = -fPIC -DPIC @IS_DARWIN_TRUE@extra_ldflags =
View file
LiVES-1.4.3.tar.bz2/lives-plugins/Makefile.in -> LiVES-1.4.5.tar.bz2/lives-plugins/Makefile.in
Changed
@@ -172,6 +172,10 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ +LIBAVCODEC_CFLAGS = @LIBAVCODEC_CFLAGS@ +LIBAVCODEC_LIBS = @LIBAVCODEC_LIBS@ +LIBAVFORMAT_CFLAGS = @LIBAVFORMAT_CFLAGS@ +LIBAVFORMAT_LIBS = @LIBAVFORMAT_LIBS@ LIBDV_CFLAGS = @LIBDV_CFLAGS@ LIBDV_LIBS = @LIBDV_LIBS@ LIBICONV = @LIBICONV@ @@ -321,6 +325,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ +v4l1_INCFILE = @v4l1_INCFILE@ SUBDIRS = icons plugins themes marcos-encoders weed-plugins all: all-recursive
View file
LiVES-1.4.3.tar.bz2/lives-plugins/icons/Makefile.in -> LiVES-1.4.5.tar.bz2/lives-plugins/icons/Makefile.in
Changed
@@ -156,6 +156,10 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ +LIBAVCODEC_CFLAGS = @LIBAVCODEC_CFLAGS@ +LIBAVCODEC_LIBS = @LIBAVCODEC_LIBS@ +LIBAVFORMAT_CFLAGS = @LIBAVFORMAT_CFLAGS@ +LIBAVFORMAT_LIBS = @LIBAVFORMAT_LIBS@ LIBDV_CFLAGS = @LIBDV_CFLAGS@ LIBDV_LIBS = @LIBDV_LIBS@ LIBICONV = @LIBICONV@ @@ -305,6 +309,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ +v4l1_INCFILE = @v4l1_INCFILE@ iconsdir = $(datadir)/$(PACKAGE)/icons icons_DATA = \ audio.png \
View file
LiVES-1.4.3.tar.bz2/lives-plugins/marcos-encoders/Makefile.in -> LiVES-1.4.5.tar.bz2/lives-plugins/marcos-encoders/Makefile.in
Changed
@@ -158,6 +158,10 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ +LIBAVCODEC_CFLAGS = @LIBAVCODEC_CFLAGS@ +LIBAVCODEC_LIBS = @LIBAVCODEC_LIBS@ +LIBAVFORMAT_CFLAGS = @LIBAVFORMAT_CFLAGS@ +LIBAVFORMAT_LIBS = @LIBAVFORMAT_LIBS@ LIBDV_CFLAGS = @LIBDV_CFLAGS@ LIBDV_LIBS = @LIBDV_LIBS@ LIBICONV = @LIBICONV@ @@ -307,6 +311,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ +v4l1_INCFILE = @v4l1_INCFILE@ marcosencodersdir = $(bindir) marcosencoders_DATA = lives_dirac_encoder \ lives_avi_encoder \
View file
LiVES-1.4.3.tar.bz2/lives-plugins/plugins/Makefile.in -> LiVES-1.4.5.tar.bz2/lives-plugins/plugins/Makefile.in
Changed
@@ -172,6 +172,10 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ +LIBAVCODEC_CFLAGS = @LIBAVCODEC_CFLAGS@ +LIBAVCODEC_LIBS = @LIBAVCODEC_LIBS@ +LIBAVFORMAT_CFLAGS = @LIBAVFORMAT_CFLAGS@ +LIBAVFORMAT_LIBS = @LIBAVFORMAT_LIBS@ LIBDV_CFLAGS = @LIBDV_CFLAGS@ LIBDV_LIBS = @LIBDV_LIBS@ LIBICONV = @LIBICONV@ @@ -321,6 +325,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ +v4l1_INCFILE = @v4l1_INCFILE@ SUBDIRS = effects encoders playback decoders all: all-recursive
View file
LiVES-1.4.3.tar.bz2/lives-plugins/plugins/decoders/Makefile.am -> LiVES-1.4.5.tar.bz2/lives-plugins/plugins/decoders/Makefile.am
Changed
@@ -41,17 +41,20 @@ endif -##experimental, does not work too well (fps and duration are often wrong; cannot seek to exact frame) -#if HAVE_AVFORMAT -#AVFORMAT_CFLAGS = -I /usr/include -#AVFORMAT_LIBS = -pthread -lavformat -lavcodec -lz -lbz2 -lfaac -lfaad -lmp3lame -lopencore-amrnb -lopencore-amrwb -ltheoraenc -ltheoradec -logg -lvpx -lx264 -lm -ljack -lX11 -lXext -lXfixes -lasound -ldl -lavutil -#avformat_libs = libzz_avformat_decoder.la -#libzz_avformat_decoder_la_SOURCES = avformat_decoder.c avformat_decoder.h -#libzz_avformat_decoder_la_CFLAGS = $(shared_cflags) $(weed_cflags) $(AVFORMAT_CFLAGS) -#libzz_avformat_decoder_la_LDFLAGS = $(shared_ldflags) $(AVFORMAT_LIBS) -#endif - - -decoderpluginslib_LTLIBRARIES = $(ogg_libs) $(dv_libs) + +if HAVE_AVFORMAT +if HAVE_AVCODEC +flv_libs = flv_decoder.la +FLVDEC_LIBS = @LIBAVCODEC_LIBS@ @LIBAVFORMAT_LIBS@ +FLVDEC_CFLAGS = @LIBAVFORMAT_CFLAGS@ @LIBAVCODEC_CFLAGS@ -Wno-deprecated-declarations +flv_decoder_la_SOURCES = flv_decoder.c flv_decoder.h +flv_decoder_la_CFLAGS = $(shared_cflags) $(weed_cflags) $(FLVDEC_CFLAGS) +flv_decoder_la_LDFLAGS = $(shared_ldflags) $(FLVDEC_LIBS) +endif +endif + + + +decoderpluginslib_LTLIBRARIES = $(ogg_libs) $(dv_libs) $(flv_libs) EXTRA_DIST = decplugin.h
View file
LiVES-1.4.3.tar.bz2/lives-plugins/plugins/decoders/Makefile.in -> LiVES-1.4.5.tar.bz2/lives-plugins/plugins/decoders/Makefile.in
Changed
@@ -100,6 +100,16 @@ $(CFLAGS) $(dv_decoder_la_LDFLAGS) $(LDFLAGS) -o $@ @HAVE_LIBDV_TRUE@am_dv_decoder_la_rpath = -rpath \ @HAVE_LIBDV_TRUE@ $(decoderpluginslibdir) +flv_decoder_la_LIBADD = +am__flv_decoder_la_SOURCES_DIST = flv_decoder.c flv_decoder.h +@HAVE_AVCODEC_TRUE@@HAVE_AVFORMAT_TRUE@am_flv_decoder_la_OBJECTS = flv_decoder_la-flv_decoder.lo +flv_decoder_la_OBJECTS = $(am_flv_decoder_la_OBJECTS) +flv_decoder_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(flv_decoder_la_CFLAGS) \ + $(CFLAGS) $(flv_decoder_la_LDFLAGS) $(LDFLAGS) -o $@ +@HAVE_AVCODEC_TRUE@@HAVE_AVFORMAT_TRUE@am_flv_decoder_la_rpath = \ +@HAVE_AVCODEC_TRUE@@HAVE_AVFORMAT_TRUE@ -rpath \ +@HAVE_AVCODEC_TRUE@@HAVE_AVFORMAT_TRUE@ $(decoderpluginslibdir) ogg_decoder_la_LIBADD = am__ogg_decoder_la_SOURCES_DIST = ogg_decoder.c ogg_decoder.h @HAVE_OGG_TRUE@am_ogg_decoder_la_OBJECTS = \ @@ -123,8 +133,10 @@ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ -SOURCES = $(dv_decoder_la_SOURCES) $(ogg_decoder_la_SOURCES) +SOURCES = $(dv_decoder_la_SOURCES) $(flv_decoder_la_SOURCES) \ + $(ogg_decoder_la_SOURCES) DIST_SOURCES = $(am__dv_decoder_la_SOURCES_DIST) \ + $(am__flv_decoder_la_SOURCES_DIST) \ $(am__ogg_decoder_la_SOURCES_DIST) ETAGS = etags CTAGS = ctags @@ -196,6 +208,10 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ +LIBAVCODEC_CFLAGS = @LIBAVCODEC_CFLAGS@ +LIBAVCODEC_LIBS = @LIBAVCODEC_LIBS@ +LIBAVFORMAT_CFLAGS = @LIBAVFORMAT_CFLAGS@ +LIBAVFORMAT_LIBS = @LIBAVFORMAT_LIBS@ LIBDV_CFLAGS = @LIBDV_CFLAGS@ LIBDV_LIBS = @LIBDV_LIBS@ LIBICONV = @LIBICONV@ @@ -345,6 +361,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ +v4l1_INCFILE = @v4l1_INCFILE@ decoderpluginslibdir = $(libdir)/$(PACKAGE)/plugins/decoders @IS_DARWIN_FALSE@shared_ldflags = -shared -fPIC -DPIC -module -avoid-version --tag=disable-static @IS_DARWIN_TRUE@shared_ldflags = -dynamiclib -module -avoid-version --tag=disable-static @@ -361,16 +378,13 @@ @HAVE_OGG_TRUE@ $(am__append_1) $(am__append_3) @HAVE_OGG_TRUE@ogg_decoder_la_LDFLAGS = $(shared_ldflags) \ @HAVE_OGG_TRUE@ $(am__append_2) $(am__append_4) - -#if HAVE_AVFORMAT -#AVFORMAT_CFLAGS = -I /usr/include -#AVFORMAT_LIBS = -pthread -lavformat -lavcodec -lz -lbz2 -lfaac -lfaad -lmp3lame -lopencore-amrnb -lopencore-amrwb -ltheoraenc -ltheoradec -logg -lvpx -lx264 -lm -ljack -lX11 -lXext -lXfixes -lasound -ldl -lavutil -#avformat_libs = libzz_avformat_decoder.la -#libzz_avformat_decoder_la_SOURCES = avformat_decoder.c avformat_decoder.h -#libzz_avformat_decoder_la_CFLAGS = $(shared_cflags) $(weed_cflags) $(AVFORMAT_CFLAGS) -#libzz_avformat_decoder_la_LDFLAGS = $(shared_ldflags) $(AVFORMAT_LIBS) -#endif -decoderpluginslib_LTLIBRARIES = $(ogg_libs) $(dv_libs) +@HAVE_AVCODEC_TRUE@@HAVE_AVFORMAT_TRUE@flv_libs = flv_decoder.la +@HAVE_AVCODEC_TRUE@@HAVE_AVFORMAT_TRUE@FLVDEC_LIBS = @LIBAVCODEC_LIBS@ @LIBAVFORMAT_LIBS@ +@HAVE_AVCODEC_TRUE@@HAVE_AVFORMAT_TRUE@FLVDEC_CFLAGS = @LIBAVFORMAT_CFLAGS@ @LIBAVCODEC_CFLAGS@ -Wno-deprecated-declarations +@HAVE_AVCODEC_TRUE@@HAVE_AVFORMAT_TRUE@flv_decoder_la_SOURCES = flv_decoder.c flv_decoder.h +@HAVE_AVCODEC_TRUE@@HAVE_AVFORMAT_TRUE@flv_decoder_la_CFLAGS = $(shared_cflags) $(weed_cflags) $(FLVDEC_CFLAGS) +@HAVE_AVCODEC_TRUE@@HAVE_AVFORMAT_TRUE@flv_decoder_la_LDFLAGS = $(shared_ldflags) $(FLVDEC_LIBS) +decoderpluginslib_LTLIBRARIES = $(ogg_libs) $(dv_libs) $(flv_libs) EXTRA_DIST = decplugin.h all: all-am @@ -439,6 +453,8 @@ done dv_decoder.la: $(dv_decoder_la_OBJECTS) $(dv_decoder_la_DEPENDENCIES) $(dv_decoder_la_LINK) $(am_dv_decoder_la_rpath) $(dv_decoder_la_OBJECTS) $(dv_decoder_la_LIBADD) $(LIBS) +flv_decoder.la: $(flv_decoder_la_OBJECTS) $(flv_decoder_la_DEPENDENCIES) + $(flv_decoder_la_LINK) $(am_flv_decoder_la_rpath) $(flv_decoder_la_OBJECTS) $(flv_decoder_la_LIBADD) $(LIBS) ogg_decoder.la: $(ogg_decoder_la_OBJECTS) $(ogg_decoder_la_DEPENDENCIES) $(ogg_decoder_la_LINK) $(am_ogg_decoder_la_rpath) $(ogg_decoder_la_OBJECTS) $(ogg_decoder_la_LIBADD) $(LIBS) @@ -449,6 +465,7 @@ -rm -f *.tab.c @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dv_decoder_la-dv_decoder.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/flv_decoder_la-flv_decoder.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ogg_decoder_la-ogg_decoder.Plo@am__quote@ .c.o: @@ -479,6 +496,13 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(dv_decoder_la_CFLAGS) $(CFLAGS) -c -o dv_decoder_la-dv_decoder.lo `test -f 'dv_decoder.c' || echo '$(srcdir)/'`dv_decoder.c +flv_decoder_la-flv_decoder.lo: flv_decoder.c +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(flv_decoder_la_CFLAGS) $(CFLAGS) -MT flv_decoder_la-flv_decoder.lo -MD -MP -MF $(DEPDIR)/flv_decoder_la-flv_decoder.Tpo -c -o flv_decoder_la-flv_decoder.lo `test -f 'flv_decoder.c' || echo '$(srcdir)/'`flv_decoder.c +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/flv_decoder_la-flv_decoder.Tpo $(DEPDIR)/flv_decoder_la-flv_decoder.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='flv_decoder.c' object='flv_decoder_la-flv_decoder.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(flv_decoder_la_CFLAGS) $(CFLAGS) -c -o flv_decoder_la-flv_decoder.lo `test -f 'flv_decoder.c' || echo '$(srcdir)/'`flv_decoder.c + ogg_decoder_la-ogg_decoder.lo: ogg_decoder.c @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ogg_decoder_la_CFLAGS) $(CFLAGS) -MT ogg_decoder_la-ogg_decoder.lo -MD -MP -MF $(DEPDIR)/ogg_decoder_la-ogg_decoder.Tpo -c -o ogg_decoder_la-ogg_decoder.lo `test -f 'ogg_decoder.c' || echo '$(srcdir)/'`ogg_decoder.c @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ogg_decoder_la-ogg_decoder.Tpo $(DEPDIR)/ogg_decoder_la-ogg_decoder.Plo
View file
LiVES-1.4.3.tar.bz2/lives-plugins/plugins/decoders/decplugin.h -> LiVES-1.4.5.tar.bz2/lives-plugins/plugins/decoders/decplugin.h
Changed
@@ -71,14 +71,14 @@ /// for primary pixel plane int offs_x; int offs_y; - int frame_width; + int frame_width; ///< frame is the surrounding part, including any black border (>=width) int frame_height; - float par; ///< pixel aspect ratio + float par; ///< pixel aspect ratio (sample width / sample height) float fps; - int *palettes; + int *palettes; ///< list of palettes which the format supports, terminated with WEED_PALETTE_END /// plugin should init this to palettes[0] if URI changes int current_palette; ///< current palette [rw host]; must be contained in palettes @@ -113,10 +113,12 @@ /// /// plugin may or may not check current_palette to see if it is valid +// should be threadsafe, and clip_data should be freed with clip_data_free() when no longer required + lives_clip_data_t *get_clip_data(const char *URI, lives_clip_data_t *clip_data); /// frame starts at 0 -boolean get_frame(const lives_clip_data_t *cdata, int64_t frame, void **pixel_data); + boolean get_frame(const lives_clip_data_t *cdata, int64_t frame, int *rowstrides, int height, void **pixel_data); /// free clip data - this should be called for each instance before unloading the module void clip_data_free(lives_clip_data_t *); @@ -139,7 +141,7 @@ #define MK_FOURCC(a, b, c, d) ((a<<24)|(b<<16)|(c<<8)|d) - +#define ABS(a) ((a)>=0.?(a):-(a))
View file
LiVES-1.4.3.tar.bz2/lives-plugins/plugins/decoders/dv_decoder.c -> LiVES-1.4.5.tar.bz2/lives-plugins/plugins/decoders/dv_decoder.c
Changed
@@ -214,7 +214,7 @@ cdata->width=360; cdata->YUV_clamping=WEED_YUV_CLAMPING_UNCLAMPED; cdata->YUV_subspace=WEED_YUV_SUBSPACE_YCBCR; - cdata->YUV_sampling=WEED_YUV_SAMPLING_DEFAULT; // TODO - may be different for PAL/NTSC + cdata->YUV_sampling=WEED_YUV_SAMPLING_DEFAULT; break; case WEED_PALETTE_RGB24: cdata->width=720; @@ -309,10 +309,10 @@ int64_t rip_audio (const lives_clip_data_t *cdata, const char *fname, int64_t stframe, int64_t nframes, unsigned char **abuff) { // rip audio from (video) frame stframe, length nframes (video) frames from cdata - // to file fname - - // if nframes==0, rip all audio + // to file fname * + // if nframes==0, rip all audio + // stframe starts at 0 // (output seems to be always 16bit per sample @@ -327,7 +327,7 @@ // return number of samples written - // if fname is NULL we write to abuff instead (unless abuff is NULL) + // * if fname is NULL we write to abuff instead (unless abuff is NULL) int i,ch,channels,samples,samps_out; @@ -345,7 +345,7 @@ if (fname==NULL&&abuff==NULL) return 0; if (nframes==0) nframes=cdata->nframes; - if (nframes>cdata->nframes) nframes=cdata->nframes; + if (nframes+stframe>cdata->nframes) nframes=cdata->nframes-stframe; xframes=nframes; @@ -373,7 +373,7 @@ // do this last so host knows we are ready if (fname!=NULL) { - if ((priv->audio_fd=open(fname,O_WRONLY|O_CREAT,S_IRUSR|S_IWUSR))==-1) { + if ((priv->audio_fd=open(fname,O_WRONLY|O_CREAT|O_APPEND,S_IRUSR|S_IWUSR))==-1) { fprintf(stderr, "dv_decoder: unable to open output %s\n",fname); return 0; } @@ -491,7 +491,7 @@ -boolean get_frame(const lives_clip_data_t *cdata, int64_t tframe, void **pixel_data) { +boolean get_frame(const lives_clip_data_t *cdata, int64_t tframe, int *rowstrides, int height, void **pixel_data) { // seek to frame, and return width, height and pixel_data // tframe starts at 0 @@ -500,8 +500,6 @@ uint8_t fbuffer[priv->frame_size]; - int rowstrides[1]; - int64_t frame=tframe; off64_t bytes=frame*priv->frame_size; @@ -514,15 +512,12 @@ switch (cdata->current_palette) { case WEED_PALETTE_RGB24: - rowstrides[0]=cdata->width*3; dv_decode_full_frame(priv->dv_dec,fbuffer,e_dv_color_rgb,(uint8_t **)pixel_data,rowstrides); break; case WEED_PALETTE_BGR24: - rowstrides[0]=cdata->width*3; dv_decode_full_frame(priv->dv_dec,fbuffer,e_dv_color_bgr0,(uint8_t **)pixel_data,rowstrides); break; case WEED_PALETTE_YUYV8888: - rowstrides[0]=cdata->width*4; // 4 bytes per macropixel dv_decode_full_frame(priv->dv_dec,fbuffer,e_dv_color_yuv,(uint8_t **)pixel_data,rowstrides); break; default:
View file
LiVES-1.4.5.tar.bz2/lives-plugins/plugins/decoders/flv_decoder.c
Added
@@ -0,0 +1,1552 @@ +// LiVES - flv decoder plugin +// (c) G. Finch 2011 <salsaman@xs4all.nl> +// released under the GNU GPL 3 or later +// see file COPYING or www.gnu.org for details + +#include <stdio.h> +#include <string.h> +#include <fcntl.h> +#include <unistd.h> +#include <stdlib.h> +#include <math.h> + +const char *plugin_version="LiVES flv decoder version 0.1"; + +#ifdef HAVE_AV_CONFIG_H +#undef HAVE_AV_CONFIG_H +#endif + +#include <libavcodec/avcodec.h> + +#include "decplugin.h" +#include "flv_decoder.h" + +//////////////////////////////////////////////////////////////////////////// + +static int pix_fmt_to_palette(enum PixelFormat pix_fmt, int *clamped) { + + switch (pix_fmt) { + case PIX_FMT_RGB24: + return WEED_PALETTE_RGB24; + case PIX_FMT_BGR24: + return WEED_PALETTE_BGR24; + case PIX_FMT_RGBA: + return WEED_PALETTE_RGBA32; + case PIX_FMT_BGRA: + return WEED_PALETTE_BGRA32; + case PIX_FMT_ARGB: + return WEED_PALETTE_ARGB32; + case PIX_FMT_YUV444P: + return WEED_PALETTE_YUV444P; + case PIX_FMT_YUV422P: + return WEED_PALETTE_YUV422P; + case PIX_FMT_YUV420P: + return WEED_PALETTE_YUV420P; + case PIX_FMT_YUYV422: + return WEED_PALETTE_YUYV; + case PIX_FMT_UYVY422: + return WEED_PALETTE_UYVY; + case PIX_FMT_UYYVYY411: + return WEED_PALETTE_YUV411; + case PIX_FMT_GRAY8: + case PIX_FMT_Y400A: + return WEED_PALETTE_A8; + case PIX_FMT_MONOWHITE: + case PIX_FMT_MONOBLACK: + return WEED_PALETTE_A1; + case PIX_FMT_YUVJ422P: + if (clamped) *clamped=WEED_YUV_CLAMPING_UNCLAMPED; + return WEED_PALETTE_YUV422P; + case PIX_FMT_YUVJ444P: + if (clamped) *clamped=WEED_YUV_CLAMPING_UNCLAMPED; + return WEED_PALETTE_YUV444P; + case PIX_FMT_YUVJ420P: + if (clamped) *clamped=WEED_YUV_CLAMPING_UNCLAMPED; + return WEED_PALETTE_YUV420P; + + default: + return WEED_PALETTE_END; + } +} + + + +/* can enable this later to handle pix_fmt (35) - YUVA4204P */ +/* +static void convert_quad_chroma(guchar *src, int width, int height, guchar *dest) { + // width and height here are width and height of dest chroma planes, in bytes + + // double the chroma samples vertically and horizontally, with interpolation, eg. 420p to 444p + + // output to planes + + register int i,j; + guchar *d_u=dest,*s_u=src; + gboolean chroma=FALSE; + int height2=height; + int width2=width; + + height>>=1; + width>>=1; + + // for this algorithm, we assume chroma samples are aligned like mpeg + + for (i=0;i<height2;i++) { + d_u[0]=d_u[1]=s_u[0]; + for (j=2;j<width2;j+=2) { + d_u[j+1]=d_u[j]=s_u[(j>>1)]; + d_u[j-1]=avg_chroma(d_u[j-1],d_u[j]); + if (!chroma&&i>0) { + // pass 2 + // average two src rows (e.g 2 with 1, 4 with 3, ... etc) for odd dst rows + // thus dst row 1 becomes average of src chroma rows 0 and 1, etc.) + d_u[j-width2]=avg_chroma(d_u[j-width2],d_u[j]); + d_u[j-1-width2]=avg_chroma(d_u[j-1-width2],d_u[j-1]); + } + } + if (!chroma&&i>0) { + d_u[j-1-width2]=avg_chroma(d_u[j-1-width2],d_u[j-1]); + } + if (chroma) { + s_u+=width; + } + chroma=!chroma; + d_u+=width2; + } +} + +*/ + +////////////////////////////////////////////// + + +static int frame_to_dts(const lives_clip_data_t *cdata, int64_t frame) { + return (int)((double)(frame)*1000./cdata->fps); +} + +static int64_t dts_to_frame(const lives_clip_data_t *cdata, int dts) { + return (int64_t)((double)dts/1000.*cdata->fps+.5); +} + +static double getfloat64(unsigned char *data) { + int64_t v=(((int64_t)(data[0]&0xFF)<<56)+((int64_t)(data[1]&0xFF)<<48)+((int64_t)(data[2]&0xFF)<<40)+((int64_t)(data[3]&0xFF)<<32)+((int64_t)(data[4]&0xFF)<<24)+((int64_t)(data[5]&0xFF)<<16)+((int64_t)(data[6]&0XFF)<<8)+(int64_t)(data[7]&0xFF)); + return ldexp(((v&((1LL<<52)-1)) + (1LL<<52)) * (v>>63|1), (v>>52&0x7FF)-1075); +} + + + +////////////////////////////////////////////////////////////////// + +static boolean lives_flv_parse_pack_header(const lives_clip_data_t *cdata, lives_flv_pack_t *pack) { + lives_flv_priv_t *priv=cdata->priv; + char data[FLV_PACK_HEADER_SIZE]; + + lseek(priv->fd,priv->input_position,SEEK_SET); + + if (read (priv->fd, data, FLV_PACK_HEADER_SIZE) < FLV_PACK_HEADER_SIZE) { + //fprintf(stderr, "flv_decoder: unable to read packet header for %s\n",cdata->URI); + return FALSE; + } + + priv->input_position+=FLV_PACK_HEADER_SIZE; + + pack->type=data[0]; + + pack->size=((data[1]&0XFF)<<16)+((data[2]&0XFF)<<8)+(data[3]&0xFF); + + pack->dts=((data[7]&0xFF)<<24)+((data[4]&0xFF)<<16)+((data[5]&0xFF)<<8)+(data[6]&0xFF); // milliseconds + + + //skip bytes 8,9,10 - stream id always 0 + + //printf("pack size of %d\n",pack->size); + + return TRUE; +} + + +static int32_t get_last_tagsize(const lives_clip_data_t *cdata) { + lives_flv_priv_t *priv=cdata->priv; + unsigned char data[4]; + + if (read (priv->fd, data, 4) < 4) return -1; + return ((data[0]&0xFF)<<24)+((data[1]&0xFF)<<16)+((data[2]&0xFF)<<8)+(data[3]&0xFF); +} + + + +static off_t get_last_packet_pos(const lives_clip_data_t *cdata) { + lives_flv_priv_t *priv=cdata->priv; + int32_t tagsize; + off_t offs=lseek(priv->fd,-4,SEEK_END); + + tagsize=get_last_tagsize(cdata); + + return offs-tagsize; +} + + +static int get_last_video_dts(const lives_clip_data_t *cdata) { + lives_flv_priv_t *priv=cdata->priv; + lives_flv_pack_t pack; + int delta,tagsize; + unsigned char flags; + off_t offs; + + priv->input_position=get_last_packet_pos(cdata); + + while (1) { + if (!lives_flv_parse_pack_header(cdata,&pack)) return -1;
View file
LiVES-1.4.5.tar.bz2/lives-plugins/plugins/decoders/flv_decoder.h
Added
@@ -0,0 +1,109 @@ +// LiVES - flv decoder plugin +// (c) G. Finch 2011 <salsaman@xs4all.nl> +// released under the GNU GPL 3 or later +// see file COPYING or www.gnu.org for details + + +// system header flags +enum { + FLV_HEADER_FLAG_HASVIDEO = 1, + FLV_HEADER_FLAG_HASAUDIO = 4, +}; + +// packet flag masks +#define FLV_AUDIO_CHANNEL_MASK 0x01 +#define FLV_AUDIO_SAMPLESIZE_MASK 0x02 +#define FLV_AUDIO_SAMPLERATE_MASK 0x0c +#define FLV_AUDIO_CODECID_MASK 0xf0 + +#define FLV_VIDEO_CODECID_MASK 0x0f +#define FLV_VIDEO_FRAMETYPE_MASK 0xf0 + + +// amf data types for metadata +typedef enum { + AMF_DATA_TYPE_NUMBER = 0x00, + AMF_DATA_TYPE_BOOL = 0x01, + AMF_DATA_TYPE_STRING = 0x02, + AMF_DATA_TYPE_OBJECT = 0x03, + AMF_DATA_TYPE_NULL = 0x05, + AMF_DATA_TYPE_UNDEFINED = 0x06, + AMF_DATA_TYPE_REFERENCE = 0x07, + AMF_DATA_TYPE_MIXEDARRAY = 0x08, + AMF_DATA_TYPE_OBJECT_END = 0x09, + AMF_DATA_TYPE_ARRAY = 0x0a, + AMF_DATA_TYPE_DATE = 0x0b, + AMF_DATA_TYPE_LONG_STRING = 0x0c, + AMF_DATA_TYPE_UNSUPPORTED = 0x0d, +} AMFDataType; + + +// video codecs +enum { + FLV_CODECID_H263 = 2, + FLV_CODECID_SCREEN = 3, + FLV_CODECID_VP6 = 4, + FLV_CODECID_VP6A = 5, + FLV_CODECID_SCREEN2 = 6, + FLV_CODECID_H264 = 7, +}; + + +// packet tags +enum { + FLV_TAG_TYPE_ERROR = 0x00, + FLV_TAG_TYPE_AUDIO = 0x08, + FLV_TAG_TYPE_VIDEO = 0x09, + FLV_TAG_TYPE_META = 0x12, +}; + + +// max data read sizes +#define FLV_PROBE_SIZE 12 +#define FLV_PACK_HEADER_SIZE 11 +#define FLV_META_SIZE 1024 + + +/////////////////////////////////////////////// + + +typedef struct { + int type; + int size; + int64_t dts; + unsigned char *data; +} lives_flv_pack_t; + + + +// TODO - this is a lazy implementation - for speed we should use bi-directional skip-lists + +typedef struct _index_entry index_entry; + +struct _index_entry { + index_entry *next; ///< ptr to next entry + int32_t dts; ///< dts of keyframe + int32_t dts_max; ///< max dts for this keyframe + uint64_t offs; ///< offset in file +}; + + + +typedef struct { + int fd; + int pack_offset; + int64_t input_position; + int64_t data_start; + AVCodec *codec; + AVCodecContext *ctx; + AVFrame *picture; + AVPacket avpkt; + int64_t last_frame; ///< last frame displayed + index_entry *idxhh; ///< head of head list (always first frame) + index_entry *idxht; ///< tail of head list + index_entry *idxth; ///< head of tail list +} lives_flv_priv_t; + +index_entry *index_upto(const lives_clip_data_t *, int pts); +index_entry *index_downto(const lives_clip_data_t *, int pts); +
View file
LiVES-1.4.3.tar.bz2/lives-plugins/plugins/decoders/ogg_decoder.c -> LiVES-1.4.5.tar.bz2/lives-plugins/plugins/decoders/ogg_decoder.c
Changed
@@ -837,7 +837,7 @@ cdata->frame_height=sformat->height; cdata->width=sformat->clean_width; - cdata->height=sformat->clean_height; + cdata->height=(sformat->clean_height>>1)<<1; if (sformat->interlaced) { @@ -2447,7 +2447,7 @@ } -boolean get_frame(const lives_clip_data_t *cdata, int64_t tframe, void **pixel_data) { +boolean get_frame(const lives_clip_data_t *cdata, int64_t tframe, int* rowstrides, int height, void **pixel_data) { // seek to frame, and return pixel_data lives_ogg_priv_t *priv=(lives_ogg_priv_t *)cdata->priv; @@ -2556,7 +2556,8 @@ //printf("cf %ld and %ld\n",tframe,priv->last_frame); - if (tframe>priv->last_frame&&(tframe-priv->last_frame<=max_frame_diff||(kframe==priv->last_kframe&&priv->vstream->stpriv->fourcc_priv==FOURCC_THEORA))) { + if (tframe>priv->last_frame&&(tframe-priv->last_frame<=max_frame_diff|| + (kframe==priv->last_kframe&&priv->vstream->stpriv->fourcc_priv==FOURCC_THEORA))) { // same keyframe as last time, or next frame; we can continue where we left off cont=TRUE; priv->skip=tframe-priv->last_frame-1; @@ -2631,13 +2632,13 @@ for (i=0;i<mheight;i++) { memcpy(pixel_data[0],y,opriv->y_width); - pixel_data[0]+=opriv->y_width; + pixel_data[0]+=rowstrides[0]; y+=yuv.y_stride; if (yuv.y_height==yuv.uv_height||crow) { memcpy(pixel_data[1],u,opriv->uv_width); memcpy(pixel_data[2],v,opriv->uv_width); - pixel_data[1]+=opriv->uv_width; - pixel_data[2]+=opriv->uv_width; + pixel_data[1]+=rowstrides[1]; + pixel_data[2]+=rowstrides[2]; u+=yuv.uv_stride; v+=yuv.uv_stride; }
View file
LiVES-1.4.3.tar.bz2/lives-plugins/plugins/effects/Makefile.in -> LiVES-1.4.5.tar.bz2/lives-plugins/plugins/effects/Makefile.in
Changed
@@ -172,6 +172,10 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ +LIBAVCODEC_CFLAGS = @LIBAVCODEC_CFLAGS@ +LIBAVCODEC_LIBS = @LIBAVCODEC_LIBS@ +LIBAVFORMAT_CFLAGS = @LIBAVFORMAT_CFLAGS@ +LIBAVFORMAT_LIBS = @LIBAVFORMAT_LIBS@ LIBDV_CFLAGS = @LIBDV_CFLAGS@ LIBDV_LIBS = @LIBDV_LIBS@ LIBICONV = @LIBICONV@ @@ -321,6 +325,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ +v4l1_INCFILE = @v4l1_INCFILE@ SUBDIRS = RFXscripts all: all-recursive
View file
LiVES-1.4.3.tar.bz2/lives-plugins/plugins/effects/RFXscripts/Makefile.in -> LiVES-1.4.5.tar.bz2/lives-plugins/plugins/effects/RFXscripts/Makefile.in
Changed
@@ -159,6 +159,10 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ +LIBAVCODEC_CFLAGS = @LIBAVCODEC_CFLAGS@ +LIBAVCODEC_LIBS = @LIBAVCODEC_LIBS@ +LIBAVFORMAT_CFLAGS = @LIBAVFORMAT_CFLAGS@ +LIBAVFORMAT_LIBS = @LIBAVFORMAT_LIBS@ LIBDV_CFLAGS = @LIBDV_CFLAGS@ LIBDV_LIBS = @LIBDV_LIBS@ LIBICONV = @LIBICONV@ @@ -308,6 +312,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ +v4l1_INCFILE = @v4l1_INCFILE@ RFXscriptsdir = $(datadir)/$(PACKAGE)/plugins/effects/RFXscripts RFXscripts_DATA = $(srcdir)/*.script EXTRA_DIST = $(RFXscripts_DATA)
View file
LiVES-1.4.5.tar.bz2/lives-plugins/plugins/effects/RFXscripts/fade_in_out.script
Added
@@ -0,0 +1,78 @@ +Script file generated from LiVES + +<define> +|1.7 +</define> + +<name> +fade_in_out +</name> + +<version> +1 +</version> + +<author> +Salsaman| +</author> + +<description> +Fade video in or out|Fading video|2|1| +</description> + +<requires> +convert +</requires> + +<params> +fcol|Fade _colour|colRGB24|0|0|0| +fin|Fade _in|bool|1|1| +fout|Fade _out|bool|0|1| +</params> + +<param_window> +layout|p0| +layout|hseparator| +layout|p1|p2| +</param_window> + +<properties> +0x0000 +</properties> + +<language_code> +0xF0 +</language_code> + +<pre> +#make overlay frame +$cstring=&RGB24_to_string($p0_red,$p0_green,$p0_blue); +`$convert_command -size $width!x$height! xc:$cstring fade$img_ext`; + +#initial value +my $fval=0.; + +#change in fade value per frame +my $fstep=100./($end-$start); + +if ($p1) { + $fval=100.; + $fstep=-$fstep; +} +</pre> + +<loop> +# blend fade image with frame, by amount $fval +system("$composite_command -compose plus -dissolve ".int($fval)." fade$img_ext -size $width!x$height! $in $out"); + +#increase or decrease fade amount +$fval+=$fstep; +</loop> + +<post> +unlink <"fade$img_ext">; +</post> + +<onchange> +</onchange> +
View file
LiVES-1.4.3.tar.bz2/lives-plugins/plugins/encoders/Makefile.in -> LiVES-1.4.5.tar.bz2/lives-plugins/plugins/encoders/Makefile.in
Changed
@@ -159,6 +159,10 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ +LIBAVCODEC_CFLAGS = @LIBAVCODEC_CFLAGS@ +LIBAVCODEC_LIBS = @LIBAVCODEC_LIBS@ +LIBAVFORMAT_CFLAGS = @LIBAVFORMAT_CFLAGS@ +LIBAVFORMAT_LIBS = @LIBAVFORMAT_LIBS@ LIBDV_CFLAGS = @LIBDV_CFLAGS@ LIBDV_LIBS = @LIBDV_LIBS@ LIBICONV = @LIBICONV@ @@ -308,6 +312,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ +v4l1_INCFILE = @v4l1_INCFILE@ encoderdir = $(libdir)/$(PACKAGE)/plugins/encoders encoder_DATA = encodedv_encoder \ ffmpeg_encoder \
View file
LiVES-1.4.3.tar.bz2/lives-plugins/plugins/encoders/x264_encoder -> LiVES-1.4.5.tar.bz2/lives-plugins/plugins/encoders/x264_encoder
Changed
@@ -78,13 +78,13 @@ print "mp4|h264/aac/mp4 (super high quality mp4)|32|none|mp4|\n"; print "divx+|DivX Plus HD|32|fps=24;24000:1001;25;30000:1001;30,hblock=8,vblock=8,minw=320,minh=240,maxw=1920,maxh=1024|mkv|\n"; - print "divx+|DivX Plus HD high framerate|32|fps=50;60000:1001;60,hblock=8,vblock=8,minw=320,minh=240,maxw=1280,maxh=720|mkv|\n"; + print "divxh+|DivX Plus HD high framerate|32|fps=50;60000:1001;60,hblock=8,vblock=8,minw=320,minh=240,maxw=1280,maxh=720|mkv|\n"; print "x264_br_1080p|x264 blu-ray 1080p NTSC (Experimental)|32|size=1920x1080,fps=24000:1001;24|mpg|\n"; # NTSC 1080p - print "x264_br_1080p|x264 blu-ray 1080p PAL (Experimental)|32|size=1920x1080,fps=25|mpg|\n"; # PAL 1080p + print "x264_br_1080pp|x264 blu-ray 1080p PAL (Experimental)|32|size=1920x1080,fps=25|mpg|\n"; # PAL 1080p print "x264_br_720p|x264 blu-ray 720p NTSC (Experimental)|32|size=1280x720,fps=60000:1001|mpg|\n"; # 720p - print "x264_br_720p|x264 blu-ray 720p PAL (Experimental)|32|size=1280x720,fps=50000:1001|mpg|\n"; # 720p + print "x264_br_720pp|x264 blu-ray 720p PAL (Experimental)|32|size=1280x720,fps=50000:1001|mpg|\n"; # 720p print "x264_br_720p|x264 blu-ray 720p 30 fps NTSC (Experimental)|32|size=1280x720,fps=30|mpg|\n"; # 720p - print "x264_br_720p|x264 blu-ray 720p 24/25 fps PAL (Experimental)|32|size=1280x720,fps=24;25|mpg|\n"; # 720p + print "x264_br_720pp|x264 blu-ray 720p 24/25 fps PAL (Experimental)|32|size=1280x720,fps=24;25|mpg|\n"; # 720p exit 0; } @@ -94,7 +94,7 @@ if ($command eq "encode") { # encode - if ($otype eq "divx+" && &location("mkvmerge") eq "") { + if (($otype eq "divx+" ||$otype eq "divxh+") && &location("mkvmerge") eq "") { print STDERR "You must install mkvmerge in order to create this file.\nTry installing the mkvtoolnix package.\n"; &sig_complete; exit 1; @@ -156,11 +156,11 @@ if ($otype eq "mp4") { $syscom="x264 --frames $end --crf 12 --threads auto --preset veryslow --tune animation $queuefile --fps $fps -o \"$ofile\""; } - elsif ($otype eq "divx+") { + elsif ($otype eq "divx+" || $otype eq "divxh+") { $syscom="x264 --frames $end --no-mixed-refs --no-weightb --weightp 0 --ref 2 --threads auto --trellis 0 --vbv-maxrate=20000 --vbv-bufsize=25000 --level 40 --bframes 3 --keyint ".($fps*4.)." $queuefile --fps $fps -o \"$ofile\""; } else { - if ($fps<=30 && $otype eq "x264_br_720p") { + if ($fps<=30 && ($otype eq "x264_br_720p" || $otype eq "x264_br_720pp")) { # do we need this for 1024p ? $fi=" --fake-interlaced"; } @@ -183,7 +183,7 @@ system("$syscom $err"); - if ($otype ne "divx+") { + if ($otype ne "divx+" && $otype ne "divxh+") { $syscom="MP4Box -fps $fps -add $ofile -add temp.aac \"$nfile\""; } else { @@ -196,7 +196,7 @@ } else { - if ($otype ne "divx+") { + if ($otype ne "divx+" && $otype ne "divxh+") { $syscom="MP4Box -fps $fps -add $ofile -add temp.aac \"$nfile\""; } else {
View file
LiVES-1.4.3.tar.bz2/lives-plugins/plugins/playback/Makefile.in -> LiVES-1.4.5.tar.bz2/lives-plugins/plugins/playback/Makefile.in
Changed
@@ -172,6 +172,10 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ +LIBAVCODEC_CFLAGS = @LIBAVCODEC_CFLAGS@ +LIBAVCODEC_LIBS = @LIBAVCODEC_LIBS@ +LIBAVFORMAT_CFLAGS = @LIBAVFORMAT_CFLAGS@ +LIBAVFORMAT_LIBS = @LIBAVFORMAT_LIBS@ LIBDV_CFLAGS = @LIBDV_CFLAGS@ LIBDV_LIBS = @LIBDV_LIBS@ LIBICONV = @LIBICONV@ @@ -321,6 +325,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ +v4l1_INCFILE = @v4l1_INCFILE@ SUBDIRS = video audiostream all: all-recursive
View file
LiVES-1.4.3.tar.bz2/lives-plugins/plugins/playback/audiostream/Makefile.in -> LiVES-1.4.5.tar.bz2/lives-plugins/plugins/playback/audiostream/Makefile.in
Changed
@@ -159,6 +159,10 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ +LIBAVCODEC_CFLAGS = @LIBAVCODEC_CFLAGS@ +LIBAVCODEC_LIBS = @LIBAVCODEC_LIBS@ +LIBAVFORMAT_CFLAGS = @LIBAVFORMAT_CFLAGS@ +LIBAVFORMAT_LIBS = @LIBAVFORMAT_LIBS@ LIBDV_CFLAGS = @LIBDV_CFLAGS@ LIBDV_LIBS = @LIBDV_LIBS@ LIBICONV = @LIBICONV@ @@ -308,6 +312,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ +v4l1_INCFILE = @v4l1_INCFILE@ astreamdir = $(libdir)/$(PACKAGE)/plugins/playback/audiostream astream_DATA = audiostreamer.pl EXTRA_DIST = $(astream_DATA)
View file
LiVES-1.4.3.tar.bz2/lives-plugins/plugins/playback/video/Makefile.am -> LiVES-1.4.5.tar.bz2/lives-plugins/plugins/playback/video/Makefile.am
Changed
@@ -53,10 +53,12 @@ SDL_la_LDFLAGS = $(shared_ldflags) $(LDFLAGS_SDL) if IS_LINUX_GNU +if HAVE_LIBv4l1 vloopback_libs = vloopback.la -vloopback_la_CFLAGS = $(shared_cflags) $(weed_cflags) +vloopback_la_CFLAGS = $(shared_cflags) $(weed_cflags) -Dv4l1_INCFILE=@v4l1_INCFILE@ vloopback_la_LDFLAGS = $(shared_ldflags) endif +endif videopluginslib_LTLIBRARIES = $(SDL_libs) $(YUV4MPEG_libs) $(oggstream_libs) $(vjack_output_libs) lives2lives_stream.la $(vloopback_libs)
View file
LiVES-1.4.3.tar.bz2/lives-plugins/plugins/playback/video/Makefile.in -> LiVES-1.4.5.tar.bz2/lives-plugins/plugins/playback/video/Makefile.in
Changed
@@ -125,8 +125,8 @@ vloopback_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(vloopback_la_CFLAGS) \ $(CFLAGS) $(vloopback_la_LDFLAGS) $(LDFLAGS) -o $@ -@IS_LINUX_GNU_TRUE@am_vloopback_la_rpath = -rpath \ -@IS_LINUX_GNU_TRUE@ $(videopluginslibdir) +@HAVE_LIBv4l1_TRUE@@IS_LINUX_GNU_TRUE@am_vloopback_la_rpath = -rpath \ +@HAVE_LIBv4l1_TRUE@@IS_LINUX_GNU_TRUE@ $(videopluginslibdir) yuv4mpeg_stream_la_LIBADD = yuv4mpeg_stream_la_SOURCES = yuv4mpeg_stream.c yuv4mpeg_stream_la_OBJECTS = yuv4mpeg_stream_la-yuv4mpeg_stream.lo @@ -223,6 +223,10 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ +LIBAVCODEC_CFLAGS = @LIBAVCODEC_CFLAGS@ +LIBAVCODEC_LIBS = @LIBAVCODEC_LIBS@ +LIBAVFORMAT_CFLAGS = @LIBAVFORMAT_CFLAGS@ +LIBAVFORMAT_LIBS = @LIBAVFORMAT_LIBS@ LIBDV_CFLAGS = @LIBDV_CFLAGS@ LIBDV_LIBS = @LIBDV_LIBS@ LIBICONV = @LIBICONV@ @@ -372,6 +376,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ +v4l1_INCFILE = @v4l1_INCFILE@ videopluginslibdir = $(libdir)/$(PACKAGE)/plugins/playback/video @IS_DARWIN_FALSE@shared_ldflags = -shared -fPIC -DPIC -module -avoid-version --tag=disable-static @IS_DARWIN_TRUE@shared_ldflags = -dynamiclib -module -avoid-version --tag=disable-static @@ -397,9 +402,9 @@ oggstream_la_LDFLAGS = $(shared_ldflags) @MJPEGTOOLS_LIBS@ SDL_la_CFLAGS = $(shared_cflags) $(CFLAGS_SDL) $(weed_cflags) SDL_la_LDFLAGS = $(shared_ldflags) $(LDFLAGS_SDL) -@IS_LINUX_GNU_TRUE@vloopback_libs = vloopback.la -@IS_LINUX_GNU_TRUE@vloopback_la_CFLAGS = $(shared_cflags) $(weed_cflags) -@IS_LINUX_GNU_TRUE@vloopback_la_LDFLAGS = $(shared_ldflags) +@HAVE_LIBv4l1_TRUE@@IS_LINUX_GNU_TRUE@vloopback_libs = vloopback.la +@HAVE_LIBv4l1_TRUE@@IS_LINUX_GNU_TRUE@vloopback_la_CFLAGS = $(shared_cflags) $(weed_cflags) -Dv4l1_INCFILE=@v4l1_INCFILE@ +@HAVE_LIBv4l1_TRUE@@IS_LINUX_GNU_TRUE@vloopback_la_LDFLAGS = $(shared_ldflags) videopluginslib_LTLIBRARIES = $(SDL_libs) $(YUV4MPEG_libs) $(oggstream_libs) $(vjack_output_libs) lives2lives_stream.la $(vloopback_libs) EXTRA_DIST = videoplugin.h all: all-am
View file
LiVES-1.4.3.tar.bz2/lives-plugins/plugins/playback/video/vloopback.c -> LiVES-1.4.5.tar.bz2/lives-plugins/plugins/playback/video/vloopback.c
Changed
@@ -22,7 +22,15 @@ #include <fcntl.h> #include <dirent.h> #include <unistd.h> + +#if v4l1_INCFILE == 2 +#include <libv4l1-videodev.h> +#else +#if v4l1_INCFILE == 1 #include <linux/videodev.h> +#endif +#endif + #include <sys/ioctl.h> static struct video_window x_vidwin;
View file
LiVES-1.4.3.tar.bz2/lives-plugins/themes/Makefile.in -> LiVES-1.4.5.tar.bz2/lives-plugins/themes/Makefile.in
Changed
@@ -196,6 +196,10 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ +LIBAVCODEC_CFLAGS = @LIBAVCODEC_CFLAGS@ +LIBAVCODEC_LIBS = @LIBAVCODEC_LIBS@ +LIBAVFORMAT_CFLAGS = @LIBAVFORMAT_CFLAGS@ +LIBAVFORMAT_LIBS = @LIBAVFORMAT_LIBS@ LIBDV_CFLAGS = @LIBDV_CFLAGS@ LIBDV_LIBS = @LIBDV_LIBS@ LIBICONV = @LIBICONV@ @@ -345,6 +349,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ +v4l1_INCFILE = @v4l1_INCFILE@ SUBDIRS = camera \ cutting_room \ pinks \
View file
LiVES-1.4.3.tar.bz2/lives-plugins/themes/camera/Makefile.in -> LiVES-1.4.5.tar.bz2/lives-plugins/themes/camera/Makefile.in
Changed
@@ -156,6 +156,10 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ +LIBAVCODEC_CFLAGS = @LIBAVCODEC_CFLAGS@ +LIBAVCODEC_LIBS = @LIBAVCODEC_LIBS@ +LIBAVFORMAT_CFLAGS = @LIBAVFORMAT_CFLAGS@ +LIBAVFORMAT_LIBS = @LIBAVFORMAT_LIBS@ LIBDV_CFLAGS = @LIBDV_CFLAGS@ LIBDV_LIBS = @LIBDV_LIBS@ LIBICONV = @LIBICONV@ @@ -305,6 +309,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ +v4l1_INCFILE = @v4l1_INCFILE@ THEME_NAME = camera themesdir = $(datadir)/$(PACKAGE)/themes/$(THEME_NAME) themes_DATA = \
View file
LiVES-1.4.3.tar.bz2/lives-plugins/themes/crayons-bright/Makefile.in -> LiVES-1.4.5.tar.bz2/lives-plugins/themes/crayons-bright/Makefile.in
Changed
@@ -156,6 +156,10 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ +LIBAVCODEC_CFLAGS = @LIBAVCODEC_CFLAGS@ +LIBAVCODEC_LIBS = @LIBAVCODEC_LIBS@ +LIBAVFORMAT_CFLAGS = @LIBAVFORMAT_CFLAGS@ +LIBAVFORMAT_LIBS = @LIBAVFORMAT_LIBS@ LIBDV_CFLAGS = @LIBDV_CFLAGS@ LIBDV_LIBS = @LIBDV_LIBS@ LIBICONV = @LIBICONV@ @@ -305,6 +309,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ +v4l1_INCFILE = @v4l1_INCFILE@ THEME_NAME = crayons-bright themesdir = $(datadir)/$(PACKAGE)/themes/$(THEME_NAME) themes_DATA = \
View file
LiVES-1.4.3.tar.bz2/lives-plugins/themes/crayons/Makefile.in -> LiVES-1.4.5.tar.bz2/lives-plugins/themes/crayons/Makefile.in
Changed
@@ -156,6 +156,10 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ +LIBAVCODEC_CFLAGS = @LIBAVCODEC_CFLAGS@ +LIBAVCODEC_LIBS = @LIBAVCODEC_LIBS@ +LIBAVFORMAT_CFLAGS = @LIBAVFORMAT_CFLAGS@ +LIBAVFORMAT_LIBS = @LIBAVFORMAT_LIBS@ LIBDV_CFLAGS = @LIBDV_CFLAGS@ LIBDV_LIBS = @LIBDV_LIBS@ LIBICONV = @LIBICONV@ @@ -305,6 +309,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ +v4l1_INCFILE = @v4l1_INCFILE@ THEME_NAME = crayons themesdir = $(datadir)/$(PACKAGE)/themes/$(THEME_NAME) themes_DATA = \
View file
LiVES-1.4.3.tar.bz2/lives-plugins/themes/cutting_room/Makefile.in -> LiVES-1.4.5.tar.bz2/lives-plugins/themes/cutting_room/Makefile.in
Changed
@@ -156,6 +156,10 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ +LIBAVCODEC_CFLAGS = @LIBAVCODEC_CFLAGS@ +LIBAVCODEC_LIBS = @LIBAVCODEC_LIBS@ +LIBAVFORMAT_CFLAGS = @LIBAVFORMAT_CFLAGS@ +LIBAVFORMAT_LIBS = @LIBAVFORMAT_LIBS@ LIBDV_CFLAGS = @LIBDV_CFLAGS@ LIBDV_LIBS = @LIBDV_LIBS@ LIBICONV = @LIBICONV@ @@ -305,6 +309,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ +v4l1_INCFILE = @v4l1_INCFILE@ THEME_NAME = cutting_room themesdir = $(datadir)/$(PACKAGE)/themes/$(THEME_NAME) themes_DATA = \
View file
LiVES-1.4.3.tar.bz2/lives-plugins/themes/editor/Makefile.in -> LiVES-1.4.5.tar.bz2/lives-plugins/themes/editor/Makefile.in
Changed
@@ -156,6 +156,10 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ +LIBAVCODEC_CFLAGS = @LIBAVCODEC_CFLAGS@ +LIBAVCODEC_LIBS = @LIBAVCODEC_LIBS@ +LIBAVFORMAT_CFLAGS = @LIBAVFORMAT_CFLAGS@ +LIBAVFORMAT_LIBS = @LIBAVFORMAT_LIBS@ LIBDV_CFLAGS = @LIBDV_CFLAGS@ LIBDV_LIBS = @LIBDV_LIBS@ LIBICONV = @LIBICONV@ @@ -305,6 +309,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ +v4l1_INCFILE = @v4l1_INCFILE@ THEME_NAME = editor themesdir = $(datadir)/$(PACKAGE)/themes/$(THEME_NAME) themes_DATA = \
View file
LiVES-1.4.3.tar.bz2/lives-plugins/themes/pinks/Makefile.in -> LiVES-1.4.5.tar.bz2/lives-plugins/themes/pinks/Makefile.in
Changed
@@ -156,6 +156,10 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ +LIBAVCODEC_CFLAGS = @LIBAVCODEC_CFLAGS@ +LIBAVCODEC_LIBS = @LIBAVCODEC_LIBS@ +LIBAVFORMAT_CFLAGS = @LIBAVFORMAT_CFLAGS@ +LIBAVFORMAT_LIBS = @LIBAVFORMAT_LIBS@ LIBDV_CFLAGS = @LIBDV_CFLAGS@ LIBDV_LIBS = @LIBDV_LIBS@ LIBICONV = @LIBICONV@ @@ -305,6 +309,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ +v4l1_INCFILE = @v4l1_INCFILE@ THEME_NAME = pinks themesdir = $(datadir)/$(PACKAGE)/themes/$(THEME_NAME) themes_DATA = \
View file
LiVES-1.4.3.tar.bz2/lives-plugins/weed-plugins/Makefile.in -> LiVES-1.4.5.tar.bz2/lives-plugins/weed-plugins/Makefile.in
Changed
@@ -351,6 +351,10 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ +LIBAVCODEC_CFLAGS = @LIBAVCODEC_CFLAGS@ +LIBAVCODEC_LIBS = @LIBAVCODEC_LIBS@ +LIBAVFORMAT_CFLAGS = @LIBAVFORMAT_CFLAGS@ +LIBAVFORMAT_LIBS = @LIBAVFORMAT_LIBS@ LIBDV_CFLAGS = @LIBDV_CFLAGS@ LIBDV_LIBS = @LIBDV_LIBS@ LIBICONV = @LIBICONV@ @@ -500,6 +504,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ +v4l1_INCFILE = @v4l1_INCFILE@ #NOTE - install-exec-local MUST go in the first subdir !! SUBDIRS = gdk
View file
LiVES-1.4.3.tar.bz2/lives-plugins/weed-plugins/fg_bg_removal.c -> LiVES-1.4.5.tar.bz2/lives-plugins/weed-plugins/fg_bg_removal.c
Changed
@@ -225,7 +225,8 @@ for (j=0;j<width-2;j+=3) { luma=calc_luma (&src[j]); - av_luma=(uint8_t)((double)luma/(double)sdata->av_count+(double)(av_luma_data[j/3]*sdata->av_count)/(double)(++sdata->av_count)); + av_luma=(uint8_t)((double)luma/(double)sdata->av_count+(double)(av_luma_data[j/3]*sdata->av_count)/(double)(sdata->av_count+1)); + sdata->av_count++; av_luma_data[j/3]=av_luma; if (ABS(luma-av_luma)<(luma_threshold)) { switch (type) {
View file
LiVES-1.4.3.tar.bz2/lives-plugins/weed-plugins/gdk/Makefile.in -> LiVES-1.4.5.tar.bz2/lives-plugins/weed-plugins/gdk/Makefile.in
Changed
@@ -198,6 +198,10 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ +LIBAVCODEC_CFLAGS = @LIBAVCODEC_CFLAGS@ +LIBAVCODEC_LIBS = @LIBAVCODEC_LIBS@ +LIBAVFORMAT_CFLAGS = @LIBAVFORMAT_CFLAGS@ +LIBAVFORMAT_LIBS = @LIBAVFORMAT_LIBS@ LIBDV_CFLAGS = @LIBDV_CFLAGS@ LIBDV_LIBS = @LIBDV_LIBS@ LIBICONV = @LIBICONV@ @@ -347,6 +351,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ +v4l1_INCFILE = @v4l1_INCFILE@ fxpluginslibdir = $(libdir)/$(PACKAGE)/plugins/effects/realtime/weed @IS_DARWIN_FALSE@shared_ldflags = -shared -fPIC -DPIC -Wl,-Bsymbolic -module -avoid-version --tag=disable-static @IS_DARWIN_TRUE@shared_ldflags = -dynamiclib -module -avoid-version --tag=disable-static
View file
LiVES-1.4.3.tar.bz2/lives-plugins/weed-plugins/gdk/puretext.c -> LiVES-1.4.5.tar.bz2/lives-plugins/weed-plugins/gdk/puretext.c
Changed
@@ -241,7 +241,7 @@ static size_t get_utf8_word_length(char *text) { // get length in words (non-spaces) - register size_t toffs; + register size_t toffs=0; int count=0; gboolean isaspace=TRUE;
View file
LiVES-1.4.3.tar.bz2/ltmain.sh -> LiVES-1.4.5.tar.bz2/ltmain.sh
Changed
@@ -65,7 +65,7 @@ # compiler: $LTCC # compiler flags: $LTCFLAGS # linker: $LD (gnu? $with_gnu_ld) -# $progname: (GNU libtool) 2.2.6b Debian-2.2.6b-2ubuntu1 +# $progname: (GNU libtool) 2.2.6b Debian-2.2.6b-2ubuntu3 # automake: $automake_version # autoconf: $autoconf_version # @@ -73,7 +73,7 @@ PROGRAM=ltmain.sh PACKAGE=libtool -VERSION="2.2.6b Debian-2.2.6b-2ubuntu1" +VERSION="2.2.6b Debian-2.2.6b-2ubuntu3" TIMESTAMP="" package_revision=1.3017
View file
LiVES-1.4.3.tar.bz2/m4/Makefile.in -> LiVES-1.4.5.tar.bz2/m4/Makefile.in
Changed
@@ -132,6 +132,10 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ +LIBAVCODEC_CFLAGS = @LIBAVCODEC_CFLAGS@ +LIBAVCODEC_LIBS = @LIBAVCODEC_LIBS@ +LIBAVFORMAT_CFLAGS = @LIBAVFORMAT_CFLAGS@ +LIBAVFORMAT_LIBS = @LIBAVFORMAT_LIBS@ LIBDV_CFLAGS = @LIBDV_CFLAGS@ LIBDV_LIBS = @LIBDV_LIBS@ LIBICONV = @LIBICONV@ @@ -281,6 +285,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ +v4l1_INCFILE = @v4l1_INCFILE@ EXTRA_DIST = codeset.m4 gettext.m4 glibc21.m4 iconv.m4 intdiv0.m4 inttypes.m4 inttypes_h.m4 inttypes-pri.m4 isc-posix.m4 lcmessage.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 progtest.m4 stdint_h.m4 uintmax_t.m4 ulonglong.m4 all: all-am
View file
LiVES-1.4.3.tar.bz2/po/ar.po -> LiVES-1.4.5.tar.bz2/po/ar.po
Changed
@@ -8,7 +8,7 @@ "Project-Id-Version: lives\n" "Report-Msgid-Bugs-To: http://www.sourceforge.net/tracker/?" "group_id=64341&atid=507139\n" -"POT-Creation-Date: 2011-06-11 19:29-0300\n" +"POT-Creation-Date: 2011-07-23 09:09-0300\n" "PO-Revision-Date: 2010-11-21 13:17+0000\n" "Last-Translator: Muhammad Negm <Unknown>\n" "Language-Team: Arabic <ar@li.org>\n" @@ -104,23 +104,23 @@ msgid "**The current layout**" msgstr "**التخطيط الحالي**" -#: src/main.c:1192 +#: src/main.c:1196 msgid "Loading realtime effect plugins..." msgstr "تحميل إضافات مؤثرات الوقت الحقيقي..." -#: src/main.c:1245 +#: src/main.c:1249 msgid "Starting jack audio server..." msgstr "بدء خادوم جاك الصوت..." -#: src/main.c:1247 +#: src/main.c:1251 msgid "Starting jack transport server..." msgstr "بدء خادوم نقل جاك" -#: src/main.c:1248 +#: src/main.c:1252 msgid "Connecting to jack transport server..." msgstr "يتصل بخادوم نقل جاك" -#: src/main.c:1275 +#: src/main.c:1279 msgid "" "\n" "\n" @@ -131,95 +131,95 @@ "Alternatively, try to start lives with either \"lives -jackopts 16\", or " msgstr "" -#: src/main.c:1299 +#: src/main.c:1303 msgid "Starting pulse audio server..." msgstr "بدء خادوم بالص-اوديو..." -#: src/main.c:1362 +#: src/main.c:1366 msgid "Checking optional dependencies:" msgstr "التحقق من إكتشاف التبعيات" -#: src/main.c:1363 +#: src/main.c:1367 msgid "mplayer...detected..." msgstr "تم العثور علي mplayer" -#: src/main.c:1364 +#: src/main.c:1368 msgid "mplayer...NOT DETECTED..." msgstr "لم يتم العثور علي mplayer" -#: src/main.c:1365 +#: src/main.c:1369 msgid "convert...detected..." msgstr "تم العثور علي convert" -#: src/main.c:1366 +#: src/main.c:1370 msgid "convert...NOT DETECTED..." msgstr "لم يتم العثور علي convert" -#: src/main.c:1367 +#: src/main.c:1371 msgid "composite...detected..." msgstr "تم العثور علي composite" -#: src/main.c:1368 +#: src/main.c:1372 msgid "composite...NOT DETECTED..." msgstr "لم يتم العثور علي composite" -#: src/main.c:1369 +#: src/main.c:1373 msgid "sox...detected\n" msgstr "تم العثور على .'sox'\n" -#: src/main.c:1370 +#: src/main.c:1374 msgid "sox...NOT DETECTED\n" msgstr "لم يتم العثور على .'sox'\n" -#: src/main.c:1371 +#: src/main.c:1375 msgid "cdda2wav...detected..." msgstr "إكتشاف...'cdda2wav'..." -#: src/main.c:1372 +#: src/main.c:1376 msgid "cdda2wav...NOT DETECTED..." msgstr "عدم إكتشاف...'cdda2wav'..." -#: src/main.c:1373 +#: src/main.c:1377 msgid "jackd...detected..." msgstr "إكتشاف ...جاك..." -#: src/main.c:1374 +#: src/main.c:1378 msgid "jackd...NOT DETECTED..." msgstr "عدم إكتشاف ...جاك..." -#: src/main.c:1375 +#: src/main.c:1379 msgid "pulse audio...detected..." msgstr "إكتشاف ...'pulse audio'..." -#: src/main.c:1376 +#: src/main.c:1380 msgid "pulse audio...NOT DETECTED..." msgstr "عدم إكتشاف ...'pulse audio'..." -#: src/main.c:1377 +#: src/main.c:1381 msgid "python...detected..." msgstr "إكتشاف ...بايثون..." -#: src/main.c:1378 +#: src/main.c:1382 msgid "python...NOT DETECTED..." msgstr "عدم إكتشاف ...بايثون..." -#: src/main.c:1379 +#: src/main.c:1383 msgid "dvgrab...detected..." msgstr "إكتشاف ...'dvgrab'..." -#: src/main.c:1380 +#: src/main.c:1384 msgid "dvgrab...NOT DETECTED..." msgstr "عدم إكتشاف ...'dvgrab'..." -#: src/main.c:1381 +#: src/main.c:1385 msgid "xwininfo...detected..." msgstr "إكتشاف ... 'xwininfo'..." -#: src/main.c:1382 +#: src/main.c:1386 msgid "xwininfo...NOT DETECTED..." msgstr "عدم إكتشاف ... 'xwininfo'..." -#: src/main.c:1385 +#: src/main.c:1389 #, c-format msgid "" "\n" @@ -230,22 +230,22 @@ "\n" "تقرير مدير النافذة كـ \"%s\"; " -#: src/main.c:1388 +#: src/main.c:1392 #, c-format msgid "number of monitors detected: %d\n" msgstr "إكتشاف عدد الشاشات %d\n" -#: src/main.c:1391 +#: src/main.c:1395 #, fuzzy, c-format msgid "Number of CPUs detected: %d\n" msgstr "إكتشاف عدد الشاشات %d\n" -#: src/main.c:1394 +#: src/main.c:1398 #, c-format msgid "Temp directory is %s\n" msgstr "مجلدات الملفات المؤقتة %s\n" -#: src/main.c:1398 +#: src/main.c:1402 msgid "" "WARNING - this version of LiVES was compiled without either\n" "jack or pulse audio support.\n" @@ -255,15 +255,15 @@ "توصيل جاك الصوت او 'pulse audio'\n" "العديد من ميزات الصوت لن تكون متوفرة\n" -#: src/main.c:1401 +#: src/main.c:1405 msgid "Compiled with jack support, good !\n" msgstr "التواصل مع جاك الصوت ، جيد !\n" -#: src/main.c:1404 +#: src/main.c:1408 msgid "Compiled with pulse audio support, wonderful !\n" msgstr "التواصل مع 'pulse audio' ، رائع !\n" -#: src/main.c:1408 +#: src/main.c:1412
View file
LiVES-1.4.3.tar.bz2/po/ca.po -> LiVES-1.4.5.tar.bz2/po/ca.po
Changed
@@ -8,7 +8,7 @@ "Project-Id-Version: lives\n" "Report-Msgid-Bugs-To: http://www.sourceforge.net/tracker/?" "group_id=64341&atid=507139\n" -"POT-Creation-Date: 2011-06-11 19:29-0300\n" +"POT-Creation-Date: 2011-07-23 09:09-0300\n" "PO-Revision-Date: 2010-02-24 17:26+0000\n" "Last-Translator: Guybrush88 <Unknown>\n" "Language-Team: Catalan <ca@li.org>\n" @@ -104,25 +104,25 @@ msgid "**The current layout**" msgstr "**El disseny actual**" -#: src/main.c:1192 +#: src/main.c:1196 msgid "Loading realtime effect plugins..." msgstr "Carregant connexió d'efectes reals" -#: src/main.c:1245 +#: src/main.c:1249 msgid "Starting jack audio server..." msgstr "Començant connexió de servidor d'audio jack..." -#: src/main.c:1247 +#: src/main.c:1251 #, fuzzy msgid "Starting jack transport server..." msgstr "Començant connexió de servidor d'audio jack..." -#: src/main.c:1248 +#: src/main.c:1252 #, fuzzy msgid "Connecting to jack transport server..." msgstr "Començant connexió de servidor d'audio jack..." -#: src/main.c:1275 +#: src/main.c:1279 msgid "" "\n" "\n" @@ -133,95 +133,95 @@ "Alternatively, try to start lives with either \"lives -jackopts 16\", or " msgstr "" -#: src/main.c:1299 +#: src/main.c:1303 msgid "Starting pulse audio server..." msgstr "Començant servidor d'audio pulsant..." -#: src/main.c:1362 +#: src/main.c:1366 msgid "Checking optional dependencies:" msgstr "Comprovant dependències opcionals:" -#: src/main.c:1363 +#: src/main.c:1367 msgid "mplayer...detected..." msgstr "mplayer...detectat..." -#: src/main.c:1364 +#: src/main.c:1368 msgid "mplayer...NOT DETECTED..." msgstr "mplayer...NO S'HA DETECTAT..." -#: src/main.c:1365 +#: src/main.c:1369 msgid "convert...detected..." msgstr "detectat convertidor" -#: src/main.c:1366 +#: src/main.c:1370 msgid "convert...NOT DETECTED..." msgstr "NO S'HA DETECTAT convertidor" -#: src/main.c:1367 +#: src/main.c:1371 msgid "composite...detected..." msgstr "detectada composició" -#: src/main.c:1368 +#: src/main.c:1372 msgid "composite...NOT DETECTED..." msgstr "NO S'HA DETECTAT composició" -#: src/main.c:1369 +#: src/main.c:1373 msgid "sox...detected\n" msgstr "sox...detectat...\n" -#: src/main.c:1370 +#: src/main.c:1374 msgid "sox...NOT DETECTED\n" msgstr "sox...NO S'HA DETECTAT...\n" -#: src/main.c:1371 +#: src/main.c:1375 msgid "cdda2wav...detected..." msgstr "cdda2wav...detectat..." -#: src/main.c:1372 +#: src/main.c:1376 msgid "cdda2wav...NOT DETECTED..." msgstr "cdda2wav...NO S'HA DETECTAT..." -#: src/main.c:1373 +#: src/main.c:1377 msgid "jackd...detected..." msgstr "jackd...detectat..." -#: src/main.c:1374 +#: src/main.c:1378 msgid "jackd...NOT DETECTED..." msgstr "jackd...NO S'HA DETECTAT..." -#: src/main.c:1375 +#: src/main.c:1379 msgid "pulse audio...detected..." msgstr "pulse audio...detectat..." -#: src/main.c:1376 +#: src/main.c:1380 msgid "pulse audio...NOT DETECTED..." msgstr "pulse audio...NO S'HA DETECTAT..." -#: src/main.c:1377 +#: src/main.c:1381 msgid "python...detected..." msgstr "python...detectat..." -#: src/main.c:1378 +#: src/main.c:1382 msgid "python...NOT DETECTED..." msgstr "python...NO S'HA DETECTAT..." -#: src/main.c:1379 +#: src/main.c:1383 msgid "dvgrab...detected..." msgstr "dvgrab...detectat..." -#: src/main.c:1380 +#: src/main.c:1384 msgid "dvgrab...NOT DETECTED..." msgstr "dvgrab...NO S'HA DETECTAT..." -#: src/main.c:1381 +#: src/main.c:1385 msgid "xwininfo...detected..." msgstr "xwininfo...detectat..." -#: src/main.c:1382 +#: src/main.c:1386 msgid "xwininfo...NOT DETECTED..." msgstr "xwininfo...NO S'HA DETECTAT..." -#: src/main.c:1385 +#: src/main.c:1389 #, c-format msgid "" "\n" @@ -232,37 +232,37 @@ "\n" "Administrador Finestra d'informes com \"%s\"; " -#: src/main.c:1388 +#: src/main.c:1392 #, c-format msgid "number of monitors detected: %d\n" msgstr "nombre de monitors detectat: %d\n" -#: src/main.c:1391 +#: src/main.c:1395 #, fuzzy, c-format msgid "Number of CPUs detected: %d\n" msgstr "nombre de monitors detectat: %d\n" -#: src/main.c:1394 +#: src/main.c:1398 #, c-format msgid "Temp directory is %s\n" msgstr "Directori temporal és %s\n" -#: src/main.c:1398 +#: src/main.c:1402 msgid "" "WARNING - this version of LiVES was compiled without either\n" "jack or pulse audio support.\n" "Many audio features will be unavailable.\n" msgstr "" -#: src/main.c:1401 +#: src/main.c:1405 msgid "Compiled with jack support, good !\n" msgstr "Compilat amb suport per a jack, bé !\n" -#: src/main.c:1404 +#: src/main.c:1408 msgid "Compiled with pulse audio support, wonderful !\n" msgstr "Compilat amb suport pulse audio, meravellós !\n" -#: src/main.c:1408
View file
LiVES-1.4.3.tar.bz2/po/cs.po -> LiVES-1.4.5.tar.bz2/po/cs.po
Changed
@@ -8,7 +8,7 @@ "Project-Id-Version: LiVEScz\n" "Report-Msgid-Bugs-To: http://www.sourceforge.net/tracker/?" "group_id=64341&atid=507139\n" -"POT-Creation-Date: 2011-06-11 19:29-0300\n" +"POT-Creation-Date: 2011-07-23 09:09-0300\n" "PO-Revision-Date: 2010-01-17 09:42+0000\n" "Last-Translator: Guybrush88 <Unknown>\n" "Language-Team: <martin@svobodicz.com, ales@mur.at>\n" @@ -103,25 +103,25 @@ msgid "**The current layout**" msgstr "**Bieżący układ**" -#: src/main.c:1192 +#: src/main.c:1196 msgid "Loading realtime effect plugins..." msgstr "Načítám pluginy pro efekty v reálném času..." -#: src/main.c:1245 +#: src/main.c:1249 msgid "Starting jack audio server..." msgstr "Spouštím zvukový server JACK..." -#: src/main.c:1247 +#: src/main.c:1251 #, fuzzy msgid "Starting jack transport server..." msgstr "Spouštím zvukový server JACK..." -#: src/main.c:1248 +#: src/main.c:1252 #, fuzzy msgid "Connecting to jack transport server..." msgstr "Spouštím zvukový server JACK..." -#: src/main.c:1275 +#: src/main.c:1279 #, fuzzy msgid "" "\n" @@ -141,95 +141,95 @@ "Případně můžete spustit LiVES příkazem: lives -aplayer sox\n" "\n" -#: src/main.c:1299 +#: src/main.c:1303 msgid "Starting pulse audio server..." msgstr "" -#: src/main.c:1362 +#: src/main.c:1366 msgid "Checking optional dependencies:" msgstr "Kontrola dodatečných závislostí:" -#: src/main.c:1363 +#: src/main.c:1367 msgid "mplayer...detected..." msgstr "mplayer... nalezen..." -#: src/main.c:1364 +#: src/main.c:1368 msgid "mplayer...NOT DETECTED..." msgstr "mplayer... NENALEZEN..." -#: src/main.c:1365 +#: src/main.c:1369 msgid "convert...detected..." msgstr "convert... nalezen..." -#: src/main.c:1366 +#: src/main.c:1370 msgid "convert...NOT DETECTED..." msgstr "convert... NENALEZEN..." -#: src/main.c:1367 +#: src/main.c:1371 msgid "composite...detected..." msgstr "composite... nalezen..." -#: src/main.c:1368 +#: src/main.c:1372 msgid "composite...NOT DETECTED..." msgstr "composite... NENALEZEN..." -#: src/main.c:1369 +#: src/main.c:1373 msgid "sox...detected\n" msgstr "sox... nalezen\n" -#: src/main.c:1370 +#: src/main.c:1374 msgid "sox...NOT DETECTED\n" msgstr "sox... NENALEZEN\n" -#: src/main.c:1371 +#: src/main.c:1375 msgid "cdda2wav...detected..." msgstr "cdda2wav... nalezen..." -#: src/main.c:1372 +#: src/main.c:1376 msgid "cdda2wav...NOT DETECTED..." msgstr "cdda2wav... NENALEZEN..." -#: src/main.c:1373 +#: src/main.c:1377 msgid "jackd...detected..." msgstr "jackd... nalezen..." -#: src/main.c:1374 +#: src/main.c:1378 msgid "jackd...NOT DETECTED..." msgstr "jackd... NENALEZEN..." -#: src/main.c:1375 +#: src/main.c:1379 msgid "pulse audio...detected..." msgstr "pulse audio...wykryto..." -#: src/main.c:1376 +#: src/main.c:1380 msgid "pulse audio...NOT DETECTED..." msgstr "pulse audio...NIE WYKRYTO..." -#: src/main.c:1377 +#: src/main.c:1381 msgid "python...detected..." msgstr "python... nalezen..." -#: src/main.c:1378 +#: src/main.c:1382 msgid "python...NOT DETECTED..." msgstr "python... NENALEZEN..." -#: src/main.c:1379 +#: src/main.c:1383 msgid "dvgrab...detected..." msgstr "dvgrab... nalezen..." -#: src/main.c:1380 +#: src/main.c:1384 msgid "dvgrab...NOT DETECTED..." msgstr "dvgrab... NENALEZEN..." -#: src/main.c:1381 +#: src/main.c:1385 msgid "xwininfo...detected..." msgstr "xwininfo... nalezeno..." -#: src/main.c:1382 +#: src/main.c:1386 msgid "xwininfo...NOT DETECTED..." msgstr "xwininfo... NENALEZENO..." -#: src/main.c:1385 +#: src/main.c:1389 #, c-format msgid "" "\n" @@ -240,37 +240,37 @@ "\n" "Správcem oken je \"%s\"; " -#: src/main.c:1388 +#: src/main.c:1392 #, c-format msgid "number of monitors detected: %d\n" msgstr "počet nalezených monitorů: %d\n" -#: src/main.c:1391 +#: src/main.c:1395 #, fuzzy, c-format msgid "Number of CPUs detected: %d\n" msgstr "počet nalezených monitorů: %d\n" -#: src/main.c:1394 +#: src/main.c:1398 #, c-format msgid "Temp directory is %s\n" msgstr "Složka pro dočasné soubory je %s\n" -#: src/main.c:1398 +#: src/main.c:1402 msgid "" "WARNING - this version of LiVES was compiled without either\n" "jack or pulse audio support.\n" "Many audio features will be unavailable.\n" msgstr "" -#: src/main.c:1401 +#: src/main.c:1405 msgid "Compiled with jack support, good !\n" msgstr "Zkompilováno s podporou Jacku, dobrá práce!\n" -#: src/main.c:1404 +#: src/main.c:1408 msgid "Compiled with pulse audio support, wonderful !\n" msgstr "Kompilován s podporou pulse audio, skvělé !\n" -#: src/main.c:1408
View file
LiVES-1.4.3.tar.bz2/po/da.po -> LiVES-1.4.5.tar.bz2/po/da.po
Changed
@@ -8,7 +8,7 @@ "Project-Id-Version: lives\n" "Report-Msgid-Bugs-To: http://www.sourceforge.net/tracker/?" "group_id=64341&atid=507139\n" -"POT-Creation-Date: 2011-06-11 19:29-0300\n" +"POT-Creation-Date: 2011-07-23 09:09-0300\n" "PO-Revision-Date: 2010-04-11 02:27+0000\n" "Last-Translator: AJenbo <anders@jenbo.dk>\n" "Language-Team: Danish <da@li.org>\n" @@ -90,23 +90,23 @@ msgid "**The current layout**" msgstr "" -#: src/main.c:1192 +#: src/main.c:1196 msgid "Loading realtime effect plugins..." msgstr "" -#: src/main.c:1245 +#: src/main.c:1249 msgid "Starting jack audio server..." msgstr "" -#: src/main.c:1247 +#: src/main.c:1251 msgid "Starting jack transport server..." msgstr "" -#: src/main.c:1248 +#: src/main.c:1252 msgid "Connecting to jack transport server..." msgstr "" -#: src/main.c:1275 +#: src/main.c:1279 msgid "" "\n" "\n" @@ -117,95 +117,95 @@ "Alternatively, try to start lives with either \"lives -jackopts 16\", or " msgstr "" -#: src/main.c:1299 +#: src/main.c:1303 msgid "Starting pulse audio server..." msgstr "" -#: src/main.c:1362 +#: src/main.c:1366 msgid "Checking optional dependencies:" msgstr "" -#: src/main.c:1363 +#: src/main.c:1367 msgid "mplayer...detected..." msgstr "" -#: src/main.c:1364 +#: src/main.c:1368 msgid "mplayer...NOT DETECTED..." msgstr "" -#: src/main.c:1365 +#: src/main.c:1369 msgid "convert...detected..." msgstr "" -#: src/main.c:1366 +#: src/main.c:1370 msgid "convert...NOT DETECTED..." msgstr "" -#: src/main.c:1367 +#: src/main.c:1371 msgid "composite...detected..." msgstr "" -#: src/main.c:1368 +#: src/main.c:1372 msgid "composite...NOT DETECTED..." msgstr "" -#: src/main.c:1369 +#: src/main.c:1373 msgid "sox...detected\n" msgstr "" -#: src/main.c:1370 +#: src/main.c:1374 msgid "sox...NOT DETECTED\n" msgstr "" -#: src/main.c:1371 +#: src/main.c:1375 msgid "cdda2wav...detected..." msgstr "" -#: src/main.c:1372 +#: src/main.c:1376 msgid "cdda2wav...NOT DETECTED..." msgstr "" -#: src/main.c:1373 +#: src/main.c:1377 msgid "jackd...detected..." msgstr "" -#: src/main.c:1374 +#: src/main.c:1378 msgid "jackd...NOT DETECTED..." msgstr "" -#: src/main.c:1375 +#: src/main.c:1379 msgid "pulse audio...detected..." msgstr "" -#: src/main.c:1376 +#: src/main.c:1380 msgid "pulse audio...NOT DETECTED..." msgstr "" -#: src/main.c:1377 +#: src/main.c:1381 msgid "python...detected..." msgstr "" -#: src/main.c:1378 +#: src/main.c:1382 msgid "python...NOT DETECTED..." msgstr "" -#: src/main.c:1379 +#: src/main.c:1383 msgid "dvgrab...detected..." msgstr "" -#: src/main.c:1380 +#: src/main.c:1384 msgid "dvgrab...NOT DETECTED..." msgstr "" -#: src/main.c:1381 +#: src/main.c:1385 msgid "xwininfo...detected..." msgstr "" -#: src/main.c:1382 +#: src/main.c:1386 msgid "xwininfo...NOT DETECTED..." msgstr "" -#: src/main.c:1385 +#: src/main.c:1389 #, c-format msgid "" "\n" @@ -213,167 +213,171 @@ "Window manager reports as \"%s\"; " msgstr "" -#: src/main.c:1388 +#: src/main.c:1392 #, c-format msgid "number of monitors detected: %d\n" msgstr "" -#: src/main.c:1391 +#: src/main.c:1395 #, c-format msgid "Number of CPUs detected: %d\n" msgstr "" -#: src/main.c:1394 +#: src/main.c:1398 #, c-format msgid "Temp directory is %s\n" msgstr "" -#: src/main.c:1398 +#: src/main.c:1402 msgid "" "WARNING - this version of LiVES was compiled without either\n" "jack or pulse audio support.\n" "Many audio features will be unavailable.\n" msgstr "" -#: src/main.c:1401 +#: src/main.c:1405 msgid "Compiled with jack support, good !\n" msgstr "" -#: src/main.c:1404 +#: src/main.c:1408 msgid "Compiled with pulse audio support, wonderful !\n" msgstr "" -#: src/main.c:1408 +#: src/main.c:1412 #, c-format
View file
LiVES-1.4.3.tar.bz2/po/de_DE.po -> LiVES-1.4.5.tar.bz2/po/de_DE.po
Changed
@@ -3,7 +3,7 @@ "Project-Id-Version: Lives 0.9.5\n" "Report-Msgid-Bugs-To: http://www.sourceforge.net/tracker/?" "group_id=64341&atid=507139\n" -"POT-Creation-Date: 2011-06-11 19:29-0300\n" +"POT-Creation-Date: 2011-07-23 09:09-0300\n" "PO-Revision-Date: 2011-06-03 07:11+0000\n" "Last-Translator: Dominik Dehning <Unknown>\n" "Language-Team: Herbert U. Hübner <herbert.u.huebner@friendglow.net>\n" @@ -101,23 +101,23 @@ msgid "**The current layout**" msgstr "**Das aktuelle Layout**" -#: src/main.c:1192 +#: src/main.c:1196 msgid "Loading realtime effect plugins..." msgstr "Lade Echtzeiteffektplugins..." -#: src/main.c:1245 +#: src/main.c:1249 msgid "Starting jack audio server..." msgstr "Starte den Jack Audio Server..." -#: src/main.c:1247 +#: src/main.c:1251 msgid "Starting jack transport server..." msgstr "" -#: src/main.c:1248 +#: src/main.c:1252 msgid "Connecting to jack transport server..." msgstr "" -#: src/main.c:1275 +#: src/main.c:1279 msgid "" "\n" "\n" @@ -128,95 +128,95 @@ "Alternatively, try to start lives with either \"lives -jackopts 16\", or " msgstr "" -#: src/main.c:1299 +#: src/main.c:1303 msgid "Starting pulse audio server..." msgstr "Starte PulseAudio Server" -#: src/main.c:1362 +#: src/main.c:1366 msgid "Checking optional dependencies:" msgstr "Optionelle Abhängigkeiten werden überprüft:" -#: src/main.c:1363 +#: src/main.c:1367 msgid "mplayer...detected..." msgstr "mplayer ...gefunden" -#: src/main.c:1364 +#: src/main.c:1368 msgid "mplayer...NOT DETECTED..." msgstr "mplayer...nicht gefunden..." -#: src/main.c:1365 +#: src/main.c:1369 msgid "convert...detected..." msgstr "convert...gefunden..." -#: src/main.c:1366 +#: src/main.c:1370 msgid "convert...NOT DETECTED..." msgstr "convert...nicht gefunden..." -#: src/main.c:1367 +#: src/main.c:1371 msgid "composite...detected..." msgstr "composite...gefunden..." -#: src/main.c:1368 +#: src/main.c:1372 msgid "composite...NOT DETECTED..." msgstr "composite...nicht gefunden..." -#: src/main.c:1369 +#: src/main.c:1373 msgid "sox...detected\n" msgstr "SoX...gefunden\n" -#: src/main.c:1370 +#: src/main.c:1374 msgid "sox...NOT DETECTED\n" msgstr "SoX...nicht gefunden\n" -#: src/main.c:1371 +#: src/main.c:1375 msgid "cdda2wav...detected..." msgstr "cdda2wav...gefunden..." -#: src/main.c:1372 +#: src/main.c:1376 msgid "cdda2wav...NOT DETECTED..." msgstr "cdda2wav...nicht gefunden..." -#: src/main.c:1373 +#: src/main.c:1377 msgid "jackd...detected..." msgstr "jackd...gefunden..." -#: src/main.c:1374 +#: src/main.c:1378 msgid "jackd...NOT DETECTED..." msgstr "jackd...NICHT GEFUNDEN..." -#: src/main.c:1375 +#: src/main.c:1379 msgid "pulse audio...detected..." msgstr "Pulse Audio...gefunden..." -#: src/main.c:1376 +#: src/main.c:1380 msgid "pulse audio...NOT DETECTED..." msgstr "Pulse Audio...nicht gefunden..." -#: src/main.c:1377 +#: src/main.c:1381 msgid "python...detected..." msgstr "python...gefunden..." -#: src/main.c:1378 +#: src/main.c:1382 msgid "python...NOT DETECTED..." msgstr "python...NICHT GEFUNDEN..." -#: src/main.c:1379 +#: src/main.c:1383 msgid "dvgrab...detected..." msgstr "dvgrab...gefunden..." -#: src/main.c:1380 +#: src/main.c:1384 msgid "dvgrab...NOT DETECTED..." msgstr "dvgrab...NICHT GEFUNDEN..." -#: src/main.c:1381 +#: src/main.c:1385 msgid "xwininfo...detected..." msgstr "xwininfo...gefunden..." -#: src/main.c:1382 +#: src/main.c:1386 msgid "xwininfo...NOT DETECTED..." msgstr "xwininfo...NICHT GEFUNDEN..." -#: src/main.c:1385 +#: src/main.c:1389 #, c-format msgid "" "\n" @@ -227,22 +227,22 @@ "\n" "Fensterverwaltung identifiziert sich als \"%s\"; " -#: src/main.c:1388 +#: src/main.c:1392 #, c-format msgid "number of monitors detected: %d\n" msgstr "Anzahl der gefundenen Monitore: %d\n" -#: src/main.c:1391 +#: src/main.c:1395 #, c-format msgid "Number of CPUs detected: %d\n" msgstr "Anzahl der gefundenen CPUs: %d\n" -#: src/main.c:1394 +#: src/main.c:1398 #, c-format msgid "Temp directory is %s\n" msgstr "temporäres Verzeichnis ist %s\n" -#: src/main.c:1398 +#: src/main.c:1402 msgid "" "WARNING - this version of LiVES was compiled without either\n" "jack or pulse audio support.\n" @@ -252,15 +252,15 @@ "PulseAudio-Unterstützung kompiliert. Viele Audiofunktionen werden nicht " "verfügbar sein.\n" -#: src/main.c:1401 +#: src/main.c:1405 msgid "Compiled with jack support, good !\n" msgstr "Kompilliert mit Support durch jack, gut!\n" -#: src/main.c:1404 +#: src/main.c:1408 msgid "Compiled with pulse audio support, wonderful !\n" msgstr "Kompiliert mit PulseAudio-Unterstützung. Wunderbar!\n" -#: src/main.c:1408 +#: src/main.c:1412
View file
LiVES-1.4.3.tar.bz2/po/en_GB.po -> LiVES-1.4.5.tar.bz2/po/en_GB.po
Changed
@@ -8,7 +8,7 @@ "Project-Id-Version: lives\n" "Report-Msgid-Bugs-To: http://www.sourceforge.net/tracker/?" "group_id=64341&atid=507139\n" -"POT-Creation-Date: 2011-06-11 19:29-0300\n" +"POT-Creation-Date: 2011-07-23 09:09-0300\n" "PO-Revision-Date: 2010-02-22 15:36+0000\n" "Last-Translator: Robert Readman <Unknown>\n" "Language-Team: English (United Kingdom) <en_GB@li.org>\n" @@ -104,25 +104,25 @@ msgid "**The current layout**" msgstr "**The current layout**" -#: src/main.c:1192 +#: src/main.c:1196 msgid "Loading realtime effect plugins..." msgstr "Loading realtime effect plugins..." -#: src/main.c:1245 +#: src/main.c:1249 msgid "Starting jack audio server..." msgstr "Starting jack audio server..." -#: src/main.c:1247 +#: src/main.c:1251 #, fuzzy msgid "Starting jack transport server..." msgstr "Starting jack audio server..." -#: src/main.c:1248 +#: src/main.c:1252 #, fuzzy msgid "Connecting to jack transport server..." msgstr "Starting jack audio server..." -#: src/main.c:1275 +#: src/main.c:1279 #, fuzzy msgid "" "\n" @@ -141,95 +141,95 @@ "\n" "Alternatively, try to start lives with: \"lives -aplayer sox\"" -#: src/main.c:1299 +#: src/main.c:1303 msgid "Starting pulse audio server..." msgstr "Starting pulse audio server..." -#: src/main.c:1362 +#: src/main.c:1366 msgid "Checking optional dependencies:" msgstr "Checking optional dependencies:" -#: src/main.c:1363 +#: src/main.c:1367 msgid "mplayer...detected..." msgstr "mplayer...detected..." -#: src/main.c:1364 +#: src/main.c:1368 msgid "mplayer...NOT DETECTED..." msgstr "mplayer...NOT DETECTED..." -#: src/main.c:1365 +#: src/main.c:1369 msgid "convert...detected..." msgstr "convert...detected..." -#: src/main.c:1366 +#: src/main.c:1370 msgid "convert...NOT DETECTED..." msgstr "convert...NOT DETECTED..." -#: src/main.c:1367 +#: src/main.c:1371 msgid "composite...detected..." msgstr "composite...detected..." -#: src/main.c:1368 +#: src/main.c:1372 msgid "composite...NOT DETECTED..." msgstr "composite...NOT DETECTED..." -#: src/main.c:1369 +#: src/main.c:1373 msgid "sox...detected\n" msgstr "sox...detected\n" -#: src/main.c:1370 +#: src/main.c:1374 msgid "sox...NOT DETECTED\n" msgstr "sox...NOT DETECTED\n" -#: src/main.c:1371 +#: src/main.c:1375 msgid "cdda2wav...detected..." msgstr "cdda2wav...detected..." -#: src/main.c:1372 +#: src/main.c:1376 msgid "cdda2wav...NOT DETECTED..." msgstr "cdda2wav...NOT DETECTED..." -#: src/main.c:1373 +#: src/main.c:1377 msgid "jackd...detected..." msgstr "jackd...detected..." -#: src/main.c:1374 +#: src/main.c:1378 msgid "jackd...NOT DETECTED..." msgstr "jackd...NOT DETECTED..." -#: src/main.c:1375 +#: src/main.c:1379 msgid "pulse audio...detected..." msgstr "pulse audio...detected..." -#: src/main.c:1376 +#: src/main.c:1380 msgid "pulse audio...NOT DETECTED..." msgstr "pulse audio...NOT DETECTED..." -#: src/main.c:1377 +#: src/main.c:1381 msgid "python...detected..." msgstr "python...detected..." -#: src/main.c:1378 +#: src/main.c:1382 msgid "python...NOT DETECTED..." msgstr "python...NOT DETECTED..." -#: src/main.c:1379 +#: src/main.c:1383 msgid "dvgrab...detected..." msgstr "dvgrab...detected..." -#: src/main.c:1380 +#: src/main.c:1384 msgid "dvgrab...NOT DETECTED..." msgstr "dvgrab...NOT DETECTED..." -#: src/main.c:1381 +#: src/main.c:1385 msgid "xwininfo...detected..." msgstr "xwininfo...detected..." -#: src/main.c:1382 +#: src/main.c:1386 msgid "xwininfo...NOT DETECTED..." msgstr "xwininfo...NOT DETECTED..." -#: src/main.c:1385 +#: src/main.c:1389 #, c-format msgid "" "\n" @@ -240,22 +240,22 @@ "\n" "Window manager reports as \"%s\"; " -#: src/main.c:1388 +#: src/main.c:1392 #, c-format msgid "number of monitors detected: %d\n" msgstr "number of monitors detected: %d\n" -#: src/main.c:1391 +#: src/main.c:1395 #, fuzzy, c-format msgid "Number of CPUs detected: %d\n" msgstr "number of monitors detected: %d\n" -#: src/main.c:1394 +#: src/main.c:1398 #, c-format msgid "Temp directory is %s\n" msgstr "Temp directory is %s\n" -#: src/main.c:1398 +#: src/main.c:1402 msgid "" "WARNING - this version of LiVES was compiled without either\n" "jack or pulse audio support.\n" @@ -265,15 +265,15 @@ "jack or pulse audio support.\n" "Many audio features will be unavailable.\n" -#: src/main.c:1401 +#: src/main.c:1405 msgid "Compiled with jack support, good !\n" msgstr "Compiled with jack support, good !\n" -#: src/main.c:1404 +#: src/main.c:1408 msgid "Compiled with pulse audio support, wonderful !\n" msgstr "Compiled with pulse audio support, wonderful !\n"
View file
LiVES-1.4.3.tar.bz2/po/es.po -> LiVES-1.4.5.tar.bz2/po/es.po
Changed
@@ -8,7 +8,7 @@ "Project-Id-Version: lives\n" "Report-Msgid-Bugs-To: http://www.sourceforge.net/tracker/?" "group_id=64341&atid=507139\n" -"POT-Creation-Date: 2011-06-11 19:29-0300\n" +"POT-Creation-Date: 2011-07-23 09:09-0300\n" "PO-Revision-Date: 2011-02-06 10:34+0000\n" "Last-Translator: Paco Molinero <paco@byasl.com>\n" "Language-Team: Spanish <es@li.org>\n" @@ -104,23 +104,23 @@ msgid "**The current layout**" msgstr "**La disposición actual**" -#: src/main.c:1192 +#: src/main.c:1196 msgid "Loading realtime effect plugins..." msgstr "Cargando plugins de effectos en tiempo real..." -#: src/main.c:1245 +#: src/main.c:1249 msgid "Starting jack audio server..." msgstr "Iniciando el servidor de audio jack" -#: src/main.c:1247 +#: src/main.c:1251 msgid "Starting jack transport server..." msgstr "" -#: src/main.c:1248 +#: src/main.c:1252 msgid "Connecting to jack transport server..." msgstr "" -#: src/main.c:1275 +#: src/main.c:1279 msgid "" "\n" "\n" @@ -131,95 +131,95 @@ "Alternatively, try to start lives with either \"lives -jackopts 16\", or " msgstr "" -#: src/main.c:1299 +#: src/main.c:1303 msgid "Starting pulse audio server..." msgstr "Iniciando servidor pulse audio" -#: src/main.c:1362 +#: src/main.c:1366 msgid "Checking optional dependencies:" msgstr "Revisando dependencias opcionales:" -#: src/main.c:1363 +#: src/main.c:1367 msgid "mplayer...detected..." msgstr "mplayer... detectado..." -#: src/main.c:1364 +#: src/main.c:1368 msgid "mplayer...NOT DETECTED..." msgstr "mplayer... NO DETECTADO..." -#: src/main.c:1365 +#: src/main.c:1369 msgid "convert...detected..." msgstr "convert... Detectado..." -#: src/main.c:1366 +#: src/main.c:1370 msgid "convert...NOT DETECTED..." msgstr "convert... No Detectado" -#: src/main.c:1367 +#: src/main.c:1371 msgid "composite...detected..." msgstr "composite... detectado..." -#: src/main.c:1368 +#: src/main.c:1372 msgid "composite...NOT DETECTED..." msgstr "composite... No Detectado" -#: src/main.c:1369 +#: src/main.c:1373 msgid "sox...detected\n" msgstr "sox... detectado\n" -#: src/main.c:1370 +#: src/main.c:1374 msgid "sox...NOT DETECTED\n" msgstr "sox... No Detectado\n" -#: src/main.c:1371 +#: src/main.c:1375 msgid "cdda2wav...detected..." msgstr "cdda2wav... detectado" -#: src/main.c:1372 +#: src/main.c:1376 msgid "cdda2wav...NOT DETECTED..." msgstr "cdda2wav... NO DETECTADO..." -#: src/main.c:1373 +#: src/main.c:1377 msgid "jackd...detected..." msgstr "jackd... detectado..." -#: src/main.c:1374 +#: src/main.c:1378 msgid "jackd...NOT DETECTED..." msgstr "jackd... NO DETECTADO..." -#: src/main.c:1375 +#: src/main.c:1379 msgid "pulse audio...detected..." msgstr "pulse audio...detectado..." -#: src/main.c:1376 +#: src/main.c:1380 msgid "pulse audio...NOT DETECTED..." msgstr "pulse audio...NO DETECTADO..." -#: src/main.c:1377 +#: src/main.c:1381 msgid "python...detected..." msgstr "python... detectado..." -#: src/main.c:1378 +#: src/main.c:1382 msgid "python...NOT DETECTED..." msgstr "python... NO DETECTADO..." -#: src/main.c:1379 +#: src/main.c:1383 msgid "dvgrab...detected..." msgstr "dvgrab... detectado..." -#: src/main.c:1380 +#: src/main.c:1384 msgid "dvgrab...NOT DETECTED..." msgstr "dvgrab... NO DETECTADO..." -#: src/main.c:1381 +#: src/main.c:1385 msgid "xwininfo...detected..." msgstr "xwininfo... detectado..." -#: src/main.c:1382 +#: src/main.c:1386 msgid "xwininfo...NOT DETECTED..." msgstr "xwininfo... NO DETECTADO..." -#: src/main.c:1385 +#: src/main.c:1389 #, c-format msgid "" "\n" @@ -230,22 +230,22 @@ "\n" "El explorador de archivos reporta como \"%s\"; " -#: src/main.c:1388 +#: src/main.c:1392 #, c-format msgid "number of monitors detected: %d\n" msgstr "número de monitores detectados: %d\n" -#: src/main.c:1391 +#: src/main.c:1395 #, fuzzy, c-format msgid "Number of CPUs detected: %d\n" msgstr "número de monitores detectados: %d\n" -#: src/main.c:1394 +#: src/main.c:1398 #, c-format msgid "Temp directory is %s\n" msgstr "El directorio temporal es %s\n" -#: src/main.c:1398 +#: src/main.c:1402 msgid "" "WARNING - this version of LiVES was compiled without either\n" "jack or pulse audio support.\n" @@ -255,15 +255,15 @@ "compilada con soporte para jack ni pulse audio.\n" "No todas las opciones de audio estarán disponibles.\n" -#: src/main.c:1401 +#: src/main.c:1405 msgid "Compiled with jack support, good !\n" msgstr "Compilado con soporte para jack, ¡bien!\n" -#: src/main.c:1404 +#: src/main.c:1408 msgid "Compiled with pulse audio support, wonderful !\n" msgstr "Compilado con soporte de audio pulse. ¡fantástico!\n" -#: src/main.c:1408 +#: src/main.c:1412
View file
LiVES-1.4.3.tar.bz2/po/et.po -> LiVES-1.4.5.tar.bz2/po/et.po
Changed
@@ -8,7 +8,7 @@ "Project-Id-Version: lives\n" "Report-Msgid-Bugs-To: http://www.sourceforge.net/tracker/?" "group_id=64341&atid=507139\n" -"POT-Creation-Date: 2011-06-11 19:29-0300\n" +"POT-Creation-Date: 2011-07-23 09:09-0300\n" "PO-Revision-Date: 2010-09-12 13:23+0000\n" "Last-Translator: Tarmo Ilves <tarmo.ilves.001@mail.ee>\n" "Language-Team: Estonian <et@li.org>\n" @@ -104,23 +104,23 @@ msgid "**The current layout**" msgstr "**Praegune skeem**" -#: src/main.c:1192 +#: src/main.c:1196 msgid "Loading realtime effect plugins..." msgstr "Laen reaalaja efektide pluginaid..." -#: src/main.c:1245 +#: src/main.c:1249 msgid "Starting jack audio server..." msgstr "Heli serveri jack käivitamine..." -#: src/main.c:1247 +#: src/main.c:1251 msgid "Starting jack transport server..." msgstr "" -#: src/main.c:1248 +#: src/main.c:1252 msgid "Connecting to jack transport server..." msgstr "" -#: src/main.c:1275 +#: src/main.c:1279 msgid "" "\n" "\n" @@ -131,95 +131,95 @@ "Alternatively, try to start lives with either \"lives -jackopts 16\", or " msgstr "" -#: src/main.c:1299 +#: src/main.c:1303 msgid "Starting pulse audio server..." msgstr "Heli serveri pulse käivitamine..." -#: src/main.c:1362 +#: src/main.c:1366 msgid "Checking optional dependencies:" msgstr "" -#: src/main.c:1363 +#: src/main.c:1367 msgid "mplayer...detected..." msgstr "mplayer...tuvastatud..." -#: src/main.c:1364 +#: src/main.c:1368 msgid "mplayer...NOT DETECTED..." msgstr "mplayer...ei tuvastatud..." -#: src/main.c:1365 +#: src/main.c:1369 msgid "convert...detected..." msgstr "konverdi...tuvastatud..." -#: src/main.c:1366 +#: src/main.c:1370 msgid "convert...NOT DETECTED..." msgstr "konversioon...ei tuvastatud..." -#: src/main.c:1367 +#: src/main.c:1371 msgid "composite...detected..." msgstr "komposiit...tuvastatud.." -#: src/main.c:1368 +#: src/main.c:1372 msgid "composite...NOT DETECTED..." msgstr "komposiit...ei tuvastatud..." -#: src/main.c:1369 +#: src/main.c:1373 msgid "sox...detected\n" msgstr "sox...tuvastatud\n" -#: src/main.c:1370 +#: src/main.c:1374 msgid "sox...NOT DETECTED\n" msgstr "sox...ei tuvastatud\n" -#: src/main.c:1371 +#: src/main.c:1375 msgid "cdda2wav...detected..." msgstr "" -#: src/main.c:1372 +#: src/main.c:1376 msgid "cdda2wav...NOT DETECTED..." msgstr "" -#: src/main.c:1373 +#: src/main.c:1377 msgid "jackd...detected..." msgstr "" -#: src/main.c:1374 +#: src/main.c:1378 msgid "jackd...NOT DETECTED..." msgstr "" -#: src/main.c:1375 +#: src/main.c:1379 msgid "pulse audio...detected..." msgstr "" -#: src/main.c:1376 +#: src/main.c:1380 msgid "pulse audio...NOT DETECTED..." msgstr "" -#: src/main.c:1377 +#: src/main.c:1381 msgid "python...detected..." msgstr "" -#: src/main.c:1378 +#: src/main.c:1382 msgid "python...NOT DETECTED..." msgstr "" -#: src/main.c:1379 +#: src/main.c:1383 msgid "dvgrab...detected..." msgstr "" -#: src/main.c:1380 +#: src/main.c:1384 msgid "dvgrab...NOT DETECTED..." msgstr "" -#: src/main.c:1381 +#: src/main.c:1385 msgid "xwininfo...detected..." msgstr "" -#: src/main.c:1382 +#: src/main.c:1386 msgid "xwininfo...NOT DETECTED..." msgstr "" -#: src/main.c:1385 +#: src/main.c:1389 #, c-format msgid "" "\n" @@ -227,167 +227,171 @@ "Window manager reports as \"%s\"; " msgstr "" -#: src/main.c:1388 +#: src/main.c:1392 #, c-format msgid "number of monitors detected: %d\n" msgstr "" -#: src/main.c:1391 +#: src/main.c:1395 #, c-format msgid "Number of CPUs detected: %d\n" msgstr "" -#: src/main.c:1394 +#: src/main.c:1398 #, c-format msgid "Temp directory is %s\n" msgstr "" -#: src/main.c:1398 +#: src/main.c:1402 msgid "" "WARNING - this version of LiVES was compiled without either\n" "jack or pulse audio support.\n" "Many audio features will be unavailable.\n" msgstr "" -#: src/main.c:1401 +#: src/main.c:1405 msgid "Compiled with jack support, good !\n" msgstr "" -#: src/main.c:1404 +#: src/main.c:1408 msgid "Compiled with pulse audio support, wonderful !\n" msgstr "" -#: src/main.c:1408 +#: src/main.c:1412 #, c-format
View file
LiVES-1.4.3.tar.bz2/po/fi.po -> LiVES-1.4.5.tar.bz2/po/fi.po
Changed
@@ -8,7 +8,7 @@ "Project-Id-Version: lives\n" "Report-Msgid-Bugs-To: http://www.sourceforge.net/tracker/?" "group_id=64341&atid=507139\n" -"POT-Creation-Date: 2011-06-11 19:29-0300\n" +"POT-Creation-Date: 2011-07-23 09:09-0300\n" "PO-Revision-Date: 2010-08-25 20:43+0000\n" "Last-Translator: Jussi Aalto <jta_l10n@dnainternet.net>\n" "Language-Team: Finnish <fi@li.org>\n" @@ -110,23 +110,23 @@ msgid "**The current layout**" msgstr "**Nykyinen asettelu**" -#: src/main.c:1192 +#: src/main.c:1196 msgid "Loading realtime effect plugins..." msgstr "Ladataan reaaliaikaiset tehosteliitännäiset..." -#: src/main.c:1245 +#: src/main.c:1249 msgid "Starting jack audio server..." msgstr "Käynnistetään jack-äänipalvelin..." -#: src/main.c:1247 +#: src/main.c:1251 msgid "Starting jack transport server..." msgstr "Käynnistetään jack-välityspalvelin..." -#: src/main.c:1248 +#: src/main.c:1252 msgid "Connecting to jack transport server..." msgstr "Yhdistetään jack-välityspalvelimeen..." -#: src/main.c:1275 +#: src/main.c:1279 msgid "" "\n" "\n" @@ -137,95 +137,95 @@ "Alternatively, try to start lives with either \"lives -jackopts 16\", or " msgstr "" -#: src/main.c:1299 +#: src/main.c:1303 msgid "Starting pulse audio server..." msgstr "Käynnistetään pulse audio -palvelin..." -#: src/main.c:1362 +#: src/main.c:1366 msgid "Checking optional dependencies:" msgstr "Tarkistetaan valinnaiset riippuvuudet:" -#: src/main.c:1363 +#: src/main.c:1367 msgid "mplayer...detected..." msgstr "mplayer...havaittu..." -#: src/main.c:1364 +#: src/main.c:1368 msgid "mplayer...NOT DETECTED..." msgstr "mplayer...EI HAVAITTU..." -#: src/main.c:1365 +#: src/main.c:1369 msgid "convert...detected..." msgstr "convert...havaittu..." -#: src/main.c:1366 +#: src/main.c:1370 msgid "convert...NOT DETECTED..." msgstr "convert...EI HAVAITTU..." -#: src/main.c:1367 +#: src/main.c:1371 msgid "composite...detected..." msgstr "composite...havaittu..." -#: src/main.c:1368 +#: src/main.c:1372 msgid "composite...NOT DETECTED..." msgstr "composite...EI HAVAITTU..." -#: src/main.c:1369 +#: src/main.c:1373 msgid "sox...detected\n" msgstr "sox...havaittu\n" -#: src/main.c:1370 +#: src/main.c:1374 msgid "sox...NOT DETECTED\n" msgstr "sox...EI HAVAITTU\n" -#: src/main.c:1371 +#: src/main.c:1375 msgid "cdda2wav...detected..." msgstr "cdda2wav...havaittu..." -#: src/main.c:1372 +#: src/main.c:1376 msgid "cdda2wav...NOT DETECTED..." msgstr "cdda2wav...EI HAVAITTU..." -#: src/main.c:1373 +#: src/main.c:1377 msgid "jackd...detected..." msgstr "jackd...havaittu..." -#: src/main.c:1374 +#: src/main.c:1378 msgid "jackd...NOT DETECTED..." msgstr "jackd...EI HAVAITTU..." -#: src/main.c:1375 +#: src/main.c:1379 msgid "pulse audio...detected..." msgstr "pulse audio...havaittu..." -#: src/main.c:1376 +#: src/main.c:1380 msgid "pulse audio...NOT DETECTED..." msgstr "pulse audio...EI HAVAITTU..." -#: src/main.c:1377 +#: src/main.c:1381 msgid "python...detected..." msgstr "python...havaittu..." -#: src/main.c:1378 +#: src/main.c:1382 msgid "python...NOT DETECTED..." msgstr "python...EI HAVAITTU..." -#: src/main.c:1379 +#: src/main.c:1383 msgid "dvgrab...detected..." msgstr "dvgrab...havaittu..." -#: src/main.c:1380 +#: src/main.c:1384 msgid "dvgrab...NOT DETECTED..." msgstr "dvgrab...EI HAVAITTU..." -#: src/main.c:1381 +#: src/main.c:1385 msgid "xwininfo...detected..." msgstr "xwininfo...havaittu..." -#: src/main.c:1382 +#: src/main.c:1386 msgid "xwininfo...NOT DETECTED..." msgstr "xwininfo...EI HAVAITTU..." -#: src/main.c:1385 +#: src/main.c:1389 #, c-format msgid "" "\n" @@ -236,22 +236,22 @@ "\n" "Ikkunointiohjelma ilmoitti olevansa \"%s\"; " -#: src/main.c:1388 +#: src/main.c:1392 #, c-format msgid "number of monitors detected: %d\n" msgstr "näyttöjä löydetty: %d\n" -#: src/main.c:1391 +#: src/main.c:1395 #, fuzzy, c-format msgid "Number of CPUs detected: %d\n" msgstr "näyttöjä löydetty: %d\n" -#: src/main.c:1394 +#: src/main.c:1398 #, c-format msgid "Temp directory is %s\n" msgstr "Tilapäishakemisto on %s\n" -#: src/main.c:1398 +#: src/main.c:1402 msgid "" "WARNING - this version of LiVES was compiled without either\n" "jack or pulse audio support.\n" @@ -261,15 +261,15 @@ "jack- tai pulse audio -tukea.\n" "Jotkut ääniominaisuudet eivät ole käytettävissä.\n" -#: src/main.c:1401 +#: src/main.c:1405 msgid "Compiled with jack support, good !\n" msgstr "Käännetty jack-tuella, hienoa!\n" -#: src/main.c:1404 +#: src/main.c:1408 msgid "Compiled with pulse audio support, wonderful !\n" msgstr "Käännetty pulse audio -tuella, loistavaa!\n" -#: src/main.c:1408 +#: src/main.c:1412
View file
LiVES-1.4.3.tar.bz2/po/fr.po -> LiVES-1.4.5.tar.bz2/po/fr.po
Changed
@@ -10,7 +10,7 @@ "Project-Id-Version: fr\n" "Report-Msgid-Bugs-To: http://www.sourceforge.net/tracker/?" "group_id=64341&atid=507139\n" -"POT-Creation-Date: 2011-06-11 19:29-0300\n" +"POT-Creation-Date: 2011-07-23 09:09-0300\n" "PO-Revision-Date: 2010-11-08 14:42+0000\n" "Last-Translator: Nicolas Delvaux <Unknown>\n" "Language-Team: Français <kwizart@gmail.com>\n" @@ -109,23 +109,23 @@ msgid "**The current layout**" msgstr "**La configuration actuelle**" -#: src/main.c:1192 +#: src/main.c:1196 msgid "Loading realtime effect plugins..." msgstr "Chargement des plugins d'effets en temps réel" -#: src/main.c:1245 +#: src/main.c:1249 msgid "Starting jack audio server..." msgstr "Démarrage du serveur audio jack..." -#: src/main.c:1247 +#: src/main.c:1251 msgid "Starting jack transport server..." msgstr "Lancement du serveur de transport Jack..." -#: src/main.c:1248 +#: src/main.c:1252 msgid "Connecting to jack transport server..." msgstr "Connexion au serveur de transport Jack..." -#: src/main.c:1275 +#: src/main.c:1279 msgid "" "\n" "\n" @@ -136,95 +136,95 @@ "Alternatively, try to start lives with either \"lives -jackopts 16\", or " msgstr "" -#: src/main.c:1299 +#: src/main.c:1303 msgid "Starting pulse audio server..." msgstr "Initialisation du serveur audio pulse..." -#: src/main.c:1362 +#: src/main.c:1366 msgid "Checking optional dependencies:" msgstr "Verification des dépendances optionnelles:" -#: src/main.c:1363 +#: src/main.c:1367 msgid "mplayer...detected..." msgstr "mplayer....détecté..." -#: src/main.c:1364 +#: src/main.c:1368 msgid "mplayer...NOT DETECTED..." msgstr "mplayer...NON DÉTECTÉ..." -#: src/main.c:1365 +#: src/main.c:1369 msgid "convert...detected..." msgstr "convert...détecté..." -#: src/main.c:1366 +#: src/main.c:1370 msgid "convert...NOT DETECTED..." msgstr "convert...NON DÉTECTÉ..." -#: src/main.c:1367 +#: src/main.c:1371 msgid "composite...detected..." msgstr "composite...détecté..." -#: src/main.c:1368 +#: src/main.c:1372 msgid "composite...NOT DETECTED..." msgstr "composite...NON DÉTECTÉ..." -#: src/main.c:1369 +#: src/main.c:1373 msgid "sox...detected\n" msgstr "sox...détecté\n" -#: src/main.c:1370 +#: src/main.c:1374 msgid "sox...NOT DETECTED\n" msgstr "sox...NON DÉTECTÉ\n" -#: src/main.c:1371 +#: src/main.c:1375 msgid "cdda2wav...detected..." msgstr "cdda2wav...détecté..." -#: src/main.c:1372 +#: src/main.c:1376 msgid "cdda2wav...NOT DETECTED..." msgstr "cdda2wav...NON DÉTECTÉ..." -#: src/main.c:1373 +#: src/main.c:1377 msgid "jackd...detected..." msgstr "jackd...détecté..." -#: src/main.c:1374 +#: src/main.c:1378 msgid "jackd...NOT DETECTED..." msgstr "jackd...NON DÉTECTÉ..." -#: src/main.c:1375 +#: src/main.c:1379 msgid "pulse audio...detected..." msgstr "pulse audio...détecté..." -#: src/main.c:1376 +#: src/main.c:1380 msgid "pulse audio...NOT DETECTED..." msgstr "pulse audio...NON DÉTECTÉ..." -#: src/main.c:1377 +#: src/main.c:1381 msgid "python...detected..." msgstr "python...détecté..." -#: src/main.c:1378 +#: src/main.c:1382 msgid "python...NOT DETECTED..." msgstr "python...NON DÉTECTÉ..." -#: src/main.c:1379 +#: src/main.c:1383 msgid "dvgrab...detected..." msgstr "dvgrab...détecté..." -#: src/main.c:1380 +#: src/main.c:1384 msgid "dvgrab...NOT DETECTED..." msgstr "dvgrab...NON DÉTECTÉ..." -#: src/main.c:1381 +#: src/main.c:1385 msgid "xwininfo...detected..." msgstr "xwininfo...détecté..." -#: src/main.c:1382 +#: src/main.c:1386 msgid "xwininfo...NOT DETECTED..." msgstr "xwininfo...NON DÉTECTÉ..." -#: src/main.c:1385 +#: src/main.c:1389 #, c-format msgid "" "\n" @@ -235,22 +235,22 @@ "\n" "Le gestionnaire de fenêtres apparaît comme étant \"%s\"; " -#: src/main.c:1388 +#: src/main.c:1392 #, c-format msgid "number of monitors detected: %d\n" msgstr "nombre d'écrans trouvés : %d\n" -#: src/main.c:1391 +#: src/main.c:1395 #, fuzzy, c-format msgid "Number of CPUs detected: %d\n" msgstr "nombre d'écrans trouvés : %d\n" -#: src/main.c:1394 +#: src/main.c:1398 #, c-format msgid "Temp directory is %s\n" msgstr "Le dossier temporaire est %s\n" -#: src/main.c:1398 +#: src/main.c:1402 msgid "" "WARNING - this version of LiVES was compiled without either\n" "jack or pulse audio support.\n" @@ -260,15 +260,15 @@ "prise en charge de jack ou de pulse audio.\n" "De nombreuses fonctionnalités ne seront pas disponibles.\n" -#: src/main.c:1401 +#: src/main.c:1405 msgid "Compiled with jack support, good !\n" msgstr "Compilé avec le support de jack, bien !\n" -#: src/main.c:1404 +#: src/main.c:1408 msgid "Compiled with pulse audio support, wonderful !\n" msgstr "Compilé avec la prise en charge de Pulse Audio, génial !\n" -#: src/main.c:1408 +#: src/main.c:1412
View file
LiVES-1.4.3.tar.bz2/po/gl.po -> LiVES-1.4.5.tar.bz2/po/gl.po
Changed
@@ -8,7 +8,7 @@ "Project-Id-Version: lives\n" "Report-Msgid-Bugs-To: http://www.sourceforge.net/tracker/?" "group_id=64341&atid=507139\n" -"POT-Creation-Date: 2011-06-11 19:29-0300\n" +"POT-Creation-Date: 2011-07-23 09:09-0300\n" "PO-Revision-Date: 2010-02-20 19:59+0000\n" "Last-Translator: Guybrush88 <Unknown>\n" "Language-Team: Galician <gl@li.org>\n" @@ -104,23 +104,23 @@ msgid "**The current layout**" msgstr "** O esquema actual **" -#: src/main.c:1192 +#: src/main.c:1196 msgid "Loading realtime effect plugins..." msgstr "" -#: src/main.c:1245 +#: src/main.c:1249 msgid "Starting jack audio server..." msgstr "" -#: src/main.c:1247 +#: src/main.c:1251 msgid "Starting jack transport server..." msgstr "" -#: src/main.c:1248 +#: src/main.c:1252 msgid "Connecting to jack transport server..." msgstr "" -#: src/main.c:1275 +#: src/main.c:1279 msgid "" "\n" "\n" @@ -131,95 +131,95 @@ "Alternatively, try to start lives with either \"lives -jackopts 16\", or " msgstr "" -#: src/main.c:1299 +#: src/main.c:1303 msgid "Starting pulse audio server..." msgstr "" -#: src/main.c:1362 +#: src/main.c:1366 msgid "Checking optional dependencies:" msgstr "Comprobar dependencias opcionais:" -#: src/main.c:1363 +#: src/main.c:1367 msgid "mplayer...detected..." msgstr "mplayer...detectados..." -#: src/main.c:1364 +#: src/main.c:1368 msgid "mplayer...NOT DETECTED..." msgstr "mplayer...NON DETECTA..." -#: src/main.c:1365 +#: src/main.c:1369 msgid "convert...detected..." msgstr "convert...detectados..." -#: src/main.c:1366 +#: src/main.c:1370 msgid "convert...NOT DETECTED..." msgstr "convert...NON DETECTA..." -#: src/main.c:1367 +#: src/main.c:1371 msgid "composite...detected..." msgstr "composite...detectados..." -#: src/main.c:1368 +#: src/main.c:1372 msgid "composite...NOT DETECTED..." msgstr "composite...NON DETECTA..." -#: src/main.c:1369 +#: src/main.c:1373 msgid "sox...detected\n" msgstr "sox...detectados\n" -#: src/main.c:1370 +#: src/main.c:1374 msgid "sox...NOT DETECTED\n" msgstr "sox...NON DETECTA\n" -#: src/main.c:1371 +#: src/main.c:1375 msgid "cdda2wav...detected..." msgstr "cdda2wav...detectados..." -#: src/main.c:1372 +#: src/main.c:1376 msgid "cdda2wav...NOT DETECTED..." msgstr "cdda2wav...NON DETECTA..." -#: src/main.c:1373 +#: src/main.c:1377 msgid "jackd...detected..." msgstr "jackd...detectados..." -#: src/main.c:1374 +#: src/main.c:1378 msgid "jackd...NOT DETECTED..." msgstr "jackd...NON DETECTA..." -#: src/main.c:1375 +#: src/main.c:1379 msgid "pulse audio...detected..." msgstr "pulse audio...detectados..." -#: src/main.c:1376 +#: src/main.c:1380 msgid "pulse audio...NOT DETECTED..." msgstr "pulse audio...NON DETECTA..." -#: src/main.c:1377 +#: src/main.c:1381 msgid "python...detected..." msgstr "python...detectados..." -#: src/main.c:1378 +#: src/main.c:1382 msgid "python...NOT DETECTED..." msgstr "python...NON DETECTA..." -#: src/main.c:1379 +#: src/main.c:1383 msgid "dvgrab...detected..." msgstr "dvgrab...detectados..." -#: src/main.c:1380 +#: src/main.c:1384 msgid "dvgrab...NOT DETECTED..." msgstr "dvgrab...NON DETECTA..." -#: src/main.c:1381 +#: src/main.c:1385 msgid "xwininfo...detected..." msgstr "xwininfo...detectados..." -#: src/main.c:1382 +#: src/main.c:1386 msgid "xwininfo...NOT DETECTED..." msgstr "xwininfo...NON DETECTA..." -#: src/main.c:1385 +#: src/main.c:1389 #, c-format msgid "" "\n" @@ -230,37 +230,37 @@ "\n" "Informes como xestor de xanelas \"%s\"; " -#: src/main.c:1388 +#: src/main.c:1392 #, c-format msgid "number of monitors detected: %d\n" msgstr "número de monitores detectado: %d\n" -#: src/main.c:1391 +#: src/main.c:1395 #, fuzzy, c-format msgid "Number of CPUs detected: %d\n" msgstr "número de monitores detectado: %d\n" -#: src/main.c:1394 +#: src/main.c:1398 #, c-format msgid "Temp directory is %s\n" msgstr "Directorio temporal é %s\n" -#: src/main.c:1398 +#: src/main.c:1402 msgid "" "WARNING - this version of LiVES was compiled without either\n" "jack or pulse audio support.\n" "Many audio features will be unavailable.\n" msgstr "" -#: src/main.c:1401 +#: src/main.c:1405 msgid "Compiled with jack support, good !\n" msgstr "Feita con soporte a jack, boa !\n" -#: src/main.c:1404 +#: src/main.c:1408 msgid "Compiled with pulse audio support, wonderful !\n" msgstr "Feita con soporte a pulse audio, marabilloso !\n" -#: src/main.c:1408 +#: src/main.c:1412 #, c-format
View file
LiVES-1.4.3.tar.bz2/po/he.po -> LiVES-1.4.5.tar.bz2/po/he.po
Changed
@@ -8,7 +8,7 @@ "Project-Id-Version: lives\n" "Report-Msgid-Bugs-To: http://www.sourceforge.net/tracker/?" "group_id=64341&atid=507139\n" -"POT-Creation-Date: 2011-06-11 19:29-0300\n" +"POT-Creation-Date: 2011-07-23 09:09-0300\n" "PO-Revision-Date: 2010-06-30 09:14+0000\n" "Last-Translator: Liel Fridman <Unknown>\n" "Language-Team: Hebrew <he@li.org>\n" @@ -109,23 +109,23 @@ msgid "**The current layout**" msgstr "**הפריסה הנוכחית**" -#: src/main.c:1192 +#: src/main.c:1196 msgid "Loading realtime effect plugins..." msgstr "מתבצעת טעינת תוספים לאפקטים בזמן אמת..." -#: src/main.c:1245 +#: src/main.c:1249 msgid "Starting jack audio server..." msgstr "מתבצעת הפעלת שרת השמע jack..." -#: src/main.c:1247 +#: src/main.c:1251 msgid "Starting jack transport server..." msgstr "מפעיל את שרת התעבורה של jack..." -#: src/main.c:1248 +#: src/main.c:1252 msgid "Connecting to jack transport server..." msgstr "מתחבר לשרת התעבורה של jack..." -#: src/main.c:1275 +#: src/main.c:1279 #, fuzzy msgid "" "\n" @@ -145,95 +145,95 @@ "לחילופין,יש לנסות להתחיל את LiVES כך: lives -aplayer sox\n" "\n" -#: src/main.c:1299 +#: src/main.c:1303 msgid "Starting pulse audio server..." msgstr "מפעיל את שרת השמע Pulse..." -#: src/main.c:1362 +#: src/main.c:1366 msgid "Checking optional dependencies:" msgstr "מתבצעת בדיקת חבילות תלות אפשריות:" -#: src/main.c:1363 +#: src/main.c:1367 msgid "mplayer...detected..." msgstr "mplayer...זוהה..." -#: src/main.c:1364 +#: src/main.c:1368 msgid "mplayer...NOT DETECTED..." msgstr "mplayer...לא זוהה..." -#: src/main.c:1365 +#: src/main.c:1369 msgid "convert...detected..." msgstr "convert...זוהה..." -#: src/main.c:1366 +#: src/main.c:1370 msgid "convert...NOT DETECTED..." msgstr "convert...לא זוהה..." -#: src/main.c:1367 +#: src/main.c:1371 msgid "composite...detected..." msgstr "composite...זוהה..." -#: src/main.c:1368 +#: src/main.c:1372 msgid "composite...NOT DETECTED..." msgstr "composite...לא זוהה..." -#: src/main.c:1369 +#: src/main.c:1373 msgid "sox...detected\n" msgstr "sox...זוהה...\n" -#: src/main.c:1370 +#: src/main.c:1374 msgid "sox...NOT DETECTED\n" msgstr "sox...לא זוהה...\n" -#: src/main.c:1371 +#: src/main.c:1375 msgid "cdda2wav...detected..." msgstr "cdda2wav...זוהה" -#: src/main.c:1372 +#: src/main.c:1376 msgid "cdda2wav...NOT DETECTED..." msgstr "cdda2wav...לא זוהה" -#: src/main.c:1373 +#: src/main.c:1377 msgid "jackd...detected..." msgstr "jackd...זוהה..." -#: src/main.c:1374 +#: src/main.c:1378 msgid "jackd...NOT DETECTED..." msgstr "jackd...לא זוהה..." -#: src/main.c:1375 +#: src/main.c:1379 msgid "pulse audio...detected..." msgstr "Pulse Audio...זוהה..." -#: src/main.c:1376 +#: src/main.c:1380 msgid "pulse audio...NOT DETECTED..." msgstr "Pulse Audio...לא זוהה..." -#: src/main.c:1377 +#: src/main.c:1381 msgid "python...detected..." msgstr "python...זוהה..." -#: src/main.c:1378 +#: src/main.c:1382 msgid "python...NOT DETECTED..." msgstr "python...לא זוהה..." -#: src/main.c:1379 +#: src/main.c:1383 msgid "dvgrab...detected..." msgstr "dvgrab...זוהה..." -#: src/main.c:1380 +#: src/main.c:1384 msgid "dvgrab...NOT DETECTED..." msgstr "dvgrab...לא זוהה..." -#: src/main.c:1381 +#: src/main.c:1385 msgid "xwininfo...detected..." msgstr "xwininfo...זוהה..." -#: src/main.c:1382 +#: src/main.c:1386 msgid "xwininfo...NOT DETECTED..." msgstr "xwininfo...לא זוהה..." -#: src/main.c:1385 +#: src/main.c:1389 #, c-format msgid "" "\n" @@ -244,22 +244,22 @@ "\n" "מנהל החלונות המדווח הוא \"%s\"; " -#: src/main.c:1388 +#: src/main.c:1392 #, c-format msgid "number of monitors detected: %d\n" msgstr "מספר הצגים שזוהו: %d\n" -#: src/main.c:1391 +#: src/main.c:1395 #, fuzzy, c-format msgid "Number of CPUs detected: %d\n" msgstr "מספר הצגים שזוהו: %d\n" -#: src/main.c:1394 +#: src/main.c:1398 #, c-format msgid "Temp directory is %s\n" msgstr "התיקייה הזמנית היא %s\n" -#: src/main.c:1398 +#: src/main.c:1402 msgid "" "WARNING - this version of LiVES was compiled without either\n" "jack or pulse audio support.\n" @@ -269,15 +269,15 @@ "תמיכה ב־jack או ב־pulse audio.\n" "תכונות רבות הקשורות לשמע לא תהיינה זמינות.\n" -#: src/main.c:1401 +#: src/main.c:1405 msgid "Compiled with jack support, good !\n" msgstr "הודר עם תמיכה ב־jack, מצוין !\n" -#: src/main.c:1404 +#: src/main.c:1408 msgid "Compiled with pulse audio support, wonderful !\n" msgstr "הודר עם תמיכה ב־pulse audio, נהדר !\n" -#: src/main.c:1408 +#: src/main.c:1412
View file
LiVES-1.4.3.tar.bz2/po/hr.po -> LiVES-1.4.5.tar.bz2/po/hr.po
Changed
@@ -8,7 +8,7 @@ "Project-Id-Version: lives\n" "Report-Msgid-Bugs-To: http://www.sourceforge.net/tracker/?" "group_id=64341&atid=507139\n" -"POT-Creation-Date: 2011-06-11 19:29-0300\n" +"POT-Creation-Date: 2011-07-23 09:09-0300\n" "PO-Revision-Date: 2010-10-26 14:50+0000\n" "Last-Translator: Guybrush88 <Unknown>\n" "Language-Team: Croatian <hr@li.org>\n" @@ -104,23 +104,23 @@ msgid "**The current layout**" msgstr "**Trenutni izgled**" -#: src/main.c:1192 +#: src/main.c:1196 msgid "Loading realtime effect plugins..." msgstr "Učitavanje stvarnom efekt čep..." -#: src/main.c:1245 +#: src/main.c:1249 msgid "Starting jack audio server..." msgstr "Pokrećem jack audio poslužitelj..." -#: src/main.c:1247 +#: src/main.c:1251 msgid "Starting jack transport server..." msgstr "Pokrećem jack transport server..." -#: src/main.c:1248 +#: src/main.c:1252 msgid "Connecting to jack transport server..." msgstr "Spajanje na jack transport server..." -#: src/main.c:1275 +#: src/main.c:1279 msgid "" "\n" "\n" @@ -131,95 +131,95 @@ "Alternatively, try to start lives with either \"lives -jackopts 16\", or " msgstr "" -#: src/main.c:1299 +#: src/main.c:1303 msgid "Starting pulse audio server..." msgstr "Pokrećem pulse audio poslužitelj..." -#: src/main.c:1362 +#: src/main.c:1366 msgid "Checking optional dependencies:" msgstr "Provjera izborno ovisnosti:" -#: src/main.c:1363 +#: src/main.c:1367 msgid "mplayer...detected..." msgstr "mplayer...pronađen..." -#: src/main.c:1364 +#: src/main.c:1368 msgid "mplayer...NOT DETECTED..." msgstr "mplayer...NIJE PRONAĐEN..." -#: src/main.c:1365 +#: src/main.c:1369 msgid "convert...detected..." msgstr "convert...pronađen..." -#: src/main.c:1366 +#: src/main.c:1370 msgid "convert...NOT DETECTED..." msgstr "convert...NIJE PRONAĐEN..." -#: src/main.c:1367 +#: src/main.c:1371 msgid "composite...detected..." msgstr "composite...otkriti..." -#: src/main.c:1368 +#: src/main.c:1372 msgid "composite...NOT DETECTED..." msgstr "composite...NIJE OTKRIVENA..." -#: src/main.c:1369 +#: src/main.c:1373 msgid "sox...detected\n" msgstr "sox...pronađen\n" -#: src/main.c:1370 +#: src/main.c:1374 msgid "sox...NOT DETECTED\n" msgstr "sox...NIJE PRONAĐEN...\n" -#: src/main.c:1371 +#: src/main.c:1375 msgid "cdda2wav...detected..." msgstr "cdda2wav...pronađen..." -#: src/main.c:1372 +#: src/main.c:1376 msgid "cdda2wav...NOT DETECTED..." msgstr "cdda2wav...NIJE PRONAĐEN..." -#: src/main.c:1373 +#: src/main.c:1377 msgid "jackd...detected..." msgstr "jackd...pronađen..." -#: src/main.c:1374 +#: src/main.c:1378 msgid "jackd...NOT DETECTED..." msgstr "jackd...NIJE PRONAĐEN..." -#: src/main.c:1375 +#: src/main.c:1379 msgid "pulse audio...detected..." msgstr "pulse audio...otkriti..." -#: src/main.c:1376 +#: src/main.c:1380 msgid "pulse audio...NOT DETECTED..." msgstr "pulse audio...NIJE PRONAĐEN..." -#: src/main.c:1377 +#: src/main.c:1381 msgid "python...detected..." msgstr "python...otkriti..." -#: src/main.c:1378 +#: src/main.c:1382 msgid "python...NOT DETECTED..." msgstr "python......NIJE PRONAĐEN..." -#: src/main.c:1379 +#: src/main.c:1383 msgid "dvgrab...detected..." msgstr "dvgrab...otkriti..." -#: src/main.c:1380 +#: src/main.c:1384 msgid "dvgrab...NOT DETECTED..." msgstr "dvgrab...NIJE PRONAĐEN..." -#: src/main.c:1381 +#: src/main.c:1385 msgid "xwininfo...detected..." msgstr "xwininfo...otkriti..." -#: src/main.c:1382 +#: src/main.c:1386 msgid "xwininfo...NOT DETECTED..." msgstr "xwininfo...NIJE PRONAĐEN..." -#: src/main.c:1385 +#: src/main.c:1389 #, c-format msgid "" "\n" @@ -230,22 +230,22 @@ "\n" "Uređivač prozora prijavljuje kao \"%s\"; " -#: src/main.c:1388 +#: src/main.c:1392 #, c-format msgid "number of monitors detected: %d\n" msgstr "Pronađen broj zaslona: %d\n" -#: src/main.c:1391 +#: src/main.c:1395 #, fuzzy, c-format msgid "Number of CPUs detected: %d\n" msgstr "Pronađen broj zaslona: %d\n" -#: src/main.c:1394 +#: src/main.c:1398 #, c-format msgid "Temp directory is %s\n" msgstr "Temp direktorij je %s\n" -#: src/main.c:1398 +#: src/main.c:1402 msgid "" "WARNING - this version of LiVES was compiled without either\n" "jack or pulse audio support.\n" @@ -255,15 +255,15 @@ "jack ili pulse audio podršku.\n" "Mnogi audio značajke neće biti dostupna.\n" -#: src/main.c:1401 +#: src/main.c:1405 msgid "Compiled with jack support, good !\n" msgstr "Kompiliran s jack podrškom, dobro !\n" -#: src/main.c:1404 +#: src/main.c:1408 msgid "Compiled with pulse audio support, wonderful !\n" msgstr "Kompliliran s pulse audio podrškom, odlično !\n" -#: src/main.c:1408 +#: src/main.c:1412
View file
LiVES-1.4.3.tar.bz2/po/hu.po -> LiVES-1.4.5.tar.bz2/po/hu.po
Changed
@@ -8,7 +8,7 @@ "Project-Id-Version: hu\n" "Report-Msgid-Bugs-To: http://www.sourceforge.net/tracker/?" "group_id=64341&atid=507139\n" -"POT-Creation-Date: 2011-06-11 19:29-0300\n" +"POT-Creation-Date: 2011-07-23 09:09-0300\n" "PO-Revision-Date: 2011-03-15 13:51+0000\n" "Last-Translator: Krasznecz Zoltán <zoltan.krasznecz@gmail.com>\n" "Language-Team: Magyar <lisovszki@gmail.com>\n" @@ -104,23 +104,23 @@ msgid "**The current layout**" msgstr "**A jelenlegi kimenet**" -#: src/main.c:1192 +#: src/main.c:1196 msgid "Loading realtime effect plugins..." msgstr "Az azonnali effektek betöltése..." -#: src/main.c:1245 +#: src/main.c:1249 msgid "Starting jack audio server..." msgstr "Jack audió szerver indítása" -#: src/main.c:1247 +#: src/main.c:1251 msgid "Starting jack transport server..." msgstr "" -#: src/main.c:1248 +#: src/main.c:1252 msgid "Connecting to jack transport server..." msgstr "" -#: src/main.c:1275 +#: src/main.c:1279 msgid "" "\n" "\n" @@ -131,95 +131,95 @@ "Alternatively, try to start lives with either \"lives -jackopts 16\", or " msgstr "" -#: src/main.c:1299 +#: src/main.c:1303 msgid "Starting pulse audio server..." msgstr "Pulse audio szerver indítása..." -#: src/main.c:1362 +#: src/main.c:1366 msgid "Checking optional dependencies:" msgstr "Ajánlott függőségek ellenőrzése" -#: src/main.c:1363 +#: src/main.c:1367 msgid "mplayer...detected..." msgstr "mplayer...megtalálva" -#: src/main.c:1364 +#: src/main.c:1368 msgid "mplayer...NOT DETECTED..." msgstr "mplayer...NEM TALÁLOM.." -#: src/main.c:1365 +#: src/main.c:1369 msgid "convert...detected..." msgstr "convert...megtalálva" -#: src/main.c:1366 +#: src/main.c:1370 msgid "convert...NOT DETECTED..." msgstr "convert...NEM TALÁLOM" -#: src/main.c:1367 +#: src/main.c:1371 msgid "composite...detected..." msgstr "composite...megtalálva..." -#: src/main.c:1368 +#: src/main.c:1372 msgid "composite...NOT DETECTED..." msgstr "composite...NEM TALÁLOM" -#: src/main.c:1369 +#: src/main.c:1373 msgid "sox...detected\n" msgstr "sox...megtalálva\n" -#: src/main.c:1370 +#: src/main.c:1374 msgid "sox...NOT DETECTED\n" msgstr "sox...NEM TALÁLOM\n" -#: src/main.c:1371 +#: src/main.c:1375 msgid "cdda2wav...detected..." msgstr "cdda2wav...megtalálva..." -#: src/main.c:1372 +#: src/main.c:1376 msgid "cdda2wav...NOT DETECTED..." msgstr "cdda2wav...NEM TALÁLOM..." -#: src/main.c:1373 +#: src/main.c:1377 msgid "jackd...detected..." msgstr "jackd...megtalálva..." -#: src/main.c:1374 +#: src/main.c:1378 msgid "jackd...NOT DETECTED..." msgstr "jackd...NEM TALÁLOM..." -#: src/main.c:1375 +#: src/main.c:1379 msgid "pulse audio...detected..." msgstr "pulse audio...megtalálva..." -#: src/main.c:1376 +#: src/main.c:1380 msgid "pulse audio...NOT DETECTED..." msgstr "pulse audio...NEM TALÁLOM..." -#: src/main.c:1377 +#: src/main.c:1381 msgid "python...detected..." msgstr "python...megtalálva..." -#: src/main.c:1378 +#: src/main.c:1382 msgid "python...NOT DETECTED..." msgstr "python...NEM TALÁLOM..." -#: src/main.c:1379 +#: src/main.c:1383 msgid "dvgrab...detected..." msgstr "dvgrab...megtalálva..." -#: src/main.c:1380 +#: src/main.c:1384 msgid "dvgrab...NOT DETECTED..." msgstr "dvgrab...NEM TALÁLOM..." -#: src/main.c:1381 +#: src/main.c:1385 msgid "xwininfo...detected..." msgstr "xwininfo...megtalálva..." -#: src/main.c:1382 +#: src/main.c:1386 msgid "xwininfo...NOT DETECTED..." msgstr "xwininfo...NEM TALÁLOM..." -#: src/main.c:1385 +#: src/main.c:1389 #, c-format msgid "" "\n" @@ -230,22 +230,22 @@ "\n" "Az ablakkezelő jelenti: \"%s\"; " -#: src/main.c:1388 +#: src/main.c:1392 #, c-format msgid "number of monitors detected: %d\n" msgstr "monitorok száma: %d\n" -#: src/main.c:1391 +#: src/main.c:1395 #, fuzzy, c-format msgid "Number of CPUs detected: %d\n" msgstr "monitorok száma: %d\n" -#: src/main.c:1394 +#: src/main.c:1398 #, c-format msgid "Temp directory is %s\n" msgstr "Az átmeneti könyvtár: %s\n" -#: src/main.c:1398 +#: src/main.c:1402 msgid "" "WARNING - this version of LiVES was compiled without either\n" "jack or pulse audio support.\n" @@ -255,15 +255,15 @@ "jack hangrendszer nélkül lett szerkesztve.\n" "A legtöbb hangszerkesztési lehetőség nem lesz elérhető.\n" -#: src/main.c:1401 +#: src/main.c:1405 msgid "Compiled with jack support, good !\n" msgstr "Jack támogatással összeállítva. Jóó !\n" -#: src/main.c:1404 +#: src/main.c:1408 msgid "Compiled with pulse audio support, wonderful !\n" msgstr "Pulse audio támogatással összeszerkesztve. Csodálatos :)!\n" -#: src/main.c:1408 +#: src/main.c:1412
View file
LiVES-1.4.3.tar.bz2/po/it.po -> LiVES-1.4.5.tar.bz2/po/it.po
Changed
@@ -8,7 +8,7 @@ "Project-Id-Version: lives\n" "Report-Msgid-Bugs-To: http://www.sourceforge.net/tracker/?" "group_id=64341&atid=507139\n" -"POT-Creation-Date: 2011-06-11 19:29-0300\n" +"POT-Creation-Date: 2011-07-23 09:09-0300\n" "PO-Revision-Date: 2010-10-14 12:45+0000\n" "Last-Translator: LoReNicolò <Unknown>\n" "Language-Team: Italian <it@li.org>\n" @@ -104,23 +104,23 @@ msgid "**The current layout**" msgstr "**Il layout corrente**" -#: src/main.c:1192 +#: src/main.c:1196 msgid "Loading realtime effect plugins..." msgstr "Caricamento dei plugin degli effetti in tempo reale in corso..." -#: src/main.c:1245 +#: src/main.c:1249 msgid "Starting jack audio server..." msgstr "Avvio del server audio jack in corso..." -#: src/main.c:1247 +#: src/main.c:1251 msgid "Starting jack transport server..." msgstr "" -#: src/main.c:1248 +#: src/main.c:1252 msgid "Connecting to jack transport server..." msgstr "" -#: src/main.c:1275 +#: src/main.c:1279 msgid "" "\n" "\n" @@ -131,95 +131,95 @@ "Alternatively, try to start lives with either \"lives -jackopts 16\", or " msgstr "" -#: src/main.c:1299 +#: src/main.c:1303 msgid "Starting pulse audio server..." msgstr "Avviando il server audio pulse..." -#: src/main.c:1362 +#: src/main.c:1366 msgid "Checking optional dependencies:" msgstr "Controllo delle dipendenze opzionali in corso:" -#: src/main.c:1363 +#: src/main.c:1367 msgid "mplayer...detected..." msgstr "mplayer...rilevato..." -#: src/main.c:1364 +#: src/main.c:1368 msgid "mplayer...NOT DETECTED..." msgstr "mplayer...NON RILEVATO..." -#: src/main.c:1365 +#: src/main.c:1369 msgid "convert...detected..." msgstr "convert...rilevato..." -#: src/main.c:1366 +#: src/main.c:1370 msgid "convert...NOT DETECTED..." msgstr "convert...NON RILEVATO..." -#: src/main.c:1367 +#: src/main.c:1371 msgid "composite...detected..." msgstr "composite...rilevato..." -#: src/main.c:1368 +#: src/main.c:1372 msgid "composite...NOT DETECTED..." msgstr "composite...NON RILEVATO..." -#: src/main.c:1369 +#: src/main.c:1373 msgid "sox...detected\n" msgstr "sox...rilevato...\n" -#: src/main.c:1370 +#: src/main.c:1374 msgid "sox...NOT DETECTED\n" msgstr "sox...NON RILEVATO...\n" -#: src/main.c:1371 +#: src/main.c:1375 msgid "cdda2wav...detected..." msgstr "cdda2wav...rilevato..." -#: src/main.c:1372 +#: src/main.c:1376 msgid "cdda2wav...NOT DETECTED..." msgstr "cdda2wav...NON RILEVATO..." -#: src/main.c:1373 +#: src/main.c:1377 msgid "jackd...detected..." msgstr "jackd...rilevato..." -#: src/main.c:1374 +#: src/main.c:1378 msgid "jackd...NOT DETECTED..." msgstr "jackd...NON RILEVATO..." -#: src/main.c:1375 +#: src/main.c:1379 msgid "pulse audio...detected..." msgstr "audio pulse...rilevato..." -#: src/main.c:1376 +#: src/main.c:1380 msgid "pulse audio...NOT DETECTED..." msgstr "audio pulse...NON RILEVATO..." -#: src/main.c:1377 +#: src/main.c:1381 msgid "python...detected..." msgstr "python...rilevato..." -#: src/main.c:1378 +#: src/main.c:1382 msgid "python...NOT DETECTED..." msgstr "python...NON RILEVATO..." -#: src/main.c:1379 +#: src/main.c:1383 msgid "dvgrab...detected..." msgstr "dvgrab...rilevato..." -#: src/main.c:1380 +#: src/main.c:1384 msgid "dvgrab...NOT DETECTED..." msgstr "dvgrab...NON RILEVATO..." -#: src/main.c:1381 +#: src/main.c:1385 msgid "xwininfo...detected..." msgstr "xwininfo...rilevato..." -#: src/main.c:1382 +#: src/main.c:1386 msgid "xwininfo...NOT DETECTED..." msgstr "xwininfo...NON RILEVATO..." -#: src/main.c:1385 +#: src/main.c:1389 #, c-format msgid "" "\n" @@ -230,22 +230,22 @@ "\n" "Il gestore delle finestre riporta come \"%s\"; " -#: src/main.c:1388 +#: src/main.c:1392 #, c-format msgid "number of monitors detected: %d\n" msgstr "numero di monitor rilevati: %d\n" -#: src/main.c:1391 +#: src/main.c:1395 #, fuzzy, c-format msgid "Number of CPUs detected: %d\n" msgstr "numero di monitor rilevati: %d\n" -#: src/main.c:1394 +#: src/main.c:1398 #, c-format msgid "Temp directory is %s\n" msgstr "La directory temporanea è %s\n" -#: src/main.c:1398 +#: src/main.c:1402 msgid "" "WARNING - this version of LiVES was compiled without either\n" "jack or pulse audio support.\n" @@ -255,15 +255,15 @@ "o a jack o pulse audio.\n" "Molte funzioni audio non saranno disponibili.\n" -#: src/main.c:1401 +#: src/main.c:1405 msgid "Compiled with jack support, good !\n" msgstr "Compilato con il supporto jack, bene !\n" -#: src/main.c:1404 +#: src/main.c:1408 msgid "Compiled with pulse audio support, wonderful !\n" msgstr "Compilato con il supporto pulse audio, magnifico !\n" -#: src/main.c:1408 +#: src/main.c:1412
View file
LiVES-1.4.3.tar.bz2/po/ja.po -> LiVES-1.4.5.tar.bz2/po/ja.po
Changed
@@ -8,7 +8,7 @@ "Project-Id-Version: ja\n" "Report-Msgid-Bugs-To: http://www.sourceforge.net/tracker/?" "group_id=64341&atid=507139\n" -"POT-Creation-Date: 2011-06-11 19:29-0300\n" +"POT-Creation-Date: 2011-07-23 09:09-0300\n" "PO-Revision-Date: 2011-03-29 23:39+0000\n" "Last-Translator: Shushi Kurose <md81bird@hitaki.net>\n" "Language-Team: Japanese <ja@li.org>\n" @@ -101,23 +101,23 @@ msgid "**The current layout**" msgstr "**現在のレイアウト**" -#: src/main.c:1192 +#: src/main.c:1196 msgid "Loading realtime effect plugins..." msgstr "リアルタイム・エフェクトプラグインをロード中..." -#: src/main.c:1245 +#: src/main.c:1249 msgid "Starting jack audio server..." msgstr "JACKサーバの音声機能を開始しています..." -#: src/main.c:1247 +#: src/main.c:1251 msgid "Starting jack transport server..." msgstr "JACKサーバのトランスポート機能を開始しています..." -#: src/main.c:1248 +#: src/main.c:1252 msgid "Connecting to jack transport server..." msgstr "JACKサーバのトランスポート機能に接続しています..." -#: src/main.c:1275 +#: src/main.c:1279 msgid "" "\n" "\n" @@ -128,95 +128,95 @@ "Alternatively, try to start lives with either \"lives -jackopts 16\", or " msgstr "" -#: src/main.c:1299 +#: src/main.c:1303 msgid "Starting pulse audio server..." msgstr "PulseAudioサーバを開始しています..." -#: src/main.c:1362 +#: src/main.c:1366 msgid "Checking optional dependencies:" msgstr "必須ではない依存性を確認しています:" -#: src/main.c:1363 +#: src/main.c:1367 msgid "mplayer...detected..." msgstr "mplayerが見つかりました..." -#: src/main.c:1364 +#: src/main.c:1368 msgid "mplayer...NOT DETECTED..." msgstr "mplayerは見つかりませんでした..." -#: src/main.c:1365 +#: src/main.c:1369 msgid "convert...detected..." msgstr "convertが見つかりました..." -#: src/main.c:1366 +#: src/main.c:1370 msgid "convert...NOT DETECTED..." msgstr "convertは見つかりませんでした..." -#: src/main.c:1367 +#: src/main.c:1371 msgid "composite...detected..." msgstr "compositeが見つかりました..." -#: src/main.c:1368 +#: src/main.c:1372 msgid "composite...NOT DETECTED..." msgstr "compositeは見つかりませんでした..." -#: src/main.c:1369 +#: src/main.c:1373 msgid "sox...detected\n" msgstr "soxが見つかりました\n" -#: src/main.c:1370 +#: src/main.c:1374 msgid "sox...NOT DETECTED\n" msgstr "soxは見つかりませんでした\n" -#: src/main.c:1371 +#: src/main.c:1375 msgid "cdda2wav...detected..." msgstr "cdda2wavが見つかりました..." -#: src/main.c:1372 +#: src/main.c:1376 msgid "cdda2wav...NOT DETECTED..." msgstr "cdda2wavは見つかりませんでした..." -#: src/main.c:1373 +#: src/main.c:1377 msgid "jackd...detected..." msgstr "jackdが見つかりました..." -#: src/main.c:1374 +#: src/main.c:1378 msgid "jackd...NOT DETECTED..." msgstr "jackdは見つかりませんでした..." -#: src/main.c:1375 +#: src/main.c:1379 msgid "pulse audio...detected..." msgstr "pulseaudioが見つかりました..." -#: src/main.c:1376 +#: src/main.c:1380 msgid "pulse audio...NOT DETECTED..." msgstr "pulseaudioは見つかりませんでした..." -#: src/main.c:1377 +#: src/main.c:1381 msgid "python...detected..." msgstr "pythonが見つかりました..." -#: src/main.c:1378 +#: src/main.c:1382 msgid "python...NOT DETECTED..." msgstr "pythonは見つかりませんでした..." -#: src/main.c:1379 +#: src/main.c:1383 msgid "dvgrab...detected..." msgstr "dvgrabが見つかりました..." -#: src/main.c:1380 +#: src/main.c:1384 msgid "dvgrab...NOT DETECTED..." msgstr "dvgrabは見つかりませんでした..." -#: src/main.c:1381 +#: src/main.c:1385 msgid "xwininfo...detected..." msgstr "dvgrabは見つかりませんでした..." -#: src/main.c:1382 +#: src/main.c:1386 msgid "xwininfo...NOT DETECTED..." msgstr "xwininfoは見つかりませんでした..." -#: src/main.c:1385 +#: src/main.c:1389 #, c-format msgid "" "\n" @@ -227,22 +227,22 @@ "\n" "ウィンドウマネージャは\"%s\"です; " -#: src/main.c:1388 +#: src/main.c:1392 #, c-format msgid "number of monitors detected: %d\n" msgstr "モニタの検出個数: %d\n" -#: src/main.c:1391 +#: src/main.c:1395 #, c-format msgid "Number of CPUs detected: %d\n" msgstr "" -#: src/main.c:1394 +#: src/main.c:1398 #, c-format msgid "Temp directory is %s\n" msgstr "一時ディレクトリは %s です。\n" -#: src/main.c:1398 +#: src/main.c:1402 msgid "" "WARNING - this version of LiVES was compiled without either\n" "jack or pulse audio support.\n" @@ -252,15 +252,15 @@ "サポートなしでコンパイルされています。\n" "そのため音声機能の多くが利用できません。\n" -#: src/main.c:1401 +#: src/main.c:1405 msgid "Compiled with jack support, good !\n" msgstr "JACKサーバをサポートするようにコンパイルされています\n" -#: src/main.c:1404 +#: src/main.c:1408 msgid "Compiled with pulse audio support, wonderful !\n" msgstr "PulseAudioサーバをサポートするようにコンパイルされています\n" -#: src/main.c:1408 +#: src/main.c:1412
View file
LiVES-1.4.3.tar.bz2/po/lives.pot -> LiVES-1.4.5.tar.bz2/po/lives.pot
Changed
@@ -6,10 +6,10 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: lives 1.4.3\n" +"Project-Id-Version: lives 1.4.5\n" "Report-Msgid-Bugs-To: http://www.sourceforge.net/tracker/?" "group_id=64341&atid=507139\n" -"POT-Creation-Date: 2011-06-11 19:29-0300\n" +"POT-Creation-Date: 2011-07-23 09:09-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" @@ -89,23 +89,23 @@ msgid "**The current layout**" msgstr "" -#: src/main.c:1192 +#: src/main.c:1196 msgid "Loading realtime effect plugins..." msgstr "" -#: src/main.c:1245 +#: src/main.c:1249 msgid "Starting jack audio server..." msgstr "" -#: src/main.c:1247 +#: src/main.c:1251 msgid "Starting jack transport server..." msgstr "" -#: src/main.c:1248 +#: src/main.c:1252 msgid "Connecting to jack transport server..." msgstr "" -#: src/main.c:1275 +#: src/main.c:1279 msgid "" "\n" "\n" @@ -116,95 +116,95 @@ "Alternatively, try to start lives with either \"lives -jackopts 16\", or " msgstr "" -#: src/main.c:1299 +#: src/main.c:1303 msgid "Starting pulse audio server..." msgstr "" -#: src/main.c:1362 +#: src/main.c:1366 msgid "Checking optional dependencies:" msgstr "" -#: src/main.c:1363 +#: src/main.c:1367 msgid "mplayer...detected..." msgstr "" -#: src/main.c:1364 +#: src/main.c:1368 msgid "mplayer...NOT DETECTED..." msgstr "" -#: src/main.c:1365 +#: src/main.c:1369 msgid "convert...detected..." msgstr "" -#: src/main.c:1366 +#: src/main.c:1370 msgid "convert...NOT DETECTED..." msgstr "" -#: src/main.c:1367 +#: src/main.c:1371 msgid "composite...detected..." msgstr "" -#: src/main.c:1368 +#: src/main.c:1372 msgid "composite...NOT DETECTED..." msgstr "" -#: src/main.c:1369 +#: src/main.c:1373 msgid "sox...detected\n" msgstr "" -#: src/main.c:1370 +#: src/main.c:1374 msgid "sox...NOT DETECTED\n" msgstr "" -#: src/main.c:1371 +#: src/main.c:1375 msgid "cdda2wav...detected..." msgstr "" -#: src/main.c:1372 +#: src/main.c:1376 msgid "cdda2wav...NOT DETECTED..." msgstr "" -#: src/main.c:1373 +#: src/main.c:1377 msgid "jackd...detected..." msgstr "" -#: src/main.c:1374 +#: src/main.c:1378 msgid "jackd...NOT DETECTED..." msgstr "" -#: src/main.c:1375 +#: src/main.c:1379 msgid "pulse audio...detected..." msgstr "" -#: src/main.c:1376 +#: src/main.c:1380 msgid "pulse audio...NOT DETECTED..." msgstr "" -#: src/main.c:1377 +#: src/main.c:1381 msgid "python...detected..." msgstr "" -#: src/main.c:1378 +#: src/main.c:1382 msgid "python...NOT DETECTED..." msgstr "" -#: src/main.c:1379 +#: src/main.c:1383 msgid "dvgrab...detected..." msgstr "" -#: src/main.c:1380 +#: src/main.c:1384 msgid "dvgrab...NOT DETECTED..." msgstr "" -#: src/main.c:1381 +#: src/main.c:1385 msgid "xwininfo...detected..." msgstr "" -#: src/main.c:1382 +#: src/main.c:1386 msgid "xwininfo...NOT DETECTED..." msgstr "" -#: src/main.c:1385 +#: src/main.c:1389 #, c-format msgid "" "\n" @@ -212,167 +212,171 @@ "Window manager reports as \"%s\"; " msgstr "" -#: src/main.c:1388 +#: src/main.c:1392 #, c-format msgid "number of monitors detected: %d\n" msgstr "" -#: src/main.c:1391 +#: src/main.c:1395 #, c-format msgid "Number of CPUs detected: %d\n" msgstr "" -#: src/main.c:1394 +#: src/main.c:1398 #, c-format msgid "Temp directory is %s\n" msgstr "" -#: src/main.c:1398 +#: src/main.c:1402 msgid "" "WARNING - this version of LiVES was compiled without either\n" "jack or pulse audio support.\n" "Many audio features will be unavailable.\n" msgstr "" -#: src/main.c:1401 +#: src/main.c:1405 msgid "Compiled with jack support, good !\n" msgstr "" -#: src/main.c:1404 +#: src/main.c:1408 msgid "Compiled with pulse audio support, wonderful !\n" msgstr ""
View file
LiVES-1.4.3.tar.bz2/po/nl_NL.po -> LiVES-1.4.5.tar.bz2/po/nl_NL.po
Changed
@@ -3,7 +3,7 @@ "Project-Id-Version: LiVES 0.9.5cvs\n" "Report-Msgid-Bugs-To: http://www.sourceforge.net/tracker/?" "group_id=64341&atid=507139\n" -"POT-Creation-Date: 2011-06-11 19:29-0300\n" +"POT-Creation-Date: 2011-07-23 09:09-0300\n" "PO-Revision-Date: 2010-01-12 10:14+0000\n" "Last-Translator: cumulus007 <cumulus0007@gmail.com>\n" "Language-Team: \n" @@ -87,25 +87,25 @@ msgid "**The current layout**" msgstr "" -#: src/main.c:1192 +#: src/main.c:1196 msgid "Loading realtime effect plugins..." msgstr "" -#: src/main.c:1245 +#: src/main.c:1249 msgid "Starting jack audio server..." msgstr "Jack audio server starten ..." -#: src/main.c:1247 +#: src/main.c:1251 #, fuzzy msgid "Starting jack transport server..." msgstr "Jack audio server starten ..." -#: src/main.c:1248 +#: src/main.c:1252 #, fuzzy msgid "Connecting to jack transport server..." msgstr "Jack audio server starten ..." -#: src/main.c:1275 +#: src/main.c:1279 msgid "" "\n" "\n" @@ -116,95 +116,95 @@ "Alternatively, try to start lives with either \"lives -jackopts 16\", or " msgstr "" -#: src/main.c:1299 +#: src/main.c:1303 msgid "Starting pulse audio server..." msgstr "" -#: src/main.c:1362 +#: src/main.c:1366 msgid "Checking optional dependencies:" msgstr "Optionele afhankelijkheden aan het controleren:" -#: src/main.c:1363 +#: src/main.c:1367 msgid "mplayer...detected..." msgstr "mplayer...gevonden..." -#: src/main.c:1364 +#: src/main.c:1368 msgid "mplayer...NOT DETECTED..." msgstr "mplayer...NIET GEDETECTEERD..." -#: src/main.c:1365 +#: src/main.c:1369 msgid "convert...detected..." msgstr "convert...gedetecteerd..." -#: src/main.c:1366 +#: src/main.c:1370 msgid "convert...NOT DETECTED..." msgstr "convert...NIET GEDETECTEERD..." -#: src/main.c:1367 +#: src/main.c:1371 msgid "composite...detected..." msgstr "composite...gedetecteerd..." -#: src/main.c:1368 +#: src/main.c:1372 msgid "composite...NOT DETECTED..." msgstr "composite...NIET GEDETECTEERD..." -#: src/main.c:1369 +#: src/main.c:1373 msgid "sox...detected\n" msgstr "sox...gedetecteerd\n" -#: src/main.c:1370 +#: src/main.c:1374 msgid "sox...NOT DETECTED\n" msgstr "sox...NIET GEDECTEERD\n" -#: src/main.c:1371 +#: src/main.c:1375 msgid "cdda2wav...detected..." msgstr "cdda2wav...gedetecteerd..." -#: src/main.c:1372 +#: src/main.c:1376 msgid "cdda2wav...NOT DETECTED..." msgstr "cdda2wav...NIET GEDETECTEERD..." -#: src/main.c:1373 +#: src/main.c:1377 msgid "jackd...detected..." msgstr "" -#: src/main.c:1374 +#: src/main.c:1378 msgid "jackd...NOT DETECTED..." msgstr "" -#: src/main.c:1375 +#: src/main.c:1379 msgid "pulse audio...detected..." msgstr "" -#: src/main.c:1376 +#: src/main.c:1380 msgid "pulse audio...NOT DETECTED..." msgstr "" -#: src/main.c:1377 +#: src/main.c:1381 msgid "python...detected..." msgstr "" -#: src/main.c:1378 +#: src/main.c:1382 msgid "python...NOT DETECTED..." msgstr "" -#: src/main.c:1379 +#: src/main.c:1383 msgid "dvgrab...detected..." msgstr "" -#: src/main.c:1380 +#: src/main.c:1384 msgid "dvgrab...NOT DETECTED..." msgstr "" -#: src/main.c:1381 +#: src/main.c:1385 msgid "xwininfo...detected..." msgstr "" -#: src/main.c:1382 +#: src/main.c:1386 msgid "xwininfo...NOT DETECTED..." msgstr "" -#: src/main.c:1385 +#: src/main.c:1389 #, c-format msgid "" "\n" @@ -212,37 +212,37 @@ "Window manager reports as \"%s\"; " msgstr "" -#: src/main.c:1388 +#: src/main.c:1392 #, c-format msgid "number of monitors detected: %d\n" msgstr "" -#: src/main.c:1391 +#: src/main.c:1395 #, c-format msgid "Number of CPUs detected: %d\n" msgstr "" -#: src/main.c:1394 +#: src/main.c:1398 #, c-format msgid "Temp directory is %s\n" msgstr "" -#: src/main.c:1398 +#: src/main.c:1402 msgid "" "WARNING - this version of LiVES was compiled without either\n" "jack or pulse audio support.\n" "Many audio features will be unavailable.\n" msgstr "" -#: src/main.c:1401 +#: src/main.c:1405 msgid "Compiled with jack support, good !\n" msgstr "" -#: src/main.c:1404 +#: src/main.c:1408 msgid "Compiled with pulse audio support, wonderful !\n" msgstr "" -#: src/main.c:1408
View file
LiVES-1.4.3.tar.bz2/po/oc.po -> LiVES-1.4.5.tar.bz2/po/oc.po
Changed
@@ -8,7 +8,7 @@ "Project-Id-Version: lives\n" "Report-Msgid-Bugs-To: http://www.sourceforge.net/tracker/?" "group_id=64341&atid=507139\n" -"POT-Creation-Date: 2011-06-11 19:29-0300\n" +"POT-Creation-Date: 2011-07-23 09:09-0300\n" "PO-Revision-Date: 2010-04-23 13:24+0000\n" "Last-Translator: Cédric VALMARY (Tot en òc) <cvalmary@yahoo.fr>\n" "Language-Team: Occitan (post 1500) <oc@li.org>\n" @@ -90,23 +90,23 @@ msgid "**The current layout**" msgstr "**La configuracion actuala**" -#: src/main.c:1192 +#: src/main.c:1196 msgid "Loading realtime effect plugins..." msgstr "Cargament dels plugins d'efièches en temps real" -#: src/main.c:1245 +#: src/main.c:1249 msgid "Starting jack audio server..." msgstr "Aviada del servidor àudio jack..." -#: src/main.c:1247 +#: src/main.c:1251 msgid "Starting jack transport server..." msgstr "" -#: src/main.c:1248 +#: src/main.c:1252 msgid "Connecting to jack transport server..." msgstr "" -#: src/main.c:1275 +#: src/main.c:1279 msgid "" "\n" "\n" @@ -117,95 +117,95 @@ "Alternatively, try to start lives with either \"lives -jackopts 16\", or " msgstr "" -#: src/main.c:1299 +#: src/main.c:1303 msgid "Starting pulse audio server..." msgstr "Initializacion del servidor àudio pulse..." -#: src/main.c:1362 +#: src/main.c:1366 msgid "Checking optional dependencies:" msgstr "Verificacion de las dependéncias opcionalas :" -#: src/main.c:1363 +#: src/main.c:1367 msgid "mplayer...detected..." msgstr "mplayer....detectat..." -#: src/main.c:1364 +#: src/main.c:1368 msgid "mplayer...NOT DETECTED..." msgstr "mplayer...PAS DETECTAT..." -#: src/main.c:1365 +#: src/main.c:1369 msgid "convert...detected..." msgstr "convert...detectat..." -#: src/main.c:1366 +#: src/main.c:1370 msgid "convert...NOT DETECTED..." msgstr "convert...PAS DETECTAT..." -#: src/main.c:1367 +#: src/main.c:1371 msgid "composite...detected..." msgstr "composite...detectat..." -#: src/main.c:1368 +#: src/main.c:1372 msgid "composite...NOT DETECTED..." msgstr "composite...PAS DETECTAT..." -#: src/main.c:1369 +#: src/main.c:1373 msgid "sox...detected\n" msgstr "sox...detectat\n" -#: src/main.c:1370 +#: src/main.c:1374 msgid "sox...NOT DETECTED\n" msgstr "sox...PAS DETECTAT\n" -#: src/main.c:1371 +#: src/main.c:1375 msgid "cdda2wav...detected..." msgstr "cdda2wav...detectat..." -#: src/main.c:1372 +#: src/main.c:1376 msgid "cdda2wav...NOT DETECTED..." msgstr "cdda2wav...PAS DETECTAT..." -#: src/main.c:1373 +#: src/main.c:1377 msgid "jackd...detected..." msgstr "jackd...detectat..." -#: src/main.c:1374 +#: src/main.c:1378 msgid "jackd...NOT DETECTED..." msgstr "jackd...PAS DETECTAT..." -#: src/main.c:1375 +#: src/main.c:1379 msgid "pulse audio...detected..." msgstr "pulse audio...detectat..." -#: src/main.c:1376 +#: src/main.c:1380 msgid "pulse audio...NOT DETECTED..." msgstr "pulse audio...PAS DETECTAT..." -#: src/main.c:1377 +#: src/main.c:1381 msgid "python...detected..." msgstr "python...detectat..." -#: src/main.c:1378 +#: src/main.c:1382 msgid "python...NOT DETECTED..." msgstr "python...PAS DETECTAT..." -#: src/main.c:1379 +#: src/main.c:1383 msgid "dvgrab...detected..." msgstr "dvgrab...detectat..." -#: src/main.c:1380 +#: src/main.c:1384 msgid "dvgrab...NOT DETECTED..." msgstr "dvgrab...PAS DETECTAT..." -#: src/main.c:1381 +#: src/main.c:1385 msgid "xwininfo...detected..." msgstr "xwininfo...detectat..." -#: src/main.c:1382 +#: src/main.c:1386 msgid "xwininfo...NOT DETECTED..." msgstr "xwininfo...PAS DETECTAT..." -#: src/main.c:1385 +#: src/main.c:1389 #, c-format msgid "" "\n" @@ -213,37 +213,37 @@ "Window manager reports as \"%s\"; " msgstr "" -#: src/main.c:1388 +#: src/main.c:1392 #, c-format msgid "number of monitors detected: %d\n" msgstr "nombre d'ecrans trobats : %d\n" -#: src/main.c:1391 +#: src/main.c:1395 #, fuzzy, c-format msgid "Number of CPUs detected: %d\n" msgstr "nombre d'ecrans trobats : %d\n" -#: src/main.c:1394 +#: src/main.c:1398 #, c-format msgid "Temp directory is %s\n" msgstr "Lo dorsièr temporari es %s\n" -#: src/main.c:1398 +#: src/main.c:1402 msgid "" "WARNING - this version of LiVES was compiled without either\n" "jack or pulse audio support.\n" "Many audio features will be unavailable.\n" msgstr "" -#: src/main.c:1401 +#: src/main.c:1405 msgid "Compiled with jack support, good !\n" msgstr "" -#: src/main.c:1404 +#: src/main.c:1408 msgid "Compiled with pulse audio support, wonderful !\n" msgstr "" -#: src/main.c:1408 +#: src/main.c:1412 #, c-format
View file
LiVES-1.4.3.tar.bz2/po/pl.po -> LiVES-1.4.5.tar.bz2/po/pl.po
Changed
@@ -8,7 +8,7 @@ "Project-Id-Version: lives\n" "Report-Msgid-Bugs-To: http://www.sourceforge.net/tracker/?" "group_id=64341&atid=507139\n" -"POT-Creation-Date: 2011-06-11 19:29-0300\n" +"POT-Creation-Date: 2011-07-23 09:09-0300\n" "PO-Revision-Date: 2010-05-14 21:38+0000\n" "Last-Translator: Marek Jędrzejewski <slomianowlosy@gmail.com>\n" "Language-Team: Polish <pl@li.org>\n" @@ -104,23 +104,23 @@ msgid "**The current layout**" msgstr "**Obecny układ**" -#: src/main.c:1192 +#: src/main.c:1196 msgid "Loading realtime effect plugins..." msgstr "" -#: src/main.c:1245 +#: src/main.c:1249 msgid "Starting jack audio server..." msgstr "" -#: src/main.c:1247 +#: src/main.c:1251 msgid "Starting jack transport server..." msgstr "" -#: src/main.c:1248 +#: src/main.c:1252 msgid "Connecting to jack transport server..." msgstr "" -#: src/main.c:1275 +#: src/main.c:1279 msgid "" "\n" "\n" @@ -131,95 +131,95 @@ "Alternatively, try to start lives with either \"lives -jackopts 16\", or " msgstr "" -#: src/main.c:1299 +#: src/main.c:1303 msgid "Starting pulse audio server..." msgstr "Uruchamianie serwera pulse audio" -#: src/main.c:1362 +#: src/main.c:1366 msgid "Checking optional dependencies:" msgstr "Sprawdzanie zależności opcjonalne:" -#: src/main.c:1363 +#: src/main.c:1367 msgid "mplayer...detected..." msgstr "mplayer... wykryto..." -#: src/main.c:1364 +#: src/main.c:1368 msgid "mplayer...NOT DETECTED..." msgstr "mplayer...NIE WYKRYTO..." -#: src/main.c:1365 +#: src/main.c:1369 msgid "convert...detected..." msgstr "convert...wykrytych..." -#: src/main.c:1366 +#: src/main.c:1370 msgid "convert...NOT DETECTED..." msgstr "convert...NIE WYKRYTO..." -#: src/main.c:1367 +#: src/main.c:1371 msgid "composite...detected..." msgstr "composite...wykrytych..." -#: src/main.c:1368 +#: src/main.c:1372 msgid "composite...NOT DETECTED..." msgstr "composite...NIE WYKRYTO..." -#: src/main.c:1369 +#: src/main.c:1373 msgid "sox...detected\n" msgstr "sox...wykrytych\n" -#: src/main.c:1370 +#: src/main.c:1374 msgid "sox...NOT DETECTED\n" msgstr "sox...NIE WYKRYTO\n" -#: src/main.c:1371 +#: src/main.c:1375 msgid "cdda2wav...detected..." msgstr "cdda2wav...wykrytych..." -#: src/main.c:1372 +#: src/main.c:1376 msgid "cdda2wav...NOT DETECTED..." msgstr "cdda2wav...NIE WYKRYTO..." -#: src/main.c:1373 +#: src/main.c:1377 msgid "jackd...detected..." msgstr "jackd...wykrytych..." -#: src/main.c:1374 +#: src/main.c:1378 msgid "jackd...NOT DETECTED..." msgstr "jackd...NIE WYKRYTO..." -#: src/main.c:1375 +#: src/main.c:1379 msgid "pulse audio...detected..." msgstr "pulse audio...wykrytych..." -#: src/main.c:1376 +#: src/main.c:1380 msgid "pulse audio...NOT DETECTED..." msgstr "pulse audio...NIE WYKRYTO..." -#: src/main.c:1377 +#: src/main.c:1381 msgid "python...detected..." msgstr "python...wykrytych..." -#: src/main.c:1378 +#: src/main.c:1382 msgid "python...NOT DETECTED..." msgstr "python...NIE WYKRYTO..." -#: src/main.c:1379 +#: src/main.c:1383 msgid "dvgrab...detected..." msgstr "dvgrab...wykrytych..." -#: src/main.c:1380 +#: src/main.c:1384 msgid "dvgrab...NOT DETECTED..." msgstr "dvgrab...NIE WYKRYTO..." -#: src/main.c:1381 +#: src/main.c:1385 msgid "xwininfo...detected..." msgstr "xwininfo...wykrytych..." -#: src/main.c:1382 +#: src/main.c:1386 msgid "xwininfo...NOT DETECTED..." msgstr "xwininfo...NIE WYKRYTO..." -#: src/main.c:1385 +#: src/main.c:1389 #, c-format msgid "" "\n" @@ -230,37 +230,37 @@ "\n" "Sprawozdania Menedżer okien jako \"%s\"; " -#: src/main.c:1388 +#: src/main.c:1392 #, c-format msgid "number of monitors detected: %d\n" msgstr "liczba wykrytych monitorów: %d\n" -#: src/main.c:1391 +#: src/main.c:1395 #, fuzzy, c-format msgid "Number of CPUs detected: %d\n" msgstr "liczba wykrytych monitorów: %d\n" -#: src/main.c:1394 +#: src/main.c:1398 #, c-format msgid "Temp directory is %s\n" msgstr "Katalog tymczasowy jest %s\n" -#: src/main.c:1398 +#: src/main.c:1402 msgid "" "WARNING - this version of LiVES was compiled without either\n" "jack or pulse audio support.\n" "Many audio features will be unavailable.\n" msgstr "" -#: src/main.c:1401 +#: src/main.c:1405 msgid "Compiled with jack support, good !\n" msgstr "Skompilowane z obsługą jack, dobre !\n" -#: src/main.c:1404 +#: src/main.c:1408 msgid "Compiled with pulse audio support, wonderful !\n" msgstr "" -#: src/main.c:1408 +#: src/main.c:1412 #, c-format
View file
LiVES-1.4.3.tar.bz2/po/pt.po -> LiVES-1.4.5.tar.bz2/po/pt.po
Changed
@@ -3,7 +3,7 @@ "Project-Id-Version: LiVES\n" "Report-Msgid-Bugs-To: http://www.sourceforge.net/tracker/?" "group_id=64341&atid=507139\n" -"POT-Creation-Date: 2011-06-11 19:29-0300\n" +"POT-Creation-Date: 2011-07-23 09:09-0300\n" "PO-Revision-Date: 2010-03-20 20:52+0000\n" "Last-Translator: salsaman <salsaman@gmail.com>\n" "Language-Team: pixel <vjpixel@gmail.com>\n" @@ -98,25 +98,25 @@ msgid "**The current layout**" msgstr "**O layout atual**" -#: src/main.c:1192 +#: src/main.c:1196 msgid "Loading realtime effect plugins..." msgstr "A carregar plugins de efeito em tempo real..." -#: src/main.c:1245 +#: src/main.c:1249 msgid "Starting jack audio server..." msgstr "A iniciar servidor de jack audio..." -#: src/main.c:1247 +#: src/main.c:1251 #, fuzzy msgid "Starting jack transport server..." msgstr "A iniciar servidor de jack audio..." -#: src/main.c:1248 +#: src/main.c:1252 #, fuzzy msgid "Connecting to jack transport server..." msgstr "A iniciar servidor de jack audio..." -#: src/main.c:1275 +#: src/main.c:1279 #, fuzzy msgid "" "\n" @@ -137,95 +137,95 @@ "Ou tente inciar o lives com: -aplayer sox\n" "\n" -#: src/main.c:1299 +#: src/main.c:1303 msgid "Starting pulse audio server..." msgstr "" -#: src/main.c:1362 +#: src/main.c:1366 msgid "Checking optional dependencies:" msgstr "A verificar as dependências opcionais:" -#: src/main.c:1363 +#: src/main.c:1367 msgid "mplayer...detected..." msgstr "mplayer...detectado..." -#: src/main.c:1364 +#: src/main.c:1368 msgid "mplayer...NOT DETECTED..." msgstr "mplayer...NÃO DETECTADO..." -#: src/main.c:1365 +#: src/main.c:1369 msgid "convert...detected..." msgstr "convert...detectado..." -#: src/main.c:1366 +#: src/main.c:1370 msgid "convert...NOT DETECTED..." msgstr "convert...NÃO DETECTADO..." -#: src/main.c:1367 +#: src/main.c:1371 msgid "composite...detected..." msgstr "composite...detectado..." -#: src/main.c:1368 +#: src/main.c:1372 msgid "composite...NOT DETECTED..." msgstr "composite...NÃO DETECTADO..." -#: src/main.c:1369 +#: src/main.c:1373 msgid "sox...detected\n" msgstr "sox...detectado\n" -#: src/main.c:1370 +#: src/main.c:1374 msgid "sox...NOT DETECTED\n" msgstr "sox...NÃO DETECTADO...\n" -#: src/main.c:1371 +#: src/main.c:1375 msgid "cdda2wav...detected..." msgstr "cdda2wav...detectado..." -#: src/main.c:1372 +#: src/main.c:1376 msgid "cdda2wav...NOT DETECTED..." msgstr "cdda2wav...NÃO DETECTADO..." -#: src/main.c:1373 +#: src/main.c:1377 msgid "jackd...detected..." msgstr "jackd...detectado..." -#: src/main.c:1374 +#: src/main.c:1378 msgid "jackd...NOT DETECTED..." msgstr "jackd...NÃO DETECTADO..." -#: src/main.c:1375 +#: src/main.c:1379 msgid "pulse audio...detected..." msgstr "pulse audio...detectados..." -#: src/main.c:1376 +#: src/main.c:1380 msgid "pulse audio...NOT DETECTED..." msgstr "pulse audio...NÃO DETECTADO..." -#: src/main.c:1377 +#: src/main.c:1381 msgid "python...detected..." msgstr "python...detectado..." -#: src/main.c:1378 +#: src/main.c:1382 msgid "python...NOT DETECTED..." msgstr "python...NÃO DETECTADO..." -#: src/main.c:1379 +#: src/main.c:1383 msgid "dvgrab...detected..." msgstr "dvgrab...detectado..." -#: src/main.c:1380 +#: src/main.c:1384 msgid "dvgrab...NOT DETECTED..." msgstr "dvgrab...NÃO DETECTADO..." -#: src/main.c:1381 +#: src/main.c:1385 msgid "xwininfo...detected..." msgstr "xwininfo...detectado..." -#: src/main.c:1382 +#: src/main.c:1386 msgid "xwininfo...NOT DETECTED..." msgstr "xwininfo...NÃO DETECTADO..." -#: src/main.c:1385 +#: src/main.c:1389 #, c-format msgid "" "\n" @@ -236,37 +236,37 @@ "\n" "Gerenciador de janelas: \"%s\"; " -#: src/main.c:1388 +#: src/main.c:1392 #, c-format msgid "number of monitors detected: %d\n" msgstr "número de monitores detectados: %d\n" -#: src/main.c:1391 +#: src/main.c:1395 #, fuzzy, c-format msgid "Number of CPUs detected: %d\n" msgstr "número de monitores detectados: %d\n" -#: src/main.c:1394 +#: src/main.c:1398 #, c-format msgid "Temp directory is %s\n" msgstr "o diretório temp utilizado é %s\n" -#: src/main.c:1398 +#: src/main.c:1402 msgid "" "WARNING - this version of LiVES was compiled without either\n" "jack or pulse audio support.\n" "Many audio features will be unavailable.\n" msgstr "" -#: src/main.c:1401 +#: src/main.c:1405 msgid "Compiled with jack support, good !\n" msgstr "Compilado com suporte a JACK, bom!\n" -#: src/main.c:1404 +#: src/main.c:1408 msgid "Compiled with pulse audio support, wonderful !\n" msgstr "" -#: src/main.c:1408
View file
LiVES-1.4.3.tar.bz2/po/pt_BR.po -> LiVES-1.4.5.tar.bz2/po/pt_BR.po
Changed
@@ -3,7 +3,7 @@ "Project-Id-Version: LiVES\n" "Report-Msgid-Bugs-To: http://www.sourceforge.net/tracker/?" "group_id=64341&atid=507139\n" -"POT-Creation-Date: 2011-06-11 19:29-0300\n" +"POT-Creation-Date: 2011-07-23 09:09-0300\n" "PO-Revision-Date: 2011-04-30 07:07+0000\n" "Last-Translator: Gustavo Guidorizzi <Unknown>\n" "Language-Team: pixel <vjpixel@gmail.com>\n" @@ -101,23 +101,23 @@ msgid "**The current layout**" msgstr "**Layout atual**" -#: src/main.c:1192 +#: src/main.c:1196 msgid "Loading realtime effect plugins..." msgstr "Carregando plugins de efeitos em tempo real..." -#: src/main.c:1245 +#: src/main.c:1249 msgid "Starting jack audio server..." msgstr "Iniciando servidor de áudio jack..." -#: src/main.c:1247 +#: src/main.c:1251 msgid "Starting jack transport server..." msgstr "Iniciando o servidor jack de transporte..." -#: src/main.c:1248 +#: src/main.c:1252 msgid "Connecting to jack transport server..." msgstr "Conectando ao servidor jack de transporte..." -#: src/main.c:1275 +#: src/main.c:1279 msgid "" "\n" "\n" @@ -128,95 +128,95 @@ "Alternatively, try to start lives with either \"lives -jackopts 16\", or " msgstr "" -#: src/main.c:1299 +#: src/main.c:1303 msgid "Starting pulse audio server..." msgstr "Iniciando o servidor pulse audio..." -#: src/main.c:1362 +#: src/main.c:1366 msgid "Checking optional dependencies:" msgstr "Checando dependências opcionais:" -#: src/main.c:1363 +#: src/main.c:1367 msgid "mplayer...detected..." msgstr "mplayer...detectado..." -#: src/main.c:1364 +#: src/main.c:1368 msgid "mplayer...NOT DETECTED..." msgstr "mplayer...NÃO DETECTADO..." -#: src/main.c:1365 +#: src/main.c:1369 msgid "convert...detected..." msgstr "convert...detectado..." -#: src/main.c:1366 +#: src/main.c:1370 msgid "convert...NOT DETECTED..." msgstr "convert...NÃO DETECTADO..." -#: src/main.c:1367 +#: src/main.c:1371 msgid "composite...detected..." msgstr "composite...detectado..." -#: src/main.c:1368 +#: src/main.c:1372 msgid "composite...NOT DETECTED..." msgstr "composite...NÃO DETECTADO..." -#: src/main.c:1369 +#: src/main.c:1373 msgid "sox...detected\n" msgstr "sox...detectado\n" -#: src/main.c:1370 +#: src/main.c:1374 msgid "sox...NOT DETECTED\n" msgstr "sox...NÃO DETECTADO...\n" -#: src/main.c:1371 +#: src/main.c:1375 msgid "cdda2wav...detected..." msgstr "cdda2wav...detectado..." -#: src/main.c:1372 +#: src/main.c:1376 msgid "cdda2wav...NOT DETECTED..." msgstr "cdda2wav...NÃO DETECTADO..." -#: src/main.c:1373 +#: src/main.c:1377 msgid "jackd...detected..." msgstr "jackd...detectado..." -#: src/main.c:1374 +#: src/main.c:1378 msgid "jackd...NOT DETECTED..." msgstr "jackd...NÃO DETECTADO..." -#: src/main.c:1375 +#: src/main.c:1379 msgid "pulse audio...detected..." msgstr "pulse audio...detectado..." -#: src/main.c:1376 +#: src/main.c:1380 msgid "pulse audio...NOT DETECTED..." msgstr "pulse audio...NÃO DETECTADO..." -#: src/main.c:1377 +#: src/main.c:1381 msgid "python...detected..." msgstr "python...detectado..." -#: src/main.c:1378 +#: src/main.c:1382 msgid "python...NOT DETECTED..." msgstr "python...NÃO DETECTADO..." -#: src/main.c:1379 +#: src/main.c:1383 msgid "dvgrab...detected..." msgstr "dvgrab...detectado..." -#: src/main.c:1380 +#: src/main.c:1384 msgid "dvgrab...NOT DETECTED..." msgstr "dvgrab...NÃO DETECTADO..." -#: src/main.c:1381 +#: src/main.c:1385 msgid "xwininfo...detected..." msgstr "xwininfo...detectado..." -#: src/main.c:1382 +#: src/main.c:1386 msgid "xwininfo...NOT DETECTED..." msgstr "xwininfo...NÃO DETECTADO..." -#: src/main.c:1385 +#: src/main.c:1389 #, c-format msgid "" "\n" @@ -227,22 +227,22 @@ "\n" "Gerenciador de janelas: \"%s\"; " -#: src/main.c:1388 +#: src/main.c:1392 #, c-format msgid "number of monitors detected: %d\n" msgstr "número de monitores detectados: %d\n" -#: src/main.c:1391 +#: src/main.c:1395 #, c-format msgid "Number of CPUs detected: %d\n" msgstr "Número de CPUs detectadas: %d\n" -#: src/main.c:1394 +#: src/main.c:1398 #, c-format msgid "Temp directory is %s\n" msgstr "o diretório temp utilizado é %s\n" -#: src/main.c:1398 +#: src/main.c:1402 msgid "" "WARNING - this version of LiVES was compiled without either\n" "jack or pulse audio support.\n" @@ -252,15 +252,15 @@ "jack ou suporte ao pulse audio.\n" "Muitos recursos de áudio não estarão disponíveis.\n" -#: src/main.c:1401 +#: src/main.c:1405 msgid "Compiled with jack support, good !\n" msgstr "Compilado com suporte a JACK, bom!\n" -#: src/main.c:1404 +#: src/main.c:1408 msgid "Compiled with pulse audio support, wonderful !\n" msgstr "Compilado com o suporte ao pulse audio, maravilha !\n" -#: src/main.c:1408 +#: src/main.c:1412
View file
LiVES-1.4.3.tar.bz2/po/ro.po -> LiVES-1.4.5.tar.bz2/po/ro.po
Changed
@@ -8,7 +8,7 @@ "Project-Id-Version: lives\n" "Report-Msgid-Bugs-To: http://www.sourceforge.net/tracker/?" "group_id=64341&atid=507139\n" -"POT-Creation-Date: 2011-06-11 19:29-0300\n" +"POT-Creation-Date: 2011-07-23 09:09-0300\n" "PO-Revision-Date: 2010-02-21 11:00+0000\n" "Last-Translator: Guybrush88 <Unknown>\n" "Language-Team: Romanian <ro@li.org>\n" @@ -105,25 +105,25 @@ msgid "**The current layout**" msgstr "** Structura actuală **" -#: src/main.c:1192 +#: src/main.c:1196 msgid "Loading realtime effect plugins..." msgstr "Se incarcă modulele de efecte in timp real..." -#: src/main.c:1245 +#: src/main.c:1249 msgid "Starting jack audio server..." msgstr "Pornirea serverului audio jack..." -#: src/main.c:1247 +#: src/main.c:1251 #, fuzzy msgid "Starting jack transport server..." msgstr "Pornirea serverului audio jack..." -#: src/main.c:1248 +#: src/main.c:1252 #, fuzzy msgid "Connecting to jack transport server..." msgstr "Pornirea serverului audio jack..." -#: src/main.c:1275 +#: src/main.c:1279 #, fuzzy msgid "" "\n" @@ -142,95 +142,95 @@ "\n" "Alternativ, incercati pornirea lives cu: \"lives -aplayer sox\"" -#: src/main.c:1299 +#: src/main.c:1303 msgid "Starting pulse audio server..." msgstr "Pornirea serverului audio pulse..." -#: src/main.c:1362 +#: src/main.c:1366 msgid "Checking optional dependencies:" msgstr "Verificarea dependenţelor opţionale:" -#: src/main.c:1363 +#: src/main.c:1367 msgid "mplayer...detected..." msgstr "mplayer...a fost detectat..." -#: src/main.c:1364 +#: src/main.c:1368 msgid "mplayer...NOT DETECTED..." msgstr "mplayer... nu a fost detectat..." -#: src/main.c:1365 +#: src/main.c:1369 msgid "convert...detected..." msgstr "convert...detectat..." -#: src/main.c:1366 +#: src/main.c:1370 msgid "convert...NOT DETECTED..." msgstr "convert...NU A FOST DETECTAT..." -#: src/main.c:1367 +#: src/main.c:1371 msgid "composite...detected..." msgstr "composite...detectat..." -#: src/main.c:1368 +#: src/main.c:1372 msgid "composite...NOT DETECTED..." msgstr "composite...NU A FOST DETECTAT..." -#: src/main.c:1369 +#: src/main.c:1373 msgid "sox...detected\n" msgstr "sox...detectat\n" -#: src/main.c:1370 +#: src/main.c:1374 msgid "sox...NOT DETECTED\n" msgstr "sox...NU A FOST DETECTAT\n" -#: src/main.c:1371 +#: src/main.c:1375 msgid "cdda2wav...detected..." msgstr "cdda2wav...detectat..." -#: src/main.c:1372 +#: src/main.c:1376 msgid "cdda2wav...NOT DETECTED..." msgstr "cdda2wav...NU A FOST DETECTAT..." -#: src/main.c:1373 +#: src/main.c:1377 msgid "jackd...detected..." msgstr "jackd...detectat..." -#: src/main.c:1374 +#: src/main.c:1378 msgid "jackd...NOT DETECTED..." msgstr "jackd...NU A FOST DETECTAT..." -#: src/main.c:1375 +#: src/main.c:1379 msgid "pulse audio...detected..." msgstr "pulse audio...detectat..." -#: src/main.c:1376 +#: src/main.c:1380 msgid "pulse audio...NOT DETECTED..." msgstr "pulse audio...NU A FOST DETECTAT..." -#: src/main.c:1377 +#: src/main.c:1381 msgid "python...detected..." msgstr "python...detectat..." -#: src/main.c:1378 +#: src/main.c:1382 msgid "python...NOT DETECTED..." msgstr "python...NU A FOST DETECTAT..." -#: src/main.c:1379 +#: src/main.c:1383 msgid "dvgrab...detected..." msgstr "dvgrab...detectat..." -#: src/main.c:1380 +#: src/main.c:1384 msgid "dvgrab...NOT DETECTED..." msgstr "dvgrab...NU A FOST DETECTAT..." -#: src/main.c:1381 +#: src/main.c:1385 msgid "xwininfo...detected..." msgstr "xwininfo...detectat..." -#: src/main.c:1382 +#: src/main.c:1386 msgid "xwininfo...NOT DETECTED..." msgstr "xwininfo...NU A FOST DETECTAT..." -#: src/main.c:1385 +#: src/main.c:1389 #, c-format msgid "" "\n" @@ -241,22 +241,22 @@ "\n" "Rapoarte de manager de ferestre ca \"%s\"; " -#: src/main.c:1388 +#: src/main.c:1392 #, c-format msgid "number of monitors detected: %d\n" msgstr "numărul de monitoare detectate: %d\n" -#: src/main.c:1391 +#: src/main.c:1395 #, fuzzy, c-format msgid "Number of CPUs detected: %d\n" msgstr "numărul de monitoare detectate: %d\n" -#: src/main.c:1394 +#: src/main.c:1398 #, c-format msgid "Temp directory is %s\n" msgstr "Directorul temporar este de %s\n" -#: src/main.c:1398 +#: src/main.c:1402 msgid "" "WARNING - this version of LiVES was compiled without either\n" "jack or pulse audio support.\n" @@ -266,15 +266,15 @@ "suport pentru jack sau pulse audio.\n" "Multe din funcțiile audio vor fi indisponibile.\n" -#: src/main.c:1401 +#: src/main.c:1405 msgid "Compiled with jack support, good !\n" msgstr "Compilate cu suport jack, de bine !\n" -#: src/main.c:1404 +#: src/main.c:1408 msgid "Compiled with pulse audio support, wonderful !\n" msgstr "Compilate cu suport de pulse audio, minunat\n"
View file
LiVES-1.4.3.tar.bz2/po/ru.po -> LiVES-1.4.5.tar.bz2/po/ru.po
Changed
@@ -8,7 +8,7 @@ "Project-Id-Version: lives\n" "Report-Msgid-Bugs-To: http://www.sourceforge.net/tracker/?" "group_id=64341&atid=507139\n" -"POT-Creation-Date: 2011-06-11 19:29-0300\n" +"POT-Creation-Date: 2011-07-23 09:09-0300\n" "PO-Revision-Date: 2010-12-06 00:51+0000\n" "Last-Translator: Alexey Ivanov <alexey.ivanes@gmail.com>\n" "Language-Team: Russian <ru@li.org>\n" @@ -109,23 +109,23 @@ msgid "**The current layout**" msgstr "Текущее размещение" -#: src/main.c:1192 +#: src/main.c:1196 msgid "Loading realtime effect plugins..." msgstr "Загрузка плагина эффектов реального времени..." -#: src/main.c:1245 +#: src/main.c:1249 msgid "Starting jack audio server..." msgstr "Запуск звукового сервера jack..." -#: src/main.c:1247 +#: src/main.c:1251 msgid "Starting jack transport server..." msgstr "Запуск передающего сервера jack..." -#: src/main.c:1248 +#: src/main.c:1252 msgid "Connecting to jack transport server..." msgstr "Подключение к передающему jack-серверу..." -#: src/main.c:1275 +#: src/main.c:1279 msgid "" "\n" "\n" @@ -136,95 +136,95 @@ "Alternatively, try to start lives with either \"lives -jackopts 16\", or " msgstr "" -#: src/main.c:1299 +#: src/main.c:1303 msgid "Starting pulse audio server..." msgstr "Запуск сервера pulse audio..." -#: src/main.c:1362 +#: src/main.c:1366 msgid "Checking optional dependencies:" msgstr "Проверка опциональных зависимостей:" -#: src/main.c:1363 +#: src/main.c:1367 msgid "mplayer...detected..." msgstr "mplayer...обнаружен..." -#: src/main.c:1364 +#: src/main.c:1368 msgid "mplayer...NOT DETECTED..." msgstr "mplayer...НЕ ОБНАРУЖЕН..." -#: src/main.c:1365 +#: src/main.c:1369 msgid "convert...detected..." msgstr "convert...обнаружен..." -#: src/main.c:1366 +#: src/main.c:1370 msgid "convert...NOT DETECTED..." msgstr "convert...НЕ ОБНАРУЖЕН..." -#: src/main.c:1367 +#: src/main.c:1371 msgid "composite...detected..." msgstr "composite...обнаружен..." -#: src/main.c:1368 +#: src/main.c:1372 msgid "composite...NOT DETECTED..." msgstr "composite...НЕ ОБНАРУЖЕН..." -#: src/main.c:1369 +#: src/main.c:1373 msgid "sox...detected\n" msgstr "sox...обнаружен...\n" -#: src/main.c:1370 +#: src/main.c:1374 msgid "sox...NOT DETECTED\n" msgstr "sox...НЕ ОБНАРУЖЕН...\n" -#: src/main.c:1371 +#: src/main.c:1375 msgid "cdda2wav...detected..." msgstr "cdda2wav...обнаружен..." -#: src/main.c:1372 +#: src/main.c:1376 msgid "cdda2wav...NOT DETECTED..." msgstr "cdda2wav...НЕ ОБНАРУЖЕН..." -#: src/main.c:1373 +#: src/main.c:1377 msgid "jackd...detected..." msgstr "jackd...обнаружен..." -#: src/main.c:1374 +#: src/main.c:1378 msgid "jackd...NOT DETECTED..." msgstr "jackd...НЕ ОБНАРУЖЕН..." -#: src/main.c:1375 +#: src/main.c:1379 msgid "pulse audio...detected..." msgstr "pulse audio...обнаружен..." -#: src/main.c:1376 +#: src/main.c:1380 msgid "pulse audio...NOT DETECTED..." msgstr "pulse audio...НЕ ОБНАРУЖЕН..." -#: src/main.c:1377 +#: src/main.c:1381 msgid "python...detected..." msgstr "python...обнаружен..." -#: src/main.c:1378 +#: src/main.c:1382 msgid "python...NOT DETECTED..." msgstr "python...НЕ ОБНАРУЖЕН..." -#: src/main.c:1379 +#: src/main.c:1383 msgid "dvgrab...detected..." msgstr "dvgrab...обнаружен..." -#: src/main.c:1380 +#: src/main.c:1384 msgid "dvgrab...NOT DETECTED..." msgstr "dvgrab...НЕ ОБНАРУЖЕН..." -#: src/main.c:1381 +#: src/main.c:1385 msgid "xwininfo...detected..." msgstr "xwininfo...обнаружен..." -#: src/main.c:1382 +#: src/main.c:1386 msgid "xwininfo...NOT DETECTED..." msgstr "xwininfo...НЕ ОБНАРУЖЕН..." -#: src/main.c:1385 +#: src/main.c:1389 #, c-format msgid "" "\n" @@ -235,22 +235,22 @@ "\n" "Менеджер интерфейса определен как \"%s\"; " -#: src/main.c:1388 +#: src/main.c:1392 #, c-format msgid "number of monitors detected: %d\n" msgstr "обнаружено мониторов: %d\n" -#: src/main.c:1391 +#: src/main.c:1395 #, fuzzy, c-format msgid "Number of CPUs detected: %d\n" msgstr "обнаружено мониторов: %d\n" -#: src/main.c:1394 +#: src/main.c:1398 #, c-format msgid "Temp directory is %s\n" msgstr "Временный каталог: %s\n" -#: src/main.c:1398 +#: src/main.c:1402 msgid "" "WARNING - this version of LiVES was compiled without either\n" "jack or pulse audio support.\n" @@ -260,15 +260,15 @@ "без поддержки jack или pulse audio.\n" "Многие аудиофункции будут недоступны.\n" -#: src/main.c:1401 +#: src/main.c:1405 msgid "Compiled with jack support, good !\n" msgstr "Скомпилировано с поддержкой jack, отлично!\n" -#: src/main.c:1404 +#: src/main.c:1408 msgid "Compiled with pulse audio support, wonderful !\n" msgstr "Скомпоновано с поддержкой pulse audio, замечательно !\n" -#: src/main.c:1408 +#: src/main.c:1412
View file
LiVES-1.4.3.tar.bz2/po/sk.po -> LiVES-1.4.5.tar.bz2/po/sk.po
Changed
@@ -8,7 +8,7 @@ "Project-Id-Version: lives\n" "Report-Msgid-Bugs-To: http://www.sourceforge.net/tracker/?" "group_id=64341&atid=507139\n" -"POT-Creation-Date: 2011-06-11 19:29-0300\n" +"POT-Creation-Date: 2011-07-23 09:09-0300\n" "PO-Revision-Date: 2010-03-28 17:11+0000\n" "Last-Translator: milboy <Unknown>\n" "Language-Team: Slovak <sk@li.org>\n" @@ -109,23 +109,23 @@ msgid "**The current layout**" msgstr "**Súčasné rozloženie**" -#: src/main.c:1192 +#: src/main.c:1196 msgid "Loading realtime effect plugins..." msgstr "Načítavam efekt rozšírenia v réálnom čase..." -#: src/main.c:1245 +#: src/main.c:1249 msgid "Starting jack audio server..." msgstr "Spúšťam zvukový server jack..." -#: src/main.c:1247 +#: src/main.c:1251 msgid "Starting jack transport server..." msgstr "" -#: src/main.c:1248 +#: src/main.c:1252 msgid "Connecting to jack transport server..." msgstr "" -#: src/main.c:1275 +#: src/main.c:1279 #, fuzzy msgid "" "\n" @@ -145,95 +145,95 @@ "Prípadne môžete spustit LiVES príkazom: lives -aplayer sox\n" "\n" -#: src/main.c:1299 +#: src/main.c:1303 msgid "Starting pulse audio server..." msgstr "Spúšťam pulse audio server..." -#: src/main.c:1362 +#: src/main.c:1366 msgid "Checking optional dependencies:" msgstr "Kontrola dodatočných záavislostí:" -#: src/main.c:1363 +#: src/main.c:1367 msgid "mplayer...detected..." msgstr "mplayer...nájdený..." -#: src/main.c:1364 +#: src/main.c:1368 msgid "mplayer...NOT DETECTED..." msgstr "mplayer...NENÁJDENÝ..." -#: src/main.c:1365 +#: src/main.c:1369 msgid "convert...detected..." msgstr "convert...nájdený..." -#: src/main.c:1366 +#: src/main.c:1370 msgid "convert...NOT DETECTED..." msgstr "convert...NENÁJDENÝ..." -#: src/main.c:1367 +#: src/main.c:1371 msgid "composite...detected..." msgstr "composite...nájdený..." -#: src/main.c:1368 +#: src/main.c:1372 msgid "composite...NOT DETECTED..." msgstr "composite...NENÁJDENÝ..." -#: src/main.c:1369 +#: src/main.c:1373 msgid "sox...detected\n" msgstr "sox...nájdený\n" -#: src/main.c:1370 +#: src/main.c:1374 msgid "sox...NOT DETECTED\n" msgstr "sox...NENÁJDENÝ\n" -#: src/main.c:1371 +#: src/main.c:1375 msgid "cdda2wav...detected..." msgstr "cdda2wav...nájdený..." -#: src/main.c:1372 +#: src/main.c:1376 msgid "cdda2wav...NOT DETECTED..." msgstr "cdda2wav...NENÁJDENÝ..." -#: src/main.c:1373 +#: src/main.c:1377 msgid "jackd...detected..." msgstr "jackd...nájdený..." -#: src/main.c:1374 +#: src/main.c:1378 msgid "jackd...NOT DETECTED..." msgstr "jackd...NENÁJDENÝ..." -#: src/main.c:1375 +#: src/main.c:1379 msgid "pulse audio...detected..." msgstr "pulse audio...nájdené..." -#: src/main.c:1376 +#: src/main.c:1380 msgid "pulse audio...NOT DETECTED..." msgstr "pulse audio...NENÁJDENÉ..." -#: src/main.c:1377 +#: src/main.c:1381 msgid "python...detected..." msgstr "python...nájdený..." -#: src/main.c:1378 +#: src/main.c:1382 msgid "python...NOT DETECTED..." msgstr "python...NENÁJDENÝ..." -#: src/main.c:1379 +#: src/main.c:1383 msgid "dvgrab...detected..." msgstr "dvgrab...nájdený..." -#: src/main.c:1380 +#: src/main.c:1384 msgid "dvgrab...NOT DETECTED..." msgstr "dvgrab...NENÁJDENÝ..." -#: src/main.c:1381 +#: src/main.c:1385 msgid "xwininfo...detected..." msgstr "xwininfo...nájdený..." -#: src/main.c:1382 +#: src/main.c:1386 msgid "xwininfo...NOT DETECTED..." msgstr "xwininfo...NENÁJDENÝ..." -#: src/main.c:1385 +#: src/main.c:1389 #, c-format msgid "" "\n" @@ -244,22 +244,22 @@ "\n" "Správa manažéra okien ako \"%s\"; " -#: src/main.c:1388 +#: src/main.c:1392 #, c-format msgid "number of monitors detected: %d\n" msgstr "počet nájdených monitorov: %d\n" -#: src/main.c:1391 +#: src/main.c:1395 #, fuzzy, c-format msgid "Number of CPUs detected: %d\n" msgstr "počet nájdených monitorov: %d\n" -#: src/main.c:1394 +#: src/main.c:1398 #, c-format msgid "Temp directory is %s\n" msgstr "Dočasný adresár je %s\n" -#: src/main.c:1398 +#: src/main.c:1402 msgid "" "WARNING - this version of LiVES was compiled without either\n" "jack or pulse audio support.\n" @@ -269,15 +269,15 @@ "podpory jack alebo pulse audio.\n" "Mnohé audio funkcie nebudú k dispozícii.\n" -#: src/main.c:1401 +#: src/main.c:1405 msgid "Compiled with jack support, good !\n" msgstr "Kompilované s podporou jack, dobrá práca!\n" -#: src/main.c:1404 +#: src/main.c:1408 msgid "Compiled with pulse audio support, wonderful !\n" msgstr "Kompilované s podporou pulse audio, nádhera !\n" -#: src/main.c:1408 +#: src/main.c:1412
View file
LiVES-1.4.3.tar.bz2/po/te.po -> LiVES-1.4.5.tar.bz2/po/te.po
Changed
@@ -8,7 +8,7 @@ "Project-Id-Version: lives\n" "Report-Msgid-Bugs-To: http://www.sourceforge.net/tracker/?" "group_id=64341&atid=507139\n" -"POT-Creation-Date: 2011-06-11 19:29-0300\n" +"POT-Creation-Date: 2011-07-23 09:09-0300\n" "PO-Revision-Date: 2009-12-27 23:30+0000\n" "Last-Translator: Guybrush88 <Unknown>\n" "Language-Team: Telugu <te@li.org>\n" @@ -90,23 +90,23 @@ msgid "**The current layout**" msgstr "" -#: src/main.c:1192 +#: src/main.c:1196 msgid "Loading realtime effect plugins..." msgstr "" -#: src/main.c:1245 +#: src/main.c:1249 msgid "Starting jack audio server..." msgstr "" -#: src/main.c:1247 +#: src/main.c:1251 msgid "Starting jack transport server..." msgstr "" -#: src/main.c:1248 +#: src/main.c:1252 msgid "Connecting to jack transport server..." msgstr "" -#: src/main.c:1275 +#: src/main.c:1279 msgid "" "\n" "\n" @@ -117,95 +117,95 @@ "Alternatively, try to start lives with either \"lives -jackopts 16\", or " msgstr "" -#: src/main.c:1299 +#: src/main.c:1303 msgid "Starting pulse audio server..." msgstr "" -#: src/main.c:1362 +#: src/main.c:1366 msgid "Checking optional dependencies:" msgstr "" -#: src/main.c:1363 +#: src/main.c:1367 msgid "mplayer...detected..." msgstr "" -#: src/main.c:1364 +#: src/main.c:1368 msgid "mplayer...NOT DETECTED..." msgstr "" -#: src/main.c:1365 +#: src/main.c:1369 msgid "convert...detected..." msgstr "" -#: src/main.c:1366 +#: src/main.c:1370 msgid "convert...NOT DETECTED..." msgstr "" -#: src/main.c:1367 +#: src/main.c:1371 msgid "composite...detected..." msgstr "" -#: src/main.c:1368 +#: src/main.c:1372 msgid "composite...NOT DETECTED..." msgstr "" -#: src/main.c:1369 +#: src/main.c:1373 msgid "sox...detected\n" msgstr "" -#: src/main.c:1370 +#: src/main.c:1374 msgid "sox...NOT DETECTED\n" msgstr "" -#: src/main.c:1371 +#: src/main.c:1375 msgid "cdda2wav...detected..." msgstr "" -#: src/main.c:1372 +#: src/main.c:1376 msgid "cdda2wav...NOT DETECTED..." msgstr "" -#: src/main.c:1373 +#: src/main.c:1377 msgid "jackd...detected..." msgstr "" -#: src/main.c:1374 +#: src/main.c:1378 msgid "jackd...NOT DETECTED..." msgstr "" -#: src/main.c:1375 +#: src/main.c:1379 msgid "pulse audio...detected..." msgstr "" -#: src/main.c:1376 +#: src/main.c:1380 msgid "pulse audio...NOT DETECTED..." msgstr "" -#: src/main.c:1377 +#: src/main.c:1381 msgid "python...detected..." msgstr "" -#: src/main.c:1378 +#: src/main.c:1382 msgid "python...NOT DETECTED..." msgstr "" -#: src/main.c:1379 +#: src/main.c:1383 msgid "dvgrab...detected..." msgstr "" -#: src/main.c:1380 +#: src/main.c:1384 msgid "dvgrab...NOT DETECTED..." msgstr "" -#: src/main.c:1381 +#: src/main.c:1385 msgid "xwininfo...detected..." msgstr "" -#: src/main.c:1382 +#: src/main.c:1386 msgid "xwininfo...NOT DETECTED..." msgstr "" -#: src/main.c:1385 +#: src/main.c:1389 #, c-format msgid "" "\n" @@ -213,167 +213,171 @@ "Window manager reports as \"%s\"; " msgstr "" -#: src/main.c:1388 +#: src/main.c:1392 #, c-format msgid "number of monitors detected: %d\n" msgstr "" -#: src/main.c:1391 +#: src/main.c:1395 #, c-format msgid "Number of CPUs detected: %d\n" msgstr "" -#: src/main.c:1394 +#: src/main.c:1398 #, c-format msgid "Temp directory is %s\n" msgstr "" -#: src/main.c:1398 +#: src/main.c:1402 msgid "" "WARNING - this version of LiVES was compiled without either\n" "jack or pulse audio support.\n" "Many audio features will be unavailable.\n" msgstr "" -#: src/main.c:1401 +#: src/main.c:1405 msgid "Compiled with jack support, good !\n" msgstr "" -#: src/main.c:1404 +#: src/main.c:1408 msgid "Compiled with pulse audio support, wonderful !\n" msgstr "" -#: src/main.c:1408 +#: src/main.c:1412 #, c-format
View file
LiVES-1.4.3.tar.bz2/po/tr.po -> LiVES-1.4.5.tar.bz2/po/tr.po
Changed
@@ -8,7 +8,7 @@ "Project-Id-Version: lives\n" "Report-Msgid-Bugs-To: http://www.sourceforge.net/tracker/?" "group_id=64341&atid=507139\n" -"POT-Creation-Date: 2011-06-11 19:29-0300\n" +"POT-Creation-Date: 2011-07-23 09:09-0300\n" "PO-Revision-Date: 2010-11-09 20:35+0000\n" "Last-Translator: zeugma <Unknown>\n" "Language-Team: Turkish <tr@li.org>\n" @@ -105,23 +105,23 @@ msgid "**The current layout**" msgstr "**Mevcut yerleşim düzeni**" -#: src/main.c:1192 +#: src/main.c:1196 msgid "Loading realtime effect plugins..." msgstr "Gerçek zaman efekt eklentileri yükleniyor" -#: src/main.c:1245 +#: src/main.c:1249 msgid "Starting jack audio server..." msgstr "Jack audio sunucusu başlıyor..." -#: src/main.c:1247 +#: src/main.c:1251 msgid "Starting jack transport server..." msgstr "Jack taşıma sunucusu başlıyor" -#: src/main.c:1248 +#: src/main.c:1252 msgid "Connecting to jack transport server..." msgstr "Jack taşıma sunucusuna bağlanılıyor" -#: src/main.c:1275 +#: src/main.c:1279 msgid "" "\n" "\n" @@ -132,95 +132,95 @@ "Alternatively, try to start lives with either \"lives -jackopts 16\", or " msgstr "" -#: src/main.c:1299 +#: src/main.c:1303 msgid "Starting pulse audio server..." msgstr "Pulse audio sunucusu başlıyor" -#: src/main.c:1362 +#: src/main.c:1366 msgid "Checking optional dependencies:" msgstr "Isteğe bağlı bağımlılıkları denetleme:" -#: src/main.c:1363 +#: src/main.c:1367 msgid "mplayer...detected..." msgstr "mplayer ... bulundu ..." -#: src/main.c:1364 +#: src/main.c:1368 msgid "mplayer...NOT DETECTED..." msgstr "mplayer ... BULUNAMADI ..." -#: src/main.c:1365 +#: src/main.c:1369 msgid "convert...detected..." msgstr "convert...bulundu..." -#: src/main.c:1366 +#: src/main.c:1370 msgid "convert...NOT DETECTED..." msgstr "convert...BULUNAMADI..." -#: src/main.c:1367 +#: src/main.c:1371 msgid "composite...detected..." msgstr "composite ... bulundu ..." -#: src/main.c:1368 +#: src/main.c:1372 msgid "composite...NOT DETECTED..." msgstr "composite ... BULUNAMADI ..." -#: src/main.c:1369 +#: src/main.c:1373 msgid "sox...detected\n" msgstr "sox...bulundu\n" -#: src/main.c:1370 +#: src/main.c:1374 msgid "sox...NOT DETECTED\n" msgstr "sox...BULUNAMADI\n" -#: src/main.c:1371 +#: src/main.c:1375 msgid "cdda2wav...detected..." msgstr "cdda2wav...bulundu..." -#: src/main.c:1372 +#: src/main.c:1376 msgid "cdda2wav...NOT DETECTED..." msgstr "cdda2wav...BULUNAMADI..." -#: src/main.c:1373 +#: src/main.c:1377 msgid "jackd...detected..." msgstr "jackd...bulundu..." -#: src/main.c:1374 +#: src/main.c:1378 msgid "jackd...NOT DETECTED..." msgstr "jackd...BULUNAMADI..." -#: src/main.c:1375 +#: src/main.c:1379 msgid "pulse audio...detected..." msgstr "Pulse audio... algılandı..." -#: src/main.c:1376 +#: src/main.c:1380 msgid "pulse audio...NOT DETECTED..." msgstr "Pulse audio...ALGILANMADI..." -#: src/main.c:1377 +#: src/main.c:1381 msgid "python...detected..." msgstr "python...bulundu..." -#: src/main.c:1378 +#: src/main.c:1382 msgid "python...NOT DETECTED..." msgstr "python...BULUNAMADI..." -#: src/main.c:1379 +#: src/main.c:1383 msgid "dvgrab...detected..." msgstr "dvgrab...bulundu..." -#: src/main.c:1380 +#: src/main.c:1384 msgid "dvgrab...NOT DETECTED..." msgstr "dvgrab...BULUNAMADI..." -#: src/main.c:1381 +#: src/main.c:1385 msgid "xwininfo...detected..." msgstr "xwininfo...bulundu..." -#: src/main.c:1382 +#: src/main.c:1386 msgid "xwininfo...NOT DETECTED..." msgstr "xwininfo...BULUNAMADI..." -#: src/main.c:1385 +#: src/main.c:1389 #, c-format msgid "" "\n" @@ -231,22 +231,22 @@ "\n" "Pencere yöneticisi raporları olarak \"%s\"; " -#: src/main.c:1388 +#: src/main.c:1392 #, c-format msgid "number of monitors detected: %d\n" msgstr "bulunan monitor sayısı : %d\n" -#: src/main.c:1391 +#: src/main.c:1395 #, fuzzy, c-format msgid "Number of CPUs detected: %d\n" msgstr "bulunan monitor sayısı : %d\n" -#: src/main.c:1394 +#: src/main.c:1398 #, c-format msgid "Temp directory is %s\n" msgstr "Geçici dizin:% s\n" -#: src/main.c:1398 +#: src/main.c:1402 msgid "" "WARNING - this version of LiVES was compiled without either\n" "jack or pulse audio support.\n" @@ -256,15 +256,15 @@ "ses desteği olmadan derlenmiştir.\n" "Bir çok ses özelliği kullanılamaz.\n" -#: src/main.c:1401 +#: src/main.c:1405 msgid "Compiled with jack support, good !\n" msgstr "Jack desteği ile derlendi, iyi!\n" -#: src/main.c:1404 +#: src/main.c:1408 msgid "Compiled with pulse audio support, wonderful !\n" msgstr "Pulse audio desteğiyle derlendi, mükemmel!\n" -#: src/main.c:1408 +#: src/main.c:1412
View file
LiVES-1.4.3.tar.bz2/po/uk.po -> LiVES-1.4.5.tar.bz2/po/uk.po
Changed
@@ -8,7 +8,7 @@ "Project-Id-Version: lives\n" "Report-Msgid-Bugs-To: http://www.sourceforge.net/tracker/?" "group_id=64341&atid=507139\n" -"POT-Creation-Date: 2011-06-11 19:29-0300\n" +"POT-Creation-Date: 2011-07-23 09:09-0300\n" "PO-Revision-Date: 2011-06-06 16:02+0000\n" "Last-Translator: Yuri Chornoivan <yurchor@gmail.com>\n" "Language-Team: Ukrainian <translation@linux.org.ua>\n" @@ -109,23 +109,23 @@ msgid "**The current layout**" msgstr "**Поточне компонування**" -#: src/main.c:1192 +#: src/main.c:1196 msgid "Loading realtime effect plugins..." msgstr "Завантаження додатків ефектів реального часу…" -#: src/main.c:1245 +#: src/main.c:1249 msgid "Starting jack audio server..." msgstr "Запуск звукового сервера jack…" -#: src/main.c:1247 +#: src/main.c:1251 msgid "Starting jack transport server..." msgstr "Запуск сервера передавання даних jack…" -#: src/main.c:1248 +#: src/main.c:1252 msgid "Connecting to jack transport server..." msgstr "Встановлення з’єднання з сервером передавання даних jack…" -#: src/main.c:1275 +#: src/main.c:1279 msgid "" "\n" "\n" @@ -143,95 +143,95 @@ "\n" "Alternatively, try to start lives with either \"lives -jackopts 16\", or " -#: src/main.c:1299 +#: src/main.c:1303 msgid "Starting pulse audio server..." msgstr "Запуск звукового сервера PulseAudio…" -#: src/main.c:1362 +#: src/main.c:1366 msgid "Checking optional dependencies:" msgstr "Пошук додаткових залежностей:" -#: src/main.c:1363 +#: src/main.c:1367 msgid "mplayer...detected..." msgstr "mplayer… виявлено…" -#: src/main.c:1364 +#: src/main.c:1368 msgid "mplayer...NOT DETECTED..." msgstr "mplayer…НЕ ВИЯВЛЕНО…" -#: src/main.c:1365 +#: src/main.c:1369 msgid "convert...detected..." msgstr "convert…виявлено…" -#: src/main.c:1366 +#: src/main.c:1370 msgid "convert...NOT DETECTED..." msgstr "convert...НЕ ВИЯВЛЕНО…" -#: src/main.c:1367 +#: src/main.c:1371 msgid "composite...detected..." msgstr "composite…виявлено…" -#: src/main.c:1368 +#: src/main.c:1372 msgid "composite...NOT DETECTED..." msgstr "composite…НЕ ВИЯВЛЕНО…" -#: src/main.c:1369 +#: src/main.c:1373 msgid "sox...detected\n" msgstr "sox…виявлено\n" -#: src/main.c:1370 +#: src/main.c:1374 msgid "sox...NOT DETECTED\n" msgstr "sox…НЕ ВИЯВЛЕНО\n" -#: src/main.c:1371 +#: src/main.c:1375 msgid "cdda2wav...detected..." msgstr "cdda2wav...виявлено..." -#: src/main.c:1372 +#: src/main.c:1376 msgid "cdda2wav...NOT DETECTED..." msgstr "cdda2wav...НЕ ВИЯВЛЕНО..." -#: src/main.c:1373 +#: src/main.c:1377 msgid "jackd...detected..." msgstr "jackd…виявлено…" -#: src/main.c:1374 +#: src/main.c:1378 msgid "jackd...NOT DETECTED..." msgstr "jackd…НЕ ВИЯВЛЕНО…" -#: src/main.c:1375 +#: src/main.c:1379 msgid "pulse audio...detected..." msgstr "pulse audio…виявлено…" -#: src/main.c:1376 +#: src/main.c:1380 msgid "pulse audio...NOT DETECTED..." msgstr "pulse audio…НЕ ВИЯВЛЕНО…" -#: src/main.c:1377 +#: src/main.c:1381 msgid "python...detected..." msgstr "python…виявлено…" -#: src/main.c:1378 +#: src/main.c:1382 msgid "python...NOT DETECTED..." msgstr "python…НЕ ВИЯВЛЕНО…" -#: src/main.c:1379 +#: src/main.c:1383 msgid "dvgrab...detected..." msgstr "dvgrab…виявлено…" -#: src/main.c:1380 +#: src/main.c:1384 msgid "dvgrab...NOT DETECTED..." msgstr "dvgrab…НЕ ВИЯВЛЕНО…" -#: src/main.c:1381 +#: src/main.c:1385 msgid "xwininfo...detected..." msgstr "xwininfo…виявлено…" -#: src/main.c:1382 +#: src/main.c:1386 msgid "xwininfo...NOT DETECTED..." msgstr "xwininfo…НЕ ВИЯВЛЕНО…" -#: src/main.c:1385 +#: src/main.c:1389 #, c-format msgid "" "\n" @@ -242,22 +242,22 @@ "\n" "Інструмент керування вікнами — «%s»; " -#: src/main.c:1388 +#: src/main.c:1392 #, c-format msgid "number of monitors detected: %d\n" msgstr "виявлена кількість моніторів: %d\n" -#: src/main.c:1391 +#: src/main.c:1395 #, c-format msgid "Number of CPUs detected: %d\n" msgstr "Кількість виявлених процесорів: %d\n" -#: src/main.c:1394 +#: src/main.c:1398 #, c-format msgid "Temp directory is %s\n" msgstr "Каталог тимчасових файлів — %s\n" -#: src/main.c:1398 +#: src/main.c:1402 msgid "" "WARNING - this version of LiVES was compiled without either\n" "jack or pulse audio support.\n" @@ -267,15 +267,15 @@ "jack або PulseAudio.\n" "Ви не зможете скористатися багатьма можливостями з обробки звуку.\n" -#: src/main.c:1401 +#: src/main.c:1405 msgid "Compiled with jack support, good !\n" msgstr "Зібрано з підтримкою jack, добре!\n" -#: src/main.c:1404 +#: src/main.c:1408 msgid "Compiled with pulse audio support, wonderful !\n" msgstr "Зібрано з підтримкою PulseAudio, чудово!\n" -#: src/main.c:1408 +#: src/main.c:1412
View file
LiVES-1.4.3.tar.bz2/po/uz.po -> LiVES-1.4.5.tar.bz2/po/uz.po
Changed
@@ -8,7 +8,7 @@ "Project-Id-Version: lives\n" "Report-Msgid-Bugs-To: http://www.sourceforge.net/tracker/?" "group_id=64341&atid=507139\n" -"POT-Creation-Date: 2011-06-11 19:29-0300\n" +"POT-Creation-Date: 2011-07-23 09:09-0300\n" "PO-Revision-Date: 2010-02-21 10:20+0000\n" "Last-Translator: Guybrush88 <Unknown>\n" "Language-Team: Uzbek <uz@li.org>\n" @@ -90,23 +90,23 @@ msgid "**The current layout**" msgstr "" -#: src/main.c:1192 +#: src/main.c:1196 msgid "Loading realtime effect plugins..." msgstr "" -#: src/main.c:1245 +#: src/main.c:1249 msgid "Starting jack audio server..." msgstr "" -#: src/main.c:1247 +#: src/main.c:1251 msgid "Starting jack transport server..." msgstr "" -#: src/main.c:1248 +#: src/main.c:1252 msgid "Connecting to jack transport server..." msgstr "" -#: src/main.c:1275 +#: src/main.c:1279 msgid "" "\n" "\n" @@ -117,95 +117,95 @@ "Alternatively, try to start lives with either \"lives -jackopts 16\", or " msgstr "" -#: src/main.c:1299 +#: src/main.c:1303 msgid "Starting pulse audio server..." msgstr "" -#: src/main.c:1362 +#: src/main.c:1366 msgid "Checking optional dependencies:" msgstr "" -#: src/main.c:1363 +#: src/main.c:1367 msgid "mplayer...detected..." msgstr "" -#: src/main.c:1364 +#: src/main.c:1368 msgid "mplayer...NOT DETECTED..." msgstr "" -#: src/main.c:1365 +#: src/main.c:1369 msgid "convert...detected..." msgstr "" -#: src/main.c:1366 +#: src/main.c:1370 msgid "convert...NOT DETECTED..." msgstr "" -#: src/main.c:1367 +#: src/main.c:1371 msgid "composite...detected..." msgstr "" -#: src/main.c:1368 +#: src/main.c:1372 msgid "composite...NOT DETECTED..." msgstr "" -#: src/main.c:1369 +#: src/main.c:1373 msgid "sox...detected\n" msgstr "" -#: src/main.c:1370 +#: src/main.c:1374 msgid "sox...NOT DETECTED\n" msgstr "" -#: src/main.c:1371 +#: src/main.c:1375 msgid "cdda2wav...detected..." msgstr "" -#: src/main.c:1372 +#: src/main.c:1376 msgid "cdda2wav...NOT DETECTED..." msgstr "" -#: src/main.c:1373 +#: src/main.c:1377 msgid "jackd...detected..." msgstr "" -#: src/main.c:1374 +#: src/main.c:1378 msgid "jackd...NOT DETECTED..." msgstr "" -#: src/main.c:1375 +#: src/main.c:1379 msgid "pulse audio...detected..." msgstr "" -#: src/main.c:1376 +#: src/main.c:1380 msgid "pulse audio...NOT DETECTED..." msgstr "" -#: src/main.c:1377 +#: src/main.c:1381 msgid "python...detected..." msgstr "" -#: src/main.c:1378 +#: src/main.c:1382 msgid "python...NOT DETECTED..." msgstr "" -#: src/main.c:1379 +#: src/main.c:1383 msgid "dvgrab...detected..." msgstr "" -#: src/main.c:1380 +#: src/main.c:1384 msgid "dvgrab...NOT DETECTED..." msgstr "" -#: src/main.c:1381 +#: src/main.c:1385 msgid "xwininfo...detected..." msgstr "" -#: src/main.c:1382 +#: src/main.c:1386 msgid "xwininfo...NOT DETECTED..." msgstr "" -#: src/main.c:1385 +#: src/main.c:1389 #, c-format msgid "" "\n" @@ -213,167 +213,171 @@ "Window manager reports as \"%s\"; " msgstr "" -#: src/main.c:1388 +#: src/main.c:1392 #, c-format msgid "number of monitors detected: %d\n" msgstr "" -#: src/main.c:1391 +#: src/main.c:1395 #, c-format msgid "Number of CPUs detected: %d\n" msgstr "" -#: src/main.c:1394 +#: src/main.c:1398 #, c-format msgid "Temp directory is %s\n" msgstr "" -#: src/main.c:1398 +#: src/main.c:1402 msgid "" "WARNING - this version of LiVES was compiled without either\n" "jack or pulse audio support.\n" "Many audio features will be unavailable.\n" msgstr "" -#: src/main.c:1401 +#: src/main.c:1405 msgid "Compiled with jack support, good !\n" msgstr "" -#: src/main.c:1404 +#: src/main.c:1408 msgid "Compiled with pulse audio support, wonderful !\n" msgstr "" -#: src/main.c:1408 +#: src/main.c:1412 #, c-format
View file
LiVES-1.4.3.tar.bz2/po/zh_CN.po -> LiVES-1.4.5.tar.bz2/po/zh_CN.po
Changed
@@ -8,7 +8,7 @@ "Project-Id-Version: lives\n" "Report-Msgid-Bugs-To: http://www.sourceforge.net/tracker/?" "group_id=64341&atid=507139\n" -"POT-Creation-Date: 2011-06-11 19:29-0300\n" +"POT-Creation-Date: 2011-07-23 09:09-0300\n" "PO-Revision-Date: 2011-03-13 04:07+0000\n" "Last-Translator: 英华 <wantinghard@gmail.com>\n" "Language-Team: Simplified Chinese <zh_CN@li.org>\n" @@ -102,23 +102,23 @@ msgid "**The current layout**" msgstr "**当前的布局**" -#: src/main.c:1192 +#: src/main.c:1196 msgid "Loading realtime effect plugins..." msgstr "正在加载实时效果插件..." -#: src/main.c:1245 +#: src/main.c:1249 msgid "Starting jack audio server..." msgstr "正在启动 jack 音频服务器..." -#: src/main.c:1247 +#: src/main.c:1251 msgid "Starting jack transport server..." msgstr "正在启动 jack 传输服务器..." -#: src/main.c:1248 +#: src/main.c:1252 msgid "Connecting to jack transport server..." msgstr "正在连接 jack 传输服务器..." -#: src/main.c:1275 +#: src/main.c:1279 msgid "" "\n" "\n" @@ -136,95 +136,95 @@ "\n" "或者，尝试通过“lives -jackopts 16”或以下方式启动 lives " -#: src/main.c:1299 +#: src/main.c:1303 msgid "Starting pulse audio server..." msgstr "正在开启 pulse 音频服务..." -#: src/main.c:1362 +#: src/main.c:1366 msgid "Checking optional dependencies:" msgstr "检查可选的依赖：" -#: src/main.c:1363 +#: src/main.c:1367 msgid "mplayer...detected..." msgstr "mplayer...发现..." -#: src/main.c:1364 +#: src/main.c:1368 msgid "mplayer...NOT DETECTED..." msgstr "mplayer...未发现..." -#: src/main.c:1365 +#: src/main.c:1369 msgid "convert...detected..." msgstr "convert...发现..." -#: src/main.c:1366 +#: src/main.c:1370 msgid "convert...NOT DETECTED..." msgstr "convert...未发现..." -#: src/main.c:1367 +#: src/main.c:1371 msgid "composite...detected..." msgstr "composite...发现..." -#: src/main.c:1368 +#: src/main.c:1372 msgid "composite...NOT DETECTED..." msgstr "composite...未发现..." -#: src/main.c:1369 +#: src/main.c:1373 msgid "sox...detected\n" msgstr "sox...发现\n" -#: src/main.c:1370 +#: src/main.c:1374 msgid "sox...NOT DETECTED\n" msgstr "sox...未发现\n" -#: src/main.c:1371 +#: src/main.c:1375 msgid "cdda2wav...detected..." msgstr "cdda2wav...发现..." -#: src/main.c:1372 +#: src/main.c:1376 msgid "cdda2wav...NOT DETECTED..." msgstr "cdda2wav...未发现..." -#: src/main.c:1373 +#: src/main.c:1377 msgid "jackd...detected..." msgstr "jackd...发现..." -#: src/main.c:1374 +#: src/main.c:1378 msgid "jackd...NOT DETECTED..." msgstr "jackd...未发现..." -#: src/main.c:1375 +#: src/main.c:1379 msgid "pulse audio...detected..." msgstr "pulse audio...发现..." -#: src/main.c:1376 +#: src/main.c:1380 msgid "pulse audio...NOT DETECTED..." msgstr "pulse 音频...未发现..." -#: src/main.c:1377 +#: src/main.c:1381 msgid "python...detected..." msgstr "python...发现..." -#: src/main.c:1378 +#: src/main.c:1382 msgid "python...NOT DETECTED..." msgstr "python...未发现..." -#: src/main.c:1379 +#: src/main.c:1383 msgid "dvgrab...detected..." msgstr "dvgrab...发现..." -#: src/main.c:1380 +#: src/main.c:1384 msgid "dvgrab...NOT DETECTED..." msgstr "dvgrab...未发现..." -#: src/main.c:1381 +#: src/main.c:1385 msgid "xwininfo...detected..." msgstr "xwininfo...发现..." -#: src/main.c:1382 +#: src/main.c:1386 msgid "xwininfo...NOT DETECTED..." msgstr "xwininfo...未发现..." -#: src/main.c:1385 +#: src/main.c:1389 #, c-format msgid "" "\n" @@ -235,22 +235,22 @@ "\n" "窗口管理器报告为\"%s\"； " -#: src/main.c:1388 +#: src/main.c:1392 #, c-format msgid "number of monitors detected: %d\n" msgstr "检测到的显视器数量：%d\n" -#: src/main.c:1391 +#: src/main.c:1395 #, fuzzy, c-format msgid "Number of CPUs detected: %d\n" msgstr "检测到的显视器数量：%d\n" -#: src/main.c:1394 +#: src/main.c:1398 #, c-format msgid "Temp directory is %s\n" msgstr "临时文件夹为 %s\n" -#: src/main.c:1398 +#: src/main.c:1402 msgid "" "WARNING - this version of LiVES was compiled without either\n" "jack or pulse audio support.\n" @@ -260,15 +260,15 @@ "jack 或 pulse 音频支持。\n" "许多音频功能将不可用。\n" -#: src/main.c:1401 +#: src/main.c:1405 msgid "Compiled with jack support, good !\n" msgstr "编译上 jack 支持了，好！\n" -#: src/main.c:1404 +#: src/main.c:1408 msgid "Compiled with pulse audio support, wonderful !\n" msgstr "编译上 pulse 音频支持了，很好！\n" -#: src/main.c:1408 +#: src/main.c:1412
View file
LiVES-1.4.3.tar.bz2/resources/Makefile.in -> LiVES-1.4.5.tar.bz2/resources/Makefile.in
Changed
@@ -158,6 +158,10 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ +LIBAVCODEC_CFLAGS = @LIBAVCODEC_CFLAGS@ +LIBAVCODEC_LIBS = @LIBAVCODEC_LIBS@ +LIBAVFORMAT_CFLAGS = @LIBAVFORMAT_CFLAGS@ +LIBAVFORMAT_LIBS = @LIBAVFORMAT_LIBS@ LIBDV_CFLAGS = @LIBDV_CFLAGS@ LIBDV_LIBS = @LIBDV_LIBS@ LIBICONV = @LIBICONV@ @@ -307,6 +311,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ +v4l1_INCFILE = @v4l1_INCFILE@ resourcesdir = $(datadir)/$(PACKAGE)/resources/ resources_DATA = vidtest.avi EXTRA_DIST = $(resources_DATA)
View file
LiVES-1.4.3.tar.bz2/smogrify -> LiVES-1.4.5.tar.bz2/smogrify
Changed
@@ -32,7 +32,7 @@ # Do not change these except for testing ! $background=1; -$version="1.4.3"; +$version="1.4.5"; #$dyneversion="LIVES-20091209"; @@ -51,8 +51,17 @@ if (defined($ARGV[0])) { $command=$ARGV[0]; - unless ($command eq "report"||$command eq "version") { - $tmpdir=&rc_get("tempdir"); + unless ($command eq "version") { + my ($rcfile)=$home."/".$rc_filename; + if (-f $rcfile) { + $tmpdir=&rc_get("session_tempdir"); + if ($tmpdir eq ""||$command eq "report") { + $tmpdir=&rc_get("tempdir"); + $priority=1; + &rc_set("session_tempdir",$tmpdir); + $priority=0; + } + } } if (!caller||$command eq "save"||$command eq "plugin_clear") { @@ -266,6 +275,7 @@ &rc_set_if_not_set("instant_open","true"); &rc_set_if_not_set("auto_deinterlace","true"); + &rc_set_if_not_set("auto_cut_borders","false"); &rc_set_if_not_set("mt_undo_buf",32); &rc_set_if_not_set("mt_enter_prompt","true"); @@ -4997,7 +5007,7 @@ sub rc_set { - # set a value in the .rc file + # set/mdoify/delete a value in the .rc file my ($key)=$_[0]; shift (@_); my ($value)=join(" ",@_); @@ -5021,7 +5031,8 @@ if ($key eq "") { $date=&get_current_date; - print OUT "# This file is autogenerated by $GUI_NAME on $date\n# You are strongly advised to change the values only through the GUI.\n"; + print OUT "# This file is autogenerated by $GUI_NAME on $date\n"; + print OUT "# You are strongly advised to change the values only through the GUI.\n"; } #replace <$key> to </$key> with our new value @@ -5029,13 +5040,34 @@ if (!defined(open IN,"$rcfile") && -e $rcfile) { exit 2; } - $string=""; - $part=0; - $found=0; + my $string=""; + my $current=""; + my $part=0; + my $found=0; while (<IN>) { - $string=$_; + my $laststring=$current; + $current=$_; + if ($delpref!=1) { + $string=$current; + + if ($string=~/^#.*/) { + #ignore comments + print OUT $string; + next; + } + } + else { + $string=$laststring; + next if ($laststring eq ""); + } + + if ($priority==2) { + print OUT "\n<$key>\n$value\n</$key>\n"; + $found=1; + $priority=1; + } if ($found==0||$part==1) { - if ($part==1||$_=~ /^(<$key>)/) { + if ($part==1||$current=~ /^(<$key>)/) { if ($skip_if_exist==1) { close IN; close OUT; @@ -5046,19 +5078,21 @@ if ($part==0) { $part=1; if ($delpref==0) { - print OUT "$1$2\n$value\n</$key>\n"; + #update existing value + print OUT "<$key>\n$value\n</$key>\n"; } else { + #delete #$date=&get_current_date; #print OUT "# $key deleted by $GUI_NAME $date\n"; + if ($string ne "\n") { + print OUT $string; + } + $delpref=2; } - $string=$3; $found=1; } - if ($string=~ /(<\/$key>)$/) { - if ($delpref==0) { - print OUT $3; - } + if ($current=~ /(<\/$key>)$/) { $part=0; } } @@ -5071,7 +5105,16 @@ } } if ($found==0&&$delpref==0) { - print OUT "\n<$key>\n$value\n</$key>\n"; + if ($priority==1) { + $priority=2; + &rc_set($key,$value); + } + else { + print OUT "\n<$key>\n$value\n</$key>\n"; + } + } + if ($delpref==1) { + print OUT $current; } } close IN;
View file
LiVES-1.4.3.tar.bz2/src/Makefile.am -> LiVES-1.4.5.tar.bz2/src/Makefile.am
Changed
@@ -129,11 +129,6 @@ endif -if HAVE_LIBv4l1 -v4l1_LDADD=-lv4l1 -endif - - lives_exe_SOURCES = \ main.c\ support.c support.h \
View file
LiVES-1.4.3.tar.bz2/src/Makefile.in -> LiVES-1.4.5.tar.bz2/src/Makefile.in
Changed
@@ -118,8 +118,7 @@ lives_exe_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) DEFAULT_INCLUDES = -I.@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -205,6 +204,10 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ +LIBAVCODEC_CFLAGS = @LIBAVCODEC_CFLAGS@ +LIBAVCODEC_LIBS = @LIBAVCODEC_LIBS@ +LIBAVFORMAT_CFLAGS = @LIBAVFORMAT_CFLAGS@ +LIBAVFORMAT_LIBS = @LIBAVFORMAT_LIBS@ LIBDV_CFLAGS = @LIBDV_CFLAGS@ LIBDV_LIBS = @LIBDV_LIBS@ LIBICONV = @LIBICONV@ @@ -354,6 +357,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ +v4l1_INCFILE = @v4l1_INCFILE@ gtk_def = $(am__append_2) $(am__append_3) @ENABLE_OSC_TRUE@osc_INCLUDES = -I $(top_srcdir)/libOSC @IS_DARWIN_TRUE@darwin_INCLUDES = -I /sw/include @@ -402,7 +406,6 @@ @ENABLE_GIW_TRUE@giw_SOURCES = giw/giwknob.c giw/giwknob.h giw/giwvslider.c giw/giwvslider.h giw/giwled.c giw/giwled.h @ENABLE_GIW_TRUE@giw_LDADD = -lm @ENABLE_GIW_TRUE@giw_CFLAGS = -DENABLE_GIW=1 -@HAVE_LIBv4l1_TRUE@v4l1_LDADD = -lv4l1 lives_exe_SOURCES = \ main.c\ support.c support.h \
View file
LiVES-1.4.3.tar.bz2/src/callbacks.c -> LiVES-1.4.5.tar.bz2/src/callbacks.c
Changed
@@ -51,21 +51,21 @@ gchar *com; if (mainw->stored_event_list!=NULL||mainw->sl_undo_mem!=NULL) { - pthread_mutex_lock(&mainw->gtk_mutex); + threaded_dialog_spin(); stored_event_list_free_all(FALSE); - pthread_mutex_unlock(&mainw->gtk_mutex); + threaded_dialog_spin(); } if (mainw->multitrack!=NULL&&mainw->multitrack->idlefunc>0) { - pthread_mutex_lock(&mainw->gtk_mutex); + threaded_dialog_spin(); g_source_remove(mainw->multitrack->idlefunc); - pthread_mutex_unlock(&mainw->gtk_mutex); + threaded_dialog_spin(); } if (mainw->multitrack!=NULL&&!mainw->only_close) { - pthread_mutex_lock(&mainw->gtk_mutex); + threaded_dialog_spin(); if (mainw->multitrack->undo_mem!=NULL) g_free(mainw->multitrack->undo_mem); - pthread_mutex_unlock(&mainw->gtk_mutex); + threaded_dialog_spin(); } if (mainw->playing_file>-1) { @@ -125,9 +125,9 @@ if (!mainw->leave_recovery) { unlink(mainw->recovery_file); // hide the main window - pthread_mutex_lock(&mainw->gtk_mutex); + threaded_dialog_spin(); while (g_main_context_iteration (NULL,FALSE)); - pthread_mutex_unlock(&mainw->gtk_mutex); + threaded_dialog_spin(); } if (strcmp(future_prefs->tmpdir,prefs->tmpdir)) { @@ -143,14 +143,15 @@ } g_snprintf(prefs->tmpdir,256,"%s",future_prefs->tmpdir); } + else if (!mainw->only_close) g_snprintf(future_prefs->tmpdir,256,"NULL"); if (mainw->leave_files) { gchar *msg; msg=g_strdup_printf(_("Saving as set %s..."),mainw->set_name); - pthread_mutex_lock(&mainw->gtk_mutex); + threaded_dialog_spin(); d_print(msg); g_free(msg); - pthread_mutex_unlock(&mainw->gtk_mutex); + threaded_dialog_spin(); } for (i=0;i<=MAX_FILES;i++) { @@ -160,55 +161,55 @@ #ifdef HAVE_YUV4MPEG if (mainw->files[i]->clip_type==CLIP_TYPE_YUV4MPEG) { - pthread_mutex_lock(&mainw->gtk_mutex); + threaded_dialog_spin(); lives_yuv_stream_stop_read(mainw->files[i]->ext_src); g_free (mainw->files[i]->ext_src); - pthread_mutex_unlock(&mainw->gtk_mutex); + threaded_dialog_spin(); } #endif #ifdef HAVE_UNICAP if (mainw->files[i]->clip_type==CLIP_TYPE_VIDEODEV) { - pthread_mutex_lock(&mainw->gtk_mutex); + threaded_dialog_spin(); lives_vdev_free(mainw->files[i]->ext_src); g_free (mainw->files[i]->ext_src); - pthread_mutex_unlock(&mainw->gtk_mutex); + threaded_dialog_spin(); } #endif com=g_strdup_printf("smogrify close %s",mainw->files[i]->handle); dummyvar=system(com); - pthread_mutex_lock(&mainw->gtk_mutex); + threaded_dialog_spin(); g_free(com); - pthread_mutex_unlock(&mainw->gtk_mutex); + threaded_dialog_spin(); } else { // or just clean them up com=g_strdup_printf("smogrify clear_tmp_files %s",mainw->files[i]->handle); dummyvar=system(com); - pthread_mutex_lock(&mainw->gtk_mutex); + threaded_dialog_spin(); g_free(com); if (mainw->files[i]->frame_index!=NULL) { save_frame_index(i); } - pthread_mutex_unlock(&mainw->gtk_mutex); + threaded_dialog_spin(); } if (!mainw->only_close) { if (mainw->files[i]->frame_index!=NULL) { - pthread_mutex_lock(&mainw->gtk_mutex); + threaded_dialog_spin(); g_free(mainw->files[i]->frame_index); - pthread_mutex_unlock(&mainw->gtk_mutex); + threaded_dialog_spin(); mainw->files[i]->frame_index=NULL; } if (mainw->files[i]->clip_type==CLIP_TYPE_FILE&&mainw->files[i]->ext_src!=NULL) { - pthread_mutex_lock(&mainw->gtk_mutex); + threaded_dialog_spin(); close_decoder_plugin(mainw->files[i]->ext_src); - pthread_mutex_unlock(&mainw->gtk_mutex); + threaded_dialog_spin(); mainw->files[i]->ext_src=NULL; } - pthread_mutex_lock(&mainw->gtk_mutex); + threaded_dialog_spin(); g_free(mainw->files[i]); - pthread_mutex_unlock(&mainw->gtk_mutex); + threaded_dialog_spin(); mainw->files[i]=NULL; } } @@ -219,40 +220,40 @@ if (!g_file_test(set_layout_dir,G_FILE_TEST_IS_DIR)) { com=g_strdup_printf("/bin/rm -r %s/%s/ 2>/dev/null",prefs->tmpdir,mainw->set_name); dummyvar=system(com); - pthread_mutex_lock(&mainw->gtk_mutex); + threaded_dialog_spin(); g_free(com); - pthread_mutex_unlock(&mainw->gtk_mutex); + threaded_dialog_spin(); } else { com=g_strdup_printf("/bin/rm -r %s/%s/clips 2>/dev/null",prefs->tmpdir,mainw->set_name); dummyvar=system(com); - pthread_mutex_lock(&mainw->gtk_mutex); + threaded_dialog_spin(); g_free(com); - pthread_mutex_unlock(&mainw->gtk_mutex); + threaded_dialog_spin(); com=g_strdup_printf("/bin/rm %s/%s/order 2>/dev/null",prefs->tmpdir,mainw->set_name); dummyvar=system(com); - pthread_mutex_lock(&mainw->gtk_mutex); + threaded_dialog_spin(); g_free(com); - pthread_mutex_unlock(&mainw->gtk_mutex); + threaded_dialog_spin(); } - pthread_mutex_lock(&mainw->gtk_mutex); + threaded_dialog_spin(); g_free(set_layout_dir); - pthread_mutex_unlock(&mainw->gtk_mutex); + threaded_dialog_spin(); } if (strlen(mainw->set_name)) { gchar *set_lock_file=g_strdup_printf("%s/%s/lock.%d",prefs->tmpdir,mainw->set_name,getpid()); unlink(set_lock_file); - pthread_mutex_lock(&mainw->gtk_mutex); + threaded_dialog_spin(); g_free(set_lock_file); - pthread_mutex_unlock(&mainw->gtk_mutex); + threaded_dialog_spin(); } for (i=1;i<=MAX_FILES;i++) { if (mainw->files[i]!=NULL) { mainw->current_file=i; - pthread_mutex_lock(&mainw->gtk_mutex); + threaded_dialog_spin(); if (cfile->event_list_back!=NULL) event_list_free (cfile->event_list_back); if (cfile->event_list!=NULL) event_list_free (cfile->event_list); @@ -276,7 +277,7 @@ cfile->layout_map=NULL; - pthread_mutex_unlock(&mainw->gtk_mutex); + threaded_dialog_spin(); } } @@ -286,9 +287,9 @@ for (i=1;i<=MAX_FILES;i++) { if (mainw->files[i]!=NULL&&(mainw->files[i]->clip_type==CLIP_TYPE_DISK||mainw->files[i]->clip_type==CLIP_TYPE_FILE)&&(mainw->multitrack==NULL||i!=mainw->multitrack->render_file)) { mainw->current_file=i; - pthread_mutex_lock(&mainw->gtk_mutex); + threaded_dialog_spin(); close_current_file(0); - pthread_mutex_unlock(&mainw->gtk_mutex); + threaded_dialog_spin(); } }
View file
LiVES-1.4.3.tar.bz2/src/colourspace.c -> LiVES-1.4.5.tar.bz2/src/colourspace.c
Changed
@@ -107,6 +107,30 @@ static gint Cr_Ru[256]; static gint Cr_Gu[256]; static gint Cr_Bu[256]; + +// clamped BT.701 +static gint HY_Rc[256]; +static gint HY_Gc[256]; +static gint HY_Bc[256]; +static gint HCb_Rc[256]; +static gint HCb_Gc[256]; +static gint HCb_Bc[256]; +static gint HCr_Rc[256]; +static gint HCr_Gc[256]; +static gint HCr_Bc[256]; + + +// unclamped BT.701 +static gint HY_Ru[256]; +static gint HY_Gu[256]; +static gint HY_Bu[256]; +static gint HCb_Ru[256]; +static gint HCb_Gu[256]; +static gint HCb_Bu[256]; +static gint HCr_Ru[256]; +static gint HCr_Gu[256]; +static gint HCr_Bu[256]; + static gint conv_RY_inited = 0; @@ -120,20 +144,27 @@ static gint *B_Cb; -// unclamped Y'CbCr +// clamped Y'CbCr static gint RGB_Yc[256]; static gint R_Crc[256]; static gint G_Cbc[256]; static gint G_Crc[256]; static gint B_Cbc[256]; -// clamped Y'CbCr +// unclamped Y'CbCr static gint RGB_Yu[256]; static gint R_Cru[256]; static gint G_Cbu[256]; static gint G_Cru[256]; static gint B_Cbu[256]; +// clamped BT.701 +static gint HRGB_Yc[256]; +static gint HR_Crc[256]; +static gint HG_Cbc[256]; +static gint HG_Crc[256]; +static gint HB_Cbc[256]; + static gint conv_YR_inited = 0; @@ -194,46 +225,9 @@ // (I call this subspace YUV_SUBSPACE_YCBCR) - // this is used for e.g. theora encoding, and I think for video cards - - - - - - // I have found slightly different (maybe more accurate for luma) values quoted elsewhere: - - // Kr == 0.2989, Kb == 0.1145 - // offs U,V = 127.5 - - // these values seem to give pretty good results - - // I think this may be what jpeg/JFIF uses - - // I might experiment with different values for this subspace - // so it should only be used for internal conversions to and from YUV - - - - - // Finally, different values are used for hdtv, I call this subspace YUV_SUBSPACE_BT709 - - // Kb = 0.0722 - // Kr = 0.2126 - - - - // converting from one subspace to another is not recommended. - + // this is used for e.g. theora encoding, and for most video cards - - - // These values are for what I call YUV_SUBSPACE_CBCR - // this should be the default for all external sources, unless they specify otherwise - - // clamped Y'CbCr - // actually we scale and offset to unclamped during the calculation - for (i = 0; i < 256; i++) { Y_Rc[i] = myround(0.299 * (gdouble)i * 219./255. * (1<<FP_BITS)); // Kr @@ -284,67 +278,67 @@ } + // Different values are used for hdtv, I call this subspace YUV_SUBSPACE_BT709 - - - /* + // Kb = 0.0722 + // Kr = 0.2126 - // These values are for an experimental YCbCr + // converting from one subspace to another is not recommended. - // clamped Y'CbCr - // actually we scale and offset to unclamped for (i = 0; i < 256; i++) { - Y_Rc[i] = myround(0.2989 * (gdouble)i - * 219./255. * (1<<FP_BITS)); // Kr - Y_Gc[i] = myround(0.5866 * (gdouble)i - * 219./255. * (1<<FP_BITS)); // Kb - Y_Bc[i] = myround((0.1145 * (gdouble)i - * 219./255. + 16) * (1<<FP_BITS)); // here we add the 16 which goes into all components + HY_Rc[i] = myround(0.183 * (gdouble)i + * (1<<FP_BITS)); // Kr + HY_Gc[i] = myround(0.614 * (gdouble)i + * (1<<FP_BITS)); // Kb + HY_Bc[i] = myround((0.062 * (gdouble)i + // here we add the 16 which goes into all components + + 16.) * (1<<FP_BITS)); - Cb_Bc[i] = myround(-0.168774704 * (gdouble)i - * 224./255. * (1<<FP_BITS)); - Cb_Gc[i] = myround(-0.331225296 * (gdouble)i - * 224./255. * (1<<FP_BITS)); - Cb_Rc[i] = myround((0.500 * (gdouble)i - * 224./255. + 127.5) * (1<<FP_BITS)); + HCb_Bc[i] = myround(-0.101 * (gdouble)i + * (1<<FP_BITS)); + HCb_Gc[i] = myround(-0.339 * (gdouble)i + * (1<<FP_BITS)); + HCb_Rc[i] = myround((0.439 * (gdouble)i + + 128.) * (1<<FP_BITS)); - Cr_Bc[i] = myround(0.500 * (gdouble)i - * 224./255. * (1<<FP_BITS)); - Cr_Gc[i] = myround(-0.418342604 * (gdouble)i - * 224./255. * (1<<FP_BITS)); - Cr_Rc[i] = myround((-0.081657396 * (gdouble)i - * 224./255. + 127.5) * (1<<FP_BITS)); + HCr_Bc[i] = myround(0.439 * (gdouble)i + * (1<<FP_BITS)); + HCr_Gc[i] = myround(-0.399 * (gdouble)i + * (1<<FP_BITS)); + HCr_Rc[i] = myround((-0.040 * (gdouble)i + + 128.) * (1<<FP_BITS)); } for (i = 0; i < 256; i++) { - Y_Ru[i] = myround(0.2989 * (gdouble)i - * (1<<FP_BITS)); - Y_Gu[i] = myround(0.5866 * (gdouble)i + HY_Ru[i] = myround(0.213 * (gdouble)i + * (1<<FP_BITS)); // Kr + HY_Gu[i] = myround(0.715 * (gdouble)i + * (1<<FP_BITS)); // Kb + HY_Bu[i] = myround(0.0722 * (gdouble)i * (1<<FP_BITS)); - Y_Bu[i] = myround(0.1145 * (gdouble)i - * (1<<FP_BITS)); + HCb_Bu[i] = myround(-0.115 * (gdouble)i + * (1<<FP_BITS)); + HCb_Gu[i] = myround(-0.4542 * (gdouble)i + * (1<<FP_BITS)); + HCb_Ru[i] = myround((0.5 * (gdouble)i + + 128.) * (1<<FP_BITS)); - Cb_Bu[i] = myround(-0.168774704 * (gdouble)i + HCr_Bu[i] = myround(0.5 * (gdouble)i * (1<<FP_BITS)); - Cb_Gu[i] = myround(-0.331225296 * (gdouble)i + HCr_Gu[i] = myround(-0.4542 * (gdouble)i * (1<<FP_BITS)); - Cb_Ru[i] = myround((0.500 * (gdouble)i - + 127.5) * (1<<FP_BITS));
View file
LiVES-1.4.3.tar.bz2/src/cvirtual.c -> LiVES-1.4.5.tar.bz2/src/cvirtual.c
Changed
@@ -185,7 +185,7 @@ if (sfile->frame_index[i-1]>=0) { - pthread_mutex_lock(&mainw->gtk_mutex); + threaded_dialog_spin(); while (g_main_context_iteration(NULL,FALSE)); @@ -228,9 +228,7 @@ while (g_main_context_iteration(NULL,FALSE)); } } - pthread_mutex_unlock(&mainw->gtk_mutex); - - sched_yield(); + threaded_dialog_spin(); sync(); @@ -347,9 +345,9 @@ if (sfile==NULL||sfile->frame_index==NULL) return; for (i=0;i<oldframes;i++) { - pthread_mutex_lock(&mainw->gtk_mutex); + threaded_dialog_spin(); while (g_main_context_iteration(NULL,FALSE)); - pthread_mutex_unlock(&mainw->gtk_mutex); + threaded_dialog_spin(); if ((i<sfile->frames&&sfile->frame_index[i]!=-1)||i>=sfile->frames) { if (sfile->img_type==IMG_TYPE_JPEG) {
View file
LiVES-1.4.3.tar.bz2/src/dialogs.c -> LiVES-1.4.5.tar.bz2/src/dialogs.c
Changed
@@ -1,6 +1,6 @@ // dialogs.c // LiVES (lives-exe) -// (c) G. Finch 2003 - 2010 +// (c) G. Finch 2003 - 2011 // Released under the GPL 3 or later // see file ../COPYING for licensing details @@ -39,9 +39,6 @@ static gdouble est_time; -static pthread_t dthread; -static gchar *thread_text=NULL; - // how often to we count frames when opening #define OPEN_CHECK_TICKS (U_SECL/10l) @@ -156,9 +153,9 @@ GtkWidget *warning_cancelbutton=NULL; GtkWidget *warning_okbutton=NULL; - dialog2 = gtk_dialog_new (); switch (diat) { case LIVES_DIALOG_WARN: + dialog2 = gtk_message_dialog_new (transient,GTK_DIALOG_MODAL,GTK_MESSAGE_WARNING,GTK_BUTTONS_NONE,"%s",""); gtk_window_set_title (GTK_WINDOW (dialog2), _("LiVES: - Warning !")); mainw->warning_label = gtk_label_new (_("warning")); warning_cancelbutton = gtk_button_new_from_stock ("gtk-cancel"); @@ -167,6 +164,7 @@ gtk_dialog_add_action_widget (GTK_DIALOG (dialog2), warning_okbutton, GTK_RESPONSE_OK); break; case LIVES_DIALOG_YESNO: + dialog2 = gtk_message_dialog_new (transient,GTK_DIALOG_MODAL,GTK_MESSAGE_QUESTION,GTK_BUTTONS_NONE,"%s",""); gtk_window_set_title (GTK_WINDOW (dialog2), _("LiVES: - Question")); mainw->warning_label = gtk_label_new (_("question")); warning_cancelbutton = gtk_button_new_from_stock ("gtk-no"); @@ -174,6 +172,9 @@ warning_okbutton = gtk_button_new_from_stock ("gtk-yes"); gtk_dialog_add_action_widget (GTK_DIALOG (dialog2), warning_okbutton, GTK_RESPONSE_YES); break; + default: + return NULL; + break; } if (palette->style&STYLE_1) { @@ -181,11 +182,7 @@ gtk_widget_modify_bg(dialog2, GTK_STATE_NORMAL, &palette->normal_back); } - gtk_window_set_modal (GTK_WINDOW (dialog2), TRUE); - gtk_window_set_position (GTK_WINDOW (dialog2), GTK_WIN_POS_CENTER); - gtk_window_set_default_size (GTK_WINDOW (dialog2), 350, 200); gtk_window_set_deletable(GTK_WINDOW(dialog2), FALSE); - gtk_window_set_transient_for(GTK_WINDOW(dialog2),transient); gtk_label_set_text(GTK_LABEL(mainw->warning_label),text); @@ -1735,38 +1732,20 @@ g_free(msg); } +static process *procw=NULL; + +static void create_threaded_dialog(gchar *text, gboolean has_cancel) { -static void dth2_inner (void *arg, gboolean has_cancel) { GtkWidget *dialog_vbox1; GtkWidget *vbox2; GtkWidget *vbox3; - process *procw=(process*)(g_malloc(sizeof(process))); gchar tmp_label[256]; - gboolean pthread_islocked=TRUE; - gdouble timesofar,sttime; - gint progress; - - // mutex lock - do { - if (!mainw->threaded_dialog||mainw->cancelled==CANCEL_USER) { - pthread_islocked=FALSE; - break; - } - sched_yield(); - g_usleep(prefs->sleep_time); - } while (pthread_mutex_trylock(&mainw->gtk_mutex)); - - if (!pthread_islocked) { - g_free(procw); - dlg_thread_ready=TRUE; - return; // parent process finished already - } - - + + procw=(process*)(g_malloc(sizeof(process))); procw->processing = gtk_dialog_new (); - gtk_window_set_position (GTK_WINDOW (procw->processing), GTK_WIN_POS_CENTER); + gtk_window_set_position (GTK_WINDOW (procw->processing), GTK_WIN_POS_CENTER_ALWAYS); gtk_container_set_border_width (GTK_CONTAINER (procw->processing), 10); gtk_window_add_accel_group (GTK_WINDOW (procw->processing), mainw->accel_group); @@ -1793,7 +1772,7 @@ gtk_widget_show (vbox3); gtk_box_pack_start (GTK_BOX (vbox2), vbox3, TRUE, TRUE, 0); - g_snprintf(tmp_label,256,"%s...\n",(gchar *)arg); + g_snprintf(tmp_label,256,"%s...\n",text); procw->label = gtk_label_new (tmp_label); gtk_widget_show (procw->label); gtk_widget_set_size_request (procw->label, PROG_LABEL_WIDTH, -1); @@ -1846,178 +1825,95 @@ mainw->cancel_type=CANCEL_SOFT; } - while (!mainw->is_ready&&pthread_islocked) { - // mutex unlock - pthread_mutex_unlock(&mainw->gtk_mutex); - do { - // wait to get lock again - if (!mainw->threaded_dialog||mainw->cancelled==CANCEL_USER) { - pthread_islocked=FALSE; - break; - } - sched_yield(); - g_usleep(prefs->sleep_time); - } while (pthread_mutex_trylock(&mainw->gtk_mutex)); - } - - if (!pthread_islocked) { - gtk_widget_destroy(procw->processing); - g_free(procw); - dlg_thread_ready=TRUE; - return; - } gtk_window_set_resizable (GTK_WINDOW (procw->processing), FALSE); - gtk_window_set_position (GTK_WINDOW (procw->processing), GTK_WIN_POS_CENTER); gtk_widget_queue_draw(procw->processing); - //gdk_flush (); - lives_set_cursor_style(LIVES_CURSOR_BUSY,procw->processing->window); - disp_frames_done=0; - gettimeofday(&tv, NULL); - sttime=tv.tv_sec*1000000+tv.tv_usec; +} - dlg_thread_ready=TRUE; - while (mainw->threaded_dialog&&mainw->cancelled!=CANCEL_USER&&mainw->cancelled!=CANCEL_KEEP&&pthread_islocked) { - // mutex locked - if (mainw->current_file<0||cfile==NULL||cfile->progress_start==0||cfile->progress_end==0||strlen(mainw->msg)==0||(progress=atoi(mainw->msg))==0) { - // pulse the progress bar - gtk_progress_bar_pulse(GTK_PROGRESS_BAR(procw->progressbar)); - } - else { - // show fraction - gettimeofday(&tv, NULL); - timesofar=(gdouble)(tv.tv_sec*1000000+tv.tv_usec-sttime)*U_SEC_RATIO/U_SEC; - disp_fraction(progress,cfile->progress_start,cfile->progress_end,timesofar,procw); - } +static gdouble sttime; - gtk_widget_queue_draw(procw->processing); - //gdk_flush (); +void threaded_dialog_spin (void) { + gdouble timesofar; + gint progress; - // unlock mutex - pthread_mutex_unlock(&mainw->gtk_mutex); - do { - // wait to get mutex again - if (!mainw->threaded_dialog||mainw->cancelled==CANCEL_USER) { - pthread_islocked=FALSE; - break; - } - sched_yield(); - g_usleep(prefs->sleep_time); - } while (pthread_mutex_trylock(&mainw->gtk_mutex)); + if (mainw->splash_window!=NULL) { + do_splash_progress(); + return; } - gtk_widget_destroy(procw->processing); - //gdk_flush (); - - g_free(procw); - - // unlock mutex - if (pthread_islocked) pthread_mutex_unlock(&mainw->gtk_mutex); - -}
View file
LiVES-1.4.3.tar.bz2/src/effects-weed.c -> LiVES-1.4.5.tar.bz2/src/effects-weed.c
Changed
@@ -2985,13 +2985,13 @@ num_weed_filters=0; - pthread_mutex_lock(&mainw->gtk_mutex); + threaded_dialog_spin(); lives_weed_plugin_path=g_strdup_printf("%s%s%s",prefs->lib_dir,PLUGIN_EXEC_DIR,PLUGIN_WEED_FX_BUILTIN); #ifdef DEBUG_WEED g_printerr("In weed init\n"); #endif - pthread_mutex_unlock(&mainw->gtk_mutex); + threaded_dialog_spin(); // danger Will Robinson ! fg_gen_to_start=fg_generator_key=fg_generator_clip=fg_generator_mode=-1; @@ -3031,7 +3031,7 @@ hashnames[i]=NULL; } - pthread_mutex_lock(&mainw->gtk_mutex); + threaded_dialog_spin(); weed_p_path=getenv("WEED_PLUGIN_PATH"); if (weed_p_path==NULL) weed_plugin_path=g_strdup(""); else weed_plugin_path=g_strdup(weed_p_path); @@ -3047,7 +3047,7 @@ // first we parse the weed_plugin_path numdirs=get_token_count(weed_plugin_path,':'); dirs=g_strsplit(weed_plugin_path,":",-1); - pthread_mutex_unlock(&mainw->gtk_mutex); + threaded_dialog_spin(); for (i=0;i<numdirs;i++) { // get list of all files @@ -3056,7 +3056,7 @@ // parse twice, first we get the plugins, then 1 level of subdirs for (plugin_idx=0;plugin_idx<listlen;plugin_idx++) { - pthread_mutex_lock(&mainw->gtk_mutex); + threaded_dialog_spin(); plugin_name=g_list_nth_data(weed_plugin_list,plugin_idx); if (!strncmp(plugin_name+strlen(plugin_name)-3,".so",3)) { plugin_path=g_strdup_printf("%s/%s",dirs[i],plugin_name); @@ -3067,18 +3067,18 @@ plugin_idx--; listlen--; } - pthread_mutex_unlock(&mainw->gtk_mutex); + threaded_dialog_spin(); } // get 1 level of subdirs for (subdir_idx=0;subdir_idx<listlen;subdir_idx++) { - pthread_mutex_lock(&mainw->gtk_mutex); + threaded_dialog_spin(); subdir_name=g_list_nth_data(weed_plugin_list,subdir_idx); subdir_path=g_strdup_printf("%s/%s",dirs[i],subdir_name); if (!g_file_test(subdir_path, G_FILE_TEST_IS_DIR)||!strcmp(subdir_name,"icons")||!strcmp(subdir_name,"data")) { g_free(subdir_path); - pthread_mutex_unlock(&mainw->gtk_mutex); + threaded_dialog_spin(); continue; } weed_plugin_sublist=get_plugin_list(PLUGIN_EFFECTS_WEED,TRUE,subdir_path,"so"); @@ -3094,23 +3094,23 @@ g_list_free(weed_plugin_sublist); } g_free(subdir_path); - pthread_mutex_unlock(&mainw->gtk_mutex); + threaded_dialog_spin(); } if (weed_plugin_list!=NULL) { - pthread_mutex_lock(&mainw->gtk_mutex); + threaded_dialog_spin(); g_list_free_strings(weed_plugin_list); g_list_free(weed_plugin_list); - pthread_mutex_unlock(&mainw->gtk_mutex); + threaded_dialog_spin(); } } - pthread_mutex_lock(&mainw->gtk_mutex); + threaded_dialog_spin(); g_strfreev(dirs); g_free(weed_plugin_path); msg=g_strdup_printf(_ ("Successfully loaded %d Weed filters\n"),num_weed_filters); d_print(msg); g_free(msg); - pthread_mutex_unlock(&mainw->gtk_mutex); + threaded_dialog_spin(); } @@ -3141,10 +3141,10 @@ nitems=weed_leaf_num_elements(filter,"in_channel_templates"); if (nitems>0) { plants=weed_get_plantptr_array(filter,"in_channel_templates",&error); - pthread_mutex_lock(&mainw->gtk_mutex); + threaded_dialog_spin(); for (i=0;i<nitems;i++) weed_plant_free(plants[i]); weed_free(plants); - pthread_mutex_unlock(&mainw->gtk_mutex); + threaded_dialog_spin(); } } @@ -3154,10 +3154,10 @@ nitems=weed_leaf_num_elements(filter,"out_channel_templates"); if (nitems>0) { plants=weed_get_plantptr_array(filter,"out_channel_templates",&error); - pthread_mutex_lock(&mainw->gtk_mutex); + threaded_dialog_spin(); for (i=0;i<nitems;i++) weed_plant_free(plants[i]); weed_free(plants); - pthread_mutex_unlock(&mainw->gtk_mutex); + threaded_dialog_spin(); } } @@ -3166,7 +3166,7 @@ nitems=weed_leaf_num_elements(filter,"in_parameter_templates"); if (nitems>0) { plants=weed_get_plantptr_array(filter,"in_parameter_templates",&error); - pthread_mutex_lock(&mainw->gtk_mutex); + threaded_dialog_spin(); for (i=0;i<nitems;i++) { if (weed_plant_has_leaf(plants[i],"gui")) { gui=(weed_get_plantptr_value(plants[i],"gui",&error)); @@ -3183,7 +3183,7 @@ weed_plant_free(plants[i]); } weed_free(plants); - pthread_mutex_unlock(&mainw->gtk_mutex); + threaded_dialog_spin(); } } @@ -3193,25 +3193,25 @@ nitems=weed_leaf_num_elements(filter,"out_parameter_templates"); if (nitems>0) { plants=weed_get_plantptr_array(filter,"out_parameter_templates",&error); - pthread_mutex_lock(&mainw->gtk_mutex); + threaded_dialog_spin(); for (i=0;i<nitems;i++) { if (weed_plant_has_leaf(plants[i],"gui")) weed_plant_free(weed_get_plantptr_value(plants[i],"gui",&error)); weed_plant_free(plants[i]); } weed_free(plants); - pthread_mutex_unlock(&mainw->gtk_mutex); + threaded_dialog_spin(); } } // free gui - pthread_mutex_lock(&mainw->gtk_mutex); + threaded_dialog_spin(); if (weed_plant_has_leaf(filter,"gui")) weed_plant_free(weed_get_plantptr_value(filter,"gui",&error)); // free filter weed_plant_free(filter); - pthread_mutex_unlock(&mainw->gtk_mutex); + threaded_dialog_spin(); } @@ -3222,7 +3222,7 @@ weed_desetup_f desetup_fn; GList *pinfo=NULL,*xpinfo; - pthread_mutex_lock(&mainw->gtk_mutex); + threaded_dialog_spin(); mainw->num_tr_applied=0; weed_deinit_all(); for (i=0;i<num_weed_filters;i++) { @@ -3250,15 +3250,15 @@ g_free(cwd); } - pthread_mutex_unlock(&mainw->gtk_mutex); + threaded_dialog_spin(); dlclose(handle); - pthread_mutex_lock(&mainw->gtk_mutex); + threaded_dialog_spin(); handle=NULL; weed_set_voidptr_value(plugin_info,"handle",handle); } weed_filter_free(filter); - pthread_mutex_unlock(&mainw->gtk_mutex); - pthread_mutex_lock(&mainw->gtk_mutex); + threaded_dialog_spin(); + threaded_dialog_spin(); } xpinfo=pinfo; @@ -3279,7 +3279,7 @@ g_free(key_to_instance_copy[i]); }
View file
LiVES-1.4.3.tar.bz2/src/effects.c -> LiVES-1.4.5.tar.bz2/src/effects.c
Changed
@@ -249,13 +249,16 @@ mainw->resizing=FALSE; cfile->nokeep=FALSE; cfile->fx_frame_pump=0; - cfile->changed=TRUE; - gtk_widget_set_sensitive (mainw->undo, TRUE); - if (rfx->num_in_channels>0) cfile->undoable=TRUE; - cfile->pb_fps=old_pb_fps; - mainw->internal_messaging=FALSE; - if (rfx->num_in_channels>0) gtk_widget_set_sensitive (mainw->select_last, TRUE); - if (rfx->num_in_channels>0) set_undoable (_ (rfx->menu_text),TRUE); + + if (!mainw->gen_to_clipboard) { + gtk_widget_set_sensitive (mainw->undo, TRUE); + if (rfx->num_in_channels>0) cfile->undoable=TRUE; + cfile->pb_fps=old_pb_fps; + mainw->internal_messaging=FALSE; + if (rfx->num_in_channels>0) gtk_widget_set_sensitive (mainw->select_last, TRUE); + if (rfx->num_in_channels>0) set_undoable (_ (rfx->menu_text),TRUE); + } + mainw->show_procd=TRUE; if (rfx->props&RFX_PROPS_MAY_RESIZE||rfx->num_in_channels==0) { @@ -308,91 +311,81 @@ mainw->keep_pre=FALSE; } - if (rfx->num_in_channels!=2) { - - if (rfx->num_in_channels==0) { - if (rfx->props&RFX_PROPS_BATCHG) { - // batch mode generators need some extra processing - gchar *imgdir=g_strdup_printf("%s%s",prefs->tmpdir,cfile->handle); - gint img_file=mainw->current_file; - - mainw->suppress_dprint=TRUE; - open_file_sel(imgdir,0,0); - g_free(imgdir); - new_file=mainw->current_file; - - if (new_file!=img_file) { - mainw->current_file=img_file; + if (rfx->num_in_channels==0) { + if (rfx->props&RFX_PROPS_BATCHG) { + // batch mode generators need some extra processing + gchar *imgdir=g_strdup_printf("%s%s",prefs->tmpdir,cfile->handle); + gint img_file=mainw->current_file; + + mainw->suppress_dprint=TRUE; + open_file_sel(imgdir,0,0); + g_free(imgdir); + new_file=mainw->current_file; + + if (new_file!=img_file) { + mainw->current_file=img_file; - g_snprintf(mainw->files[new_file]->name,256,"%s",cfile->name); - g_snprintf(mainw->files[new_file]->file_name,256,"%s",cfile->file_name); - set_menu_text(mainw->files[new_file]->menuentry,cfile->name,FALSE); - - mainw->files[new_file]->fps=mainw->files[new_file]->pb_fps=cfile->fps; - } - else got_no_frames=TRUE; - - close_current_file(current_file); - mainw->suppress_dprint=FALSE; + g_snprintf(mainw->files[new_file]->name,256,"%s",cfile->name); + g_snprintf(mainw->files[new_file]->file_name,256,"%s",cfile->file_name); + set_menu_text(mainw->files[new_file]->menuentry,cfile->name,FALSE); - if (!got_no_frames) mainw->current_file=new_file; - } - } - else { - gchar *tfile=g_strdup_printf("%s/%s/%08d.%s",prefs->tmpdir,cfile->handle,cfile->frames,prefs->image_ext); - - if (!g_file_test (tfile, G_FILE_TEST_EXISTS)) { - get_frame_count(mainw->current_file); - cfile->end=cfile->frames; - } - g_free(tfile); + mainw->files[new_file]->fps=mainw->files[new_file]->pb_fps=cfile->fps; } + else got_no_frames=TRUE; + + close_current_file(current_file); + mainw->suppress_dprint=FALSE; + + if (!got_no_frames) mainw->current_file=new_file; + } + else { + gchar *tfile=g_strdup_printf("%s/%s/%08d.%s",prefs->tmpdir,cfile->handle,cfile->frames,prefs->image_ext); - if (got_no_frames||cfile->frames==0) { - mainw->is_generating=FALSE; - if (!mainw->cancelled) { - do_error_dialog(_("\nNo frames were generated.\n")); - d_print_failed(); - } - else d_print_cancelled(); - if (!got_no_frames) { - mainw->suppress_dprint=TRUE; - close_current_file(current_file); - mainw->suppress_dprint=FALSE; - } - mainw->last_dprint_file=ldfile; - mainw->no_switch_dprint=FALSE; - if (mainw->multitrack!=NULL) mainw->current_file=mainw->multitrack->render_file; - return FALSE; + if (!g_file_test (tfile, G_FILE_TEST_EXISTS)) { + get_frame_count(mainw->current_file); + cfile->end=cfile->frames; } + g_free(tfile); } - - if (rfx->num_in_channels!=0||mainw->gen_to_clipboard) { - if (rfx->num_in_channels==0) { - - // here we will copy all values to the clipboard, including the handle - // then close the current file without deleting the frames - - init_clipboard(); - w_memcpy(clipboard,cfile,sizeof(file)); - cfile->is_loaded=TRUE; + if (got_no_frames||cfile->frames==0) { + mainw->is_generating=FALSE; + if (!mainw->cancelled) { + do_error_dialog(_("\nNo frames were generated.\n")); + d_print_failed(); + } + else d_print_cancelled(); + if (!got_no_frames) { mainw->suppress_dprint=TRUE; - mainw->only_close=TRUE; - close_current_file(current_file); - mainw->suppress_dprint=FALSE; - mainw->only_close=FALSE; - - mainw->current_file=0; + } + mainw->last_dprint_file=ldfile; + mainw->no_switch_dprint=FALSE; + if (mainw->multitrack!=NULL) mainw->current_file=mainw->multitrack->render_file; + return FALSE; + } - mainw->untitled_number--; + if (mainw->gen_to_clipboard) { + // here we will copy all values to the clipboard, including the handle + // then close the current file without deleting the frames + + init_clipboard(); + + w_memcpy(clipboard,cfile,sizeof(file)); + cfile->is_loaded=TRUE; + mainw->suppress_dprint=TRUE; + mainw->only_close=TRUE; + + close_current_file(current_file); + + mainw->suppress_dprint=FALSE; + mainw->only_close=FALSE; + + new_file=current_file; - } - if (cfile->undo_action==UNDO_RESIZABLE) mainw->current_file=0; // force a resize - if (current_file!=-1) switch_to_file (mainw->current_file,current_file); - else mainw->current_file=-1; + mainw->untitled_number--; + } else { if (!(rfx->props&RFX_PROPS_BATCHG)) { @@ -408,25 +401,29 @@ } } - cfile->changed=TRUE; - if (mainw->multitrack==NULL) switch_to_file ((mainw->current_file=0),new_file); - else { - mainw->current_file=mainw->multitrack->render_file; - mainw->pre_src_file=-1; - } #ifdef ENABLE_OSC lives_osc_notify(LIVES_OSC_NOTIFY_CLIP_OPENED,""); #endif } + mainw->is_generating=FALSE; + } + if (!mainw->gen_to_clipboard) cfile->changed=TRUE; + if (mainw->multitrack==NULL) { + if (new_file!=-1) switch_to_file ((mainw->current_file=0),new_file);
View file
LiVES-1.4.3.tar.bz2/src/events.c -> LiVES-1.4.5.tar.bz2/src/events.c
Changed
@@ -199,11 +199,11 @@ void delete_event(weed_plant_t *event_list, weed_plant_t *event) { // delete event from event_list - pthread_mutex_lock(&mainw->gtk_mutex); + threaded_dialog_spin(); unlink_event(event_list,event); if (mainw->multitrack!=NULL) mt_fixup_events(mainw->multitrack,event,NULL); weed_plant_free(event); - pthread_mutex_unlock(&mainw->gtk_mutex); + threaded_dialog_spin(); } @@ -2030,7 +2030,7 @@ e_rec_dialog = gtk_dialog_new (); gtk_window_set_title (GTK_WINDOW (e_rec_dialog), _("LiVES: - Events recorded")); - gtk_window_set_position (GTK_WINDOW (e_rec_dialog), GTK_WIN_POS_CENTER); + gtk_window_set_position (GTK_WINDOW (e_rec_dialog), GTK_WIN_POS_CENTER_ALWAYS); gtk_window_set_modal (GTK_WINDOW (e_rec_dialog), TRUE); if (palette->style&STYLE_1) { gtk_dialog_set_has_separator(GTK_DIALOG(e_rec_dialog),FALSE);
View file
LiVES-1.4.3.tar.bz2/src/gui.c -> LiVES-1.4.5.tar.bz2/src/gui.c
Changed
@@ -72,7 +72,51 @@ } } +void add_message_scroller(GtkWidget *conter) { + GtkTextBuffer *tbuff=NULL; + if (mainw->textview1!=NULL) { + tbuff=gtk_text_view_get_buffer(GTK_TEXT_VIEW(mainw->textview1)); + g_object_ref(tbuff); + gtk_widget_destroy(mainw->textview1); + } + + if (mainw->scrolledwindow!=NULL) { + gtk_widget_destroy(mainw->scrolledwindow); + } + + mainw->scrolledwindow = gtk_scrolled_window_new (NULL, NULL); + gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(mainw->scrolledwindow),GTK_POLICY_AUTOMATIC,GTK_POLICY_ALWAYS); + gtk_widget_show (mainw->scrolledwindow); + + gtk_container_add (GTK_CONTAINER(conter), mainw->scrolledwindow); + + mainw->textview1 = gtk_text_view_new (); + gtk_widget_show (mainw->textview1); + gtk_container_add (GTK_CONTAINER (mainw->scrolledwindow), mainw->textview1); + + if (tbuff!=NULL) { + gtk_text_view_set_buffer(GTK_TEXT_VIEW(mainw->textview1),tbuff); + g_object_unref(tbuff); + } + + gtk_widget_set_size_request (mainw->textview1, -1, 50); + gtk_text_view_set_editable (GTK_TEXT_VIEW (mainw->textview1), FALSE); + gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (mainw->textview1), GTK_WRAP_WORD); + gtk_text_view_set_cursor_visible (GTK_TEXT_VIEW (mainw->textview1), FALSE); + + if (palette->style&STYLE_1) { + gtk_widget_modify_base(mainw->textview1, GTK_STATE_NORMAL, &palette->info_base); + gtk_widget_modify_text(mainw->textview1, GTK_STATE_NORMAL, &palette->info_text); + } +} + + +void make_custom_submenus(void) { + mainw->custom_gens_submenu = gtk_menu_item_new_with_mnemonic (_ ("_Custom Generators")); + mainw->custom_effects_submenu = gtk_menu_item_new_with_mnemonic (_ ("_Custom Effects")); + mainw->custom_utilities_submenu = gtk_menu_item_new_with_mnemonic (_("Custom _Utilities")); +} void @@ -939,7 +983,6 @@ gtk_widget_modify_bg(mainw->effects_menu, GTK_STATE_NORMAL, &palette->menu_and_bars); } - mainw->custom_effects_submenu = gtk_menu_item_new_with_mnemonic (_ ("_Custom Effects")); mainw->custom_effects_menu=NULL; mainw->run_test_rfx_submenu=gtk_menu_item_new_with_mnemonic (_("_Run Test Rendered Effect/Tool/Generator...")); @@ -978,24 +1021,21 @@ gtk_container_add (GTK_CONTAINER (mainw->tools_menu), mainw->resample_video); gtk_widget_set_sensitive (mainw->resample_video, FALSE); - mainw->utilities_submenu = gtk_menu_item_new_with_mnemonic (_("_Utilities")); mainw->utilities_menu=NULL; + mainw->utilities_submenu = gtk_menu_item_new_with_mnemonic (_("_Utilities")); gtk_widget_show (mainw->utilities_submenu); - mainw->custom_tools_submenu = gtk_menu_item_new_with_mnemonic (_("Custom _Tools")); mainw->custom_tools_menu=NULL; - mainw->custom_utilities_submenu = gtk_menu_item_new_with_mnemonic (_("Custom _Utilities")); mainw->custom_utilities_menu=NULL; mainw->custom_tools_separator = gtk_menu_item_new (); gtk_widget_set_sensitive (mainw->custom_tools_separator, FALSE); - mainw->gens_submenu = gtk_menu_item_new_with_mnemonic (_("_Generate")); mainw->gens_menu=NULL; + mainw->gens_submenu = gtk_menu_item_new_with_mnemonic (_("_Generate")); gtk_widget_show (mainw->gens_submenu); - mainw->custom_gens_submenu = gtk_menu_item_new_with_mnemonic (_("Custom _Generators")); mainw->custom_gens_menu=NULL; // add RFX plugins @@ -1003,6 +1043,8 @@ mainw->custom_gens_menu=NULL; mainw->rendered_fx=NULL; + mainw->custom_tools_submenu = gtk_menu_item_new_with_mnemonic (_("Custom _Tools")); + if (!mainw->foreign&&capable->smog_version_correct) { splash_msg(_("Loading rendered effect plugins..."),.2); add_rfx_effects(); @@ -2167,27 +2209,11 @@ mainw->message_box=gtk_vbox_new(FALSE, 0); gtk_widget_show (mainw->message_box); - - - mainw->scrolledwindow = gtk_scrolled_window_new (NULL, NULL); - gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(mainw->scrolledwindow),GTK_POLICY_AUTOMATIC,GTK_POLICY_ALWAYS); - gtk_widget_show (mainw->scrolledwindow); - - gtk_box_pack_start (GTK_BOX (mainw->message_box), mainw->scrolledwindow, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX (vbox4), mainw->message_box, TRUE, TRUE, 0); - mainw->textview1 = gtk_text_view_new (); - gtk_widget_show (mainw->textview1); - gtk_container_add (GTK_CONTAINER (mainw->scrolledwindow), mainw->textview1); - gtk_widget_set_size_request (mainw->textview1, -1, 50); - gtk_text_view_set_editable (GTK_TEXT_VIEW (mainw->textview1), FALSE); - gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (mainw->textview1), GTK_WRAP_WORD); - gtk_text_view_set_cursor_visible (GTK_TEXT_VIEW (mainw->textview1), FALSE); - - if (palette->style&STYLE_1) { - gtk_widget_modify_base(mainw->textview1, GTK_STATE_NORMAL, &palette->info_base); - gtk_widget_modify_text(mainw->textview1, GTK_STATE_NORMAL, &palette->info_text); - } + mainw->textview1=NULL; + mainw->scrolledwindow=NULL; + add_message_scroller(mainw->message_box); // accel keys gtk_accel_group_connect (GTK_ACCEL_GROUP (mainw->accel_group), GDK_Page_Up, GDK_CONTROL_MASK, 0, g_cclosure_new (G_CALLBACK (prevclip_callback),NULL,NULL)); @@ -3458,7 +3484,8 @@ } mainw->play_window = gtk_window_new (GTK_WINDOW_TOPLEVEL); - gtk_window_set_position(GTK_WINDOW(mainw->play_window),GTK_WIN_POS_CENTER_ON_PARENT); + + gtk_window_set_position(GTK_WINDOW(mainw->play_window),GTK_WIN_POS_CENTER_ALWAYS); if (mainw->multitrack==NULL) gtk_window_add_accel_group (GTK_WINDOW (mainw->play_window), mainw->accel_group); else gtk_window_add_accel_group (GTK_WINDOW (mainw->play_window), mainw->multitrack->accel_group); @@ -3538,8 +3565,10 @@ if (mainw->multitrack!=NULL&&mainw->multitrack->idlefunc>0) g_source_remove(mainw->multitrack->idlefunc); mainw->noswitch=TRUE; - g_signal_handler_block(mainw->play_window,mainw->pw_exp_func); - mainw->pw_exp_is_blocked=TRUE; + if (mainw->current_file>-1) { + g_signal_handler_block(mainw->play_window,mainw->pw_exp_func); + mainw->pw_exp_is_blocked=TRUE; + } while (g_main_context_iteration(NULL,FALSE)); if (mainw->multitrack!=NULL&&mainw->multitrack->idlefunc>0) { @@ -3553,6 +3582,10 @@ gtk_widget_queue_draw(mainw->play_window); } + g_signal_connect (GTK_OBJECT (mainw->play_window), "scroll_event", + G_CALLBACK (on_mouse_scroll), + NULL); + } @@ -3947,7 +3980,6 @@ } if (prefs->startup_interface==STARTUP_MT&&mainw->multitrack==NULL) on_multitrack_activate(NULL,NULL); - while (g_main_context_iteration(NULL,FALSE)); }
View file
LiVES-1.4.3.tar.bz2/src/interface.c -> LiVES-1.4.5.tar.bz2/src/interface.c
Changed
@@ -82,7 +82,7 @@ } gtk_container_set_border_width (GTK_CONTAINER (fileselection), 10); - gtk_window_set_position (GTK_WINDOW (fileselection), GTK_WIN_POS_CENTER); + gtk_window_set_position (GTK_WINDOW (fileselection), GTK_WIN_POS_CENTER_ALWAYS); gtk_window_set_modal (GTK_WINDOW (fileselection), TRUE); if (prefs->show_gui) { @@ -294,7 +294,7 @@ gtk_window_set_title (GTK_WINDOW (procw->processing), _("LiVES: - Processing...")); if (mainw->multitrack==NULL) gtk_window_set_transient_for(GTK_WINDOW(procw->processing),GTK_WINDOW(mainw->LiVES)); else gtk_window_set_transient_for(GTK_WINDOW(procw->processing),GTK_WINDOW(mainw->multitrack->window)); - gtk_window_set_position (GTK_WINDOW (procw->processing), GTK_WIN_POS_CENTER); + gtk_window_set_position (GTK_WINDOW (procw->processing), GTK_WIN_POS_CENTER_ALWAYS); dialog_vbox1 = GTK_DIALOG (procw->processing)->vbox; gtk_widget_show (dialog_vbox1); @@ -499,7 +499,7 @@ fileinfo *filew=(fileinfo*)(g_malloc(sizeof(fileinfo))); filew->info_window = gtk_window_new (GTK_WINDOW_TOPLEVEL); - gtk_window_set_position (GTK_WINDOW (filew->info_window), GTK_WIN_POS_CENTER); + gtk_window_set_position (GTK_WINDOW (filew->info_window), GTK_WIN_POS_CENTER_ALWAYS); gtk_window_set_modal (GTK_WINDOW (filew->info_window), TRUE); if (palette->style&STYLE_1) { @@ -827,7 +827,7 @@ } gtk_window_set_modal (GTK_WINDOW (dialog), TRUE); - gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_CENTER); + gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_CENTER_ALWAYS); gtk_window_set_default_size (GTK_WINDOW (dialog), 450, 300); dialog_vbox = GTK_DIALOG (dialog)->vbox; @@ -909,7 +909,7 @@ dialog3 = gtk_dialog_new (); gtk_window_set_title (GTK_WINDOW (dialog3), "LiVES"); if (is_blocking) gtk_window_set_modal (GTK_WINDOW (dialog3), TRUE); - gtk_window_set_position (GTK_WINDOW (dialog3), GTK_WIN_POS_CENTER); + gtk_window_set_position (GTK_WINDOW (dialog3), GTK_WIN_POS_CENTER_ALWAYS); gtk_window_set_default_size (GTK_WINDOW (dialog3), 350, 200); if (mainw!=NULL) { if (palette->style&STYLE_1) { @@ -1017,7 +1017,7 @@ textwindow->dialog = gtk_dialog_new (); gtk_window_set_title (GTK_WINDOW (textwindow->dialog), (tmp=g_strconcat ("LiVES: - ",mytitle,NULL))); g_free(tmp); - gtk_window_set_position (GTK_WINDOW (textwindow->dialog), GTK_WIN_POS_CENTER); + gtk_window_set_position (GTK_WINDOW (textwindow->dialog), GTK_WIN_POS_CENTER_ALWAYS); gtk_window_set_modal (GTK_WINDOW (textwindow->dialog), TRUE); gtk_window_set_default_size (GTK_WINDOW (textwindow->dialog), 600, 400); @@ -1179,7 +1179,7 @@ insertw->insert_dialog = gtk_dialog_new (); gtk_window_add_accel_group (GTK_WINDOW (insertw->insert_dialog), accel_group); gtk_window_set_title (GTK_WINDOW (insertw->insert_dialog), _("LiVES: - Insert")); - gtk_window_set_position (GTK_WINDOW (insertw->insert_dialog), GTK_WIN_POS_CENTER); + gtk_window_set_position (GTK_WINDOW (insertw->insert_dialog), GTK_WIN_POS_CENTER_ALWAYS); gtk_window_set_modal (GTK_WINDOW (insertw->insert_dialog), TRUE); gtk_window_set_default_size (GTK_WINDOW (insertw->insert_dialog), 300, 200); if (palette->style&STYLE_1) { @@ -1478,7 +1478,7 @@ opensel_dialog = gtk_dialog_new (); gtk_window_set_title (GTK_WINDOW (opensel_dialog), _("LiVES: - Open Selection")); - gtk_window_set_position (GTK_WINDOW (opensel_dialog), GTK_WIN_POS_CENTER); + gtk_window_set_position (GTK_WINDOW (opensel_dialog), GTK_WIN_POS_CENTER_ALWAYS); gtk_window_set_modal (GTK_WINDOW (opensel_dialog), TRUE); if (prefs->show_gui) { @@ -1609,7 +1609,7 @@ else gtk_window_set_transient_for(GTK_WINDOW(locw->dialog),GTK_WINDOW(mainw->multitrack->window)); } - gtk_window_set_position (GTK_WINDOW (locw->dialog), GTK_WIN_POS_CENTER); + gtk_window_set_position (GTK_WINDOW (locw->dialog), GTK_WIN_POS_CENTER_ALWAYS); gtk_window_set_modal (GTK_WINDOW (locw->dialog), TRUE); gtk_window_set_default_size (GTK_WINDOW (locw->dialog), 300, 200); @@ -1736,7 +1736,7 @@ renamew->dialog = gtk_dialog_new (); - gtk_window_set_position (GTK_WINDOW (renamew->dialog), GTK_WIN_POS_CENTER); + gtk_window_set_position (GTK_WINDOW (renamew->dialog), GTK_WIN_POS_CENTER_ALWAYS); if (prefs->show_gui) { if (mainw->multitrack==NULL) { @@ -2001,7 +2001,7 @@ gtk_window_set_title (GTK_WINDOW (combo_dialog), _("LiVES:- Select input device")); } - gtk_window_set_position (GTK_WINDOW (combo_dialog), GTK_WIN_POS_CENTER); + gtk_window_set_position (GTK_WINDOW (combo_dialog), GTK_WIN_POS_CENTER_ALWAYS); gtk_window_set_modal (GTK_WINDOW (combo_dialog), TRUE); gtk_container_set_border_width (GTK_CONTAINER (combo_dialog), 20); @@ -2138,7 +2138,7 @@ gtk_window_set_title (GTK_WINDOW (cd_dialog), _("LiVES:- Device details")); } - gtk_window_set_position (GTK_WINDOW (cd_dialog), GTK_WIN_POS_CENTER); + gtk_window_set_position (GTK_WINDOW (cd_dialog), GTK_WIN_POS_CENTER_ALWAYS); gtk_window_set_modal (GTK_WINDOW (cd_dialog), TRUE); gtk_container_set_border_width (GTK_CONTAINER (cd_dialog), 10); @@ -2593,7 +2593,7 @@ gtk_window_set_title (GTK_WINDOW (audd->dialog), _("LiVES:- Fade Audio Out")); } - gtk_window_set_position (GTK_WINDOW (audd->dialog), GTK_WIN_POS_CENTER); + gtk_window_set_position (GTK_WINDOW (audd->dialog), GTK_WIN_POS_CENTER_ALWAYS); gtk_window_set_modal (GTK_WINDOW (audd->dialog), TRUE); gtk_container_set_border_width (GTK_CONTAINER (audd->dialog), 10); @@ -2763,7 +2763,7 @@ gtk_widget_modify_bg (xranw->rp_dialog, GTK_STATE_NORMAL, &palette->normal_back); } - gtk_window_set_position (GTK_WINDOW (xranw->rp_dialog), GTK_WIN_POS_CENTER); + gtk_window_set_position (GTK_WINDOW (xranw->rp_dialog), GTK_WIN_POS_CENTER_ALWAYS); gtk_window_set_modal (GTK_WINDOW (xranw->rp_dialog), TRUE); gtk_container_set_border_width (GTK_CONTAINER (xranw->rp_dialog), 10); @@ -2938,7 +2938,7 @@ commentsw->comments_dialog = gtk_dialog_new (); gtk_container_set_border_width (GTK_CONTAINER (commentsw->comments_dialog), 10); gtk_window_set_title (GTK_WINDOW (commentsw->comments_dialog), _("LiVES: - File Comments (optional)")); - gtk_window_set_position (GTK_WINDOW (commentsw->comments_dialog), GTK_WIN_POS_CENTER); + gtk_window_set_position (GTK_WINDOW (commentsw->comments_dialog), GTK_WIN_POS_CENTER_ALWAYS); gtk_window_set_modal (GTK_WINDOW (commentsw->comments_dialog), TRUE); if (prefs->show_gui) { gtk_window_set_transient_for(GTK_WINDOW(commentsw->comments_dialog),GTK_WINDOW(mainw->LiVES)); @@ -3253,7 +3253,7 @@ } gtk_window_set_modal (GTK_WINDOW (cdsw->dialog), TRUE); - gtk_window_set_position (GTK_WINDOW (cdsw->dialog), GTK_WIN_POS_CENTER); + gtk_window_set_position (GTK_WINDOW (cdsw->dialog), GTK_WIN_POS_CENTER_ALWAYS); gtk_window_set_default_size (GTK_WINDOW (cdsw->dialog), 350, 200); if (prefs->show_gui) { @@ -3411,7 +3411,7 @@ GtkWidget *mdialog=gtk_dialog_new (); gtk_window_set_title (GTK_WINDOW (mdialog), _("LiVES: recover layout ?")); - gtk_window_set_position (GTK_WINDOW (mdialog), GTK_WIN_POS_CENTER); + gtk_window_set_position (GTK_WINDOW (mdialog), GTK_WIN_POS_CENTER_ALWAYS); gtk_window_set_default_size (GTK_WINDOW (mdialog), 450, 200); if (prefs->show_gui) {
View file
LiVES-1.4.3.tar.bz2/src/ldvinterface.c -> LiVES-1.4.5.tar.bz2/src/ldvinterface.c
Changed
@@ -1,6 +1,6 @@ // ldvinterface.c // LiVES -// (c) G. Finch 2006 <salsaman@xs4all.nl> +// (c) G. Finch 2006-2011 <salsaman@xs4all.nl> // released under the GNU GPL 3 or later // see file ../COPYING for licensing details @@ -33,11 +33,11 @@ dvgrabw->window = gtk_window_new (GTK_WINDOW_TOPLEVEL); dvgrabw->playing=FALSE; - gtk_window_set_title (GTK_WINDOW (dvgrabw->window), ("LiVES: DVGrab")); + gtk_window_set_title (GTK_WINDOW (dvgrabw->window), (_("LiVES: DVGrab"))); gtk_container_set_border_width (GTK_CONTAINER (dvgrabw->window), 20); gtk_window_set_modal (GTK_WINDOW (dvgrabw->window), TRUE); - gtk_window_set_position (GTK_WINDOW (dvgrabw->window), GTK_WIN_POS_CENTER); + gtk_window_set_position (GTK_WINDOW (dvgrabw->window), GTK_WIN_POS_CENTER_ALWAYS); if (palette->style&STYLE_1) { gtk_widget_modify_bg(dvgrabw->window, GTK_STATE_NORMAL, &palette->normal_back); } @@ -53,7 +53,7 @@ hbox = gtk_hbox_new (FALSE,10); gtk_box_pack_start(GTK_BOX(vbox),hbox,FALSE,FALSE,10); - label=gtk_label_new_with_mnemonic("Save _directory :"); + label=gtk_label_new_with_mnemonic(_("Save _directory :")); gtk_box_pack_start(GTK_BOX(hbox),label,FALSE,FALSE,10); if (palette->style&STYLE_1) { gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore); @@ -65,7 +65,7 @@ g_free(tmp); gtk_entry_set_editable(GTK_ENTRY(direntry),FALSE); - buttond = gtk_file_chooser_button_new("Save directory",GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER); + buttond = gtk_file_chooser_button_new(_("Save directory"),GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER); gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(buttond),g_get_current_dir()); gtk_label_set_mnemonic_widget(GTK_LABEL(label),buttond); @@ -76,7 +76,7 @@ hbox = gtk_hbox_new (FALSE,10); gtk_box_pack_start(GTK_BOX(vbox),hbox,FALSE,FALSE,10); - label=gtk_label_new_with_mnemonic("File_name:"); + label=gtk_label_new_with_mnemonic(_("File_name:")); gtk_box_pack_start(GTK_BOX(hbox),label,FALSE,FALSE,10); if (palette->style&STYLE_1) { gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
View file
LiVES-1.4.3.tar.bz2/src/main.c -> LiVES-1.4.5.tar.bz2/src/main.c
Changed
@@ -849,6 +849,9 @@ if (!ign_opts->ign_vppdefs) g_snprintf(mainw->vpp_defs_file,PATH_MAX,"%s/%svpp_defaults",capable->home_dir,LIVES_CONFIG_DIR); + mainw->has_custom_tools=FALSE; + mainw->has_custom_gens=FALSE; + mainw->has_custom_utilities=FALSE; /////////////////////////////////////////////////// add new stuff just above here ^^ @@ -1014,6 +1017,7 @@ prefs->instant_open=get_boolean_pref("instant_open"); prefs->auto_deint=get_boolean_pref("auto_deinterlace"); + prefs->auto_nobord=get_boolean_pref("auto_cut_borders"); if (!ign_opts->ign_clipset) { get_pref("ar_clipset",prefs->ar_clipset_name,128); @@ -1195,9 +1199,9 @@ // replace any multi choice effects with their delegates replace_with_delegates(); - pthread_mutex_lock(&mainw->gtk_mutex); + threaded_dialog_spin(); load_default_keymap(); - pthread_mutex_unlock(&mainw->gtk_mutex); + threaded_dialog_spin(); prefs->audio_opts=get_int_pref("audio_opts"); #ifdef ENABLE_JACK @@ -1528,18 +1532,20 @@ gchar **array; gchar buffer[8192]; - FILE *bootfile,*tfile; + FILE *bootfile; gchar string[256]; int err; gint numtok; gchar *tmp; - size_t len; #ifdef IS_DARWIN processor_info_array_t processorInfo; mach_msg_type_number_t numProcessorInfo; natural_t numProcessors = 0U; - kern_return_t err; + kern_return_t kerr; +#else + size_t len; + FILE *tfile; #endif capable=(capability *)g_malloc(sizeof(capability)); @@ -1708,7 +1714,7 @@ capable->ncpus=0; #ifdef IS_DARWIN - err = host_processor_info(mach_host_self(), PROCESSOR_CPU_LOAD_INFO, &numProcessors, &processorInfo, &numProcessorInfo); + kerr = host_processor_info(mach_host_self(), PROCESSOR_CPU_LOAD_INFO, &numProcessors, &processorInfo, &numProcessorInfo); capable->ncpus=(gint)numProcessors; #else @@ -1741,6 +1747,7 @@ g_printerr("%s","\n"); g_printerr("%s",_("opts can be:\n")); g_printerr("%s",_("-help : show this help text and exit\n")); + g_printerr("%s",_("-tmpdir <tempdir>: use alternate working directory (e.g /var/ramdisk)\n")); g_printerr("%s",_("-set <setname> : autoload clip set setname\n")); g_printerr("%s",_("-noset : do not load any set on startup\n")); g_printerr("%s",_("-norecover : force no-loading of crash recovery\n")); @@ -1999,10 +2006,11 @@ textdomain (GETTEXT_PACKAGE); #endif - gtk_set_locale (); putenv ("LC_NUMERIC=C"); gtk_init (&argc, &argv); + + g_log_set_always_fatal (0); theme_expected=pre_init(); mainw->foreign=FALSE; @@ -2041,6 +2049,7 @@ else { struct option longopts[] = { {"aplayer", 1, 0, 0}, + {"tmpdir", 1, 0, 0}, {"set", 1, 0, 0}, {"noset", 0, 0, 0}, {"devicemap", 1, 0, 0}, @@ -2087,6 +2096,13 @@ auto_recover=TRUE; continue; } + if (!strcmp(charopt,"tmpdir")) { + // override tempdir setting + g_snprintf(prefs->tmpdir,256,"%s",optarg); + g_snprintf(future_prefs->tmpdir,256,"%s",prefs->tmpdir); + set_pref("session_tempdir",prefs->tmpdir); + continue; + } if (!strcmp(charopt,"noset")) { // override clipset loading memset(prefs->ar_clipset_name,0,1); @@ -2585,21 +2601,21 @@ if (mainw->current_file<0||cfile==NULL||frame<1||frame>cfile->frames|| (cfile->clip_type!=CLIP_TYPE_DISK&&cfile->clip_type!=CLIP_TYPE_FILE)) { - pthread_mutex_lock(&mainw->gtk_mutex); + threaded_dialog_spin(); if (!(mainw->imframe==NULL)) { gtk_image_set_from_pixbuf(GTK_IMAGE(mainw->image272),mainw->imframe); } else { gtk_image_set_from_pixbuf(GTK_IMAGE(mainw->image272),NULL); } - pthread_mutex_unlock(&mainw->gtk_mutex); + threaded_dialog_spin(); return; } tc=((frame-1.))/cfile->fps*U_SECL; if (!prefs->ce_maxspect||mainw->double_size) { - pthread_mutex_lock(&mainw->gtk_mutex); + threaded_dialog_spin(); layer=weed_plant_new(WEED_PLANT_CHANNEL); weed_set_int_value(layer,"clip",mainw->current_file); weed_set_int_value(layer,"frame",frame); @@ -2615,13 +2631,13 @@ gdk_pixbuf_unref(start_pixbuf); } } - pthread_mutex_unlock(&mainw->gtk_mutex); + threaded_dialog_spin(); return; } mainw->noswitch=TRUE; - pthread_mutex_lock(&mainw->gtk_mutex); + threaded_dialog_spin(); do { width=cfile->hsize; @@ -2656,7 +2672,7 @@ while (g_main_context_iteration(NULL,FALSE)); } while (rwidth!=mainw->image272->allocation.width||rheight!=mainw->image272->allocation.height); - pthread_mutex_unlock(&mainw->gtk_mutex); + threaded_dialog_spin(); mainw->noswitch=noswitch; @@ -2690,14 +2706,14 @@ if (mainw->current_file<0||cfile==NULL||frame<1||frame>cfile->frames|| (cfile->clip_type!=CLIP_TYPE_DISK&&cfile->clip_type!=CLIP_TYPE_FILE)) { - pthread_mutex_lock(&mainw->gtk_mutex); + threaded_dialog_spin(); if (!(mainw->imframe==NULL)) { gtk_image_set_from_pixbuf(GTK_IMAGE(mainw->image273),mainw->imframe); } else { gtk_image_set_from_pixbuf(GTK_IMAGE(mainw->image273),NULL); } - pthread_mutex_unlock(&mainw->gtk_mutex); + threaded_dialog_spin(); return; } @@ -2705,7 +2721,7 @@ tc=((frame-1.))/cfile->fps*U_SECL; if (!prefs->ce_maxspect||mainw->double_size) { - pthread_mutex_lock(&mainw->gtk_mutex); + threaded_dialog_spin(); layer=weed_plant_new(WEED_PLANT_CHANNEL); weed_set_int_value(layer,"clip",mainw->current_file); weed_set_int_value(layer,"frame",frame); @@ -2722,13 +2738,13 @@ gdk_pixbuf_unref(end_pixbuf); } } - pthread_mutex_unlock(&mainw->gtk_mutex); + threaded_dialog_spin(); return; } mainw->noswitch=TRUE; - pthread_mutex_lock(&mainw->gtk_mutex); + threaded_dialog_spin(); do { width=cfile->hsize; height=cfile->vsize; @@ -2763,7 +2779,7 @@ while (g_main_context_iteration(NULL,FALSE));
View file
LiVES-1.4.3.tar.bz2/src/main.h -> LiVES-1.4.5.tar.bz2/src/main.h
Changed
@@ -632,12 +632,6 @@ // some useful functions -//gui.c -void create_LiVES (void); -void enable_record (void); -void toggle_record (void); -void disable_record (void); - // interface.c process* create_processing (const gchar *text); void add_to_winmenu(void); @@ -731,8 +725,9 @@ void do_do_not_close_d (void); gboolean process_one (gboolean visible); -void do_threaded_dialog(const gchar *text, gboolean has_cancel); +void do_threaded_dialog(gchar *translated_text, gboolean has_cancel); void end_threaded_dialog(void); +void threaded_dialog_spin (void); void response_ok (GtkButton *button, gpointer user_data); void response_cancel (GtkButton *button, gpointer user_data); void pump_io_chan(GIOChannel *iochan); @@ -823,10 +818,13 @@ void set_main_title(const gchar *filename, gint or_untitled_number); void set_record (void); -// main.c - in progress -weed_plant_t *weed_layer_new_from_video(gint fnum, gint frame); - //gui.c +//gui.c +void create_LiVES (void); +void enable_record (void); +void toggle_record (void); +void disable_record (void); +void make_custom_submenus(void); void fade_background(void); void unfade_background(void); void block_expose (void); @@ -835,6 +833,7 @@ void splash_init(void); void splash_end(void); void splash_msg(const gchar *msg, gdouble pct); +void add_message_scroller(GtkWidget *conter); // utils.c #ifdef IS_IRIX
View file
LiVES-1.4.3.tar.bz2/src/mainwindow.h -> LiVES-1.4.5.tar.bz2/src/mainwindow.h
Changed
@@ -816,7 +816,7 @@ GMemVTable alt_vtable; void (*free_fn)(gpointer); - pthread_mutex_t gtk_mutex; ///< gtk drawing mutex - used by the threaded dialog + 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 abuf_mutex; ///< used to synch audio buffer request count - shared between audio and video threads @@ -908,6 +908,10 @@ pthread_t sig_pid; gchar *sig_file; + gboolean has_custom_tools; + gboolean has_custom_gens; + gboolean has_custom_utilities; + /// decoders gboolean decoders_loaded; GList *decoder_list;
View file
LiVES-1.4.3.tar.bz2/src/merge.c -> LiVES-1.4.5.tar.bz2/src/merge.c
Changed
@@ -85,7 +85,7 @@ merge_opts->merge_dialog = gtk_dialog_new (); gtk_container_set_border_width (GTK_CONTAINER (merge_opts->merge_dialog), 10); gtk_window_set_title (GTK_WINDOW (merge_opts->merge_dialog), _("LiVES: - Merge")); - gtk_window_set_position (GTK_WINDOW (merge_opts->merge_dialog), GTK_WIN_POS_CENTER); + gtk_window_set_position (GTK_WINDOW (merge_opts->merge_dialog), GTK_WIN_POS_CENTER_ALWAYS); gtk_window_set_modal (GTK_WINDOW (merge_opts->merge_dialog), TRUE); gtk_widget_set_size_request (merge_opts->merge_dialog, 720, -1); gtk_dialog_set_has_separator(GTK_DIALOG(merge_opts->merge_dialog),FALSE);
View file
LiVES-1.4.3.tar.bz2/src/multitrack.c -> LiVES-1.4.5.tar.bz2/src/multitrack.c
Changed
@@ -101,7 +101,7 @@ static void save_event_list_inner(lives_mt *mt, int fd, weed_plant_t *event_list, unsigned char **mem) { weed_plant_t *event=get_first_event(event_list); - pthread_mutex_lock(&mainw->gtk_mutex); + threaded_dialog_spin(); weed_set_int_value(event_list,"width",cfile->hsize); weed_set_int_value(event_list,"height",cfile->vsize); @@ -136,21 +136,17 @@ g_free(avols); } - pthread_mutex_unlock(&mainw->gtk_mutex); - if (mem==NULL&&fd<0) return; - pthread_mutex_lock(&mainw->gtk_mutex); + threaded_dialog_spin(); weed_plant_serialise(fd,event_list,mem); while (event!=NULL) { if (WEED_EVENT_IS_FILTER_INIT(event)) weed_set_voidptr_value(event,"event_id",(void *)event); weed_plant_serialise(fd,event,mem); event=get_next_event(event); - pthread_mutex_unlock(&mainw->gtk_mutex); - sched_yield(); - pthread_mutex_lock(&mainw->gtk_mutex); + threaded_dialog_spin(); } - pthread_mutex_unlock(&mainw->gtk_mutex); + } @@ -2114,17 +2110,17 @@ lmap=mainw->files[i]->layout_map; while (lmap!=NULL) { if (!strncmp(lmap->data,lfile,strlen(lfile))) { - pthread_mutex_lock(&mainw->gtk_mutex); + threaded_dialog_spin(); array=g_strsplit(lmap->data,"|",-1); - pthread_mutex_unlock(&mainw->gtk_mutex); + threaded_dialog_spin(); rnc=atoi(array[1]); renumbered_clips[rnc]=i; lfps[i]=strtod(array[3],NULL); - pthread_mutex_lock(&mainw->gtk_mutex); + threaded_dialog_spin(); g_strfreev(array); - pthread_mutex_unlock(&mainw->gtk_mutex); + threaded_dialog_spin(); } lmap=lmap->next; } @@ -5793,7 +5789,6 @@ } } - /// None autotransition menuitem2 = gtk_check_menu_item_new_with_label (mainw->none_string); g_object_set_data(G_OBJECT(menuitem2),"idx",GINT_TO_POINTER(-1)); @@ -7499,7 +7494,7 @@ mainw->unordered_blocks=FALSE; } - gtk_widget_reparent (mainw->scrolledwindow,mt->vpaned); + add_message_scroller(mt->vpaned); gtk_widget_set_size_request (mt->window, scr_width-MT_BORDER_WIDTH, -1); @@ -7845,8 +7840,11 @@ if (mt->clip_labels!=NULL) g_list_free(mt->clip_labels); - gtk_widget_show(mainw->scrolledwindow); - gtk_widget_reparent (mainw->scrolledwindow,mainw->message_box); + // gtk_widget_reparent broke in gtk+... + //gtk_widget_show(mainw->scrolledwindow); + //gtk_widget_reparent (mainw->scrolledwindow,mainw->message_box); + + add_message_scroller(mainw->message_box); if (prefs->show_gui) { if (gtk_window_has_toplevel_focus(GTK_WINDOW(mt->window))) transfer_focus=TRUE; @@ -7992,15 +7990,11 @@ mainw->last_dprint_file=-1; d_print (_ ("\n==============================\nSwitched to Clip Edit mode\n")); - if (prefs->show_gui&&prefs->open_maximised) { - gtk_window_unmaximize (GTK_WINDOW(mainw->LiVES)); - } - - while (g_main_context_iteration(NULL,FALSE)); if (prefs->show_gui&&prefs->open_maximised) { gtk_window_maximize (GTK_WINDOW(mainw->LiVES)); + gtk_widget_queue_draw(mainw->LiVES); } if (mt->file_selected!=-1) { @@ -9519,6 +9513,10 @@ gtk_widget_hide (multi->poly_box); gtk_widget_queue_resize(multi->nb_label); } + if (!mainw->has_custom_gens) { + gtk_widget_hide(mainw->custom_gens_menu); + gtk_widget_hide(mainw->custom_gens_submenu); + } gtk_widget_hide (mainw->LiVES); } @@ -11764,9 +11762,9 @@ // we need to call this to warp the pointer, but gtk+ behaves like a PITA if (mt->idlefunc>0) g_source_remove(mt->idlefunc); - pthread_mutex_lock(&mainw->gtk_mutex); + threaded_dialog_spin(); g_main_context_iteration(NULL,FALSE); - pthread_mutex_unlock(&mainw->gtk_mutex); + threaded_dialog_spin(); #endif } @@ -14622,8 +14620,8 @@ else if (mt->audio_draws!=NULL) eventbox=mt->audio_draws->data; if (eventbox!=NULL) { - gtk_widget_set_sensitive (mt->jumpback, g_object_get_data(G_OBJECT(eventbox),"blocks")!=(gulong)NULL); - gtk_widget_set_sensitive (mt->jumpnext, g_object_get_data(G_OBJECT(eventbox),"blocks")!=(gulong)NULL); + gtk_widget_set_sensitive (mt->jumpback, g_object_get_data(G_OBJECT(eventbox),"blocks")!=NULL); + gtk_widget_set_sensitive (mt->jumpnext, g_object_get_data(G_OBJECT(eventbox),"blocks")!=NULL); } gtk_widget_set_sensitive (mt->change_vals,TRUE); @@ -17132,7 +17130,7 @@ elist_errors++; - pthread_mutex_lock(&mainw->gtk_mutex); + threaded_dialog_spin(); if (tc==-1) new=g_strdup(msg); // missing timecode else { if (num==-1) new=g_strdup_printf("%s at timecode %"PRId64"\n",msg,tc); @@ -17145,7 +17143,7 @@ #endif g_free(ebuf); g_free(new); - pthread_mutex_unlock(&mainw->gtk_mutex); + threaded_dialog_spin(); return tmp; } @@ -17605,11 +17603,6 @@ // The checking done is quite sophisticated, and can correct many errors in badly-formed event_lists - // note we need to make extensive use of the gtk_mutex, as we are also showing the - // threaded dialog (setting and freeing of weed parameters makes use of the slice allocator - // which appears to be not thread-safe) - - weed_plant_t *event=get_first_event(event_list),*event_next; weed_timecode_t tc=0,last_tc=0; gchar *ebuf=g_strdup(""); @@ -17675,9 +17668,9 @@ } tc=get_event_timecode(event); tc=q_gint64(tc+U_SEC/(2.*fps)-1,fps); - pthread_mutex_lock(&mainw->gtk_mutex); + threaded_dialog_spin(); weed_set_int64_value(event,"timecode",tc); - pthread_mutex_unlock(&mainw->gtk_mutex); + threaded_dialog_spin(); if (!weed_get_plant_type(event)==WEED_PLANT_EVENT) { ebuf=rec_error_add(ebuf,"Invalid plant type",weed_get_plant_type(event),tc); delete_event(event_list,event); @@ -17749,10 +17742,10 @@ } } } - pthread_mutex_lock(&mainw->gtk_mutex); + threaded_dialog_spin(); weed_free(inct); weed_free(ctmpls); - pthread_mutex_unlock(&mainw->gtk_mutex); + threaded_dialog_spin(); if (!was_deleted) { num_ctmpls=weed_leaf_num_elements(filter,"out_channel_templates"); num_outct=weed_leaf_num_elements(event,"out_count"); @@ -17800,9 +17793,9 @@ else force_backing_tracks=1; } } - pthread_mutex_lock(&mainw->gtk_mutex); + threaded_dialog_spin(); weed_free(trax);
View file
LiVES-1.4.3.tar.bz2/src/paramwindow.c -> LiVES-1.4.5.tar.bz2/src/paramwindow.c
Changed
@@ -823,7 +823,7 @@ if (rfx->status==RFX_STATUS_WEED&&rfx->is_template) is_defaults=TRUE; gtk_container_set_border_width (GTK_CONTAINER (fx_dialog[n]), 20); - gtk_window_set_position (GTK_WINDOW (fx_dialog[n]), GTK_WIN_POS_CENTER); + gtk_window_set_position (GTK_WINDOW (fx_dialog[n]), GTK_WIN_POS_CENTER_ALWAYS); if (menuitem!=NULL) { // activated from the menu for a rendered effect
View file
LiVES-1.4.3.tar.bz2/src/plugins.c -> LiVES-1.4.5.tar.bz2/src/plugins.c
Changed
@@ -51,7 +51,7 @@ gchar *com; gchar buffer[65536]; - pthread_mutex_lock(&mainw->gtk_mutex); + threaded_dialog_spin(); outfile=g_strdup_printf ("%s/.smogplugin.%d",prefs->tmpdir,getpid()); com=g_strconcat (command," >",outfile,NULL); @@ -82,35 +82,35 @@ } } g_free (outfile); - pthread_mutex_unlock(&mainw->gtk_mutex); + threaded_dialog_spin(); return list; } g_free (com); if (!g_file_test (outfile, G_FILE_TEST_EXISTS)) { g_free (outfile); - pthread_mutex_unlock(&mainw->gtk_mutex); + threaded_dialog_spin(); return NULL; } - pthread_mutex_unlock(&mainw->gtk_mutex); + threaded_dialog_spin(); while ((outfile_fd=open(outfile,O_RDONLY))==-1&&(count-->0||list_plugins)) { g_usleep (prefs->sleep_time); } if (!count) { - pthread_mutex_lock(&mainw->gtk_mutex); + threaded_dialog_spin(); g_printerr (_("Plugin timed out on message %s\n"),command); g_free (outfile); - pthread_mutex_unlock(&mainw->gtk_mutex); + threaded_dialog_spin(); return list; } bytes=read (outfile_fd,&buffer,65535); close (outfile_fd); unlink (outfile); - pthread_mutex_lock(&mainw->gtk_mutex); + threaded_dialog_spin(); g_free (outfile); - pthread_mutex_unlock(&mainw->gtk_mutex); + threaded_dialog_spin(); memset (buffer+bytes,0,1); #ifdef DEBUG_PLUGINS @@ -126,17 +126,17 @@ pieces=get_token_count (buffer,delim[0]); array=g_strsplit(buffer,delim,pieces); for (i=0;i<pieces;i++) { - if ((buf=g_strdup(array[i]))!=NULL) { - buf=(g_strchomp (g_strchug(buf))); + if (array[i]!=NULL) { + buf=g_strdup(g_strchomp (g_strchug(array[i]))); if (strlen (buf)||allow_blanks) { list=g_list_append (list, buf); } else g_free(buf); } } - pthread_mutex_lock(&mainw->gtk_mutex); + threaded_dialog_spin(); g_strfreev (array); - pthread_mutex_unlock(&mainw->gtk_mutex); + threaded_dialog_spin(); return list; } @@ -193,9 +193,9 @@ else com=g_strdup (request); list_plugins=FALSE; reslist=get_plugin_result (com,delim,allow_blanks); - pthread_mutex_lock(&mainw->gtk_mutex); + threaded_dialog_spin(); g_free(com); - pthread_mutex_unlock(&mainw->gtk_mutex); + threaded_dialog_spin(); return reslist; } @@ -240,9 +240,9 @@ } list_plugins=TRUE; pluglist=get_plugin_result (com,"|",FALSE); - pthread_mutex_lock(&mainw->gtk_mutex); + threaded_dialog_spin(); g_free(com); - pthread_mutex_unlock(&mainw->gtk_mutex); + threaded_dialog_spin(); return pluglist; } @@ -736,7 +736,7 @@ vppa->dialog = gtk_dialog_new (); - gtk_window_set_position (GTK_WINDOW (vppa->dialog), GTK_WIN_POS_CENTER); + gtk_window_set_position (GTK_WINDOW (vppa->dialog), GTK_WIN_POS_CENTER_ALWAYS); if (prefs->show_gui) { if (prefsw!=NULL) gtk_window_set_transient_for(GTK_WINDOW(vppa->dialog),GTK_WINDOW(prefsw->prefs_dialog)); else { @@ -1944,7 +1944,6 @@ while (decoder_plugin!=NULL) { lives_decoder_sys_t *dpsys=(lives_decoder_sys_t *)decoder_plugin->data; - //#define DEBUG_DECPLUG #ifdef DEBUG_DECPLUG g_print("trying decoder %s\n",dpsys->name); #endif @@ -2027,7 +2026,7 @@ lives_decoder_sys_t *open_decoder_plugin(const gchar *plname) { lives_decoder_sys_t *dplug; - gchar *plugname=g_strdup_printf ("%s%s%s/%s.so",prefs->lib_dir,PLUGIN_EXEC_DIR,PLUGIN_DECODERS,plname); + gchar *plugname; gboolean OK=TRUE; const gchar *err; @@ -2040,6 +2039,7 @@ dplug->name=NULL; + plugname=g_strdup_printf ("%s%s%s/%s.so",prefs->lib_dir,PLUGIN_EXEC_DIR,PLUGIN_DECODERS,plname); dplug->handle=dlopen(plugname,RTLD_LAZY); g_free (plugname); @@ -2189,7 +2189,7 @@ return; } - pthread_mutex_lock(&mainw->gtk_mutex); + threaded_dialog_spin(); rfx->num_params=g_list_length (parameter_list); rfx->params=g_malloc (rfx->num_params*sizeof(lives_param_t)); @@ -2337,7 +2337,7 @@ } g_list_free_strings (parameter_list); g_list_free (parameter_list); - pthread_mutex_unlock(&mainw->gtk_mutex); + threaded_dialog_spin(); } @@ -2473,6 +2473,7 @@ rfx_free(&mainw->rendered_fx[i]); } g_free(mainw->rendered_fx); + mainw->rendered_fx=NULL; }
View file
LiVES-1.4.3.tar.bz2/src/plugins.h -> LiVES-1.4.5.tar.bz2/src/plugins.h
Changed
@@ -242,8 +242,8 @@ /// if URI changes, current_clip and current_palette are reset by plugin lives_clip_data_t *(*get_clip_data)(char *URI, lives_clip_data_t *cdata); - /// frame starts at 0 in these functions - gboolean (*get_frame)(const lives_clip_data_t *, int64_t frame, void **pixel_data); + /// frame starts at 0 in these functions; height is height of primary plane + gboolean (*get_frame)(const lives_clip_data_t *, int64_t frame, int *rowstrides, int height, void **pixel_data); /// call this for each cdata before unloading the module void (*clip_data_free)(lives_clip_data_t *);
View file
LiVES-1.4.3.tar.bz2/src/preferences.c -> LiVES-1.4.5.tar.bz2/src/preferences.c
Changed
@@ -341,6 +341,7 @@ gboolean midisynch=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prefsw->check_midi)); gboolean instant_open=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prefsw->checkbutton_instant_open)); gboolean auto_deint=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prefsw->checkbutton_auto_deint)); + gboolean auto_nobord=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prefsw->checkbutton_nobord)); gboolean concat_images=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prefsw->checkbutton_concat_images)); gboolean ins_speed=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prefsw->ins_speed)); gboolean show_player_stats=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prefsw->checkbutton_show_stats)); @@ -504,16 +505,16 @@ } } - if (strcmp(tmpdir+strlen(tmpdir)-1,"/")) { - g_strappend(tmpdir,256,"/"); - } - - get_dirname(tmpdir); + ensure_isdir(tmpdir); + ensure_isdir(prefs->tmpdir); + ensure_isdir(future_prefs->tmpdir); if (strcmp(prefs->tmpdir,tmpdir)||strcmp (future_prefs->tmpdir,tmpdir)) { if (g_file_test (tmpdir, G_FILE_TEST_EXISTS)&&(strlen (tmpdir)<10||strncmp (tmpdir+strlen (tmpdir)-10,"/livestmp/",10))) g_strappend (tmpdir,256,"livestmp/"); + if (strcmp(prefs->tmpdir,tmpdir)||strcmp (future_prefs->tmpdir,tmpdir)) { gchar *msg; + if (!check_dir_access (tmpdir)) { tmp=g_filename_to_utf8(tmpdir,-1,NULL,NULL,NULL); msg=g_strdup_printf (_ ("Unable to create or write to the new temporary directory.\nYou may need to create it as the root user first, e.g:\n\nmkdir %s; chmod 777 %s\n\nThe directory will not be changed now.\n"),tmp,tmp); @@ -675,6 +676,11 @@ set_boolean_pref("auto_deinterlace",(prefs->auto_deint=auto_deint)); } + // auto border cut + if (prefs->auto_nobord!=auto_nobord) { + set_boolean_pref("auto_cut_borders",(prefs->auto_nobord=auto_nobord)); + } + // concat images if (prefs->concat_images!=concat_images) { set_boolean_pref("concat_images",(prefs->concat_images=concat_images)); @@ -1728,7 +1734,6 @@ GtkWidget *hbox94; GtkWidget *hbox101; GtkWidget *label37; - GtkWidget *hseparator8; GtkWidget *hbox115; GtkWidget *label56; GtkWidget *label94; @@ -1756,7 +1761,6 @@ GtkWidget *dirimage4; GtkWidget *dirimage5; GtkWidget *dirimage6; - GtkWidget *hseparator13; GtkWidget *hbox31; GtkWidget *label126; GtkWidget *pp_combo; @@ -1823,7 +1827,7 @@ prefsw->prefs_dialog = gtk_dialog_new (); gtk_container_set_border_width (GTK_CONTAINER (prefsw->prefs_dialog), 10); gtk_window_set_title (GTK_WINDOW (prefsw->prefs_dialog), _("LiVES: - Preferences")); - gtk_window_set_position (GTK_WINDOW (prefsw->prefs_dialog), GTK_WIN_POS_CENTER); + gtk_window_set_position (GTK_WINDOW (prefsw->prefs_dialog), GTK_WIN_POS_CENTER_ALWAYS); gtk_window_set_modal (GTK_WINDOW (prefsw->prefs_dialog), TRUE); gtk_window_set_default_size (GTK_WINDOW (prefsw->prefs_dialog), PREF_WIN_WIDTH, PREF_WIN_HEIGHT); gtk_window_set_resizable (GTK_WINDOW (prefsw->prefs_dialog), FALSE); @@ -2715,9 +2719,17 @@ gtk_box_pack_start(GTK_BOX(hbox), eventbox, FALSE, FALSE, 5); gtk_tooltips_set_tip (mainw->tooltips, prefsw->checkbutton_instant_open, (_("Enable instant opening of some file types using decoder plugins")), NULL); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefsw->checkbutton_instant_open),prefs->instant_open); + gtk_container_set_border_width(GTK_CONTAINER (hbox), 10); + // --- + hbox = gtk_hbox_new (FALSE, 0); + gtk_widget_show (hbox); + gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_decoding), hbox, TRUE, TRUE, 0); + // --- + prefsw->checkbutton_auto_deint = gtk_check_button_new(); eventbox = gtk_event_box_new(); + label = gtk_label_new_with_mnemonic(_("Enable automatic deinterlacing when possible")); gtk_label_set_mnemonic_widget(GTK_LABEL(label), prefsw->checkbutton_auto_deint); gtk_container_add(GTK_CONTAINER(eventbox), label); @@ -2732,14 +2744,41 @@ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefsw->checkbutton_auto_deint),prefs->auto_deint); gtk_tooltips_set_tip (mainw->tooltips, prefsw->checkbutton_auto_deint, (_("Automatically deinterlace frames when a plugin suggests it")), NULL); gtk_widget_show_all(hbox); - gtk_container_set_border_width(GTK_CONTAINER (hbox), 20); + gtk_container_set_border_width(GTK_CONTAINER (hbox), 10); + + // --- - hseparator13 = gtk_hseparator_new (); - gtk_widget_show (hseparator13); + hbox = gtk_hbox_new (FALSE, 0); + gtk_widget_show (hbox); + gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_decoding), hbox, TRUE, TRUE, 0); + // --- + + prefsw->checkbutton_nobord = gtk_check_button_new(); + eventbox = gtk_event_box_new(); + + label = gtk_label_new_with_mnemonic(_("Ignore blank borders when possible")); + gtk_label_set_mnemonic_widget(GTK_LABEL(label), prefsw->checkbutton_nobord); + gtk_container_add(GTK_CONTAINER(eventbox), label); + g_signal_connect(GTK_OBJECT(eventbox), "button_press_event", G_CALLBACK(label_act_toggle), prefsw->checkbutton_nobord); if (palette->style&STYLE_1) { - gtk_widget_modify_bg(hseparator13, GTK_STATE_NORMAL, &palette->normal_back); + gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore); + gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore); + gtk_widget_modify_bg(eventbox, GTK_STATE_NORMAL, &palette->normal_back); } - gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_decoding), hseparator13, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (hbox), prefsw->checkbutton_nobord, FALSE, FALSE, 5); + gtk_box_pack_start(GTK_BOX(hbox), eventbox, FALSE, FALSE, 5); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefsw->checkbutton_nobord),prefs->auto_nobord); + gtk_tooltips_set_tip (mainw->tooltips, prefsw->checkbutton_nobord, (_("Clip any blank borders from frames where possible")), NULL); + gtk_widget_show_all(hbox); + gtk_container_set_border_width(GTK_CONTAINER (hbox), 10); + + // --- + hseparator = gtk_hseparator_new (); + gtk_widget_show (hseparator); + if (palette->style&STYLE_1) { + gtk_widget_modify_bg(hseparator, GTK_STATE_NORMAL, &palette->normal_back); + } + gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_decoding), hseparator, TRUE, TRUE, 0); // --- prefsw->checkbutton_concat_images = gtk_check_button_new(); eventbox = gtk_event_box_new(); @@ -2755,7 +2794,7 @@ hbox = gtk_hbox_new(FALSE, 0); gtk_box_pack_start(GTK_BOX(hbox), prefsw->checkbutton_concat_images, FALSE, FALSE, 5); gtk_box_pack_start(GTK_BOX(hbox), eventbox, FALSE, FALSE, 5); - gtk_container_set_border_width(GTK_CONTAINER (hbox), 20); + gtk_container_set_border_width(GTK_CONTAINER (hbox), 10); gtk_widget_show_all(hbox); gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_decoding), hbox, FALSE, FALSE, 0); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefsw->checkbutton_concat_images),prefs->concat_images); @@ -2845,12 +2884,12 @@ add_fill_to_box(GTK_BOX(hbox101)); // --- - hseparator13 = gtk_hseparator_new (); - gtk_widget_show (hseparator13); + hseparator = gtk_hseparator_new (); + gtk_widget_show (hseparator); if (palette->style&STYLE_1) { - gtk_widget_modify_bg(hseparator13, GTK_STATE_NORMAL, &palette->normal_back); + gtk_widget_modify_bg(hseparator, GTK_STATE_NORMAL, &palette->normal_back); } - gtk_box_pack_start (GTK_BOX (vbox69), hseparator13, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (vbox69), hseparator, TRUE, TRUE, 0); // --- hbox31 = gtk_hbox_new (FALSE, 0); gtk_widget_show (hbox31); @@ -3136,12 +3175,12 @@ gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_recording), hbox, TRUE, FALSE, 0); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefsw->rdesk_audio),prefs->rec_desktop_audio); // --- - hseparator8 = gtk_hseparator_new (); - gtk_widget_show (hseparator8); + hseparator = gtk_hseparator_new (); + gtk_widget_show (hseparator); if (palette->style&STYLE_1) { - gtk_widget_modify_bg(hseparator8, GTK_STATE_NORMAL, &palette->normal_back); + gtk_widget_modify_bg(hseparator, GTK_STATE_NORMAL, &palette->normal_back); } - gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_recording), hseparator8, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_recording), hseparator, TRUE, TRUE, 0); // --- label37 = gtk_label_new (_(" What to record when 'r' is pressed ")); if (palette->style&STYLE_1) { @@ -3298,12 +3337,12 @@ gtk_widget_set_sensitive (label, FALSE); } // --- - hseparator8 = gtk_hseparator_new (); - gtk_widget_show (hseparator8); + hseparator = gtk_hseparator_new (); + gtk_widget_show (hseparator); if (palette->style&STYLE_1) { - gtk_widget_modify_bg(hseparator8, GTK_STATE_NORMAL, &palette->normal_back); + gtk_widget_modify_bg(hseparator, GTK_STATE_NORMAL, &palette->normal_back); } - gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_recording), hseparator8, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_recording), hseparator, TRUE, TRUE, 0); // --- hbox5 = gtk_hbox_new (FALSE,0); gtk_widget_show (hbox5); @@ -3376,12 +3415,12 @@ gtk_widget_show(prefsw->encoder_combo); - hseparator8 = gtk_hseparator_new (); - gtk_widget_show (hseparator8); + hseparator = gtk_hseparator_new (); + gtk_widget_show (hseparator);
View file
LiVES-1.4.3.tar.bz2/src/preferences.h -> LiVES-1.4.5.tar.bz2/src/preferences.h
Changed
@@ -225,6 +225,7 @@ gboolean instant_open; gboolean auto_deint; + gboolean auto_nobord; gint gui_monitor; gint play_monitor; @@ -429,6 +430,7 @@ GtkWidget *checkbutton_render_prompt; GtkWidget *checkbutton_instant_open; GtkWidget *checkbutton_auto_deint; + GtkWidget *checkbutton_nobord; GtkWidget *checkbutton_concat_images; GtkWidget *forcesmon; GList *pbq_list;
View file
LiVES-1.4.3.tar.bz2/src/resample.c -> LiVES-1.4.5.tar.bz2/src/resample.c
Changed
@@ -1119,7 +1119,7 @@ else if (type==9||type==8) { gtk_window_set_title (GTK_WINDOW (resaudw->dialog), _("LiVES: - External Clip Settings")); } - gtk_window_set_position (GTK_WINDOW (resaudw->dialog), GTK_WIN_POS_CENTER); + gtk_window_set_position (GTK_WINDOW (resaudw->dialog), GTK_WIN_POS_CENTER_ALWAYS); gtk_window_set_modal (GTK_WINDOW (resaudw->dialog), TRUE); if (prefs->show_gui) { @@ -1979,7 +1979,7 @@ else if (type==2) { gtk_window_set_title (GTK_WINDOW (new_pb_speed), _("LiVES: - Resample Video")); } - gtk_window_set_position (GTK_WINDOW (new_pb_speed), GTK_WIN_POS_CENTER); + gtk_window_set_position (GTK_WINDOW (new_pb_speed), GTK_WIN_POS_CENTER_ALWAYS); gtk_window_set_modal (GTK_WINDOW (new_pb_speed), TRUE); gtk_window_set_default_size (GTK_WINDOW (new_pb_speed), 300, 200);
View file
LiVES-1.4.3.tar.bz2/src/rfx-builder.c -> LiVES-1.4.5.tar.bz2/src/rfx-builder.c
Changed
@@ -131,7 +131,7 @@ else { gtk_window_set_title (GTK_WINDOW (rfxbuilder->dialog), _("LiVES: - Edit Test RFX")); } - gtk_window_set_position (GTK_WINDOW (rfxbuilder->dialog), GTK_WIN_POS_CENTER); + gtk_window_set_position (GTK_WINDOW (rfxbuilder->dialog), GTK_WIN_POS_CENTER_ALWAYS); gtk_window_set_modal (GTK_WINDOW (rfxbuilder->dialog), TRUE); if (prefs->show_gui) { gtk_window_set_transient_for(GTK_WINDOW(rfxbuilder->dialog),GTK_WINDOW(mainw->LiVES)); @@ -714,7 +714,7 @@ gtk_widget_show (dialog); - gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_CENTER); + gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_CENTER_ALWAYS); gtk_window_set_modal (GTK_WINDOW (dialog), TRUE); if (prefs->show_gui) { gtk_window_set_transient_for(GTK_WINDOW(dialog),GTK_WINDOW(mainw->LiVES)); @@ -1143,7 +1143,7 @@ gtk_window_set_title (GTK_WINDOW (dialog), _("LiVES: - RFX Properties")); gtk_widget_show (dialog); - gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_CENTER); + gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_CENTER_ALWAYS); gtk_window_set_modal (GTK_WINDOW (dialog), TRUE); if (prefs->show_gui) { gtk_window_set_transient_for(GTK_WINDOW(dialog),GTK_WINDOW(rfxbuilder->dialog)); @@ -1873,7 +1873,7 @@ else { gtk_window_set_title (GTK_WINDOW (dialog), _("LiVES: - Edit RFX Parameter")); } - gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_CENTER); + gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_CENTER_ALWAYS); gtk_window_set_modal (GTK_WINDOW (dialog), TRUE); if (prefs->show_gui) { gtk_window_set_transient_for(GTK_WINDOW(dialog),GTK_WINDOW(mainw->LiVES)); @@ -2592,7 +2592,7 @@ else { gtk_window_set_title (GTK_WINDOW (dialog), _("LiVES: - Edit RFX Parameter Window Hint")); } - gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_CENTER); + gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_CENTER_ALWAYS); gtk_window_set_modal (GTK_WINDOW (dialog), TRUE); if (prefs->show_gui) { gtk_window_set_transient_for(GTK_WINDOW(dialog),GTK_WINDOW(mainw->LiVES)); @@ -2863,7 +2863,7 @@ else { gtk_window_set_title (GTK_WINDOW (dialog), _("LiVES: - Edit RFX Trigger")); } - gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_CENTER); + gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_CENTER_ALWAYS); gtk_window_set_modal (GTK_WINDOW (dialog), TRUE); if (prefs->show_gui) { gtk_window_set_transient_for(GTK_WINDOW(dialog),GTK_WINDOW(mainw->LiVES)); @@ -2975,7 +2975,7 @@ dialog = gtk_dialog_new (); gtk_widget_show (dialog); - gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_CENTER); + gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_CENTER_ALWAYS); gtk_window_set_modal (GTK_WINDOW (dialog), TRUE); if (prefs->show_gui) { gtk_window_set_transient_for(GTK_WINDOW(dialog),GTK_WINDOW(mainw->LiVES)); @@ -3921,23 +3921,23 @@ com=g_strdup_printf("smogrify build_rfx_plugins builtinx %s%s%s %s%s%s %s/bin",prefs->prefix_dir,PLUGIN_SCRIPTS_DIR,PLUGIN_RENDERED_EFFECTS_BUILTIN_SCRIPTS,prefs->lib_dir,PLUGIN_EXEC_DIR,PLUGIN_RENDERED_EFFECTS_BUILTIN,prefs->prefix_dir); dummyvar=system(com); g_free(com); - pthread_mutex_lock(&mainw->gtk_mutex); + threaded_dialog_spin(); d_print (_ ("custom...")); - pthread_mutex_unlock(&mainw->gtk_mutex); + threaded_dialog_spin(); dummyvar=system("smogrify build_rfx_plugins custom"); - pthread_mutex_lock(&mainw->gtk_mutex); + threaded_dialog_spin(); d_print (_("test...")); - pthread_mutex_unlock(&mainw->gtk_mutex); + threaded_dialog_spin(); dummyvar=system("smogrify build_rfx_plugins test"); - pthread_mutex_lock(&mainw->gtk_mutex); + threaded_dialog_spin(); d_print(_("rebuilding dynamic menu entries...")); while (g_main_context_iteration(NULL,FALSE)); - pthread_mutex_unlock(&mainw->gtk_mutex); + threaded_dialog_spin(); add_rfx_effects(); - pthread_mutex_lock(&mainw->gtk_mutex); + threaded_dialog_spin(); d_print_done(); - pthread_mutex_unlock(&mainw->gtk_mutex); + threaded_dialog_spin(); end_threaded_dialog(); gtk_widget_queue_draw(mainw->LiVES); @@ -4232,7 +4232,7 @@ } dialog = gtk_dialog_new (); - gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_CENTER); + gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_CENTER_ALWAYS); if (prefs->show_gui) { gtk_window_set_transient_for(GTK_WINDOW(dialog),GTK_WINDOW(mainw->LiVES)); } @@ -4492,11 +4492,9 @@ - - - - - +static void remove_from_parent(GtkWidget *widget) { + gtk_container_remove(GTK_CONTAINER(widget->parent),widget); +} void add_rfx_effects(void) { @@ -4509,10 +4507,6 @@ gint rfx_builtin_list_length=0,rfx_custom_list_length=0,rfx_test_list_length=0,rfx_list_length=0; - gboolean has_custom_tools=FALSE; - gboolean has_custom_gens=FALSE; - gboolean has_custom_utilities=FALSE; - lives_rfx_t *rfx=NULL; lives_rfx_t *rendered_fx; @@ -4523,111 +4517,87 @@ int i,plugin_idx,rfx_slot_count=1; + int rc_child=0; + + mainw->has_custom_tools=FALSE; + mainw->has_custom_gens=FALSE; + mainw->has_custom_utilities=FALSE; + // exterminate...all...menuentries.... // TODO - account for case where we only have apply_realtime (i.e add 1 to builtin count) if (mainw->num_rendered_effects_builtin) { for (i=0;i<=mainw->num_rendered_effects_builtin+mainw->num_rendered_effects_custom+mainw->num_rendered_effects_test;i++) { - if (mainw->rendered_fx[i].menuitem!=NULL) { - pthread_mutex_lock(&mainw->gtk_mutex); - gtk_widget_destroy(mainw->rendered_fx[i].menuitem); - pthread_mutex_unlock(&mainw->gtk_mutex); + if (mainw->rendered_fx!=NULL) { + if (mainw->rendered_fx[i].menuitem!=NULL) { + threaded_dialog_spin(); + remove_from_parent(mainw->rendered_fx[i].menuitem); + threaded_dialog_spin(); + } } } - pthread_mutex_lock(&mainw->gtk_mutex); - gtk_container_remove (GTK_CONTAINER (mainw->effects_menu), mainw->custom_effects_submenu); - gtk_container_remove (GTK_CONTAINER (mainw->custom_tools_menu), mainw->custom_utilities_submenu); - gtk_container_remove (GTK_CONTAINER (mainw->gens_menu), mainw->custom_gens_submenu); + threaded_dialog_spin(); if (mainw->rte_separator!=NULL) { - gtk_widget_destroy (mainw->rte_separator); - mainw->rte_separator=NULL; + remove_from_parent (mainw->custom_effects_separator); + remove_from_parent (mainw->custom_effects_menu); + remove_from_parent (mainw->custom_effects_submenu); + remove_from_parent (mainw->custom_gens_menu); + remove_from_parent (mainw->custom_gens_submenu); + remove_from_parent (mainw->gens_menu); + remove_from_parent (mainw->custom_utilities_separator); + remove_from_parent (mainw->custom_utilities_menu); + remove_from_parent (mainw->custom_utilities_submenu); + remove_from_parent (mainw->custom_tools_menu); + remove_from_parent (mainw->utilities_menu); + remove_from_parent (mainw->run_test_rfx_menu); } - gtk_widget_destroy (mainw->custom_effects_separator); - gtk_widget_destroy (mainw->custom_utilities_separator); gtk_widget_queue_draw(mainw->effects_menu); while (g_main_context_iteration(NULL,FALSE)); - pthread_mutex_unlock(&mainw->gtk_mutex); + threaded_dialog_spin(); - rfx_free_all(); - } - else { - if (mainw->rendered_fx!=NULL&&mainw->rendered_fx[0].menuitem!=NULL) { - pthread_mutex_lock(&mainw->gtk_mutex); - gtk_widget_destroy(mainw->rendered_fx[0].menuitem); - pthread_mutex_unlock(&mainw->gtk_mutex); - } - pthread_mutex_lock(&mainw->gtk_mutex); - if (mainw->rte_separator!=NULL) { - gtk_widget_destroy (mainw->rte_separator); - mainw->rte_separator=NULL; - gtk_container_remove (GTK_CONTAINER (mainw->effects_menu), mainw->custom_effects_submenu); - gtk_container_remove (GTK_CONTAINER (mainw->custom_tools_menu), mainw->custom_utilities_submenu); - gtk_container_remove (GTK_CONTAINER (mainw->gens_menu), mainw->custom_gens_submenu); - }
View file
LiVES-1.4.3.tar.bz2/src/rte_window.c -> LiVES-1.4.5.tar.bz2/src/rte_window.c
Changed
@@ -706,7 +706,7 @@ gtk_container_set_border_width (GTK_CONTAINER (rte_info_window), 40); gtk_window_set_transient_for(GTK_WINDOW(rte_info_window),GTK_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(button)))); - gtk_window_set_position (GTK_WINDOW (rte_info_window), GTK_WIN_POS_CENTER); + gtk_window_set_position (GTK_WINDOW (rte_info_window), GTK_WIN_POS_CENTER_ALWAYS); gtk_window_set_default_size (GTK_WINDOW (rte_info_window), RTE_INFO_WIDTH, RTE_INFO_HEIGHT); gtk_widget_show(rte_info_window); @@ -1552,7 +1552,7 @@ gchar *keymap_template=g_strdup_printf("%s%sdefault.keymap",prefs->prefix_dir,DATA_DIR); gchar *com,*tmp; - pthread_mutex_lock(&mainw->gtk_mutex); + threaded_dialog_spin(); if (!g_file_test (keymap_file, G_FILE_TEST_EXISTS)) { com=g_strdup_printf("/bin/cp %s %s",keymap_template,keymap_file); dummyvar=system(com); @@ -1564,11 +1564,11 @@ g_free(tmp); g_free(keymap_file); g_free(keymap_template); - pthread_mutex_unlock(&mainw->gtk_mutex); + threaded_dialog_spin(); return; } on_load_keymap_clicked(NULL,NULL); g_free(keymap_file); g_free(keymap_template); - pthread_mutex_unlock(&mainw->gtk_mutex); + threaded_dialog_spin(); }
View file
LiVES-1.4.3.tar.bz2/src/saveplay.c -> LiVES-1.4.5.tar.bz2/src/saveplay.c
Changed
@@ -34,12 +34,6 @@ #include "cvirtual.h" -jmp_buf riperror; - -static void catch_sigusr(int signum) { - longjmp(riperror,1); -} - void save_clip_values(gint which) { gint asigned; gint endian; @@ -102,20 +96,20 @@ if (mainw->opening_loc) return do_progress_dialog(TRUE,TRUE,_ ("Examining file header")); - pthread_mutex_lock(&mainw->gtk_mutex); + threaded_dialog_spin(); clear_mainw_msg(); while (!(infofile=fopen(cfile->info_file,"r"))) { while (g_main_context_iteration (NULL,FALSE)); - pthread_mutex_unlock(&mainw->gtk_mutex); + threaded_dialog_spin(); g_usleep(prefs->sleep_time); - pthread_mutex_lock(&mainw->gtk_mutex); + threaded_dialog_spin(); } dummychar=fgets(mainw->msg,512,infofile); fclose(infofile); - pthread_mutex_unlock(&mainw->gtk_mutex); + threaded_dialog_spin(); return TRUE; } @@ -154,6 +148,39 @@ open_file_sel(file_name,0.,0); } + + +static gboolean rip_audio_cancelled(gint old_file, weed_plant_t *mt_pb_start_event, + gboolean mt_has_audio_file) { + + if (mainw->cancelled==CANCEL_KEEP) { + // user clicked "enough" + mainw->cancelled=CANCEL_NONE; + return TRUE; + } + + end_threaded_dialog(); + + d_print("\n"); + d_print_cancelled(); + close_current_file(old_file); + + mainw->noswitch=FALSE; + + if (mainw->multitrack!=NULL) { + mainw->multitrack->pb_start_event=mt_pb_start_event; + mainw->multitrack->has_audio_file=mt_has_audio_file; + } + + if (mainw->file_open_params!=NULL) g_free (mainw->file_open_params); + mainw->file_open_params=NULL; + lives_set_cursor_style(LIVES_CURSOR_NORMAL,NULL); + return FALSE; +} + + +#define AUDIO_FRAMES_TO_READ 100 + void open_file_sel(const gchar *file_name, gdouble start, gint frames) { gchar *com; gint withsound=1; @@ -220,12 +247,23 @@ get_mime_type(cfile->type,40,cdata); - cfile->hsize=cdata->frame_width*weed_palette_get_pixels_per_macropixel(cdata->current_palette); - cfile->vsize=cdata->frame_height; + if (!prefs->auto_nobord) { + cfile->hsize=cdata->frame_width*weed_palette_get_pixels_per_macropixel(cdata->current_palette); + cfile->vsize=cdata->frame_height; + } + else { + cfile->hsize=cdata->width*weed_palette_get_pixels_per_macropixel(cdata->current_palette); + cfile->vsize=cdata->height; + } + cfile->frames=cdata->nframes; if (frames>0&&cfile->frames>frames) cfile->frames=frames; + cfile->start=1; + cfile->end=cfile->frames; + create_frame_index(mainw->current_file,TRUE,cfile->fps*(start==0?0:start-1),frames==0?cfile->frames:frames); + cfile->arate=cfile->arps=cdata->arate; cfile->achans=cdata->achans; cfile->asampsize=cdata->asamps; @@ -234,88 +272,45 @@ if (cfile->achans>0&&(dplug->decoder->rip_audio)!=NULL&&withsound==1) { // call rip_audio() in the decoder plugin - - // since this function blocks, we need to take some special measures to allow cancel - - // we will set mainw->sig_pid, this will cause a cancel in the threaded window - // to send sigusr1 to us; this has the effect of a) killing the decoder plugin - // b) calling catch_sigusr in this thread - we then do a longjmp() back here - - // the threaded dialog will wait until mainw->sig_file exists before sending - // sigusr1. This allows the plugin time to complete its immediate setup - // the plugin gets a chance to do any internal cleanup in rip_audio_cleanup() - - struct sigaction sact; - + int64_t stframe=cfile->fps*start+.5; + int64_t maxframe=stframe+(frames==0)?cfile->frames:frames; + int64_t nframes=AUDIO_FRAMES_TO_READ; gchar *afile=g_strdup_printf("%s/%s/audiodump.pcm",prefs->tmpdir,cfile->handle); - msgstr=g_strdup_printf(_("Opening audio for %s"),file_name); - - mainw->cancelled=CANCEL_NONE; - - sact.sa_handler=catch_sigusr; - sact.sa_flags=SA_NODEFER; - sigemptyset(&sact.sa_mask); - - sigaction (SIGUSR1, &sact, NULL); - - mainw->sig_pid=pthread_self(); - mainw->sig_file=g_strdup(afile); - - if (setjmp(riperror)) { - // catch sigusr from threaded dialog cancel and then longjmp here - signal(SIGUSR1,SIG_IGN); - mainw->sig_pid=0; - g_free(mainw->sig_file); - mainw->sig_file=NULL; - - end_threaded_dialog(); - if (dplug->decoder->rip_audio_cleanup!=NULL) { - (dplug->decoder->rip_audio_cleanup)(cdata); - } + msgstr=g_strdup_printf(_("Opening audio for %s"),file_name); - if (mainw->cancelled==CANCEL_KEEP) { - // user clicked "enough" - mainw->cancelled=CANCEL_NONE; - goto pt1; - } + if (mainw->playing_file==-1) resize(1); - d_print("\n"); - d_print_cancelled(); - close_current_file(old_file); - - mainw->noswitch=FALSE; - if (mainw->multitrack!=NULL) { - mainw->multitrack->pb_start_event=mt_pb_start_event; - mainw->multitrack->has_audio_file=mt_has_audio_file; - } - if (mainw->file_open_params!=NULL) g_free (mainw->file_open_params); - mainw->file_open_params=NULL; - lives_set_cursor_style(LIVES_CURSOR_NORMAL,NULL); - g_free(afile); - return; - } + mainw->cancelled=CANCEL_NONE; cfile->opening_only_audio=TRUE; - do_threaded_dialog(msgstr,TRUE); + if (mainw->playing_file==-1) do_threaded_dialog(msgstr,TRUE); - (dplug->decoder->rip_audio)(cdata,afile,(cfile->fps*start+.5),frames,NULL); + do { + if (stframe+nframes>maxframe) nframes=maxframe-stframe; + if (nframes<=0) break; + (dplug->decoder->rip_audio)(cdata,afile,stframe,nframes,NULL); + threaded_dialog_spin(); + stframe+=nframes; + } while (mainw->cancelled==CANCEL_NONE); if (dplug->decoder->rip_audio_cleanup!=NULL) { (dplug->decoder->rip_audio_cleanup)(cdata); } + if (mainw->cancelled!=CANCEL_NONE) { + if (!rip_audio_cancelled(old_file,mt_pb_start_event,mt_has_audio_file)) { + g_free(afile); + return; + }
View file
LiVES-1.4.3.tar.bz2/src/startup.c -> LiVES-1.4.5.tar.bz2/src/startup.c
Changed
@@ -104,6 +104,7 @@ g_free (com); set_pref("tempdir",prefs->tmpdir); + set_pref("session_tempdir",prefs->tmpdir); g_snprintf(mainw->first_info_file,255,"%s/.info.%d",prefs->tmpdir,getpid()); @@ -214,7 +215,7 @@ gtk_window_set_title (GTK_WINDOW (dialog), _("LiVES: - Choose an audio player")); gtk_window_set_modal (GTK_WINDOW (dialog), TRUE); - gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_CENTER); + gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_CENTER_ALWAYS); gtk_window_set_default_size (GTK_WINDOW (dialog), 350, 200); if (palette->style&STYLE_1) { @@ -561,7 +562,7 @@ } gtk_window_set_modal (GTK_WINDOW (dialog), TRUE); - gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_CENTER); + gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_CENTER_ALWAYS); gtk_window_set_default_size (GTK_WINDOW (dialog), 350, 200); if (palette->style&STYLE_1) { @@ -913,7 +914,7 @@ gtk_window_set_title (GTK_WINDOW (dialog), _("LiVES: - Choose the startup interface")); gtk_window_set_modal (GTK_WINDOW (dialog), TRUE); - gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_CENTER); + gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_CENTER_ALWAYS); gtk_window_set_default_size (GTK_WINDOW (dialog), 350, 200); if (palette->style&STYLE_1) {
View file
LiVES-1.4.3.tar.bz2/src/stream.c -> LiVES-1.4.5.tar.bz2/src/stream.c
Changed
@@ -102,13 +102,11 @@ return buflen+btoread; } else { - if (!pthread_mutex_trylock(&mainw->gtk_mutex)) { - weed_plant_t *frame_layer=mainw->frame_layer; - mainw->frame_layer=NULL; - while (g_main_context_iteration(NULL,FALSE)); - mainw->frame_layer=frame_layer; - pthread_mutex_unlock(&mainw->gtk_mutex); - } + weed_plant_t *frame_layer=mainw->frame_layer; + mainw->frame_layer=NULL; + while (g_main_context_iteration(NULL,FALSE)); + mainw->frame_layer=frame_layer; + threaded_dialog_spin(); if (mainw->cancelled) return buflen+btoread; g_usleep(prefs->sleep_time); } @@ -140,13 +138,11 @@ do { ret=lives_stream_in(lstream->handle,buflen,buf,0); if (ret==-1) { - if (!pthread_mutex_trylock(&mainw->gtk_mutex)) { - weed_plant_t *frame_layer=mainw->frame_layer; - mainw->frame_layer=NULL; - while (g_main_context_iteration(NULL,FALSE)); - mainw->frame_layer=frame_layer; - pthread_mutex_unlock(&mainw->gtk_mutex); - } + weed_plant_t *frame_layer=mainw->frame_layer; + mainw->frame_layer=NULL; + while (g_main_context_iteration(NULL,FALSE)); + mainw->frame_layer=frame_layer; + threaded_dialog_spin(); if (mainw->cancelled) { return -1; } @@ -179,13 +175,11 @@ copied=lives_stream_in(lstream->handle,buflen,buf,bfsize); if (copied==-2) return FALSE; if (copied==-1) { - if (!pthread_mutex_trylock(&mainw->gtk_mutex)) { - weed_plant_t *frame_layer=mainw->frame_layer; - mainw->frame_layer=NULL; - while (g_main_context_iteration(NULL,FALSE)); - mainw->frame_layer=frame_layer; - pthread_mutex_unlock(&mainw->gtk_mutex); - } + weed_plant_t *frame_layer=mainw->frame_layer; + mainw->frame_layer=NULL; + while (g_main_context_iteration(NULL,FALSE)); + mainw->frame_layer=frame_layer; + threaded_dialog_spin(); if (mainw->cancelled) return TRUE; g_usleep(prefs->sleep_time); } @@ -1111,7 +1105,7 @@ pandhw->dialog = gtk_dialog_new (); - gtk_window_set_position (GTK_WINDOW (pandhw->dialog), GTK_WIN_POS_CENTER); + gtk_window_set_position (GTK_WINDOW (pandhw->dialog), GTK_WIN_POS_CENTER_ALWAYS); if (prefs->show_gui) { gtk_window_set_transient_for(GTK_WINDOW(pandhw->dialog),GTK_WINDOW(mainw->LiVES)); }
View file
LiVES-1.4.3.tar.bz2/src/utils.c -> LiVES-1.4.5.tar.bz2/src/utils.c
Changed
@@ -732,9 +732,9 @@ int lockpid; unlink(info_file); - pthread_mutex_lock(&mainw->gtk_mutex); + threaded_dialog_spin(); dummyvar=system(com); - pthread_mutex_unlock(&mainw->gtk_mutex); + threaded_dialog_spin(); g_free(com); clear_mainw_msg(); @@ -748,9 +748,9 @@ if (type==0) { msg=g_strdup_printf(_("Set %s\ncannot be opened, as it is in use\nby another copy of LiVES.\n"),set_name); - pthread_mutex_lock(&mainw->gtk_mutex); + threaded_dialog_spin(); do_error_dialog(msg); - pthread_mutex_unlock(&mainw->gtk_mutex); + threaded_dialog_spin(); } else if (type==1) { msg=g_strdup_printf(_("\nThe set %s is currently in use by another copy of LiVES.\nPlease choose another set name.\n"),set_name); @@ -1373,7 +1373,7 @@ make_preview_box(); } // and add it the play window - if (mainw->preview_box->parent==NULL&&cfile->clip_type==CLIP_TYPE_DISK&&!mainw->is_rendering) { + if (mainw->preview_box->parent==NULL&&(cfile->clip_type==CLIP_TYPE_DISK||cfile->clip_type==CLIP_TYPE_FILE)&&!mainw->is_rendering) { gtk_widget_queue_draw(mainw->play_window); gtk_container_add (GTK_CONTAINER (mainw->play_window), mainw->preview_box); } @@ -1462,8 +1462,6 @@ if (!prefs->show_gui) return; - if (pthread_mutex_trylock(&mainw->gtk_mutex)) return; - if (!(frame=calc_frame_from_time(mainw->current_file,ptrtime))) frame=cfile->frames; @@ -1570,7 +1568,7 @@ } } } - pthread_mutex_unlock(&mainw->gtk_mutex); + threaded_dialog_spin(); } @@ -2166,6 +2164,7 @@ int i; GtkWidget *active_image=NULL; + gchar menutext[32768]; for (i=1;i<=MAX_FILES;i++) { if (!(mainw->files[i]==NULL)) { @@ -2184,7 +2183,9 @@ gtk_widget_show (active_image); } if (mainw->files[i]->menuentry!=NULL) { + get_menu_text_long(mainw->files[i]->menuentry,menutext); gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (mainw->files[i]->menuentry), active_image); + set_menu_text(mainw->files[i]->menuentry,menutext,FALSE); gtk_widget_queue_draw(mainw->files[i]->menuentry); } } @@ -2679,9 +2680,9 @@ if (!(hfile=fopen(filename,"r"))) return; while (fgets(buff,65536,hfile)!=NULL) { - pthread_mutex_lock(&mainw->gtk_mutex); + threaded_dialog_spin(); mainw->cached_list=g_list_append(mainw->cached_list,g_strdup(buff)); - pthread_mutex_unlock(&mainw->gtk_mutex); + threaded_dialog_spin(); } fclose(hfile); } @@ -2858,22 +2859,22 @@ val=g_malloc(maxlen); memset(val,0,maxlen); - pthread_mutex_lock(&mainw->gtk_mutex); + threaded_dialog_spin(); if (system(com)) { tempdir_warning(); - pthread_mutex_unlock(&mainw->gtk_mutex); + threaded_dialog_spin(); g_free(com); return FALSE; } vfile=g_strdup_printf("%s/.smogval.%d.%d",prefs->tmpdir,getuid(),getpid()); - pthread_mutex_unlock(&mainw->gtk_mutex); + threaded_dialog_spin(); do { if (!(valfile=fopen(vfile,"r"))) { if (!(mainw==NULL)) { - pthread_mutex_lock(&mainw->gtk_mutex); + threaded_dialog_spin(); while (g_main_context_iteration(NULL,FALSE)); - pthread_mutex_unlock(&mainw->gtk_mutex); + threaded_dialog_spin(); } g_usleep(prefs->sleep_time); timeout--; @@ -3275,10 +3276,10 @@ get_border_size (GtkWidget *win, gint *bx, gint *by) { GdkRectangle rect; gint wx,wy; - pthread_mutex_lock(&mainw->gtk_mutex); + threaded_dialog_spin(); gdk_window_get_frame_extents (GDK_WINDOW (win->window),&rect); gdk_window_get_origin (GDK_WINDOW (win->window), &wx, &wy); - pthread_mutex_unlock(&mainw->gtk_mutex); + threaded_dialog_spin(); bx[0]=wx-rect.x; by[0]=wy-rect.y; }
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
.