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 11
View file
LiVES.changes
Changed
@@ -1,4 +1,15 @@ ------------------------------------------------------------------- +Sat Dec 10 16:43:13 UTC 2011 - pascal.bleser@opensuse.org + +- update to 1.4.9: + * support for v4l2loopback output has been added + * instant opening of WebM / Matroska clips + * a Youtube download tool have been implemented + * fixes were made for crash recovery for virtual clips + * fixes a possible crash when showing preview frame in multitrack + * memory allocation has been optimized for multiplanar images + +------------------------------------------------------------------- Sun Nov 27 15:27:41 UTC 2011 - pascal.bleser@opensuse.org - update to 1.4.8:
View file
LiVES.spec
Changed
@@ -1,7 +1,7 @@ # vim: set ts=4 sw=4 et: Name: LiVES -Version: 1.4.8 +Version: 1.4.9 %define soname 0 Release: 1 Summary: Video Editor and VJ Tool @@ -165,6 +165,8 @@ %{_libdir}/lives/plugins/decoders/asf_decoder.la %{_libdir}/lives/plugins/decoders/dv_decoder.so %{_libdir}/lives/plugins/decoders/dv_decoder.la +%{_libdir}/lives/plugins/decoders/mkv_decoder.so +%{_libdir}/lives/plugins/decoders/mkv_decoder.la %{_libdir}/lives/plugins/decoders/ogg_decoder.so %{_libdir}/lives/plugins/decoders/ogg_decoder.la %{_libdir}/lives/plugins/decoders/flv_decoder.so @@ -349,6 +351,8 @@ %{_libdir}/lives/plugins/playback/video/yuv4mpeg_stream.la %{_libdir}/lives/plugins/playback/video/icecast_output.so %{_libdir}/lives/plugins/playback/video/icecast_output.la +%{_libdir}/lives/plugins/playback/video/vloopback2.so +%{_libdir}/lives/plugins/playback/video/vloopback2.la %files -n libweed%{soname} %defattr(-,root,root)
View file
LiVES-1.4.8.tar.bz2/ChangeLog -> LiVES-1.4.9.tar.bz2/ChangeLog
Changed
@@ -1,3 +1,22 @@ +Version 1.4.9 (8 December 2011) +------------------------------- +Add support for v4l2loopback output. +Implement instant opening of webm / matroska clips. +Implement a Youtube download tool. +Fix crash recovery for virtual clips. +Fix crash when showing preview frame in multitrack (regression). +Optimise memory for multiplanar images. +Fix compilation problem (not finding weed-palettes.h) + + + + + + + + + + Version 1.4.8 (26 Nov 2011) --------------------------- Optimise resizing for virtual clips.
View file
LiVES-1.4.8.tar.bz2/GETTING.STARTED -> LiVES-1.4.9.tar.bz2/GETTING.STARTED
Changed
@@ -90,7 +90,7 @@ Donations (of any kind) are also very welcome. -You can contact the author at: salsaman@xs4all.nl +You can contact the author at: salsaman@xs4all.nl or salsaman@gmail.com
View file
LiVES-1.4.8.tar.bz2/LiVES.doxygen -> LiVES-1.4.9.tar.bz2/LiVES.doxygen
Changed
@@ -31,7 +31,7 @@ # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = 1.4.8 +PROJECT_NUMBER = 1.4.9 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) # base path where the generated documentation will be put.
View file
LiVES-1.4.8.tar.bz2/Makefile.in -> LiVES-1.4.9.tar.bz2/Makefile.in
Changed
@@ -217,6 +217,10 @@ LIBAVCODEC_LIBS = @LIBAVCODEC_LIBS@ LIBAVFORMAT_CFLAGS = @LIBAVFORMAT_CFLAGS@ LIBAVFORMAT_LIBS = @LIBAVFORMAT_LIBS@ +LIBAVUTIL_CFLAGS = @LIBAVUTIL_CFLAGS@ +LIBAVUTIL_LIBS = @LIBAVUTIL_LIBS@ +LIBBZ_CFLAGS = @LIBBZ_CFLAGS@ +LIBBZ_LIBS = @LIBBZ_LIBS@ LIBDV_CFLAGS = @LIBDV_CFLAGS@ LIBDV_LIBS = @LIBDV_LIBS@ LIBICONV = @LIBICONV@ @@ -230,6 +234,8 @@ LIBSWSCALE_LIBS = @LIBSWSCALE_LIBS@ LIBTHREAD = @LIBTHREAD@ LIBTOOL = @LIBTOOL@ +LIBZ_CFLAGS = @LIBZ_CFLAGS@ +LIBZ_LIBS = @LIBZ_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBC = @LTLIBC@ @@ -299,6 +305,8 @@ VORBIS_CFLAGS = @VORBIS_CFLAGS@ VORBIS_LIBS = @VORBIS_LIBS@ WEED_CFLAGS = @WEED_CFLAGS@ +WEED_COMPAT_CFLAGS = @WEED_COMPAT_CFLAGS@ +WEED_COMPAT_LIBS = @WEED_COMPAT_LIBS@ WEED_LIBS = @WEED_LIBS@ WEED_PLUGIN_UTILS_CFLAGS = @WEED_PLUGIN_UTILS_CFLAGS@ WEED_PLUGIN_UTILS_LIBS = @WEED_PLUGIN_UTILS_LIBS@
View file
LiVES-1.4.8.tar.bz2/README -> LiVES-1.4.9.tar.bz2/README
Changed
@@ -4,7 +4,7 @@ - - - - - -Original author: salsaman (salsaman@xs4all.nl) and others (see file AUTHORS) +Original author: salsaman (salsaman@xs4all.nl,salsaman@gmail.com) and others (see file AUTHORS) Released under the GNU PUBLIC LICENSE, version 3 or later. @@ -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.8.tar.bz2 + bzip2 -d LiVES-1.4.9.tar.bz2 or, - gzip -d LiVES-1.4.8.tar.gz + gzip -d LiVES-1.4.9.tar.gz depending on which version you have. Then: - tar xvf LIVES-1.4.8.tar + tar xvf LIVES-1.4.9.tar - cd lives-1.4.8 + cd lives-1.4.9
View file
LiVES-1.4.8.tar.bz2/build-lives-rfx-plugin -> LiVES-1.4.9.tar.bz2/build-lives-rfx-plugin
Changed
@@ -78,7 +78,7 @@ } -$builder_version="1.4.8"; +$builder_version="1.4.9"; if ($in_channels==0&&$properties&0x0004) { #batch mode generator
View file
LiVES-1.4.8.tar.bz2/configure -> LiVES-1.4.9.tar.bz2/configure
Changed
@@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for LiVES 1.4.8. +# Generated by GNU Autoconf 2.68 for LiVES 1.4.9. # # Report bugs to <http://www.sourceforge.net/tracker/?group_id=64341&atid=507139>. # @@ -571,8 +571,8 @@ # Identity of this package. PACKAGE_NAME='LiVES' PACKAGE_TARNAME='lives' -PACKAGE_VERSION='1.4.8' -PACKAGE_STRING='LiVES 1.4.8' +PACKAGE_VERSION='1.4.9' +PACKAGE_STRING='LiVES 1.4.9' PACKAGE_BUGREPORT='http://www.sourceforge.net/tracker/?group_id=64341&atid=507139' PACKAGE_URL='' @@ -624,6 +624,10 @@ HAVE_SYSTEM_WEED_PLUGIN_UTILS_TRUE WEED_PLUGIN_UTILS_LIBS WEED_PLUGIN_UTILS_CFLAGS +HAVE_SYSTEM_WEED_COMPAT_FALSE +HAVE_SYSTEM_WEED_COMPAT_TRUE +WEED_COMPAT_LIBS +WEED_COMPAT_CFLAGS HAVE_SYSTEM_WEED_UTILS_FALSE HAVE_SYSTEM_WEED_UTILS_TRUE WEED_UTILS_LIBS @@ -678,6 +682,8 @@ HAVE_LIBDV_TRUE LIBDV_LIBS LIBDV_CFLAGS +HAVE_LIBv4l2_FALSE +HAVE_LIBv4l2_TRUE v4l1_INCFILE HAVE_LIBv4l1_FALSE HAVE_LIBv4l1_TRUE @@ -685,6 +691,14 @@ HAVE_UNICAP_TRUE UNICAP_LIBS UNICAP_CFLAGS +CONFIG_BZLIB_FALSE +CONFIG_BZLIB_TRUE +LIBBZ_LIBS +LIBBZ_CFLAGS +CONFIG_ZLIB_FALSE +CONFIG_ZLIB_TRUE +LIBZ_LIBS +LIBZ_CFLAGS HAVE_LIBPNG_FALSE HAVE_LIBPNG_TRUE PNG_LIBS @@ -695,12 +709,16 @@ MJPEGTOOLS_CFLAGS HAVE_SWSCALE_FALSE HAVE_SWSCALE_TRUE +HAVE_AVUTIL_FALSE +HAVE_AVUTIL_TRUE HAVE_AVFORMAT_FALSE HAVE_AVFORMAT_TRUE HAVE_AVCODEC_FALSE HAVE_AVCODEC_TRUE LIBSWSCALE_LIBS LIBSWSCALE_CFLAGS +LIBAVUTIL_LIBS +LIBAVUTIL_CFLAGS LIBAVFORMAT_LIBS LIBAVFORMAT_CFLAGS LIBAVCODEC_LIBS @@ -953,6 +971,8 @@ enable_ffmpeg enable_mjpegtools enable_libpng +enable_libz +enable_libbz enable_unicap enable_libvisual enable_liboil @@ -985,12 +1005,16 @@ LIBAVCODEC_LIBS LIBAVFORMAT_CFLAGS LIBAVFORMAT_LIBS +LIBAVUTIL_CFLAGS +LIBAVUTIL_LIBS LIBSWSCALE_CFLAGS LIBSWSCALE_LIBS MJPEGTOOLS_CFLAGS MJPEGTOOLS_LIBS PNG_CFLAGS PNG_LIBS +LIBZ_CFLAGS +LIBZ_LIBS UNICAP_CFLAGS UNICAP_LIBS LIBDV_CFLAGS @@ -1017,6 +1041,8 @@ WEED_SLICE_LIBS WEED_UTILS_CFLAGS WEED_UTILS_LIBS +WEED_COMPAT_CFLAGS +WEED_COMPAT_LIBS WEED_PLUGIN_UTILS_CFLAGS WEED_PLUGIN_UTILS_LIBS' @@ -1561,7 +1587,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.8 to adapt to many kinds of systems. +\`configure' configures LiVES 1.4.9 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1632,7 +1658,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of LiVES 1.4.8:";; + short | recursive ) echo "Configuration of LiVES 1.4.9:";; esac cat <<\_ACEOF @@ -1667,6 +1693,8 @@ --disable-ffmpeg Disable ffmpeg (avcodec) support. --disable-mjpegtools Disable mjpegtools (yuv4mpeg) support. --disable-libpng Disable direct libpng support. + --disable-libz Disable libz support. + --disable-libbz Disable libbz support. --disable-unicap Disable unicap support. --disable-libvisual Disable libvisual support. --disable-liboil Disable liboil support. @@ -1722,6 +1750,10 @@ C compiler flags for LIBAVFORMAT, overriding pkg-config LIBAVFORMAT_LIBS linker flags for LIBAVFORMAT, overriding pkg-config + LIBAVUTIL_CFLAGS + C compiler flags for LIBAVUTIL, overriding pkg-config + LIBAVUTIL_LIBS + linker flags for LIBAVUTIL, overriding pkg-config LIBSWSCALE_CFLAGS C compiler flags for LIBSWSCALE, overriding pkg-config LIBSWSCALE_LIBS @@ -1732,6 +1764,8 @@ linker flags for MJPEGTOOLS, overriding pkg-config PNG_CFLAGS C compiler flags for PNG, overriding pkg-config PNG_LIBS linker flags for PNG, overriding pkg-config + LIBZ_CFLAGS C compiler flags for LIBZ, overriding pkg-config + LIBZ_LIBS linker flags for LIBZ, overriding pkg-config UNICAP_CFLAGS C compiler flags for UNICAP, overriding pkg-config UNICAP_LIBS linker flags for UNICAP, overriding pkg-config @@ -1769,6 +1803,10 @@ C compiler flags for WEED_UTILS, overriding pkg-config WEED_UTILS_LIBS linker flags for WEED_UTILS, overriding pkg-config + WEED_COMPAT_CFLAGS + C compiler flags for WEED_COMPAT, overriding pkg-config + WEED_COMPAT_LIBS + linker flags for WEED_COMPAT, overriding pkg-config WEED_PLUGIN_UTILS_CFLAGS C compiler flags for WEED_PLUGIN_UTILS, overriding pkg-config WEED_PLUGIN_UTILS_LIBS @@ -1840,7 +1878,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -LiVES configure 1.4.8 +LiVES configure 1.4.9 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2441,7 +2479,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.8, which was +It was created by LiVES $as_me 1.4.9, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -3373,7 +3411,7 @@ # Define the identity of the package. PACKAGE='lives' - VERSION='1.4.8' + VERSION='1.4.9' cat >>confdefs.h <<_ACEOF @@ -20785,15 +20823,16 @@ - - fi else FORCE_SDL=true
View file
LiVES-1.4.8.tar.bz2/configure.in -> LiVES-1.4.9.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.8,http://www.sourceforge.net/tracker/?group_id=64341&atid=507139) +AC_INIT(LiVES,1.4.9,http://www.sourceforge.net/tracker/?group_id=64341&atid=507139) AC_CANONICAL_HOST AC_CANONICAL_TARGET @@ -331,22 +331,24 @@ ]) - AC_SUBST(SDL_LIBS) - AC_SUBST(SDL_CFLAGS) fi else FORCE_SDL=true SDL_PREFIX=${with-sdl-prefix} -AC_SUBST(SDL_PREFIX) fi +AC_SUBST(SDL_LIBS) +AC_SUBST(SDL_CFLAGS) +AC_SUBST(SDL_PREFIX) + AM_CONDITIONAL(HAVE_SDL,$HAVE_SDL) AM_CONDITIONAL(FORCE_SDL,$FORCE_SDL) HAVE_AVCODEC=false HAVE_AVFORMAT=false +HAVE_AVUTIL=false HAVE_SWSCALE=false AC_ARG_ENABLE( ffmpeg, [ --disable-ffmpeg Disable ffmpeg (avcodec) support.] , disable_ffmpeg=yes) @@ -355,21 +357,27 @@ 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) + +PKG_CHECK_MODULES(LIBAVUTIL,libavutil,HAVE_AVUTIL=true,HAVE_AVUTIL=false) PKG_CHECK_MODULES(LIBSWSCALE,libswscale,HAVE_SWSCALE=true,HAVE_SWSCALE=false) -AC_SUBST(LIBSWSCALE_CFLAGS) -AC_SUBST(LIBSWSCALE_LIBS) fi +AC_SUBST(LIBAVCODEC_CFLAGS) +AC_SUBST(LIBAVCODEC_LIBS) +AC_SUBST(LIBAVFORMAT_CFLAGS) +AC_SUBST(LIBAVFORMAT_LIBS) +AC_SUBST(LIBAVUTIL_CFLAGS) +AC_SUBST(LIBAVUTIL_LIBS) +AC_SUBST(LIBSWSCALE_CFLAGS) +AC_SUBST(LIBSWSCALE_LIBS) + AM_CONDITIONAL(HAVE_AVCODEC,$HAVE_AVCODEC) AM_CONDITIONAL(HAVE_AVFORMAT,$HAVE_AVFORMAT) +AM_CONDITIONAL(HAVE_AVUTIL,$HAVE_AVUTIL) AM_CONDITIONAL(HAVE_SWSCALE,$HAVE_SWSCALE) @@ -380,9 +388,10 @@ dnl check for mjpegtools PKG_CHECK_MODULES(MJPEGTOOLS,mjpegtools >= 1.6.2,HAVE_MJPEGTOOLS=true,HAVE_MJPEGTOOLS=false) +fi + AC_SUBST(MJPEGTOOLS_CFLAGS) AC_SUBST(MJPEGTOOLS_LIBS) -fi AM_CONDITIONAL(HAVE_MJPEGTOOLS,$HAVE_MJPEGTOOLS) @@ -392,24 +401,59 @@ AC_ARG_ENABLE( libpng, [ --disable-libpng Disable direct libpng support.] , disable_libpng=yes) if test "x$disable_libpng" != "xyes" ; then -dnl check for mjpegtools +dnl check for libpng PKG_CHECK_MODULES(PNG,libpng > 1.2.0,HAVE_LIBPNG=true,HAVE_LIBPNG=false) +fi + AC_SUBST(PNG_CFLAGS) AC_SUBST(PNG_LIBS) -fi AM_CONDITIONAL(HAVE_LIBPNG,$HAVE_LIBPNG) + +HAVE_ZLIB=false +AC_ARG_ENABLE( libz, [ --disable-libz Disable libz support.] , disable_libz=yes) +if test "x$disable_libz" != "xyes" ; then + +dnl check for libz +PKG_CHECK_MODULES(LIBZ,zlib,HAVE_LIBZ=true,HAVE_LIBZ=false) +fi + +AC_SUBST(LIBZ_CFLAGS) +AC_SUBST(LIBZ_LIBS) + +AM_CONDITIONAL(CONFIG_ZLIB,$HAVE_LIBZ) + + +HAVE_BZLIB=false +AC_ARG_ENABLE( libbz, [ --disable-libbz Disable libbz support.] , disable_libbz=yes) +if test "x$disable_libbz" != "xyes" ; then + +dnl check for libz +AC_CHECK_HEADERS(bzlib.h,HAVE_LIBBZ=true,HAVE_LIBBZ=false) + +if test "HAVE_LIBBZ" == "true" ; then +LIBBZ_LIBS=-lbz +fi +fi + +AC_SUBST(LIBBZ_CFLAGS) +AC_SUBST(LIBBZ_LIBS) + +AM_CONDITIONAL(CONFIG_BZLIB,$HAVE_LIBBZ) + + HAVE_UNICAP=false AC_ARG_ENABLE( unicap, [ --disable-unicap Disable unicap support.] , disable_unicap=yes) if test "x$disable_unicap" != "xyes" ; then dnl check for unicap PKG_CHECK_MODULES(UNICAP,libunicap,HAVE_UNICAP=true,HAVE_UNICAP=false) +fi + AC_SUBST(UNICAP_CFLAGS) AC_SUBST(UNICAP_LIBS) -fi AM_CONDITIONAL(HAVE_UNICAP,$HAVE_UNICAP) @@ -427,6 +471,9 @@ AM_CONDITIONAL(HAVE_LIBv4l1,$HAVE_LIBv4l1) AC_SUBST(v4l1_INCFILE) +AC_CHECK_HEADERS(linux/videodev2.h, HAVE_LIBv4l2=true, HAVE_LIBv4l2=false) +AM_CONDITIONAL(HAVE_LIBv4l2,$HAVE_LIBv4l2) + HAVE_LIBDV=false @@ -587,6 +634,14 @@ AM_CONDITIONAL(HAVE_SYSTEM_WEED_UTILS,$HAVE_SYSTEM_WEED_UTILS) +PKG_CHECK_MODULES(WEED_COMPAT, libweed-compat >= 0.5.1, HAVE_SYSTEM_WEED_COMPAT=true, HAVE_SYSTEM_WEED_COMPAT=false) + +AC_SUBST(WEED_COMPAT_CFLAGS) +AC_SUBST(WEED_COMPAT_LIBS) + +AM_CONDITIONAL(HAVE_SYSTEM_WEED_COMPAT,$HAVE_SYSTEM_WEED_COMPAT) + + PKG_CHECK_MODULES(WEED_PLUGIN_UTILS, libweed-plugin-utils >= 0.5.0, HAVE_SYSTEM_WEED_PLUGIN_UTILS=true, HAVE_SYSTEM_WEED_PLUGIN_UTILS=false) AC_SUBST(WEED_PLUGIN_UTILS_CFLAGS)
View file
LiVES-1.4.8.tar.bz2/libOSC/Makefile.in -> LiVES-1.4.9.tar.bz2/libOSC/Makefile.in
Changed
@@ -218,6 +218,10 @@ LIBAVCODEC_LIBS = @LIBAVCODEC_LIBS@ LIBAVFORMAT_CFLAGS = @LIBAVFORMAT_CFLAGS@ LIBAVFORMAT_LIBS = @LIBAVFORMAT_LIBS@ +LIBAVUTIL_CFLAGS = @LIBAVUTIL_CFLAGS@ +LIBAVUTIL_LIBS = @LIBAVUTIL_LIBS@ +LIBBZ_CFLAGS = @LIBBZ_CFLAGS@ +LIBBZ_LIBS = @LIBBZ_LIBS@ LIBDV_CFLAGS = @LIBDV_CFLAGS@ LIBDV_LIBS = @LIBDV_LIBS@ LIBICONV = @LIBICONV@ @@ -231,6 +235,8 @@ LIBSWSCALE_LIBS = @LIBSWSCALE_LIBS@ LIBTHREAD = @LIBTHREAD@ LIBTOOL = @LIBTOOL@ +LIBZ_CFLAGS = @LIBZ_CFLAGS@ +LIBZ_LIBS = @LIBZ_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBC = @LTLIBC@ @@ -300,6 +306,8 @@ VORBIS_CFLAGS = @VORBIS_CFLAGS@ VORBIS_LIBS = @VORBIS_LIBS@ WEED_CFLAGS = @WEED_CFLAGS@ +WEED_COMPAT_CFLAGS = @WEED_COMPAT_CFLAGS@ +WEED_COMPAT_LIBS = @WEED_COMPAT_LIBS@ WEED_LIBS = @WEED_LIBS@ WEED_PLUGIN_UTILS_CFLAGS = @WEED_PLUGIN_UTILS_CFLAGS@ WEED_PLUGIN_UTILS_LIBS = @WEED_PLUGIN_UTILS_LIBS@
View file
LiVES-1.4.8.tar.bz2/libOSC/client/Makefile.in -> LiVES-1.4.9.tar.bz2/libOSC/client/Makefile.in
Changed
@@ -163,6 +163,10 @@ LIBAVCODEC_LIBS = @LIBAVCODEC_LIBS@ LIBAVFORMAT_CFLAGS = @LIBAVFORMAT_CFLAGS@ LIBAVFORMAT_LIBS = @LIBAVFORMAT_LIBS@ +LIBAVUTIL_CFLAGS = @LIBAVUTIL_CFLAGS@ +LIBAVUTIL_LIBS = @LIBAVUTIL_LIBS@ +LIBBZ_CFLAGS = @LIBBZ_CFLAGS@ +LIBBZ_LIBS = @LIBBZ_LIBS@ LIBDV_CFLAGS = @LIBDV_CFLAGS@ LIBDV_LIBS = @LIBDV_LIBS@ LIBICONV = @LIBICONV@ @@ -176,6 +180,8 @@ LIBSWSCALE_LIBS = @LIBSWSCALE_LIBS@ LIBTHREAD = @LIBTHREAD@ LIBTOOL = @LIBTOOL@ +LIBZ_CFLAGS = @LIBZ_CFLAGS@ +LIBZ_LIBS = @LIBZ_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBC = @LTLIBC@ @@ -245,6 +251,8 @@ VORBIS_CFLAGS = @VORBIS_CFLAGS@ VORBIS_LIBS = @VORBIS_LIBS@ WEED_CFLAGS = @WEED_CFLAGS@ +WEED_COMPAT_CFLAGS = @WEED_COMPAT_CFLAGS@ +WEED_COMPAT_LIBS = @WEED_COMPAT_LIBS@ WEED_LIBS = @WEED_LIBS@ WEED_PLUGIN_UTILS_CFLAGS = @WEED_PLUGIN_UTILS_CFLAGS@ WEED_PLUGIN_UTILS_LIBS = @WEED_PLUGIN_UTILS_LIBS@
View file
LiVES-1.4.8.tar.bz2/libOSC/sendOSC/Makefile.in -> LiVES-1.4.9.tar.bz2/libOSC/sendOSC/Makefile.in
Changed
@@ -164,6 +164,10 @@ LIBAVCODEC_LIBS = @LIBAVCODEC_LIBS@ LIBAVFORMAT_CFLAGS = @LIBAVFORMAT_CFLAGS@ LIBAVFORMAT_LIBS = @LIBAVFORMAT_LIBS@ +LIBAVUTIL_CFLAGS = @LIBAVUTIL_CFLAGS@ +LIBAVUTIL_LIBS = @LIBAVUTIL_LIBS@ +LIBBZ_CFLAGS = @LIBBZ_CFLAGS@ +LIBBZ_LIBS = @LIBBZ_LIBS@ LIBDV_CFLAGS = @LIBDV_CFLAGS@ LIBDV_LIBS = @LIBDV_LIBS@ LIBICONV = @LIBICONV@ @@ -177,6 +181,8 @@ LIBSWSCALE_LIBS = @LIBSWSCALE_LIBS@ LIBTHREAD = @LIBTHREAD@ LIBTOOL = @LIBTOOL@ +LIBZ_CFLAGS = @LIBZ_CFLAGS@ +LIBZ_LIBS = @LIBZ_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBC = @LTLIBC@ @@ -246,6 +252,8 @@ VORBIS_CFLAGS = @VORBIS_CFLAGS@ VORBIS_LIBS = @VORBIS_LIBS@ WEED_CFLAGS = @WEED_CFLAGS@ +WEED_COMPAT_CFLAGS = @WEED_COMPAT_CFLAGS@ +WEED_COMPAT_LIBS = @WEED_COMPAT_LIBS@ WEED_LIBS = @WEED_LIBS@ WEED_PLUGIN_UTILS_CFLAGS = @WEED_PLUGIN_UTILS_CFLAGS@ WEED_PLUGIN_UTILS_LIBS = @WEED_PLUGIN_UTILS_LIBS@
View file
LiVES-1.4.8.tar.bz2/libweed/Makefile.in -> LiVES-1.4.9.tar.bz2/libweed/Makefile.in
Changed
@@ -222,6 +222,10 @@ LIBAVCODEC_LIBS = @LIBAVCODEC_LIBS@ LIBAVFORMAT_CFLAGS = @LIBAVFORMAT_CFLAGS@ LIBAVFORMAT_LIBS = @LIBAVFORMAT_LIBS@ +LIBAVUTIL_CFLAGS = @LIBAVUTIL_CFLAGS@ +LIBAVUTIL_LIBS = @LIBAVUTIL_LIBS@ +LIBBZ_CFLAGS = @LIBBZ_CFLAGS@ +LIBBZ_LIBS = @LIBBZ_LIBS@ LIBDV_CFLAGS = @LIBDV_CFLAGS@ LIBDV_LIBS = @LIBDV_LIBS@ LIBICONV = @LIBICONV@ @@ -235,6 +239,8 @@ LIBSWSCALE_LIBS = @LIBSWSCALE_LIBS@ LIBTHREAD = @LIBTHREAD@ LIBTOOL = @LIBTOOL@ +LIBZ_CFLAGS = @LIBZ_CFLAGS@ +LIBZ_LIBS = @LIBZ_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBC = @LTLIBC@ @@ -304,6 +310,8 @@ VORBIS_CFLAGS = @VORBIS_CFLAGS@ VORBIS_LIBS = @VORBIS_LIBS@ WEED_CFLAGS = @WEED_CFLAGS@ +WEED_COMPAT_CFLAGS = @WEED_COMPAT_CFLAGS@ +WEED_COMPAT_LIBS = @WEED_COMPAT_LIBS@ WEED_LIBS = @WEED_LIBS@ WEED_PLUGIN_UTILS_CFLAGS = @WEED_PLUGIN_UTILS_CFLAGS@ WEED_PLUGIN_UTILS_LIBS = @WEED_PLUGIN_UTILS_LIBS@
View file
LiVES-1.4.8.tar.bz2/libweed/libweed-compat.pc -> LiVES-1.4.9.tar.bz2/libweed/libweed-compat.pc
Changed
@@ -7,6 +7,6 @@ Description: Compatibility utilities for libweed Requires: Requires.private: -Version: 0.5.0 +Version: 0.5.1 Libs: Cflags: -I${includedir}
View file
LiVES-1.4.8.tar.bz2/libweed/weed-compat.h -> LiVES-1.4.9.tar.bz2/libweed/weed-compat.h
Changed
@@ -58,6 +58,237 @@ #include <libavcodec/avcodec.h> + +typedef struct AVCodecTag { + int id; + unsigned int tag; +} AVCodecTag; + +#ifndef MKTAG +#define MKTAG(a,b,c,d) ((a) | ((b) << 8) | ((c) << 16) | ((d) << 24)) +#endif + +const AVCodecTag codec_bmp_tags[] = { + { CODEC_ID_H264, MKTAG('H', '2', '6', '4') }, + { CODEC_ID_H264, MKTAG('h', '2', '6', '4') }, + { CODEC_ID_H264, MKTAG('X', '2', '6', '4') }, + { CODEC_ID_H264, MKTAG('x', '2', '6', '4') }, + { CODEC_ID_H264, MKTAG('a', 'v', 'c', '1') }, + { CODEC_ID_H264, MKTAG('V', 'S', 'S', 'H') }, + { CODEC_ID_H263, MKTAG('H', '2', '6', '3') }, + { CODEC_ID_H263, MKTAG('X', '2', '6', '3') }, + { CODEC_ID_H263, MKTAG('T', '2', '6', '3') }, + { CODEC_ID_H263, MKTAG('L', '2', '6', '3') }, + { CODEC_ID_H263, MKTAG('V', 'X', '1', 'K') }, + { CODEC_ID_H263, MKTAG('Z', 'y', 'G', 'o') }, + { CODEC_ID_H263P, MKTAG('H', '2', '6', '3') }, + { CODEC_ID_H263I, MKTAG('I', '2', '6', '3') }, /* intel h263 */ + { CODEC_ID_H261, MKTAG('H', '2', '6', '1') }, + { CODEC_ID_H263P, MKTAG('U', '2', '6', '3') }, + { CODEC_ID_H263P, MKTAG('v', 'i', 'v', '1') }, + { CODEC_ID_MPEG4, MKTAG('F', 'M', 'P', '4') }, + { CODEC_ID_MPEG4, MKTAG('D', 'I', 'V', 'X') }, + { CODEC_ID_MPEG4, MKTAG('D', 'X', '5', '0') }, + { CODEC_ID_MPEG4, MKTAG('X', 'V', 'I', 'D') }, + { CODEC_ID_MPEG4, MKTAG('M', 'P', '4', 'S') }, + { CODEC_ID_MPEG4, MKTAG('M', '4', 'S', '2') }, + { CODEC_ID_MPEG4, MKTAG( 4 , 0 , 0 , 0 ) }, /* some broken avi use this */ + { CODEC_ID_MPEG4, MKTAG('D', 'I', 'V', '1') }, + { CODEC_ID_MPEG4, MKTAG('B', 'L', 'Z', '0') }, + { CODEC_ID_MPEG4, MKTAG('m', 'p', '4', 'v') }, + { CODEC_ID_MPEG4, MKTAG('U', 'M', 'P', '4') }, + { CODEC_ID_MPEG4, MKTAG('W', 'V', '1', 'F') }, + { CODEC_ID_MPEG4, MKTAG('S', 'E', 'D', 'G') }, + { CODEC_ID_MPEG4, MKTAG('R', 'M', 'P', '4') }, + { CODEC_ID_MPEG4, MKTAG('3', 'I', 'V', '2') }, + { CODEC_ID_MPEG4, MKTAG('F', 'F', 'D', 'S') }, + { CODEC_ID_MPEG4, MKTAG('F', 'V', 'F', 'W') }, + { CODEC_ID_MPEG4, MKTAG('D', 'C', 'O', 'D') }, + { CODEC_ID_MPEG4, MKTAG('M', 'V', 'X', 'M') }, + { CODEC_ID_MPEG4, MKTAG('P', 'M', '4', 'V') }, + { CODEC_ID_MPEG4, MKTAG('S', 'M', 'P', '4') }, + { CODEC_ID_MPEG4, MKTAG('D', 'X', 'G', 'M') }, + { CODEC_ID_MPEG4, MKTAG('V', 'I', 'D', 'M') }, + { CODEC_ID_MPEG4, MKTAG('M', '4', 'T', '3') }, + { CODEC_ID_MPEG4, MKTAG('G', 'E', 'O', 'X') }, + { CODEC_ID_MPEG4, MKTAG('H', 'D', 'X', '4') }, /* flipped video */ + { CODEC_ID_MPEG4, MKTAG('D', 'M', 'K', '2') }, + { CODEC_ID_MPEG4, MKTAG('D', 'I', 'G', 'I') }, + { CODEC_ID_MPEG4, MKTAG('I', 'N', 'M', 'C') }, + { CODEC_ID_MPEG4, MKTAG('E', 'P', 'H', 'V') }, /* Ephv MPEG-4 */ + { CODEC_ID_MPEG4, MKTAG('E', 'M', '4', 'A') }, + { CODEC_ID_MPEG4, MKTAG('M', '4', 'C', 'C') }, /* Divio MPEG-4 */ + { CODEC_ID_MPEG4, MKTAG('S', 'N', '4', '0') }, + { CODEC_ID_MPEG4, MKTAG('V', 'S', 'P', 'X') }, + { CODEC_ID_MPEG4, MKTAG('U', 'L', 'D', 'X') }, + { CODEC_ID_MPEG4, MKTAG('G', 'E', 'O', 'V') }, + { CODEC_ID_MPEG4, MKTAG('S', 'I', 'P', 'P') }, /* Samsung SHR-6040 */ + { CODEC_ID_MSMPEG4V3, MKTAG('D', 'I', 'V', '3') }, /* default signature when using MSMPEG4 */ + { CODEC_ID_MSMPEG4V3, MKTAG('M', 'P', '4', '3') }, + { CODEC_ID_MSMPEG4V3, MKTAG('M', 'P', 'G', '3') }, + { CODEC_ID_MSMPEG4V3, MKTAG('D', 'I', 'V', '5') }, + { CODEC_ID_MSMPEG4V3, MKTAG('D', 'I', 'V', '6') }, + { CODEC_ID_MSMPEG4V3, MKTAG('D', 'I', 'V', '4') }, + { CODEC_ID_MSMPEG4V3, MKTAG('D', 'V', 'X', '3') }, + { CODEC_ID_MSMPEG4V3, MKTAG('A', 'P', '4', '1') }, + { CODEC_ID_MSMPEG4V3, MKTAG('C', 'O', 'L', '1') }, + { CODEC_ID_MSMPEG4V3, MKTAG('C', 'O', 'L', '0') }, + { CODEC_ID_MSMPEG4V2, MKTAG('M', 'P', '4', '2') }, + { CODEC_ID_MSMPEG4V2, MKTAG('D', 'I', 'V', '2') }, + { CODEC_ID_MSMPEG4V1, MKTAG('M', 'P', 'G', '4') }, + { CODEC_ID_MSMPEG4V1, MKTAG('M', 'P', '4', '1') }, + { CODEC_ID_WMV1, MKTAG('W', 'M', 'V', '1') }, + { CODEC_ID_WMV2, MKTAG('W', 'M', 'V', '2') }, + { CODEC_ID_DVVIDEO, MKTAG('d', 'v', 's', 'd') }, + { CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'h', 'd') }, + { CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'h', '1') }, + { CODEC_ID_DVVIDEO, MKTAG('d', 'v', 's', 'l') }, + { CODEC_ID_DVVIDEO, MKTAG('d', 'v', '2', '5') }, + { CODEC_ID_DVVIDEO, MKTAG('d', 'v', '5', '0') }, + { CODEC_ID_DVVIDEO, MKTAG('c', 'd', 'v', 'c') }, /* Canopus DV */ + { CODEC_ID_DVVIDEO, MKTAG('C', 'D', 'V', 'H') }, /* Canopus DV */ + { CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'c', ' ') }, + { CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'c', 's') }, + { CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'h', '1') }, + { CODEC_ID_MPEG1VIDEO, MKTAG('m', 'p', 'g', '1') }, + { CODEC_ID_MPEG1VIDEO, MKTAG('m', 'p', 'g', '2') }, + { CODEC_ID_MPEG2VIDEO, MKTAG('m', 'p', 'g', '2') }, + { CODEC_ID_MPEG2VIDEO, MKTAG('M', 'P', 'E', 'G') }, + { CODEC_ID_MPEG1VIDEO, MKTAG('P', 'I', 'M', '1') }, + { CODEC_ID_MPEG2VIDEO, MKTAG('P', 'I', 'M', '2') }, + { CODEC_ID_MPEG1VIDEO, MKTAG('V', 'C', 'R', '2') }, + { CODEC_ID_MPEG1VIDEO, MKTAG( 1 , 0 , 0 , 16) }, + { CODEC_ID_MPEG2VIDEO, MKTAG( 2 , 0 , 0 , 16) }, + { CODEC_ID_MPEG4, MKTAG( 4 , 0 , 0 , 16) }, + { CODEC_ID_MPEG2VIDEO, MKTAG('D', 'V', 'R', ' ') }, + { CODEC_ID_MPEG2VIDEO, MKTAG('M', 'M', 'E', 'S') }, + { CODEC_ID_MPEG2VIDEO, MKTAG('L', 'M', 'P', '2') }, /* Lead MPEG2 in avi */ + { CODEC_ID_MPEG2VIDEO, MKTAG('s', 'l', 'i', 'f') }, + { CODEC_ID_MPEG2VIDEO, MKTAG('E', 'M', '2', 'V') }, + { CODEC_ID_MJPEG, MKTAG('M', 'J', 'P', 'G') }, + { CODEC_ID_MJPEG, MKTAG('L', 'J', 'P', 'G') }, + { CODEC_ID_MJPEG, MKTAG('d', 'm', 'b', '1') }, + { CODEC_ID_MJPEG, MKTAG('m', 'j', 'p', 'a') }, + { CODEC_ID_LJPEG, MKTAG('L', 'J', 'P', 'G') }, + { CODEC_ID_MJPEG, MKTAG('J', 'P', 'G', 'L') }, /* Pegasus lossless JPEG */ + { CODEC_ID_JPEGLS, MKTAG('M', 'J', 'L', 'S') }, /* JPEG-LS custom FOURCC for avi - encoder */ + { CODEC_ID_MJPEG, MKTAG('M', 'J', 'L', 'S') }, /* JPEG-LS custom FOURCC for avi - decoder */ + { CODEC_ID_MJPEG, MKTAG('j', 'p', 'e', 'g') }, + { CODEC_ID_MJPEG, MKTAG('I', 'J', 'P', 'G') }, + { CODEC_ID_MJPEG, MKTAG('A', 'V', 'R', 'n') }, + { CODEC_ID_MJPEG, MKTAG('A', 'C', 'D', 'V') }, + { CODEC_ID_MJPEG, MKTAG('Q', 'I', 'V', 'G') }, + { CODEC_ID_MJPEG, MKTAG('S', 'L', 'M', 'J') }, /* SL M-JPEG */ + { CODEC_ID_MJPEG, MKTAG('C', 'J', 'P', 'G') }, /* Creative Webcam JPEG */ + { CODEC_ID_MJPEG, MKTAG('I', 'J', 'L', 'V') }, /* Intel JPEG Library Video Codec */ + { CODEC_ID_MJPEG, MKTAG('M', 'V', 'J', 'P') }, /* Midvid JPEG Video Codec */ + { CODEC_ID_MJPEG, MKTAG('A', 'V', 'I', '1') }, + { CODEC_ID_MJPEG, MKTAG('A', 'V', 'I', '2') }, + { CODEC_ID_MJPEG, MKTAG('M', 'T', 'S', 'J') }, + { CODEC_ID_MJPEG, MKTAG('Z', 'J', 'P', 'G') }, /* Paradigm Matrix M-JPEG Codec */ + { CODEC_ID_HUFFYUV, MKTAG('H', 'F', 'Y', 'U') }, + { CODEC_ID_FFVHUFF, MKTAG('F', 'F', 'V', 'H') }, + { CODEC_ID_CYUV, MKTAG('C', 'Y', 'U', 'V') }, + { CODEC_ID_RAWVIDEO, MKTAG( 0 , 0 , 0 , 0 ) }, + { CODEC_ID_RAWVIDEO, MKTAG( 3 , 0 , 0 , 0 ) }, + { CODEC_ID_RAWVIDEO, MKTAG('I', '4', '2', '0') }, + { CODEC_ID_RAWVIDEO, MKTAG('Y', 'U', 'Y', '2') }, + { CODEC_ID_RAWVIDEO, MKTAG('Y', '4', '2', '2') }, + { CODEC_ID_RAWVIDEO, MKTAG('V', '4', '2', '2') }, + { CODEC_ID_RAWVIDEO, MKTAG('Y', 'U', 'N', 'V') }, + { CODEC_ID_RAWVIDEO, MKTAG('U', 'Y', 'N', 'V') }, + { CODEC_ID_RAWVIDEO, MKTAG('U', 'Y', 'N', 'Y') }, + { CODEC_ID_RAWVIDEO, MKTAG('u', 'y', 'v', '1') }, + { CODEC_ID_RAWVIDEO, MKTAG('2', 'V', 'u', '1') }, + { CODEC_ID_RAWVIDEO, MKTAG('2', 'v', 'u', 'y') }, + { CODEC_ID_RAWVIDEO, MKTAG('P', '4', '2', '2') }, + { CODEC_ID_RAWVIDEO, MKTAG('Y', 'V', '1', '2') }, + { CODEC_ID_RAWVIDEO, MKTAG('U', 'Y', 'V', 'Y') }, + { CODEC_ID_RAWVIDEO, MKTAG('V', 'Y', 'U', 'Y') }, + { CODEC_ID_RAWVIDEO, MKTAG('I', 'Y', 'U', 'V') }, + { CODEC_ID_RAWVIDEO, MKTAG('Y', '8', '0', '0') }, + { CODEC_ID_RAWVIDEO, MKTAG('H', 'D', 'Y', 'C') }, + { CODEC_ID_RAWVIDEO, MKTAG('Y', 'V', 'U', '9') }, + { CODEC_ID_RAWVIDEO, MKTAG('V', 'D', 'T', 'Z') }, /* SoftLab-NSK VideoTizer */ + { CODEC_ID_FRWU, MKTAG('F', 'R', 'W', 'U') }, + { CODEC_ID_R210, MKTAG('r', '2', '1', '0') }, + { CODEC_ID_V210, MKTAG('v', '2', '1', '0') }, + { CODEC_ID_INDEO3, MKTAG('I', 'V', '3', '1') }, + { CODEC_ID_INDEO3, MKTAG('I', 'V', '3', '2') }, + { CODEC_ID_INDEO4, MKTAG('I', 'V', '4', '1') }, + { CODEC_ID_INDEO5, MKTAG('I', 'V', '5', '0') }, + { CODEC_ID_VP3, MKTAG('V', 'P', '3', '1') }, + { CODEC_ID_VP3, MKTAG('V', 'P', '3', '0') }, + { CODEC_ID_VP5, MKTAG('V', 'P', '5', '0') }, + { CODEC_ID_VP6, MKTAG('V', 'P', '6', '0') }, + { CODEC_ID_VP6, MKTAG('V', 'P', '6', '1') }, + { CODEC_ID_VP6, MKTAG('V', 'P', '6', '2') }, + { CODEC_ID_VP6F, MKTAG('V', 'P', '6', 'F') }, + { CODEC_ID_VP6F, MKTAG('F', 'L', 'V', '4') }, + { CODEC_ID_ASV1, MKTAG('A', 'S', 'V', '1') }, + { CODEC_ID_ASV2, MKTAG('A', 'S', 'V', '2') }, + { CODEC_ID_VCR1, MKTAG('V', 'C', 'R', '1') }, + { CODEC_ID_FFV1, MKTAG('F', 'F', 'V', '1') }, + { CODEC_ID_XAN_WC4, MKTAG('X', 'x', 'a', 'n') }, + { CODEC_ID_MIMIC, MKTAG('L', 'M', '2', '0') }, + { CODEC_ID_MSRLE, MKTAG('m', 'r', 'l', 'e') }, + { CODEC_ID_MSRLE, MKTAG( 1 , 0 , 0 , 0 ) }, + { CODEC_ID_MSRLE, MKTAG( 2 , 0 , 0 , 0 ) }, + { CODEC_ID_MSVIDEO1, MKTAG('M', 'S', 'V', 'C') }, + { CODEC_ID_MSVIDEO1, MKTAG('m', 's', 'v', 'c') }, + { CODEC_ID_MSVIDEO1, MKTAG('C', 'R', 'A', 'M') }, + { CODEC_ID_MSVIDEO1, MKTAG('c', 'r', 'a', 'm') }, + { CODEC_ID_MSVIDEO1, MKTAG('W', 'H', 'A', 'M') }, + { CODEC_ID_MSVIDEO1, MKTAG('w', 'h', 'a', 'm') }, + { CODEC_ID_CINEPAK, MKTAG('c', 'v', 'i', 'd') }, + { CODEC_ID_TRUEMOTION1, MKTAG('D', 'U', 'C', 'K') }, + { CODEC_ID_TRUEMOTION1, MKTAG('P', 'V', 'E', 'Z') }, + { CODEC_ID_MSZH, MKTAG('M', 'S', 'Z', 'H') }, + { CODEC_ID_ZLIB, MKTAG('Z', 'L', 'I', 'B') }, + { CODEC_ID_SNOW, MKTAG('S', 'N', 'O', 'W') }, + { CODEC_ID_4XM, MKTAG('4', 'X', 'M', 'V') }, + { CODEC_ID_FLV1, MKTAG('F', 'L', 'V', '1') }, + { CODEC_ID_FLASHSV, MKTAG('F', 'S', 'V', '1') }, + { CODEC_ID_SVQ1, MKTAG('s', 'v', 'q', '1') }, + { CODEC_ID_TSCC, MKTAG('t', 's', 'c', 'c') }, + { CODEC_ID_ULTI, MKTAG('U', 'L', 'T', 'I') }, + { CODEC_ID_VIXL, MKTAG('V', 'I', 'X', 'L') }, + { CODEC_ID_QPEG, MKTAG('Q', 'P', 'E', 'G') },
View file
LiVES-1.4.8.tar.bz2/lives-plugins/Makefile.in -> LiVES-1.4.9.tar.bz2/lives-plugins/Makefile.in
Changed
@@ -177,6 +177,10 @@ LIBAVCODEC_LIBS = @LIBAVCODEC_LIBS@ LIBAVFORMAT_CFLAGS = @LIBAVFORMAT_CFLAGS@ LIBAVFORMAT_LIBS = @LIBAVFORMAT_LIBS@ +LIBAVUTIL_CFLAGS = @LIBAVUTIL_CFLAGS@ +LIBAVUTIL_LIBS = @LIBAVUTIL_LIBS@ +LIBBZ_CFLAGS = @LIBBZ_CFLAGS@ +LIBBZ_LIBS = @LIBBZ_LIBS@ LIBDV_CFLAGS = @LIBDV_CFLAGS@ LIBDV_LIBS = @LIBDV_LIBS@ LIBICONV = @LIBICONV@ @@ -190,6 +194,8 @@ LIBSWSCALE_LIBS = @LIBSWSCALE_LIBS@ LIBTHREAD = @LIBTHREAD@ LIBTOOL = @LIBTOOL@ +LIBZ_CFLAGS = @LIBZ_CFLAGS@ +LIBZ_LIBS = @LIBZ_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBC = @LTLIBC@ @@ -259,6 +265,8 @@ VORBIS_CFLAGS = @VORBIS_CFLAGS@ VORBIS_LIBS = @VORBIS_LIBS@ WEED_CFLAGS = @WEED_CFLAGS@ +WEED_COMPAT_CFLAGS = @WEED_COMPAT_CFLAGS@ +WEED_COMPAT_LIBS = @WEED_COMPAT_LIBS@ WEED_LIBS = @WEED_LIBS@ WEED_PLUGIN_UTILS_CFLAGS = @WEED_PLUGIN_UTILS_CFLAGS@ WEED_PLUGIN_UTILS_LIBS = @WEED_PLUGIN_UTILS_LIBS@
View file
LiVES-1.4.8.tar.bz2/lives-plugins/icons/Makefile.in -> LiVES-1.4.9.tar.bz2/lives-plugins/icons/Makefile.in
Changed
@@ -161,6 +161,10 @@ LIBAVCODEC_LIBS = @LIBAVCODEC_LIBS@ LIBAVFORMAT_CFLAGS = @LIBAVFORMAT_CFLAGS@ LIBAVFORMAT_LIBS = @LIBAVFORMAT_LIBS@ +LIBAVUTIL_CFLAGS = @LIBAVUTIL_CFLAGS@ +LIBAVUTIL_LIBS = @LIBAVUTIL_LIBS@ +LIBBZ_CFLAGS = @LIBBZ_CFLAGS@ +LIBBZ_LIBS = @LIBBZ_LIBS@ LIBDV_CFLAGS = @LIBDV_CFLAGS@ LIBDV_LIBS = @LIBDV_LIBS@ LIBICONV = @LIBICONV@ @@ -174,6 +178,8 @@ LIBSWSCALE_LIBS = @LIBSWSCALE_LIBS@ LIBTHREAD = @LIBTHREAD@ LIBTOOL = @LIBTOOL@ +LIBZ_CFLAGS = @LIBZ_CFLAGS@ +LIBZ_LIBS = @LIBZ_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBC = @LTLIBC@ @@ -243,6 +249,8 @@ VORBIS_CFLAGS = @VORBIS_CFLAGS@ VORBIS_LIBS = @VORBIS_LIBS@ WEED_CFLAGS = @WEED_CFLAGS@ +WEED_COMPAT_CFLAGS = @WEED_COMPAT_CFLAGS@ +WEED_COMPAT_LIBS = @WEED_COMPAT_LIBS@ WEED_LIBS = @WEED_LIBS@ WEED_PLUGIN_UTILS_CFLAGS = @WEED_PLUGIN_UTILS_CFLAGS@ WEED_PLUGIN_UTILS_LIBS = @WEED_PLUGIN_UTILS_LIBS@
View file
LiVES-1.4.8.tar.bz2/lives-plugins/marcos-encoders/Makefile.in -> LiVES-1.4.9.tar.bz2/lives-plugins/marcos-encoders/Makefile.in
Changed
@@ -163,6 +163,10 @@ LIBAVCODEC_LIBS = @LIBAVCODEC_LIBS@ LIBAVFORMAT_CFLAGS = @LIBAVFORMAT_CFLAGS@ LIBAVFORMAT_LIBS = @LIBAVFORMAT_LIBS@ +LIBAVUTIL_CFLAGS = @LIBAVUTIL_CFLAGS@ +LIBAVUTIL_LIBS = @LIBAVUTIL_LIBS@ +LIBBZ_CFLAGS = @LIBBZ_CFLAGS@ +LIBBZ_LIBS = @LIBBZ_LIBS@ LIBDV_CFLAGS = @LIBDV_CFLAGS@ LIBDV_LIBS = @LIBDV_LIBS@ LIBICONV = @LIBICONV@ @@ -176,6 +180,8 @@ LIBSWSCALE_LIBS = @LIBSWSCALE_LIBS@ LIBTHREAD = @LIBTHREAD@ LIBTOOL = @LIBTOOL@ +LIBZ_CFLAGS = @LIBZ_CFLAGS@ +LIBZ_LIBS = @LIBZ_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBC = @LTLIBC@ @@ -245,6 +251,8 @@ VORBIS_CFLAGS = @VORBIS_CFLAGS@ VORBIS_LIBS = @VORBIS_LIBS@ WEED_CFLAGS = @WEED_CFLAGS@ +WEED_COMPAT_CFLAGS = @WEED_COMPAT_CFLAGS@ +WEED_COMPAT_LIBS = @WEED_COMPAT_LIBS@ WEED_LIBS = @WEED_LIBS@ WEED_PLUGIN_UTILS_CFLAGS = @WEED_PLUGIN_UTILS_CFLAGS@ WEED_PLUGIN_UTILS_LIBS = @WEED_PLUGIN_UTILS_LIBS@
View file
LiVES-1.4.8.tar.bz2/lives-plugins/plugins/Makefile.in -> LiVES-1.4.9.tar.bz2/lives-plugins/plugins/Makefile.in
Changed
@@ -177,6 +177,10 @@ LIBAVCODEC_LIBS = @LIBAVCODEC_LIBS@ LIBAVFORMAT_CFLAGS = @LIBAVFORMAT_CFLAGS@ LIBAVFORMAT_LIBS = @LIBAVFORMAT_LIBS@ +LIBAVUTIL_CFLAGS = @LIBAVUTIL_CFLAGS@ +LIBAVUTIL_LIBS = @LIBAVUTIL_LIBS@ +LIBBZ_CFLAGS = @LIBBZ_CFLAGS@ +LIBBZ_LIBS = @LIBBZ_LIBS@ LIBDV_CFLAGS = @LIBDV_CFLAGS@ LIBDV_LIBS = @LIBDV_LIBS@ LIBICONV = @LIBICONV@ @@ -190,6 +194,8 @@ LIBSWSCALE_LIBS = @LIBSWSCALE_LIBS@ LIBTHREAD = @LIBTHREAD@ LIBTOOL = @LIBTOOL@ +LIBZ_CFLAGS = @LIBZ_CFLAGS@ +LIBZ_LIBS = @LIBZ_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBC = @LTLIBC@ @@ -259,6 +265,8 @@ VORBIS_CFLAGS = @VORBIS_CFLAGS@ VORBIS_LIBS = @VORBIS_LIBS@ WEED_CFLAGS = @WEED_CFLAGS@ +WEED_COMPAT_CFLAGS = @WEED_COMPAT_CFLAGS@ +WEED_COMPAT_LIBS = @WEED_COMPAT_LIBS@ WEED_LIBS = @WEED_LIBS@ WEED_PLUGIN_UTILS_CFLAGS = @WEED_PLUGIN_UTILS_CFLAGS@ WEED_PLUGIN_UTILS_LIBS = @WEED_PLUGIN_UTILS_LIBS@
View file
LiVES-1.4.8.tar.bz2/lives-plugins/plugins/decoders/Makefile.am -> LiVES-1.4.9.tar.bz2/lives-plugins/plugins/decoders/Makefile.am
Changed
@@ -59,9 +59,20 @@ asf_decoder_la_LDFLAGS = $(shared_ldflags) $(ASFDEC_LIBS) +if HAVE_AVUTIL +mkv_libs = mkv_decoder.la +MKVDEC_LIBS = @LIBAVCODEC_LIBS@ @LIBAVFORMAT_LIBS@ @LIBAVUTIL_LIBS@ @LIBZ_LIBS@ @LIBBZ_LIBS@ +MKVDEC_CFLAGS = @LIBAVFORMAT_CFLAGS@ @LIBAVCODEC_CFLAGS@ @LIBAVUTIL_CFLAGS@ @LIBZ_CFLAGS@ @LIBBZ_CFLAGS@ \ + -Wno-deprecated-declarations +mkv_decoder_la_SOURCES = mkv_decoder.c mkv_decoder.h +mkv_decoder_la_CFLAGS = $(shared_cflags) $(weed_cflags) $(MKVDEC_CFLAGS) +mkv_decoder_la_LDFLAGS = $(shared_ldflags) $(MKVDEC_LIBS) +endif + + #in progress -#does not work - unable to parse video pckets +#does not work - unable to parse video packets (patch would be very nice...) #avi_libs = avi_decoder.la #AVIDEC_LIBS = @LIBAVCODEC_LIBS@ @LIBAVFORMAT_LIBS@ @@ -77,6 +88,6 @@ -decoderpluginslib_LTLIBRARIES = $(ogg_libs) $(dv_libs) $(flv_libs) $(asf_libs) #$(avi_libs) +decoderpluginslib_LTLIBRARIES = $(ogg_libs) $(dv_libs) $(flv_libs) $(asf_libs) $(mkv_libs) #$(avi_libs) EXTRA_DIST = decplugin.h
View file
LiVES-1.4.8.tar.bz2/lives-plugins/plugins/decoders/Makefile.in -> LiVES-1.4.9.tar.bz2/lives-plugins/plugins/decoders/Makefile.in
Changed
@@ -120,6 +120,15 @@ @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) +mkv_decoder_la_LIBADD = +am__mkv_decoder_la_SOURCES_DIST = mkv_decoder.c mkv_decoder.h +@HAVE_AVCODEC_TRUE@@HAVE_AVFORMAT_TRUE@@HAVE_AVUTIL_TRUE@am_mkv_decoder_la_OBJECTS = mkv_decoder_la-mkv_decoder.lo +mkv_decoder_la_OBJECTS = $(am_mkv_decoder_la_OBJECTS) +mkv_decoder_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(mkv_decoder_la_CFLAGS) \ + $(CFLAGS) $(mkv_decoder_la_LDFLAGS) $(LDFLAGS) -o $@ +@HAVE_AVCODEC_TRUE@@HAVE_AVFORMAT_TRUE@@HAVE_AVUTIL_TRUE@am_mkv_decoder_la_rpath = -rpath \ +@HAVE_AVCODEC_TRUE@@HAVE_AVFORMAT_TRUE@@HAVE_AVUTIL_TRUE@ $(decoderpluginslibdir) ogg_decoder_la_LIBADD = am__ogg_decoder_la_SOURCES_DIST = ogg_decoder.c ogg_decoder.h @HAVE_OGG_TRUE@am_ogg_decoder_la_OBJECTS = \ @@ -144,10 +153,12 @@ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ SOURCES = $(asf_decoder_la_SOURCES) $(dv_decoder_la_SOURCES) \ - $(flv_decoder_la_SOURCES) $(ogg_decoder_la_SOURCES) + $(flv_decoder_la_SOURCES) $(mkv_decoder_la_SOURCES) \ + $(ogg_decoder_la_SOURCES) DIST_SOURCES = $(am__asf_decoder_la_SOURCES_DIST) \ $(am__dv_decoder_la_SOURCES_DIST) \ $(am__flv_decoder_la_SOURCES_DIST) \ + $(am__mkv_decoder_la_SOURCES_DIST) \ $(am__ogg_decoder_la_SOURCES_DIST) ETAGS = etags CTAGS = ctags @@ -224,6 +235,10 @@ LIBAVCODEC_LIBS = @LIBAVCODEC_LIBS@ LIBAVFORMAT_CFLAGS = @LIBAVFORMAT_CFLAGS@ LIBAVFORMAT_LIBS = @LIBAVFORMAT_LIBS@ +LIBAVUTIL_CFLAGS = @LIBAVUTIL_CFLAGS@ +LIBAVUTIL_LIBS = @LIBAVUTIL_LIBS@ +LIBBZ_CFLAGS = @LIBBZ_CFLAGS@ +LIBBZ_LIBS = @LIBBZ_LIBS@ LIBDV_CFLAGS = @LIBDV_CFLAGS@ LIBDV_LIBS = @LIBDV_LIBS@ LIBICONV = @LIBICONV@ @@ -237,6 +252,8 @@ LIBSWSCALE_LIBS = @LIBSWSCALE_LIBS@ LIBTHREAD = @LIBTHREAD@ LIBTOOL = @LIBTOOL@ +LIBZ_CFLAGS = @LIBZ_CFLAGS@ +LIBZ_LIBS = @LIBZ_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBC = @LTLIBC@ @@ -306,6 +323,8 @@ VORBIS_CFLAGS = @VORBIS_CFLAGS@ VORBIS_LIBS = @VORBIS_LIBS@ WEED_CFLAGS = @WEED_CFLAGS@ +WEED_COMPAT_CFLAGS = @WEED_COMPAT_CFLAGS@ +WEED_COMPAT_LIBS = @WEED_COMPAT_LIBS@ WEED_LIBS = @WEED_LIBS@ WEED_PLUGIN_UTILS_CFLAGS = @WEED_PLUGIN_UTILS_CFLAGS@ WEED_PLUGIN_UTILS_LIBS = @WEED_PLUGIN_UTILS_LIBS@ @@ -407,10 +426,18 @@ @HAVE_AVCODEC_TRUE@@HAVE_AVFORMAT_TRUE@asf_decoder_la_SOURCES = asf_decoder.c asf_decoder.h @HAVE_AVCODEC_TRUE@@HAVE_AVFORMAT_TRUE@asf_decoder_la_CFLAGS = $(shared_cflags) $(weed_cflags) $(ASFDEC_CFLAGS) @HAVE_AVCODEC_TRUE@@HAVE_AVFORMAT_TRUE@asf_decoder_la_LDFLAGS = $(shared_ldflags) $(ASFDEC_LIBS) +@HAVE_AVCODEC_TRUE@@HAVE_AVFORMAT_TRUE@@HAVE_AVUTIL_TRUE@mkv_libs = mkv_decoder.la +@HAVE_AVCODEC_TRUE@@HAVE_AVFORMAT_TRUE@@HAVE_AVUTIL_TRUE@MKVDEC_LIBS = @LIBAVCODEC_LIBS@ @LIBAVFORMAT_LIBS@ @LIBAVUTIL_LIBS@ @LIBZ_LIBS@ @LIBBZ_LIBS@ +@HAVE_AVCODEC_TRUE@@HAVE_AVFORMAT_TRUE@@HAVE_AVUTIL_TRUE@MKVDEC_CFLAGS = @LIBAVFORMAT_CFLAGS@ @LIBAVCODEC_CFLAGS@ @LIBAVUTIL_CFLAGS@ @LIBZ_CFLAGS@ @LIBBZ_CFLAGS@ \ +@HAVE_AVCODEC_TRUE@@HAVE_AVFORMAT_TRUE@@HAVE_AVUTIL_TRUE@ -Wno-deprecated-declarations + +@HAVE_AVCODEC_TRUE@@HAVE_AVFORMAT_TRUE@@HAVE_AVUTIL_TRUE@mkv_decoder_la_SOURCES = mkv_decoder.c mkv_decoder.h +@HAVE_AVCODEC_TRUE@@HAVE_AVFORMAT_TRUE@@HAVE_AVUTIL_TRUE@mkv_decoder_la_CFLAGS = $(shared_cflags) $(weed_cflags) $(MKVDEC_CFLAGS) +@HAVE_AVCODEC_TRUE@@HAVE_AVFORMAT_TRUE@@HAVE_AVUTIL_TRUE@mkv_decoder_la_LDFLAGS = $(shared_ldflags) $(MKVDEC_LIBS) #in progress -#does not work - unable to parse video pckets +#does not work - unable to parse video packets (patch would be very nice...) #avi_libs = avi_decoder.la #AVIDEC_LIBS = @LIBAVCODEC_LIBS@ @LIBAVFORMAT_LIBS@ @@ -418,7 +445,7 @@ #avi_decoder_la_SOURCES = avi_decoder.c avi_decoder.h #avi_decoder_la_CFLAGS = $(shared_cflags) $(weed_cflags) $(AVIDEC_CFLAGS) #avi_decoder_la_LDFLAGS = $(shared_ldflags) $(AVIDEC_LIBS) -decoderpluginslib_LTLIBRARIES = $(ogg_libs) $(dv_libs) $(flv_libs) $(asf_libs) #$(avi_libs) +decoderpluginslib_LTLIBRARIES = $(ogg_libs) $(dv_libs) $(flv_libs) $(asf_libs) $(mkv_libs) #$(avi_libs) EXTRA_DIST = decplugin.h all: all-am @@ -491,6 +518,8 @@ $(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) +mkv_decoder.la: $(mkv_decoder_la_OBJECTS) $(mkv_decoder_la_DEPENDENCIES) + $(mkv_decoder_la_LINK) $(am_mkv_decoder_la_rpath) $(mkv_decoder_la_OBJECTS) $(mkv_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) @@ -503,6 +532,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asf_decoder_la-asf_decoder.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dv_decoder_la-dv_decoder.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/flv_decoder_la-flv_decoder.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mkv_decoder_la-mkv_decoder.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ogg_decoder_la-ogg_decoder.Plo@am__quote@ .c.o: @@ -547,6 +577,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) $(flv_decoder_la_CFLAGS) $(CFLAGS) -c -o flv_decoder_la-flv_decoder.lo `test -f 'flv_decoder.c' || echo '$(srcdir)/'`flv_decoder.c +mkv_decoder_la-mkv_decoder.lo: mkv_decoder.c +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkv_decoder_la_CFLAGS) $(CFLAGS) -MT mkv_decoder_la-mkv_decoder.lo -MD -MP -MF $(DEPDIR)/mkv_decoder_la-mkv_decoder.Tpo -c -o mkv_decoder_la-mkv_decoder.lo `test -f 'mkv_decoder.c' || echo '$(srcdir)/'`mkv_decoder.c +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/mkv_decoder_la-mkv_decoder.Tpo $(DEPDIR)/mkv_decoder_la-mkv_decoder.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mkv_decoder.c' object='mkv_decoder_la-mkv_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) $(mkv_decoder_la_CFLAGS) $(CFLAGS) -c -o mkv_decoder_la-mkv_decoder.lo `test -f 'mkv_decoder.c' || echo '$(srcdir)/'`mkv_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.8.tar.bz2/lives-plugins/plugins/decoders/asf_decoder.c -> LiVES-1.4.9.tar.bz2/lives-plugins/plugins/decoders/asf_decoder.c
Changed
@@ -1,10 +1,29 @@ // LiVES - asf 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 +// (c) G. Finch 2011 <salsaman@xs4all.nl,salsaman@gmail.com> -// partly based on ffmpeg asf decoder by Fabrice Bellard and others +/* + * This file is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * LiVES is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with LiVES; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +*/ + +// based on code from libavformat +/* + * ASF compatible demuxer + * Copyright (c) 2000, 2001 Fabrice Bellard + * + */ #include <stdio.h> #include <string.h> @@ -20,6 +39,10 @@ #undef HAVE_AV_CONFIG_H #endif +#ifndef HAVE_SYSTEM_WEED +#include "../../../libweed/weed-palettes.h" +#endif + #define HAVE_AVCODEC #ifdef HAVE_SYSTEM_WEED_COMPAT @@ -2113,6 +2136,33 @@ if (fps!=1000.) cdata->fps=fps; } + if (cdata->fps==0.||cdata->fps==1000.) { + // use mplayer to get fps if we can...it seems to have some magical way + char cmd[1024]; + char tmpfname[32]; + int ofd; + + sprintf(tmpfname,"/tmp/mkvdec=XXXXXX"); + ofd=mkstemp(tmpfname); + if (ofd!=-1) { + int res; + snprintf(cmd,1024,"LANGUAGE=en LANG=en mplayer \"%s\" -identify -frames 0 2>/dev/null | grep ID_VIDEO_FPS > %s",cdata->URI,tmpfname); + + res=system(cmd); + + if (!res) { + char buffer[1024]; + ssize_t bytes=read(ofd,buffer,1024); + memset(buffer+bytes,0,1); + if (!(strncmp(buffer,"ID_VIDEO_FPS=",13))) { + cdata->fps=strtod (buffer+13,NULL); + } + } + close(ofd); + unlink(tmpfname); + } + } + if (cdata->fps==0.&&ctx->time_base.num==0) { if (ctx->time_base.den==1) cdata->fps=25.; } @@ -2134,7 +2184,13 @@ vidst->duration = get_last_video_dts(cdata); - cdata->nframes = dts_to_frame(cdata,vidst->duration+priv->start_dts); + cdata->nframes = dts_to_frame(cdata,vidst->duration+priv->start_dts)+2; + + // double check, sometimes we can be out by one or two frames + while (1) { + if (get_frame(cdata,cdata->nframes-1,NULL,0,NULL)) break; + cdata->nframes--; + } return TRUE; } @@ -2318,40 +2374,43 @@ fprintf(stderr,"vals %ld %ld\n",tframe,priv->last_frame); #endif - // calc frame width and height, including any border - - if (pal==WEED_PALETTE_YUV420P||pal==WEED_PALETTE_YVU420P||pal==WEED_PALETTE_YUV422P||pal==WEED_PALETTE_YUV444P) { - nplanes=3; - black[0]=y_black; - black[1]=black[2]=128; - } - else if (pal==WEED_PALETTE_YUVA4444P) { - nplanes=4; - black[0]=y_black; - black[1]=black[2]=128; - black[3]=255; - } - - if (pal==WEED_PALETTE_RGB24||pal==WEED_PALETTE_BGR24) psize=3; - - if (pal==WEED_PALETTE_RGBA32||pal==WEED_PALETTE_BGRA32||pal==WEED_PALETTE_ARGB32||pal==WEED_PALETTE_UYVY8888||pal==WEED_PALETTE_YUYV8888||pal==WEED_PALETTE_YUV888||pal==WEED_PALETTE_YUVA8888) psize=4; - - if (pal==WEED_PALETTE_YUV411) psize=6; - - if (pal==WEED_PALETTE_A1) dstwidth>>=3; - - dstwidth*=psize; - - if (cdata->frame_height > cdata->height && height == cdata->height) { - // host ignores vertical border - btop=0; - xheight=cdata->height; - bbot=xheight-1; - } - - if (cdata->frame_width > cdata->width && rowstrides[0] < cdata->frame_width*psize) { - // host ignores horizontal border - bleft=bright=0; + if (pixel_data!=NULL) { + + // calc frame width and height, including any border + + if (pal==WEED_PALETTE_YUV420P||pal==WEED_PALETTE_YVU420P||pal==WEED_PALETTE_YUV422P||pal==WEED_PALETTE_YUV444P) { + nplanes=3; + black[0]=y_black; + black[1]=black[2]=128; + } + else if (pal==WEED_PALETTE_YUVA4444P) { + nplanes=4; + black[0]=y_black; + black[1]=black[2]=128; + black[3]=255; + } + + if (pal==WEED_PALETTE_RGB24||pal==WEED_PALETTE_BGR24) psize=3; + + if (pal==WEED_PALETTE_RGBA32||pal==WEED_PALETTE_BGRA32||pal==WEED_PALETTE_ARGB32||pal==WEED_PALETTE_UYVY8888||pal==WEED_PALETTE_YUYV8888||pal==WEED_PALETTE_YUV888||pal==WEED_PALETTE_YUVA8888) psize=4; + + if (pal==WEED_PALETTE_YUV411) psize=6; + + if (pal==WEED_PALETTE_A1) dstwidth>>=3; + + dstwidth*=psize; + + if (cdata->frame_height > cdata->height && height == cdata->height) { + // host ignores vertical border + btop=0; + xheight=cdata->height; + bbot=xheight-1; + } + + if (cdata->frame_width > cdata->width && rowstrides[0] < cdata->frame_width*psize) { + // host ignores horizontal border + bleft=bright=0; + } } //////////////////////////////////////////////////////////////////// @@ -2405,6 +2464,8 @@ priv->avpkt.data=NULL; priv->avpkt.size=0; if (ret==-2) { + // EOF + if (pixel_data==NULL) return FALSE; priv->black_fill=TRUE; break; } @@ -2437,6 +2498,8 @@ } + if (pixel_data==NULL) return TRUE; + if (priv->black_fill) btop=cdata->frame_height; for (p=0;p<nplanes;p++) {
View file
LiVES-1.4.8.tar.bz2/lives-plugins/plugins/decoders/asf_decoder.h -> LiVES-1.4.9.tar.bz2/lives-plugins/plugins/decoders/asf_decoder.h
Changed
@@ -1,229 +1,24 @@ +/* + * This file is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * LiVES is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with LiVES; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +*/ + + // codec types - it would be very nice if the ffmpeg devs would put this in a header... -typedef struct AVCodecTag { - int id; - unsigned int tag; -} AVCodecTag; - -const AVCodecTag codec_bmp_tags[] = { - { CODEC_ID_H264, MKTAG('H', '2', '6', '4') }, - { CODEC_ID_H264, MKTAG('h', '2', '6', '4') }, - { CODEC_ID_H264, MKTAG('X', '2', '6', '4') }, - { CODEC_ID_H264, MKTAG('x', '2', '6', '4') }, - { CODEC_ID_H264, MKTAG('a', 'v', 'c', '1') }, - { CODEC_ID_H264, MKTAG('V', 'S', 'S', 'H') }, - { CODEC_ID_H263, MKTAG('H', '2', '6', '3') }, - { CODEC_ID_H263, MKTAG('X', '2', '6', '3') }, - { CODEC_ID_H263, MKTAG('T', '2', '6', '3') }, - { CODEC_ID_H263, MKTAG('L', '2', '6', '3') }, - { CODEC_ID_H263, MKTAG('V', 'X', '1', 'K') }, - { CODEC_ID_H263, MKTAG('Z', 'y', 'G', 'o') }, - { CODEC_ID_H263P, MKTAG('H', '2', '6', '3') }, - { CODEC_ID_H263I, MKTAG('I', '2', '6', '3') }, /* intel h263 */ - { CODEC_ID_H261, MKTAG('H', '2', '6', '1') }, - { CODEC_ID_H263P, MKTAG('U', '2', '6', '3') }, - { CODEC_ID_H263P, MKTAG('v', 'i', 'v', '1') }, - { CODEC_ID_MPEG4, MKTAG('F', 'M', 'P', '4') }, - { CODEC_ID_MPEG4, MKTAG('D', 'I', 'V', 'X') }, - { CODEC_ID_MPEG4, MKTAG('D', 'X', '5', '0') }, - { CODEC_ID_MPEG4, MKTAG('X', 'V', 'I', 'D') }, - { CODEC_ID_MPEG4, MKTAG('M', 'P', '4', 'S') }, - { CODEC_ID_MPEG4, MKTAG('M', '4', 'S', '2') }, - { CODEC_ID_MPEG4, MKTAG( 4 , 0 , 0 , 0 ) }, /* some broken avi use this */ - { CODEC_ID_MPEG4, MKTAG('D', 'I', 'V', '1') }, - { CODEC_ID_MPEG4, MKTAG('B', 'L', 'Z', '0') }, - { CODEC_ID_MPEG4, MKTAG('m', 'p', '4', 'v') }, - { CODEC_ID_MPEG4, MKTAG('U', 'M', 'P', '4') }, - { CODEC_ID_MPEG4, MKTAG('W', 'V', '1', 'F') }, - { CODEC_ID_MPEG4, MKTAG('S', 'E', 'D', 'G') }, - { CODEC_ID_MPEG4, MKTAG('R', 'M', 'P', '4') }, - { CODEC_ID_MPEG4, MKTAG('3', 'I', 'V', '2') }, - { CODEC_ID_MPEG4, MKTAG('F', 'F', 'D', 'S') }, - { CODEC_ID_MPEG4, MKTAG('F', 'V', 'F', 'W') }, - { CODEC_ID_MPEG4, MKTAG('D', 'C', 'O', 'D') }, - { CODEC_ID_MPEG4, MKTAG('M', 'V', 'X', 'M') }, - { CODEC_ID_MPEG4, MKTAG('P', 'M', '4', 'V') }, - { CODEC_ID_MPEG4, MKTAG('S', 'M', 'P', '4') }, - { CODEC_ID_MPEG4, MKTAG('D', 'X', 'G', 'M') }, - { CODEC_ID_MPEG4, MKTAG('V', 'I', 'D', 'M') }, - { CODEC_ID_MPEG4, MKTAG('M', '4', 'T', '3') }, - { CODEC_ID_MPEG4, MKTAG('G', 'E', 'O', 'X') }, - { CODEC_ID_MPEG4, MKTAG('H', 'D', 'X', '4') }, /* flipped video */ - { CODEC_ID_MPEG4, MKTAG('D', 'M', 'K', '2') }, - { CODEC_ID_MPEG4, MKTAG('D', 'I', 'G', 'I') }, - { CODEC_ID_MPEG4, MKTAG('I', 'N', 'M', 'C') }, - { CODEC_ID_MPEG4, MKTAG('E', 'P', 'H', 'V') }, /* Ephv MPEG-4 */ - { CODEC_ID_MPEG4, MKTAG('E', 'M', '4', 'A') }, - { CODEC_ID_MPEG4, MKTAG('M', '4', 'C', 'C') }, /* Divio MPEG-4 */ - { CODEC_ID_MPEG4, MKTAG('S', 'N', '4', '0') }, - { CODEC_ID_MPEG4, MKTAG('V', 'S', 'P', 'X') }, - { CODEC_ID_MPEG4, MKTAG('U', 'L', 'D', 'X') }, - { CODEC_ID_MPEG4, MKTAG('G', 'E', 'O', 'V') }, - { CODEC_ID_MPEG4, MKTAG('S', 'I', 'P', 'P') }, /* Samsung SHR-6040 */ - { CODEC_ID_MSMPEG4V3, MKTAG('D', 'I', 'V', '3') }, /* default signature when using MSMPEG4 */ - { CODEC_ID_MSMPEG4V3, MKTAG('M', 'P', '4', '3') }, - { CODEC_ID_MSMPEG4V3, MKTAG('M', 'P', 'G', '3') }, - { CODEC_ID_MSMPEG4V3, MKTAG('D', 'I', 'V', '5') }, - { CODEC_ID_MSMPEG4V3, MKTAG('D', 'I', 'V', '6') }, - { CODEC_ID_MSMPEG4V3, MKTAG('D', 'I', 'V', '4') }, - { CODEC_ID_MSMPEG4V3, MKTAG('D', 'V', 'X', '3') }, - { CODEC_ID_MSMPEG4V3, MKTAG('A', 'P', '4', '1') }, - { CODEC_ID_MSMPEG4V3, MKTAG('C', 'O', 'L', '1') }, - { CODEC_ID_MSMPEG4V3, MKTAG('C', 'O', 'L', '0') }, - { CODEC_ID_MSMPEG4V2, MKTAG('M', 'P', '4', '2') }, - { CODEC_ID_MSMPEG4V2, MKTAG('D', 'I', 'V', '2') }, - { CODEC_ID_MSMPEG4V1, MKTAG('M', 'P', 'G', '4') }, - { CODEC_ID_MSMPEG4V1, MKTAG('M', 'P', '4', '1') }, - { CODEC_ID_WMV1, MKTAG('W', 'M', 'V', '1') }, - { CODEC_ID_WMV2, MKTAG('W', 'M', 'V', '2') }, - { CODEC_ID_DVVIDEO, MKTAG('d', 'v', 's', 'd') }, - { CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'h', 'd') }, - { CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'h', '1') }, - { CODEC_ID_DVVIDEO, MKTAG('d', 'v', 's', 'l') }, - { CODEC_ID_DVVIDEO, MKTAG('d', 'v', '2', '5') }, - { CODEC_ID_DVVIDEO, MKTAG('d', 'v', '5', '0') }, - { CODEC_ID_DVVIDEO, MKTAG('c', 'd', 'v', 'c') }, /* Canopus DV */ - { CODEC_ID_DVVIDEO, MKTAG('C', 'D', 'V', 'H') }, /* Canopus DV */ - { CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'c', ' ') }, - { CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'c', 's') }, - { CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'h', '1') }, - { CODEC_ID_MPEG1VIDEO, MKTAG('m', 'p', 'g', '1') }, - { CODEC_ID_MPEG1VIDEO, MKTAG('m', 'p', 'g', '2') }, - { CODEC_ID_MPEG2VIDEO, MKTAG('m', 'p', 'g', '2') }, - { CODEC_ID_MPEG2VIDEO, MKTAG('M', 'P', 'E', 'G') }, - { CODEC_ID_MPEG1VIDEO, MKTAG('P', 'I', 'M', '1') }, - { CODEC_ID_MPEG2VIDEO, MKTAG('P', 'I', 'M', '2') }, - { CODEC_ID_MPEG1VIDEO, MKTAG('V', 'C', 'R', '2') }, - { CODEC_ID_MPEG1VIDEO, MKTAG( 1 , 0 , 0 , 16) }, - { CODEC_ID_MPEG2VIDEO, MKTAG( 2 , 0 , 0 , 16) }, - { CODEC_ID_MPEG4, MKTAG( 4 , 0 , 0 , 16) }, - { CODEC_ID_MPEG2VIDEO, MKTAG('D', 'V', 'R', ' ') }, - { CODEC_ID_MPEG2VIDEO, MKTAG('M', 'M', 'E', 'S') }, - { CODEC_ID_MPEG2VIDEO, MKTAG('L', 'M', 'P', '2') }, /* Lead MPEG2 in avi */ - { CODEC_ID_MPEG2VIDEO, MKTAG('s', 'l', 'i', 'f') }, - { CODEC_ID_MPEG2VIDEO, MKTAG('E', 'M', '2', 'V') }, - { CODEC_ID_MJPEG, MKTAG('M', 'J', 'P', 'G') }, - { CODEC_ID_MJPEG, MKTAG('L', 'J', 'P', 'G') }, - { CODEC_ID_MJPEG, MKTAG('d', 'm', 'b', '1') }, - { CODEC_ID_MJPEG, MKTAG('m', 'j', 'p', 'a') }, - { CODEC_ID_LJPEG, MKTAG('L', 'J', 'P', 'G') }, - { CODEC_ID_MJPEG, MKTAG('J', 'P', 'G', 'L') }, /* Pegasus lossless JPEG */ - { CODEC_ID_JPEGLS, MKTAG('M', 'J', 'L', 'S') }, /* JPEG-LS custom FOURCC for avi - encoder */ - { CODEC_ID_MJPEG, MKTAG('M', 'J', 'L', 'S') }, /* JPEG-LS custom FOURCC for avi - decoder */ - { CODEC_ID_MJPEG, MKTAG('j', 'p', 'e', 'g') }, - { CODEC_ID_MJPEG, MKTAG('I', 'J', 'P', 'G') }, - { CODEC_ID_MJPEG, MKTAG('A', 'V', 'R', 'n') }, - { CODEC_ID_MJPEG, MKTAG('A', 'C', 'D', 'V') }, - { CODEC_ID_MJPEG, MKTAG('Q', 'I', 'V', 'G') }, - { CODEC_ID_MJPEG, MKTAG('S', 'L', 'M', 'J') }, /* SL M-JPEG */ - { CODEC_ID_MJPEG, MKTAG('C', 'J', 'P', 'G') }, /* Creative Webcam JPEG */ - { CODEC_ID_MJPEG, MKTAG('I', 'J', 'L', 'V') }, /* Intel JPEG Library Video Codec */ - { CODEC_ID_MJPEG, MKTAG('M', 'V', 'J', 'P') }, /* Midvid JPEG Video Codec */ - { CODEC_ID_MJPEG, MKTAG('A', 'V', 'I', '1') }, - { CODEC_ID_MJPEG, MKTAG('A', 'V', 'I', '2') }, - { CODEC_ID_MJPEG, MKTAG('M', 'T', 'S', 'J') }, - { CODEC_ID_MJPEG, MKTAG('Z', 'J', 'P', 'G') }, /* Paradigm Matrix M-JPEG Codec */ - { CODEC_ID_HUFFYUV, MKTAG('H', 'F', 'Y', 'U') }, - { CODEC_ID_FFVHUFF, MKTAG('F', 'F', 'V', 'H') }, - { CODEC_ID_CYUV, MKTAG('C', 'Y', 'U', 'V') }, - { CODEC_ID_RAWVIDEO, MKTAG( 0 , 0 , 0 , 0 ) }, - { CODEC_ID_RAWVIDEO, MKTAG( 3 , 0 , 0 , 0 ) }, - { CODEC_ID_RAWVIDEO, MKTAG('I', '4', '2', '0') }, - { CODEC_ID_RAWVIDEO, MKTAG('Y', 'U', 'Y', '2') }, - { CODEC_ID_RAWVIDEO, MKTAG('Y', '4', '2', '2') }, - { CODEC_ID_RAWVIDEO, MKTAG('V', '4', '2', '2') }, - { CODEC_ID_RAWVIDEO, MKTAG('Y', 'U', 'N', 'V') }, - { CODEC_ID_RAWVIDEO, MKTAG('U', 'Y', 'N', 'V') }, - { CODEC_ID_RAWVIDEO, MKTAG('U', 'Y', 'N', 'Y') }, - { CODEC_ID_RAWVIDEO, MKTAG('u', 'y', 'v', '1') }, - { CODEC_ID_RAWVIDEO, MKTAG('2', 'V', 'u', '1') }, - { CODEC_ID_RAWVIDEO, MKTAG('2', 'v', 'u', 'y') }, - { CODEC_ID_RAWVIDEO, MKTAG('P', '4', '2', '2') }, - { CODEC_ID_RAWVIDEO, MKTAG('Y', 'V', '1', '2') }, - { CODEC_ID_RAWVIDEO, MKTAG('U', 'Y', 'V', 'Y') }, - { CODEC_ID_RAWVIDEO, MKTAG('V', 'Y', 'U', 'Y') }, - { CODEC_ID_RAWVIDEO, MKTAG('I', 'Y', 'U', 'V') }, - { CODEC_ID_RAWVIDEO, MKTAG('Y', '8', '0', '0') }, - { CODEC_ID_RAWVIDEO, MKTAG('H', 'D', 'Y', 'C') }, - { CODEC_ID_RAWVIDEO, MKTAG('Y', 'V', 'U', '9') }, - { CODEC_ID_RAWVIDEO, MKTAG('V', 'D', 'T', 'Z') }, /* SoftLab-NSK VideoTizer */ - { CODEC_ID_FRWU, MKTAG('F', 'R', 'W', 'U') }, - { CODEC_ID_R210, MKTAG('r', '2', '1', '0') }, - { CODEC_ID_V210, MKTAG('v', '2', '1', '0') }, - { CODEC_ID_INDEO3, MKTAG('I', 'V', '3', '1') }, - { CODEC_ID_INDEO3, MKTAG('I', 'V', '3', '2') }, - { CODEC_ID_INDEO4, MKTAG('I', 'V', '4', '1') }, - { CODEC_ID_INDEO5, MKTAG('I', 'V', '5', '0') }, - { CODEC_ID_VP3, MKTAG('V', 'P', '3', '1') }, - { CODEC_ID_VP3, MKTAG('V', 'P', '3', '0') }, - { CODEC_ID_VP5, MKTAG('V', 'P', '5', '0') }, - { CODEC_ID_VP6, MKTAG('V', 'P', '6', '0') }, - { CODEC_ID_VP6, MKTAG('V', 'P', '6', '1') }, - { CODEC_ID_VP6, MKTAG('V', 'P', '6', '2') }, - { CODEC_ID_VP6F, MKTAG('V', 'P', '6', 'F') }, - { CODEC_ID_VP6F, MKTAG('F', 'L', 'V', '4') }, - { CODEC_ID_ASV1, MKTAG('A', 'S', 'V', '1') }, - { CODEC_ID_ASV2, MKTAG('A', 'S', 'V', '2') }, - { CODEC_ID_VCR1, MKTAG('V', 'C', 'R', '1') }, - { CODEC_ID_FFV1, MKTAG('F', 'F', 'V', '1') }, - { CODEC_ID_XAN_WC4, MKTAG('X', 'x', 'a', 'n') }, - { CODEC_ID_MIMIC, MKTAG('L', 'M', '2', '0') }, - { CODEC_ID_MSRLE, MKTAG('m', 'r', 'l', 'e') }, - { CODEC_ID_MSRLE, MKTAG( 1 , 0 , 0 , 0 ) }, - { CODEC_ID_MSRLE, MKTAG( 2 , 0 , 0 , 0 ) }, - { CODEC_ID_MSVIDEO1, MKTAG('M', 'S', 'V', 'C') }, - { CODEC_ID_MSVIDEO1, MKTAG('m', 's', 'v', 'c') }, - { CODEC_ID_MSVIDEO1, MKTAG('C', 'R', 'A', 'M') }, - { CODEC_ID_MSVIDEO1, MKTAG('c', 'r', 'a', 'm') }, - { CODEC_ID_MSVIDEO1, MKTAG('W', 'H', 'A', 'M') }, - { CODEC_ID_MSVIDEO1, MKTAG('w', 'h', 'a', 'm') }, - { CODEC_ID_CINEPAK, MKTAG('c', 'v', 'i', 'd') }, - { CODEC_ID_TRUEMOTION1, MKTAG('D', 'U', 'C', 'K') }, - { CODEC_ID_TRUEMOTION1, MKTAG('P', 'V', 'E', 'Z') },
View file
LiVES-1.4.8.tar.bz2/lives-plugins/plugins/decoders/decplugin.h -> LiVES-1.4.9.tar.bz2/lives-plugins/plugins/decoders/decplugin.h
Changed
@@ -1,5 +1,5 @@ // LiVES - decoder plugin header -// (c) G. Finch 2008 <salsaman@xs4all.nl> +// (c) G. Finch 2008 <salsaman@xs4all.nl,salsaman@gmail.com> // released under the GNU GPL 3 or later // see file COPYING or www.gnu.org for details
View file
LiVES-1.4.8.tar.bz2/lives-plugins/plugins/decoders/dv_decoder.c -> LiVES-1.4.9.tar.bz2/lives-plugins/plugins/decoders/dv_decoder.c
Changed
@@ -1,5 +1,5 @@ // LiVES - dv decoder plugin -// (c) G. Finch 2008 - 2010 <salsaman@xs4all.nl> +// (c) G. Finch 2008 - 2010 <salsaman@xs4all.nl,salsaman@gmail.com> // released under the GNU GPL 3 or later // see file COPYING or www.gnu.org for details
View file
LiVES-1.4.8.tar.bz2/lives-plugins/plugins/decoders/dv_decoder.h -> LiVES-1.4.9.tar.bz2/lives-plugins/plugins/decoders/dv_decoder.h
Changed
@@ -1,5 +1,5 @@ // LiVES - dv decoder plugin -// (c) G. Finch 2008 <salsaman@xs4all.nl> +// (c) G. Finch 2008 <salsaman@xs4all.nl,salsaman@gmail.com> // released under the GNU GPL 3 or later // see file COPYING or www.gnu.org for details
View file
LiVES-1.4.8.tar.bz2/lives-plugins/plugins/decoders/flv_decoder.c -> LiVES-1.4.9.tar.bz2/lives-plugins/plugins/decoders/flv_decoder.c
Changed
@@ -1,7 +1,30 @@ // 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 +// (c) G. Finch 2011 <salsaman@xs4all.nl,salsaman@gmail.com> + +/* + * This file is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * LiVES is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with LiVES; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +*/ + +// based on code + +/* + * FLV demuxer + * Copyright (c) 2003 The FFmpeg Project + * + */ + #include <stdio.h> #include <string.h> @@ -20,6 +43,10 @@ #undef HAVE_AV_CONFIG_H #endif +#ifndef HAVE_SYSTEM_WEED +#include "../../../libweed/weed-palettes.h" +#endif + #define HAVE_AVCODEC #ifdef HAVE_SYSTEM_WEED_COMPAT @@ -1096,6 +1123,33 @@ if (fps!=1000.) cdata->fps=fps; } + if (cdata->fps==0.||cdata->fps==1000.) { + // use mplayer to get fps if we can...it seems to have some magical way + char cmd[1024]; + char tmpfname[32]; + int ofd; + + sprintf(tmpfname,"/tmp/mkvdec=XXXXXX"); + ofd=mkstemp(tmpfname); + if (ofd!=-1) { + int res; + snprintf(cmd,1024,"LANGUAGE=en LANG=en mplayer \"%s\" -identify -frames 0 2>/dev/null | grep ID_VIDEO_FPS > %s",cdata->URI,tmpfname); + + res=system(cmd); + + if (!res) { + char buffer[1024]; + ssize_t bytes=read(ofd,buffer,1024); + memset(buffer+bytes,0,1); + if (!(strncmp(buffer,"ID_VIDEO_FPS=",13))) { + cdata->fps=strtod (buffer+13,NULL); + } + } + close(ofd); + unlink(tmpfname); + } + } + if (cdata->fps==0.&&ctx->time_base.num==0) { // not sure about this if (ctx->time_base.den==1) cdata->fps=12.; @@ -1123,7 +1177,14 @@ return FALSE; } - cdata->nframes=dts_to_frame(cdata,ldts)+1; + cdata->nframes=dts_to_frame(cdata,ldts)+2; + + // double check, sometimes we can be out by one or two frames + while (1) { + if (get_frame(cdata,cdata->nframes-1,NULL,0,NULL)) break; + cdata->nframes--; + } + #ifdef DEBUG fprintf(stderr,"fps is %.4f %ld\n",cdata->fps,cdata->nframes); @@ -1314,40 +1375,43 @@ fprintf(stderr,"vals %ld %ld\n",tframe,priv->last_frame); #endif - // calc frame width and height, including any border - - if (pal==WEED_PALETTE_YUV420P||pal==WEED_PALETTE_YVU420P||pal==WEED_PALETTE_YUV422P||pal==WEED_PALETTE_YUV444P) { - nplanes=3; - black[0]=y_black; - black[1]=black[2]=128; - } - else if (pal==WEED_PALETTE_YUVA4444P) { - nplanes=4; - black[0]=y_black; - black[1]=black[2]=128; - black[3]=255; - } - - if (pal==WEED_PALETTE_RGB24||pal==WEED_PALETTE_BGR24) psize=3; - - if (pal==WEED_PALETTE_RGBA32||pal==WEED_PALETTE_BGRA32||pal==WEED_PALETTE_ARGB32||pal==WEED_PALETTE_UYVY8888||pal==WEED_PALETTE_YUYV8888||pal==WEED_PALETTE_YUV888||pal==WEED_PALETTE_YUVA8888) psize=4; - - if (pal==WEED_PALETTE_YUV411) psize=6; - - if (pal==WEED_PALETTE_A1) dstwidth>>=3; - - dstwidth*=psize; - - if (cdata->frame_height > cdata->height && height == cdata->height) { - // host ignores vertical border - btop=0; - xheight=cdata->height; - bbot=xheight-1; - } - - if (cdata->frame_width > cdata->width && rowstrides[0] < cdata->frame_width*psize) { - // host ignores horizontal border - bleft=bright=0; + if (pixel_data!=NULL) { + + // calc frame width and height, including any border + + if (pal==WEED_PALETTE_YUV420P||pal==WEED_PALETTE_YVU420P||pal==WEED_PALETTE_YUV422P||pal==WEED_PALETTE_YUV444P) { + nplanes=3; + black[0]=y_black; + black[1]=black[2]=128; + } + else if (pal==WEED_PALETTE_YUVA4444P) { + nplanes=4; + black[0]=y_black; + black[1]=black[2]=128; + black[3]=255; + } + + if (pal==WEED_PALETTE_RGB24||pal==WEED_PALETTE_BGR24) psize=3; + + if (pal==WEED_PALETTE_RGBA32||pal==WEED_PALETTE_BGRA32||pal==WEED_PALETTE_ARGB32||pal==WEED_PALETTE_UYVY8888||pal==WEED_PALETTE_YUYV8888||pal==WEED_PALETTE_YUV888||pal==WEED_PALETTE_YUVA8888) psize=4; + + if (pal==WEED_PALETTE_YUV411) psize=6; + + if (pal==WEED_PALETTE_A1) dstwidth>>=3; + + dstwidth*=psize; + + if (cdata->frame_height > cdata->height && height == cdata->height) { + // host ignores vertical border + btop=0; + xheight=cdata->height; + bbot=xheight-1; + } + + if (cdata->frame_width > cdata->width && rowstrides[0] < cdata->frame_width*psize) { + // host ignores horizontal border + bleft=bright=0; + } } //////////////////////////////////////////////////////////////////// @@ -1447,6 +1511,8 @@ ///////////////////////////////////////////////////// } + + if (pixel_data==NULL) return TRUE; for (p=0;p<nplanes;p++) { dst=pixel_data[p];
View file
LiVES-1.4.8.tar.bz2/lives-plugins/plugins/decoders/flv_decoder.h -> LiVES-1.4.9.tar.bz2/lives-plugins/plugins/decoders/flv_decoder.h
Changed
@@ -1,7 +1,29 @@ // 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 +// (c) G. Finch 2011 <salsaman@xs4all.nl,salsaman@gmail.com> + +/* + * This file is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * LiVES is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with LiVES; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +*/ + +// based on code + +/* + * FLV demuxer + * Copyright (c) 2003 The FFmpeg Project + * + */ // system header flags
View file
LiVES-1.4.9.tar.bz2/lives-plugins/plugins/decoders/mkv_decoder.c
Added
@@ -0,0 +1,2686 @@ +// LiVES - mkv decoder plugin +// (c) G. Finch 2011 <salsaman@xs4all.nl,salsaman@gmail.com> + +/* + * This file is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * LiVES is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with LiVES; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +// based on code from libavformat + + + +/** + * @file + * Matroska file demuxer + * by Ronald Bultje <rbultje@ronald.bitfreak.net> + * with a little help from Moritz Bunkus <moritz@bunkus.org> + * totally reworked by Aurelien Jacobs <aurel@gnuage.org> + * Specs available on the Matroska project page: http://www.matroska.org/. + */ + + +#include <stdio.h> +#include <string.h> +#include <fcntl.h> +#include <unistd.h> +#include <stdlib.h> +#include <sys/stat.h> + +const char *plugin_version="LiVES mkv decoder version 1.0"; + +#ifdef HAVE_AV_CONFIG_H +#undef HAVE_AV_CONFIG_H +#endif + +#ifdef HAVE_AV_CONFIG_H +#undef HAVE_AV_CONFIG_H +#endif + +#define HAVE_AVCODEC + +#ifdef HAVE_SYSTEM_WEED_COMPAT +#include "weed/weed-compat.h" +#else +#include "../../../libweed/weed-compat.h" +#endif + +#include <libavformat/avformat.h> +#include <libavutil/avstring.h> +#include <libavutil/mem.h> + +#include "decplugin.h" + +#include "mkv_decoder.h" + +//#include "mkv_decoder.h" + +#include "libavutil/intfloat_readwrite.h" +#include "libavutil/intreadwrite.h" +#include "libavutil/avstring.h" +#include "libavutil/lzo.h" +#include "libavutil/dict.h" +#if CONFIG_ZLIB +#include <zlib.h> +#endif +#if CONFIG_BZLIB +#include <bzlib.h> +#endif + +//////////////////////////////////////////////////////////////////////////// + + +const uint8_t ff_log2_tab[256]={ + 0,0,1,1,2,2,2,2,3,3,3,3,3,3,3,3,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4, + 5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5, + 6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6, + 6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6, + 7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7, + 7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7, + 7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7, + 7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7 +}; + + + +static enum CodecID ff_codec_get_id(const AVCodecTag *tags, unsigned int tag) +{ + int i; + for(i=0; tags[i].id != CODEC_ID_NONE;i++) { + if(tag == tags[i].tag) + return tags[i].id; + } + for(i=0; tags[i].id != CODEC_ID_NONE; i++) { + if( toupper((tag >> 0)&0xFF) == toupper((tags[i].tag >> 0)&0xFF) + && toupper((tag >> 8)&0xFF) == toupper((tags[i].tag >> 8)&0xFF) + && toupper((tag >>16)&0xFF) == toupper((tags[i].tag >>16)&0xFF) + && toupper((tag >>24)&0xFF) == toupper((tags[i].tag >>24)&0xFF)) + return tags[i].id; + } + return CODEC_ID_NONE; +} + + +#define MKV_TAG_TYPE_VIDEO 1 + +boolean got_eof; +int errval; + +static const char *matroska_doctypes[] = { "matroska", "webm" }; + + + + +static void lives_dynarray_add(void *tab_ptr, int *nb_ptr, void *elem) { + int nb, nb_alloc; + intptr_t *tab; + + nb = *nb_ptr; + tab = *(intptr_t**)tab_ptr; + if ((nb & (nb - 1)) == 0) { + if (nb == 0) + nb_alloc = 1; + else + nb_alloc = nb * 2; + tab = av_realloc(tab, nb_alloc * sizeof(intptr_t)); + *(intptr_t**)tab_ptr = tab; + } + tab[nb++] = (intptr_t)elem; + *nb_ptr = nb; +} + + +static boolean check_eof(const lives_clip_data_t *cdata) { + lives_mkv_priv_t *priv=cdata->priv; + if (priv->input_position>=priv->filesize) return TRUE; + return FALSE; +} + + +/* + * Return: Whether we reached the end of a level in the hierarchy or not. + */ +static int ebml_level_end(const lives_clip_data_t *cdata) { + lives_mkv_priv_t *priv=cdata->priv; + MatroskaDemuxContext *matroska=&priv->matroska; + int64_t pos = priv->input_position; + + if (matroska->num_levels > 0) { + MatroskaLevel *level = &matroska->levels[matroska->num_levels - 1]; + if (pos - level->start >= level->length || matroska->current_id) { + matroska->num_levels--; + return 1; + } + } + return 0; +} + +/* + * Read: an "EBML number", which is defined as a variable-length + * array of bytes. The first byte indicates the length by giving a + * number of 0-bits followed by a one. The position of the first + * "one" bit inside the first byte indicates the length of this + * number. + * Returns: number of bytes read, < 0 on error + */ +static int ebml_read_num(const lives_clip_data_t *cdata, uint8_t * data, + int max_size, uint64_t *number) { + lives_mkv_priv_t *priv=cdata->priv; + + int bread = 1, n = 1; + uint64_t total = 0; + unsigned char buffer[1]; + uint8_t val8; + + /* The first byte tells us the length in bytes - avio_r8() can normally + * return 0, but since that's not a valid first ebmlID byte, we can + * use it safely here to catch EOS. */ + + if (data==NULL) { + if (read (priv->fd, buffer, 1) < 1) { + if (!priv->expect_eof) + fprintf(stderr, "mkv_decoder: error in stream header for %s\n",cdata->URI); + got_eof=TRUE; + return 0; + } + + priv->input_position+=1; +
View file
LiVES-1.4.9.tar.bz2/lives-plugins/plugins/decoders/mkv_decoder.h
Added
@@ -0,0 +1,1089 @@ +// LiVES - mkv decoder plugin +// (c) G. Finch 2011 <salsaman@xs4all.nl,salsaman@gmail.com> + +/* + * This file is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * LiVES is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with LiVES; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +*/ + +/////////////////////////////////////////////// + + + + +/* EBML version supported */ +#define EBML_VERSION 1 + +/* top-level master-IDs */ +#define EBML_ID_HEADER 0x1A45DFA3 + +/* IDs in the HEADER master */ +#define EBML_ID_EBMLVERSION 0x4286 +#define EBML_ID_EBMLREADVERSION 0x42F7 +#define EBML_ID_EBMLMAXIDLENGTH 0x42F2 +#define EBML_ID_EBMLMAXSIZELENGTH 0x42F3 +#define EBML_ID_DOCTYPE 0x4282 +#define EBML_ID_DOCTYPEVERSION 0x4287 +#define EBML_ID_DOCTYPEREADVERSION 0x4285 +\ +/* general EBML types */ +#define EBML_ID_VOID 0xEC +#define EBML_ID_CRC32 0xBF + +/* + * Matroska element IDs, max. 32 bits + */ + +/* toplevel segment */ +#define MATROSKA_ID_SEGMENT 0x18538067 + +/* Matroska top-level master IDs */ +#define MATROSKA_ID_INFO 0x1549A966 +#define MATROSKA_ID_TRACKS 0x1654AE6B +#define MATROSKA_ID_CUES 0x1C53BB6B +#define MATROSKA_ID_TAGS 0x1254C367 +#define MATROSKA_ID_SEEKHEAD 0x114D9B74 +#define MATROSKA_ID_ATTACHMENTS 0x1941A469 +#define MATROSKA_ID_CLUSTER 0x1F43B675 +#define MATROSKA_ID_CHAPTERS 0x1043A770 + +/* IDs in the info master */ +#define MATROSKA_ID_TIMECODESCALE 0x2AD7B1 +#define MATROSKA_ID_DURATION 0x4489 +#define MATROSKA_ID_TITLE 0x7BA9 +#define MATROSKA_ID_WRITINGAPP 0x5741 +#define MATROSKA_ID_MUXINGAPP 0x4D80 +#define MATROSKA_ID_DATEUTC 0x4461 +#define MATROSKA_ID_SEGMENTUID 0x73A4 + +/* ID in the tracks master */ +#define MATROSKA_ID_TRACKENTRY 0xAE + +/* IDs in the trackentry master */ +#define MATROSKA_ID_TRACKNUMBER 0xD7 +#define MATROSKA_ID_TRACKUID 0x73C5 +#define MATROSKA_ID_TRACKTYPE 0x83 +#define MATROSKA_ID_TRACKVIDEO 0xE0 +#define MATROSKA_ID_TRACKAUDIO 0xE1 +#define MATROSKA_ID_TRACKOPERATION 0xE2 +#define MATROSKA_ID_TRACKCOMBINEPLANES 0xE3 +#define MATROSKA_ID_TRACKPLANE 0xE4 +#define MATROSKA_ID_TRACKPLANEUID 0xE5 +#define MATROSKA_ID_TRACKPLANETYPE 0xE6 +#define MATROSKA_ID_CODECID 0x86 +#define MATROSKA_ID_CODECPRIVATE 0x63A2 +#define MATROSKA_ID_CODECNAME 0x258688 +#define MATROSKA_ID_CODECINFOURL 0x3B4040 +#define MATROSKA_ID_CODECDOWNLOADURL 0x26B240 +#define MATROSKA_ID_CODECDECODEALL 0xAA +#define MATROSKA_ID_TRACKNAME 0x536E +#define MATROSKA_ID_TRACKLANGUAGE 0x22B59C +#define MATROSKA_ID_TRACKFLAGENABLED 0xB9 +#define MATROSKA_ID_TRACKFLAGDEFAULT 0x88 +#define MATROSKA_ID_TRACKFLAGFORCED 0x55AA +#define MATROSKA_ID_TRACKFLAGLACING 0x9C +#define MATROSKA_ID_TRACKMINCACHE 0x6DE7 +#define MATROSKA_ID_TRACKMAXCACHE 0x6DF8 +#define MATROSKA_ID_TRACKDEFAULTDURATION 0x23E383 +#define MATROSKA_ID_TRACKCONTENTENCODINGS 0x6D80 +#define MATROSKA_ID_TRACKCONTENTENCODING 0x6240 +#define MATROSKA_ID_TRACKTIMECODESCALE 0x23314F +#define MATROSKA_ID_TRACKMAXBLKADDID 0x55EE + +/* IDs in the trackvideo master */ +#define MATROSKA_ID_VIDEOFRAMERATE 0x2383E3 +#define MATROSKA_ID_VIDEODISPLAYWIDTH 0x54B0 +#define MATROSKA_ID_VIDEODISPLAYHEIGHT 0x54BA +#define MATROSKA_ID_VIDEOPIXELWIDTH 0xB0 +#define MATROSKA_ID_VIDEOPIXELHEIGHT 0xBA +#define MATROSKA_ID_VIDEOPIXELCROPB 0x54AA +#define MATROSKA_ID_VIDEOPIXELCROPT 0x54BB +#define MATROSKA_ID_VIDEOPIXELCROPL 0x54CC +#define MATROSKA_ID_VIDEOPIXELCROPR 0x54DD +#define MATROSKA_ID_VIDEODISPLAYUNIT 0x54B2 +#define MATROSKA_ID_VIDEOFLAGINTERLACED 0x9A +#define MATROSKA_ID_VIDEOSTEREOMODE 0x53B8 +#define MATROSKA_ID_VIDEOASPECTRATIO 0x54B3 +#define MATROSKA_ID_VIDEOCOLORSPACE 0x2EB524 + +/* IDs in the trackaudio master */ +#define MATROSKA_ID_AUDIOSAMPLINGFREQ 0xB5 +#define MATROSKA_ID_AUDIOOUTSAMPLINGFREQ 0x78B5 + +#define MATROSKA_ID_AUDIOBITDEPTH 0x6264 +#define MATROSKA_ID_AUDIOCHANNELS 0x9F + +/* IDs in the content encoding master */ +#define MATROSKA_ID_ENCODINGORDER 0x5031 +#define MATROSKA_ID_ENCODINGSCOPE 0x5032 +#define MATROSKA_ID_ENCODINGTYPE 0x5033 +#define MATROSKA_ID_ENCODINGCOMPRESSION 0x5034 +#define MATROSKA_ID_ENCODINGCOMPALGO 0x4254 +#define MATROSKA_ID_ENCODINGCOMPSETTINGS 0x4255 + +/* ID in the cues master */ +#define MATROSKA_ID_POINTENTRY 0xBB + +/* IDs in the pointentry master */ +#define MATROSKA_ID_CUETIME 0xB3 +#define MATROSKA_ID_CUETRACKPOSITION 0xB7 + +/* IDs in the cuetrackposition master */ +#define MATROSKA_ID_CUETRACK 0xF7 +#define MATROSKA_ID_CUECLUSTERPOSITION 0xF1 +#define MATROSKA_ID_CUEBLOCKNUMBER 0x5378 + +/* IDs in the tags master */ +#define MATROSKA_ID_TAG 0x7373 +#define MATROSKA_ID_SIMPLETAG 0x67C8 +#define MATROSKA_ID_TAGNAME 0x45A3 +#define MATROSKA_ID_TAGSTRING 0x4487 +#define MATROSKA_ID_TAGLANG 0x447A +#define MATROSKA_ID_TAGDEFAULT 0x4484 +#define MATROSKA_ID_TAGDEFAULT_BUG 0x44B4 +#define MATROSKA_ID_TAGTARGETS 0x63C0 +#define MATROSKA_ID_TAGTARGETS_TYPE 0x63CA +#define MATROSKA_ID_TAGTARGETS_TYPEVALUE 0x68CA +#define MATROSKA_ID_TAGTARGETS_TRACKUID 0x63C5 +#define MATROSKA_ID_TAGTARGETS_CHAPTERUID 0x63C4 +#define MATROSKA_ID_TAGTARGETS_ATTACHUID 0x63C6 + +/* IDs in the seekhead master */ +#define MATROSKA_ID_SEEKENTRY 0x4DBB + +/* IDs in the seekpoint master */ +#define MATROSKA_ID_SEEKID 0x53AB +#define MATROSKA_ID_SEEKPOSITION 0x53AC + +/* IDs in the cluster master */ +#define MATROSKA_ID_CLUSTERTIMECODE 0xE7 +#define MATROSKA_ID_CLUSTERPOSITION 0xA7 +#define MATROSKA_ID_CLUSTERPREVSIZE 0xAB +#define MATROSKA_ID_BLOCKGROUP 0xA0 +#define MATROSKA_ID_SIMPLEBLOCK 0xA3 + +/* IDs in the blockgroup master */ +#define MATROSKA_ID_BLOCK 0xA1 +#define MATROSKA_ID_BLOCKDURATION 0x9B +#define MATROSKA_ID_BLOCKREFERENCE 0xFB + +/* IDs in the attachments master */ +#define MATROSKA_ID_ATTACHEDFILE 0x61A7 +#define MATROSKA_ID_FILEDESC 0x467E +#define MATROSKA_ID_FILENAME 0x466E +#define MATROSKA_ID_FILEMIMETYPE 0x4660 +#define MATROSKA_ID_FILEDATA 0x465C +#define MATROSKA_ID_FILEUID 0x46AE + +/* IDs in the chapters master */ +#define MATROSKA_ID_EDITIONENTRY 0x45B9 +#define MATROSKA_ID_CHAPTERATOM 0xB6 +#define MATROSKA_ID_CHAPTERTIMESTART 0x91 +#define MATROSKA_ID_CHAPTERTIMEEND 0x92 +#define MATROSKA_ID_CHAPTERDISPLAY 0x80 +#define MATROSKA_ID_CHAPSTRING 0x85 +#define MATROSKA_ID_CHAPLANG 0x437C +#define MATROSKA_ID_EDITIONUID 0x45BC +#define MATROSKA_ID_EDITIONFLAGHIDDEN 0x45BD +#define MATROSKA_ID_EDITIONFLAGDEFAULT 0x45DB
View file
LiVES-1.4.8.tar.bz2/lives-plugins/plugins/decoders/ogg_decoder.c -> LiVES-1.4.9.tar.bz2/lives-plugins/plugins/decoders/ogg_decoder.c
Changed
@@ -1,5 +1,5 @@ // LiVES - ogg/theora/dirac/vorbis decoder plugin -// (c) G. Finch 2008 - 2010 <salsaman@xs4all.nl> +// (c) G. Finch 2008 - 2010 <salsaman@xs4all.nl,salsaman@gmail.com> // released under the GNU GPL 3 or later // see file COPYING or www.gnu.org for details
View file
LiVES-1.4.8.tar.bz2/lives-plugins/plugins/decoders/ogg_decoder.h -> LiVES-1.4.9.tar.bz2/lives-plugins/plugins/decoders/ogg_decoder.h
Changed
@@ -1,5 +1,5 @@ // LiVES - ogg/theora/vorbis decoder plugin -// (c) G. Finch 2008 <salsaman@xs4all.nl> +// (c) G. Finch 2008 <salsaman@xs4all.nl,salsaman@gmail.com> // released under the GNU GPL 3 or later // see file COPYING or www.gnu.org for details
View file
LiVES-1.4.8.tar.bz2/lives-plugins/plugins/effects/Makefile.in -> LiVES-1.4.9.tar.bz2/lives-plugins/plugins/effects/Makefile.in
Changed
@@ -177,6 +177,10 @@ LIBAVCODEC_LIBS = @LIBAVCODEC_LIBS@ LIBAVFORMAT_CFLAGS = @LIBAVFORMAT_CFLAGS@ LIBAVFORMAT_LIBS = @LIBAVFORMAT_LIBS@ +LIBAVUTIL_CFLAGS = @LIBAVUTIL_CFLAGS@ +LIBAVUTIL_LIBS = @LIBAVUTIL_LIBS@ +LIBBZ_CFLAGS = @LIBBZ_CFLAGS@ +LIBBZ_LIBS = @LIBBZ_LIBS@ LIBDV_CFLAGS = @LIBDV_CFLAGS@ LIBDV_LIBS = @LIBDV_LIBS@ LIBICONV = @LIBICONV@ @@ -190,6 +194,8 @@ LIBSWSCALE_LIBS = @LIBSWSCALE_LIBS@ LIBTHREAD = @LIBTHREAD@ LIBTOOL = @LIBTOOL@ +LIBZ_CFLAGS = @LIBZ_CFLAGS@ +LIBZ_LIBS = @LIBZ_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBC = @LTLIBC@ @@ -259,6 +265,8 @@ VORBIS_CFLAGS = @VORBIS_CFLAGS@ VORBIS_LIBS = @VORBIS_LIBS@ WEED_CFLAGS = @WEED_CFLAGS@ +WEED_COMPAT_CFLAGS = @WEED_COMPAT_CFLAGS@ +WEED_COMPAT_LIBS = @WEED_COMPAT_LIBS@ WEED_LIBS = @WEED_LIBS@ WEED_PLUGIN_UTILS_CFLAGS = @WEED_PLUGIN_UTILS_CFLAGS@ WEED_PLUGIN_UTILS_LIBS = @WEED_PLUGIN_UTILS_LIBS@
View file
LiVES-1.4.8.tar.bz2/lives-plugins/plugins/effects/RFXscripts/Makefile.in -> LiVES-1.4.9.tar.bz2/lives-plugins/plugins/effects/RFXscripts/Makefile.in
Changed
@@ -164,6 +164,10 @@ LIBAVCODEC_LIBS = @LIBAVCODEC_LIBS@ LIBAVFORMAT_CFLAGS = @LIBAVFORMAT_CFLAGS@ LIBAVFORMAT_LIBS = @LIBAVFORMAT_LIBS@ +LIBAVUTIL_CFLAGS = @LIBAVUTIL_CFLAGS@ +LIBAVUTIL_LIBS = @LIBAVUTIL_LIBS@ +LIBBZ_CFLAGS = @LIBBZ_CFLAGS@ +LIBBZ_LIBS = @LIBBZ_LIBS@ LIBDV_CFLAGS = @LIBDV_CFLAGS@ LIBDV_LIBS = @LIBDV_LIBS@ LIBICONV = @LIBICONV@ @@ -177,6 +181,8 @@ LIBSWSCALE_LIBS = @LIBSWSCALE_LIBS@ LIBTHREAD = @LIBTHREAD@ LIBTOOL = @LIBTOOL@ +LIBZ_CFLAGS = @LIBZ_CFLAGS@ +LIBZ_LIBS = @LIBZ_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBC = @LTLIBC@ @@ -246,6 +252,8 @@ VORBIS_CFLAGS = @VORBIS_CFLAGS@ VORBIS_LIBS = @VORBIS_LIBS@ WEED_CFLAGS = @WEED_CFLAGS@ +WEED_COMPAT_CFLAGS = @WEED_COMPAT_CFLAGS@ +WEED_COMPAT_LIBS = @WEED_COMPAT_LIBS@ WEED_LIBS = @WEED_LIBS@ WEED_PLUGIN_UTILS_CFLAGS = @WEED_PLUGIN_UTILS_CFLAGS@ WEED_PLUGIN_UTILS_LIBS = @WEED_PLUGIN_UTILS_LIBS@
View file
LiVES-1.4.8.tar.bz2/lives-plugins/plugins/encoders/Makefile.in -> LiVES-1.4.9.tar.bz2/lives-plugins/plugins/encoders/Makefile.in
Changed
@@ -164,6 +164,10 @@ LIBAVCODEC_LIBS = @LIBAVCODEC_LIBS@ LIBAVFORMAT_CFLAGS = @LIBAVFORMAT_CFLAGS@ LIBAVFORMAT_LIBS = @LIBAVFORMAT_LIBS@ +LIBAVUTIL_CFLAGS = @LIBAVUTIL_CFLAGS@ +LIBAVUTIL_LIBS = @LIBAVUTIL_LIBS@ +LIBBZ_CFLAGS = @LIBBZ_CFLAGS@ +LIBBZ_LIBS = @LIBBZ_LIBS@ LIBDV_CFLAGS = @LIBDV_CFLAGS@ LIBDV_LIBS = @LIBDV_LIBS@ LIBICONV = @LIBICONV@ @@ -177,6 +181,8 @@ LIBSWSCALE_LIBS = @LIBSWSCALE_LIBS@ LIBTHREAD = @LIBTHREAD@ LIBTOOL = @LIBTOOL@ +LIBZ_CFLAGS = @LIBZ_CFLAGS@ +LIBZ_LIBS = @LIBZ_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBC = @LTLIBC@ @@ -246,6 +252,8 @@ VORBIS_CFLAGS = @VORBIS_CFLAGS@ VORBIS_LIBS = @VORBIS_LIBS@ WEED_CFLAGS = @WEED_CFLAGS@ +WEED_COMPAT_CFLAGS = @WEED_COMPAT_CFLAGS@ +WEED_COMPAT_LIBS = @WEED_COMPAT_LIBS@ WEED_LIBS = @WEED_LIBS@ WEED_PLUGIN_UTILS_CFLAGS = @WEED_PLUGIN_UTILS_CFLAGS@ WEED_PLUGIN_UTILS_LIBS = @WEED_PLUGIN_UTILS_LIBS@
View file
LiVES-1.4.8.tar.bz2/lives-plugins/plugins/encoders/ffmpeg_encoder -> LiVES-1.4.9.tar.bz2/lives-plugins/plugins/encoders/ffmpeg_encoder
Changed
@@ -14,7 +14,7 @@ # v 2.4 allow encoding of .png images # v 2.5 add threading support and experimental webm encoding # v 2.6 made threading support optional because of instability problems; versioning string changed in ffmpeg - +# v 2.7 fixed webm encoding support, removed asf format ####################################################################### if (!defined($standalone)) { @@ -28,7 +28,7 @@ if ($command eq "version") { - print "ffmpeg encoder plugin v2.6\n"; + print "ffmpeg encoder plugin v2.7\n"; exit 0; } @@ -76,14 +76,15 @@ # - otherwise set it to 'none' + print "webmh|webm high quality|8|none|webm|\n"; + print "webmm|webm medium quality|8|none|webm|\n"; + print "webml|webm low (stream) quality|8|none|webm|\n"; print "flv|flv|9|arate=44100;22050;11025|flv|\n"; print "divx|divx (25 fps)|5|fps=25.00|avi|\n"; - print "asf|asf|5|none|asf|\n"; print "3gp_h263|3gp (h263)|96|size=176x144,arate=8000|3gp|\n"; print "3gp_mp4|3gp (mp4)|96|size=176x144,arate=8000|3gp|\n"; print "flv-youtube|flv (425x318, optimised for youtube)|33|arate=44100;22050;11025,size=425x318|flv|\n"; print "flv-youtubex|flv (other sizes, optimised for youtube)|33|arate=44100;22050;11025,aspect=1.3333:1|flv|\n"; - print "webm|webm (experimental)|8|none|webm|\n"; exit 0; } @@ -93,7 +94,7 @@ if ($command eq "get_rfx") { # nice example of how to give the user a choice of options - if ($otype eq "flv"||$otype eq "flv-youtube"||$otype eq "flv-youtubex"||$otype eq "divx"||$otype eq "asf") { + if ($otype eq "flv"||$otype eq "flv-youtube"||$otype eq "flv-youtubex"||$otype eq "divx") { $aq=&rc_get("encoder_acodec"); if ($aq==0) { # mandatory section @@ -166,8 +167,14 @@ elsif ($otype eq "flv"||$otype eq "flv-youtube"||$otype eq "flv-youtubex") { $vcodec="-f flv"; } - elsif ($otype eq "webm") { - $vcodec="-f webm"; + elsif ($otype eq "webmh") { + $vcodec="-f webm -vcodec libvpx -g 60 -quality best -b 1G"; + } + elsif ($otype eq "webmm") { + $vcodec="-f webm -vcodec libvpx -g 60 -quality good"; + } + elsif ($otype eq "webml") { + $vcodec="-f webm -vcodec libvpx -g 60 -quality realtime"; } if ($otype eq "flv-youtube"||$otype eq "flv-youtubex") { @@ -199,6 +206,15 @@ } elsif ($aq==3) { $audio_com.=" -acodec vorbis"; + if ($otype eq "webmh") { + $audio_com.=" -aq 10"; + } + elsif ($otype eq "webmm") { + $audio_com.=" -aq 5"; + } + elsif ($otype eq "webml") { + $audio_com.=" -aq 1"; + } } else { $audio_com.=" -acodec mp2"; @@ -223,12 +239,12 @@ elsif ($otype eq "3gp") { $passfile="passfile"; for $pass (1,2) { - $syscom="$encoder_command -strict 1 -pass $pass -passfile $passfile -y -r $fps -f image2 -i %8d$img_ext $audio_com -r $fps -t $vid_length $vcodec \"$nfile\" $err"; + $syscom="$encoder_command -strict 1 -pass $pass -y -r $fps -f image2 -i %8d$img_ext $audio_com -t $vid_length $vcodec \"$nfile\" $err"; if (defined($DEBUG_ENCODERS)) { print STDERR "ffmpeg_encoder command is: $syscom\n"; } - - system ($syscom); + + system ($syscom); } } else { @@ -239,19 +255,40 @@ $threads=""; } - if ($ffver>=52) { - $syscom="$encoder_command $threads -metadata comment=\"$comment\" -metadata author=\"$author\" -metadata title=\"$title\" -y -r $fps -f image2 -i %8d$img_ext $audio_com -r $fps -t $vid_length $vcodec \"$nfile\" $err"; + if ($otype eq "webmh") { + for $pass (1,2) { + if ($ffver>=52) { + $syscom="$encoder_command -pass $pass $threads -metadata comment=\"$comment\" -metadata author=\"$author\" -metadata title=\"$title\" -y -r $fps -f image2 -i %8d$img_ext $audio_com -t $vid_length $vcodec \"$nfile\" $err"; + } + else { + $syscom="$encoder_command -pass $pass $threads -comment \"$comment\" -author \"$author\" -title \"$title\" -y -r $fps -f image2 -i %8d$img_ext $audio_com -t $vid_length $vcodec \"$nfile\" $err"; + } + + if (defined($DEBUG_ENCODERS)) { + print STDERR "ffmpeg_encoder command is: $syscom\n"; + } + + system ($syscom); + } } else { - $syscom="$encoder_command $threads -comment \"$comment\" -author \"$author\" -title \"$title\" -y -r $fps -f image2 -i %8d$img_ext $audio_com -r $fps -t $vid_length $vcodec \"$nfile\" $err"; + if ($ffver>=52) { + $syscom="$encoder_command $threads -metadata comment=\"$comment\" -metadata author=\"$author\" -metadata title=\"$title\" -y -r $fps -f image2 -i %8d$img_ext $audio_com -t $vid_length $vcodec \"$nfile\" $err"; + } + else { + $syscom="$encoder_command $threads -comment \"$comment\" -author \"$author\" -title \"$title\" -y -r $fps -f image2 -i %8d$img_ext $audio_com -t $vid_length $vcodec \"$nfile\" $err"; + } + + if (defined($DEBUG_ENCODERS)) { + print STDERR "ffmpeg_encoder command is: $syscom\n"; + } + + system ($syscom); + } - } - if (defined($DEBUG_ENCODERS)) { - print STDERR "ffmpeg_encoder command is: $syscom\n"; } - system ($syscom); &sig_complete; exit 0;
View file
LiVES-1.4.8.tar.bz2/lives-plugins/plugins/encoders/mencoder_encoder -> LiVES-1.4.9.tar.bz2/lives-plugins/plugins/encoders/mencoder_encoder
Changed
@@ -224,7 +224,7 @@ if ($otype eq "flv") { $lavfopts="-of lavf -lavfopts format=flv"; } - if ($otype eq "wmv3") { + if ($otype eq "wmv2") { $lavfopts="-of lavf -lavfopts format=asf"; }
View file
LiVES-1.4.8.tar.bz2/lives-plugins/plugins/encoders/mjpegtools_encoder -> LiVES-1.4.9.tar.bz2/lives-plugins/plugins/encoders/mjpegtools_encoder
Changed
@@ -5,7 +5,7 @@ # Released under the GPL 3 or later -# Author: Gabriel Finch (salsaman@xs4all.nl) +# Author: Gabriel Finch (salsaman@xs4all.nl,salsaman@gmail.com) #0.1 first version 21/04/04 #0.2 allow encoding of files without audio
View file
LiVES-1.4.8.tar.bz2/lives-plugins/plugins/encoders/multi_encoder -> LiVES-1.4.9.tar.bz2/lives-plugins/plugins/encoders/multi_encoder
Changed
@@ -31,7 +31,7 @@ -Copyright (C) 2008 - 2010 Salsaman (salsaman@xs4all.nl) +Copyright (C) 2008 - 2010 Salsaman (salsaman@xs4all.nl,salsaman@gmail.com) """
View file
LiVES-1.4.8.tar.bz2/lives-plugins/plugins/encoders/multi_encoder3 -> LiVES-1.4.9.tar.bz2/lives-plugins/plugins/encoders/multi_encoder3
Changed
@@ -33,7 +33,7 @@ -Copyright (C) 2008 - 2010 Salsaman (salsaman@xs4all.nl) +Copyright (C) 2008 - 2010 Salsaman (salsaman@xs4all.nl,salsaman@gmail.com) """
View file
LiVES-1.4.8.tar.bz2/lives-plugins/plugins/playback/Makefile.in -> LiVES-1.4.9.tar.bz2/lives-plugins/plugins/playback/Makefile.in
Changed
@@ -177,6 +177,10 @@ LIBAVCODEC_LIBS = @LIBAVCODEC_LIBS@ LIBAVFORMAT_CFLAGS = @LIBAVFORMAT_CFLAGS@ LIBAVFORMAT_LIBS = @LIBAVFORMAT_LIBS@ +LIBAVUTIL_CFLAGS = @LIBAVUTIL_CFLAGS@ +LIBAVUTIL_LIBS = @LIBAVUTIL_LIBS@ +LIBBZ_CFLAGS = @LIBBZ_CFLAGS@ +LIBBZ_LIBS = @LIBBZ_LIBS@ LIBDV_CFLAGS = @LIBDV_CFLAGS@ LIBDV_LIBS = @LIBDV_LIBS@ LIBICONV = @LIBICONV@ @@ -190,6 +194,8 @@ LIBSWSCALE_LIBS = @LIBSWSCALE_LIBS@ LIBTHREAD = @LIBTHREAD@ LIBTOOL = @LIBTOOL@ +LIBZ_CFLAGS = @LIBZ_CFLAGS@ +LIBZ_LIBS = @LIBZ_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBC = @LTLIBC@ @@ -259,6 +265,8 @@ VORBIS_CFLAGS = @VORBIS_CFLAGS@ VORBIS_LIBS = @VORBIS_LIBS@ WEED_CFLAGS = @WEED_CFLAGS@ +WEED_COMPAT_CFLAGS = @WEED_COMPAT_CFLAGS@ +WEED_COMPAT_LIBS = @WEED_COMPAT_LIBS@ WEED_LIBS = @WEED_LIBS@ WEED_PLUGIN_UTILS_CFLAGS = @WEED_PLUGIN_UTILS_CFLAGS@ WEED_PLUGIN_UTILS_LIBS = @WEED_PLUGIN_UTILS_LIBS@
View file
LiVES-1.4.8.tar.bz2/lives-plugins/plugins/playback/audiostream/Makefile.in -> LiVES-1.4.9.tar.bz2/lives-plugins/plugins/playback/audiostream/Makefile.in
Changed
@@ -164,6 +164,10 @@ LIBAVCODEC_LIBS = @LIBAVCODEC_LIBS@ LIBAVFORMAT_CFLAGS = @LIBAVFORMAT_CFLAGS@ LIBAVFORMAT_LIBS = @LIBAVFORMAT_LIBS@ +LIBAVUTIL_CFLAGS = @LIBAVUTIL_CFLAGS@ +LIBAVUTIL_LIBS = @LIBAVUTIL_LIBS@ +LIBBZ_CFLAGS = @LIBBZ_CFLAGS@ +LIBBZ_LIBS = @LIBBZ_LIBS@ LIBDV_CFLAGS = @LIBDV_CFLAGS@ LIBDV_LIBS = @LIBDV_LIBS@ LIBICONV = @LIBICONV@ @@ -177,6 +181,8 @@ LIBSWSCALE_LIBS = @LIBSWSCALE_LIBS@ LIBTHREAD = @LIBTHREAD@ LIBTOOL = @LIBTOOL@ +LIBZ_CFLAGS = @LIBZ_CFLAGS@ +LIBZ_LIBS = @LIBZ_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBC = @LTLIBC@ @@ -246,6 +252,8 @@ VORBIS_CFLAGS = @VORBIS_CFLAGS@ VORBIS_LIBS = @VORBIS_LIBS@ WEED_CFLAGS = @WEED_CFLAGS@ +WEED_COMPAT_CFLAGS = @WEED_COMPAT_CFLAGS@ +WEED_COMPAT_LIBS = @WEED_COMPAT_LIBS@ WEED_LIBS = @WEED_LIBS@ WEED_PLUGIN_UTILS_CFLAGS = @WEED_PLUGIN_UTILS_CFLAGS@ WEED_PLUGIN_UTILS_LIBS = @WEED_PLUGIN_UTILS_LIBS@
View file
LiVES-1.4.8.tar.bz2/lives-plugins/plugins/playback/audiostream/audiostreamer.pl -> LiVES-1.4.9.tar.bz2/lives-plugins/plugins/playback/audiostream/audiostreamer.pl
Changed
@@ -17,7 +17,7 @@ # unlike encoders, this is sent as a string e.g. "1|3|8" - print "3"; + print "1|3"; exit 0; } @@ -29,14 +29,22 @@ #vorbis if (&location("oggenc") eq "" && &location("sox") eq "") { - print "\nFor audio encoding to the 'vorbis' format you need to have either\n'oggenc' or correctly configured 'sox' installed.\nPlease install either of these programs and try again.\n"; exit 1; } exit 0; } -} + if ($chkform == 1) { + if (&location("sox") eq "") { + print "\nFor audio encoding to the 'wav' format you need to have correctly configured 'sox' installed.\nPlease check your installation of sox and try again.\n"; + exit 1; + } + exit 0; + } + print "\nUnknown audio format for streaming.\n"; + exit 1; +} @@ -51,8 +59,8 @@ # TODO - channels, samps, signed, endian - #system("mkfifo $outfifo"); #create outfifo; host should have already created infifo + system("mkfifo $outfifo"); # do conversion # audio formats taken from lives/src/plugins.h @@ -65,6 +73,10 @@ system("sox -t raw -r $arate -s -L -b 16 -c 2 $infifo -t vorbis $outfifo"); } } + elsif ($format==1) { + #pcm + system("sox -t raw -r $arate -s -L -b 16 -c 2 $infifo -t wav $outfifo 2>/dev/null"); + } else { exit 2; }
View file
LiVES-1.4.8.tar.bz2/lives-plugins/plugins/playback/video/Makefile.am -> LiVES-1.4.9.tar.bz2/lives-plugins/plugins/playback/video/Makefile.am
Changed
@@ -56,14 +56,19 @@ SDL_la_CFLAGS = $(shared_cflags) $(CFLAGS_SDL) $(weed_cflags) 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) -Dv4l1_INCFILE=@v4l1_INCFILE@ vloopback_la_LDFLAGS = $(shared_ldflags) endif + + +if HAVE_LIBv4l2 +vloopback2_libs = vloopback2.la +vloopback2_la_CFLAGS = $(shared_cflags) $(weed_cflags) +vloopback2_la_LDFLAGS = $(shared_ldflags) endif -videopluginslib_LTLIBRARIES = $(SDL_libs) $(YUV4MPEG_libs) $(oggstream_libs) $(icecast_output_libs) $(vjack_output_libs) lives2lives_stream.la $(vloopback_libs) +videopluginslib_LTLIBRARIES = $(SDL_libs) $(YUV4MPEG_libs) $(oggstream_libs) $(icecast_output_libs) $(vjack_output_libs) lives2lives_stream.la $(vloopback_libs) $(vloopback2_libs) EXTRA_DIST = videoplugin.h
View file
LiVES-1.4.8.tar.bz2/lives-plugins/plugins/playback/video/Makefile.in -> LiVES-1.4.9.tar.bz2/lives-plugins/plugins/playback/video/Makefile.in
Changed
@@ -134,8 +134,16 @@ vloopback_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(vloopback_la_CFLAGS) \ $(CFLAGS) $(vloopback_la_LDFLAGS) $(LDFLAGS) -o $@ -@HAVE_LIBv4l1_TRUE@@IS_LINUX_GNU_TRUE@am_vloopback_la_rpath = -rpath \ -@HAVE_LIBv4l1_TRUE@@IS_LINUX_GNU_TRUE@ $(videopluginslibdir) +@HAVE_LIBv4l1_TRUE@am_vloopback_la_rpath = -rpath \ +@HAVE_LIBv4l1_TRUE@ $(videopluginslibdir) +vloopback2_la_LIBADD = +vloopback2_la_SOURCES = vloopback2.c +vloopback2_la_OBJECTS = vloopback2_la-vloopback2.lo +vloopback2_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(vloopback2_la_CFLAGS) \ + $(CFLAGS) $(vloopback2_la_LDFLAGS) $(LDFLAGS) -o $@ +@HAVE_LIBv4l2_TRUE@am_vloopback2_la_rpath = -rpath \ +@HAVE_LIBv4l2_TRUE@ $(videopluginslibdir) yuv4mpeg_stream_la_LIBADD = yuv4mpeg_stream_la_SOURCES = yuv4mpeg_stream.c yuv4mpeg_stream_la_OBJECTS = yuv4mpeg_stream_la-yuv4mpeg_stream.lo @@ -159,9 +167,9 @@ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ SOURCES = SDL.c icecast_output.c lives2lives_stream.c oggstream.c \ - vjack_output.c vloopback.c yuv4mpeg_stream.c + vjack_output.c vloopback.c vloopback2.c yuv4mpeg_stream.c DIST_SOURCES = SDL.c icecast_output.c lives2lives_stream.c oggstream.c \ - vjack_output.c vloopback.c yuv4mpeg_stream.c + vjack_output.c vloopback.c vloopback2.c yuv4mpeg_stream.c ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -237,6 +245,10 @@ LIBAVCODEC_LIBS = @LIBAVCODEC_LIBS@ LIBAVFORMAT_CFLAGS = @LIBAVFORMAT_CFLAGS@ LIBAVFORMAT_LIBS = @LIBAVFORMAT_LIBS@ +LIBAVUTIL_CFLAGS = @LIBAVUTIL_CFLAGS@ +LIBAVUTIL_LIBS = @LIBAVUTIL_LIBS@ +LIBBZ_CFLAGS = @LIBBZ_CFLAGS@ +LIBBZ_LIBS = @LIBBZ_LIBS@ LIBDV_CFLAGS = @LIBDV_CFLAGS@ LIBDV_LIBS = @LIBDV_LIBS@ LIBICONV = @LIBICONV@ @@ -250,6 +262,8 @@ LIBSWSCALE_LIBS = @LIBSWSCALE_LIBS@ LIBTHREAD = @LIBTHREAD@ LIBTOOL = @LIBTOOL@ +LIBZ_CFLAGS = @LIBZ_CFLAGS@ +LIBZ_LIBS = @LIBZ_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBC = @LTLIBC@ @@ -319,6 +333,8 @@ VORBIS_CFLAGS = @VORBIS_CFLAGS@ VORBIS_LIBS = @VORBIS_LIBS@ WEED_CFLAGS = @WEED_CFLAGS@ +WEED_COMPAT_CFLAGS = @WEED_COMPAT_CFLAGS@ +WEED_COMPAT_LIBS = @WEED_COMPAT_LIBS@ WEED_LIBS = @WEED_LIBS@ WEED_PLUGIN_UTILS_CFLAGS = @WEED_PLUGIN_UTILS_CFLAGS@ WEED_PLUGIN_UTILS_LIBS = @WEED_PLUGIN_UTILS_LIBS@ @@ -420,10 +436,13 @@ icecast_output_la_LDFLAGS = $(shared_ldflags) @MJPEGTOOLS_LIBS@ SDL_la_CFLAGS = $(shared_cflags) $(CFLAGS_SDL) $(weed_cflags) SDL_la_LDFLAGS = $(shared_ldflags) $(LDFLAGS_SDL) -@HAVE_LIBv4l1_TRUE@@IS_LINUX_GNU_TRUE@vloopback_libs = vloopback.la -@HAVE_LIBv4l1_TRUE@@IS_LINUX_GNU_TRUE@vloopback_la_CFLAGS = $(shared_cflags) $(weed_cflags) -Dv4l1_INCFILE=@v4l1_INCFILE@ -@HAVE_LIBv4l1_TRUE@@IS_LINUX_GNU_TRUE@vloopback_la_LDFLAGS = $(shared_ldflags) -videopluginslib_LTLIBRARIES = $(SDL_libs) $(YUV4MPEG_libs) $(oggstream_libs) $(icecast_output_libs) $(vjack_output_libs) lives2lives_stream.la $(vloopback_libs) +@HAVE_LIBv4l1_TRUE@vloopback_libs = vloopback.la +@HAVE_LIBv4l1_TRUE@vloopback_la_CFLAGS = $(shared_cflags) $(weed_cflags) -Dv4l1_INCFILE=@v4l1_INCFILE@ +@HAVE_LIBv4l1_TRUE@vloopback_la_LDFLAGS = $(shared_ldflags) +@HAVE_LIBv4l2_TRUE@vloopback2_libs = vloopback2.la +@HAVE_LIBv4l2_TRUE@vloopback2_la_CFLAGS = $(shared_cflags) $(weed_cflags) +@HAVE_LIBv4l2_TRUE@vloopback2_la_LDFLAGS = $(shared_ldflags) +videopluginslib_LTLIBRARIES = $(SDL_libs) $(YUV4MPEG_libs) $(oggstream_libs) $(icecast_output_libs) $(vjack_output_libs) lives2lives_stream.la $(vloopback_libs) $(vloopback2_libs) EXTRA_DIST = videoplugin.h all: all-am @@ -502,6 +521,8 @@ $(vjack_output_la_LINK) $(am_vjack_output_la_rpath) $(vjack_output_la_OBJECTS) $(vjack_output_la_LIBADD) $(LIBS) vloopback.la: $(vloopback_la_OBJECTS) $(vloopback_la_DEPENDENCIES) $(vloopback_la_LINK) $(am_vloopback_la_rpath) $(vloopback_la_OBJECTS) $(vloopback_la_LIBADD) $(LIBS) +vloopback2.la: $(vloopback2_la_OBJECTS) $(vloopback2_la_DEPENDENCIES) + $(vloopback2_la_LINK) $(am_vloopback2_la_rpath) $(vloopback2_la_OBJECTS) $(vloopback2_la_LIBADD) $(LIBS) yuv4mpeg_stream.la: $(yuv4mpeg_stream_la_OBJECTS) $(yuv4mpeg_stream_la_DEPENDENCIES) $(yuv4mpeg_stream_la_LINK) $(am_yuv4mpeg_stream_la_rpath) $(yuv4mpeg_stream_la_OBJECTS) $(yuv4mpeg_stream_la_LIBADD) $(LIBS) @@ -516,6 +537,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lives2lives_stream_la-lives2lives_stream.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/oggstream_la-oggstream.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vjack_output_la-vjack_output.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vloopback2_la-vloopback2.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vloopback_la-vloopback.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/yuv4mpeg_stream_la-yuv4mpeg_stream.Plo@am__quote@ @@ -582,6 +604,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) $(vloopback_la_CFLAGS) $(CFLAGS) -c -o vloopback_la-vloopback.lo `test -f 'vloopback.c' || echo '$(srcdir)/'`vloopback.c +vloopback2_la-vloopback2.lo: vloopback2.c +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vloopback2_la_CFLAGS) $(CFLAGS) -MT vloopback2_la-vloopback2.lo -MD -MP -MF $(DEPDIR)/vloopback2_la-vloopback2.Tpo -c -o vloopback2_la-vloopback2.lo `test -f 'vloopback2.c' || echo '$(srcdir)/'`vloopback2.c +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/vloopback2_la-vloopback2.Tpo $(DEPDIR)/vloopback2_la-vloopback2.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='vloopback2.c' object='vloopback2_la-vloopback2.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) $(vloopback2_la_CFLAGS) $(CFLAGS) -c -o vloopback2_la-vloopback2.lo `test -f 'vloopback2.c' || echo '$(srcdir)/'`vloopback2.c + yuv4mpeg_stream_la-yuv4mpeg_stream.lo: yuv4mpeg_stream.c @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(yuv4mpeg_stream_la_CFLAGS) $(CFLAGS) -MT yuv4mpeg_stream_la-yuv4mpeg_stream.lo -MD -MP -MF $(DEPDIR)/yuv4mpeg_stream_la-yuv4mpeg_stream.Tpo -c -o yuv4mpeg_stream_la-yuv4mpeg_stream.lo `test -f 'yuv4mpeg_stream.c' || echo '$(srcdir)/'`yuv4mpeg_stream.c @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/yuv4mpeg_stream_la-yuv4mpeg_stream.Tpo $(DEPDIR)/yuv4mpeg_stream_la-yuv4mpeg_stream.Plo
View file
LiVES-1.4.8.tar.bz2/lives-plugins/plugins/playback/video/SDL.c -> LiVES-1.4.9.tar.bz2/lives-plugins/plugins/playback/video/SDL.c
Changed
@@ -1,5 +1,5 @@ // LiVES - SDL playback engine -// (c) G. Finch 2003 - 2008 <salsaman@xs4all.nl> +// (c) G. Finch 2003 - 2008 <salsaman@xs4all.nl,salsaman@gmail.com> // released under the GNU GPL 3 or later // see file COPYING or www.gnu.org for details
View file
LiVES-1.4.8.tar.bz2/lives-plugins/plugins/playback/video/icecast_output.c -> LiVES-1.4.9.tar.bz2/lives-plugins/plugins/playback/video/icecast_output.c
Changed
@@ -1,5 +1,5 @@ // LiVES - ogg/theora/vorbis to icecast stream engine -// (c) G. Finch 2004 - 2011 <salsaman@xs4all.nl> +// (c) G. Finch 2004 - 2011 <salsaman@xs4all.nl,salsaman@gmail.com> // released under the GNU GPL 3 or later // see file COPYING or www.gnu.org for details @@ -144,7 +144,7 @@ // get tempdir dummyvar=system("smogrify get_tempdir oggstream"); rfd=open("/tmp/.smogrify.oggstream",O_RDONLY); - ret=read(rfd,(void *)buf,16384); + ret=read(rfd,(void *)buf,16383); memset(buf+ret,0,1); tmpdir=strdup(buf);
View file
LiVES-1.4.8.tar.bz2/lives-plugins/plugins/playback/video/lives2lives_stream.c -> LiVES-1.4.9.tar.bz2/lives-plugins/plugins/playback/video/lives2lives_stream.c
Changed
@@ -1,5 +1,5 @@ // LiVES - LiVES stream engine -// (c) G. Finch 2008 - 2011 <salsaman@xs4all.nl> +// (c) G. Finch 2008 - 2011 <salsaman@xs4all.nl,salsaman@gmail.com> // released under the GNU GPL 3 or later // see file COPYING or www.gnu.org for details
View file
LiVES-1.4.8.tar.bz2/lives-plugins/plugins/playback/video/oggstream.c -> LiVES-1.4.9.tar.bz2/lives-plugins/plugins/playback/video/oggstream.c
Changed
@@ -1,5 +1,5 @@ // LiVES - ogg/theora/vorbis stream engine -// (c) G. Finch 2004 - 2011 <salsaman@xs4all.nl> +// (c) G. Finch 2004 - 2011 <salsaman@xs4all.nl,salsaman@gmail.com> // released under the GNU GPL 3 or later // see file COPYING or www.gnu.org for details @@ -143,7 +143,7 @@ // get tempdir dummyvar=system("smogrify get_tempdir oggstream"); rfd=open("/tmp/.smogrify.oggstream",O_RDONLY); - ret=read(rfd,(void *)buf,16384); + ret=read(rfd,(void *)buf,16383); memset(buf+ret,0,1); tmpdir=strdup(buf);
View file
LiVES-1.4.8.tar.bz2/lives-plugins/plugins/playback/video/videoplugin.h -> LiVES-1.4.9.tar.bz2/lives-plugins/plugins/playback/video/videoplugin.h
Changed
@@ -1,5 +1,5 @@ // LiVES - video playback plugin header -// (c) G. Finch 2003 - 2008 <salsaman@xs4all.nl> +// (c) G. Finch 2003 - 2008 <salsaman@xs4all.nl,salsaman@gmail.com> // released under the GNU GPL 3 or later // see file COPYING or www.gnu.org for details
View file
LiVES-1.4.8.tar.bz2/lives-plugins/plugins/playback/video/vjack_output.c -> LiVES-1.4.9.tar.bz2/lives-plugins/plugins/playback/video/vjack_output.c
Changed
@@ -1,5 +1,5 @@ // LiVES - vjack playback engine -// (c) G. Finch 2006 - 2008 <salsaman@xs4all.nl> +// (c) G. Finch 2006 - 2008 <salsaman@xs4all.nl,salsaman@gmail.com> // released under the GNU GPL 3 or later // see file COPYING or www.gnu.org for details
View file
LiVES-1.4.8.tar.bz2/lives-plugins/plugins/playback/video/vloopback.c -> LiVES-1.4.9.tar.bz2/lives-plugins/plugins/playback/video/vloopback.c
Changed
@@ -1,5 +1,5 @@ // LiVES - vloopback playback engine -// (c) G. Finch 2010 <salsaman@xs4all.nl> +// (c) G. Finch 2010 <salsaman@xs4all.nl,salsaman@gmail.com> // released under the GNU GPL 3 or later // see file COPYING or www.gnu.org for details
View file
LiVES-1.4.9.tar.bz2/lives-plugins/plugins/playback/video/vloopback2.c
Added
@@ -0,0 +1,417 @@ +// LiVES - vloopback2 playback engine +// (c) G. Finch 2011 <salsaman@xs4all.nl,salsaman@gmail.com> +// released under the GNU GPL 3 or later +// see file COPYING or www.gnu.org for details + +#include "videoplugin.h" + +#include <linux/videodev2.h> + +#include <stdio.h> +#include <string.h> +#include <fcntl.h> +#include <assert.h> +#include <stdlib.h> +#include <sys/ioctl.h> + + +///////////////////////////////////////////////////////////////// + +static char plugin_version[64]="LiVES vloopback2 output client 1.0.0"; +static int palette_list[4]; +static int clampings[3]; +static int mypalette; +static int mysubspace=WEED_YUV_SUBSPACE_YCBCR; +static int myclamp; + +////////////////////////////////////////////////////////////////// + +#include <errno.h> +#include <dirent.h> +#include <unistd.h> + +static int vdevfd; + +static char *vdevname; + +static char *tmpdir; + +static char xfile[4096]; + +static int aforms[2]; + +////////////////////////////////////////////// + + +static int file_filter( const struct dirent *a ) +{ + int match = 0; + + // match: 'videoXY' where X = {0..9} and Y = {0..9} + if( !strncmp( a->d_name, "video", 5 ) ) + { + if( strlen( a->d_name ) > 5 ) + { + if( ( a->d_name[5] >= '0' ) && ( a->d_name[5] <= '9' ) ) // match + // the 'X' + { + match = 1; + } + + if( strlen( a->d_name ) > 6 ) + { + match = 0; + + if( ( a->d_name[6] >= '0' ) && ( a->d_name[6] <= '9' ) ) + { + match = 1; + } + } + + if( strlen( a->d_name ) > 7 ) + { + match = 0; + } + } + } + + return match; +} + + +#define MAX_DEVICES 65 + +static char **get_vloopback2_devices(void) { + char devname[256]; + struct dirent **namelist; + int n; + int fd; + int i=-1; + int ndevices=0; + + struct v4l2_capability vid_caps; + + char **devnames=malloc(MAX_DEVICES * sizeof(char *)); + + for (i=0;i<MAX_DEVICES;devnames[i++]=NULL); + + n = scandir( "/dev", &namelist, file_filter, alphasort ); + if( n < 0 ) return devnames; + + + for(i=0; i < n && ndevices < MAX_DEVICES-1; i++ ) { + sprintf( devname, "/dev/%s", namelist[i]->d_name ); + + if( ( fd = open( devname, O_RDWR | O_NONBLOCK ) ) == -1 ) { + // could not open device + continue; + } + + if( ioctl( fd, VIDIOC_QUERYCAP, &vid_caps ) < 0 ) { + // not a video device + close( fd ); + continue; + } + + if( !(vid_caps.capabilities & V4L2_CAP_VIDEO_OUTPUT ) ) { + // is not an output device + close( fd ); + continue; + } + + close( fd ); + devnames[ndevices++]=strdup(devname); + //fprintf(stderr,"got %s\n",devname); + } + devnames[ndevices]=NULL; + + for( i=0; i < n; free(namelist[i++]) ); + free (namelist); + + return devnames; +} + + + +/////////////////////////////////////////////////// + + +const char *module_check_init(void) { + char **vdevs = get_vloopback2_devices(); + + char buf[16384]; + + int i=0; + int dummyvar,rfd; + + size_t ret; + + if (vdevs[0]==NULL) { + free(vdevs); + return "No vloopback2 devices were found\nInstall vloopback2 and then try: sudo modprobe webcamstudio\nAlso check the device permissions.\n"; + } + + while (vdevs[i]!=NULL) free(vdevs[i++]); + free( vdevs ); + + // get tempdir + dummyvar=system("smogrify get_tempdir oggstream"); + rfd=open("/tmp/.smogrify.oggstream",O_RDONLY); + ret=read(rfd,(void *)buf,16383); + memset(buf+ret,0,1); + + tmpdir=strdup(buf); + + dummyvar=dummyvar; // keep compiler happy + + + return NULL; +} + +const char *version (void) { + return plugin_version; +} + +const char *get_description (void) { + return "The vloopback2 playback plugin makes LiVES appear as a video device in /dev.\nIt requires the vloopback2 kernel module which can be downloaded from\nhttps://github.com/umlaeute/v4l2loopback\n"; +} + +uint64_t get_capabilities (int palette) { + return 0; +} + + +const int *get_audio_fmts() { + // this is not yet documented, but is an optional function to get a list of audio formats. If the user chooses to stream audio then it will be sent to a fifo file in the tempdir called livesaudio.stream, in one of the supported formats + aforms[0]=1; // pcm + aforms[1]=-1; // end + + return aforms; +} + +const char rfx[32768]; + + +const char *get_rfx (void) { + char **vdevs = get_vloopback2_devices(); + char devstr[30000]; + size_t slen=0; + int i=0;
View file
LiVES-1.4.8.tar.bz2/lives-plugins/plugins/playback/video/yuv4mpeg_stream.c -> LiVES-1.4.9.tar.bz2/lives-plugins/plugins/playback/video/yuv4mpeg_stream.c
Changed
@@ -1,5 +1,5 @@ // LiVES - yuv4mpeg stream engine -// (c) G. Finch 2004 - 2008 <salsaman@xs4all.nl> +// (c) G. Finch 2004 - 2008 <salsaman@xs4all.nl,salsaman@gmail.com> // released under the GNU GPL 3 or later // see file COPYING or www.gnu.org for details
View file
LiVES-1.4.8.tar.bz2/lives-plugins/themes/Makefile.in -> LiVES-1.4.9.tar.bz2/lives-plugins/themes/Makefile.in
Changed
@@ -201,6 +201,10 @@ LIBAVCODEC_LIBS = @LIBAVCODEC_LIBS@ LIBAVFORMAT_CFLAGS = @LIBAVFORMAT_CFLAGS@ LIBAVFORMAT_LIBS = @LIBAVFORMAT_LIBS@ +LIBAVUTIL_CFLAGS = @LIBAVUTIL_CFLAGS@ +LIBAVUTIL_LIBS = @LIBAVUTIL_LIBS@ +LIBBZ_CFLAGS = @LIBBZ_CFLAGS@ +LIBBZ_LIBS = @LIBBZ_LIBS@ LIBDV_CFLAGS = @LIBDV_CFLAGS@ LIBDV_LIBS = @LIBDV_LIBS@ LIBICONV = @LIBICONV@ @@ -214,6 +218,8 @@ LIBSWSCALE_LIBS = @LIBSWSCALE_LIBS@ LIBTHREAD = @LIBTHREAD@ LIBTOOL = @LIBTOOL@ +LIBZ_CFLAGS = @LIBZ_CFLAGS@ +LIBZ_LIBS = @LIBZ_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBC = @LTLIBC@ @@ -283,6 +289,8 @@ VORBIS_CFLAGS = @VORBIS_CFLAGS@ VORBIS_LIBS = @VORBIS_LIBS@ WEED_CFLAGS = @WEED_CFLAGS@ +WEED_COMPAT_CFLAGS = @WEED_COMPAT_CFLAGS@ +WEED_COMPAT_LIBS = @WEED_COMPAT_LIBS@ WEED_LIBS = @WEED_LIBS@ WEED_PLUGIN_UTILS_CFLAGS = @WEED_PLUGIN_UTILS_CFLAGS@ WEED_PLUGIN_UTILS_LIBS = @WEED_PLUGIN_UTILS_LIBS@
View file
LiVES-1.4.8.tar.bz2/lives-plugins/themes/camera/Makefile.in -> LiVES-1.4.9.tar.bz2/lives-plugins/themes/camera/Makefile.in
Changed
@@ -161,6 +161,10 @@ LIBAVCODEC_LIBS = @LIBAVCODEC_LIBS@ LIBAVFORMAT_CFLAGS = @LIBAVFORMAT_CFLAGS@ LIBAVFORMAT_LIBS = @LIBAVFORMAT_LIBS@ +LIBAVUTIL_CFLAGS = @LIBAVUTIL_CFLAGS@ +LIBAVUTIL_LIBS = @LIBAVUTIL_LIBS@ +LIBBZ_CFLAGS = @LIBBZ_CFLAGS@ +LIBBZ_LIBS = @LIBBZ_LIBS@ LIBDV_CFLAGS = @LIBDV_CFLAGS@ LIBDV_LIBS = @LIBDV_LIBS@ LIBICONV = @LIBICONV@ @@ -174,6 +178,8 @@ LIBSWSCALE_LIBS = @LIBSWSCALE_LIBS@ LIBTHREAD = @LIBTHREAD@ LIBTOOL = @LIBTOOL@ +LIBZ_CFLAGS = @LIBZ_CFLAGS@ +LIBZ_LIBS = @LIBZ_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBC = @LTLIBC@ @@ -243,6 +249,8 @@ VORBIS_CFLAGS = @VORBIS_CFLAGS@ VORBIS_LIBS = @VORBIS_LIBS@ WEED_CFLAGS = @WEED_CFLAGS@ +WEED_COMPAT_CFLAGS = @WEED_COMPAT_CFLAGS@ +WEED_COMPAT_LIBS = @WEED_COMPAT_LIBS@ WEED_LIBS = @WEED_LIBS@ WEED_PLUGIN_UTILS_CFLAGS = @WEED_PLUGIN_UTILS_CFLAGS@ WEED_PLUGIN_UTILS_LIBS = @WEED_PLUGIN_UTILS_LIBS@
View file
LiVES-1.4.8.tar.bz2/lives-plugins/themes/crayons-bright/Makefile.in -> LiVES-1.4.9.tar.bz2/lives-plugins/themes/crayons-bright/Makefile.in
Changed
@@ -161,6 +161,10 @@ LIBAVCODEC_LIBS = @LIBAVCODEC_LIBS@ LIBAVFORMAT_CFLAGS = @LIBAVFORMAT_CFLAGS@ LIBAVFORMAT_LIBS = @LIBAVFORMAT_LIBS@ +LIBAVUTIL_CFLAGS = @LIBAVUTIL_CFLAGS@ +LIBAVUTIL_LIBS = @LIBAVUTIL_LIBS@ +LIBBZ_CFLAGS = @LIBBZ_CFLAGS@ +LIBBZ_LIBS = @LIBBZ_LIBS@ LIBDV_CFLAGS = @LIBDV_CFLAGS@ LIBDV_LIBS = @LIBDV_LIBS@ LIBICONV = @LIBICONV@ @@ -174,6 +178,8 @@ LIBSWSCALE_LIBS = @LIBSWSCALE_LIBS@ LIBTHREAD = @LIBTHREAD@ LIBTOOL = @LIBTOOL@ +LIBZ_CFLAGS = @LIBZ_CFLAGS@ +LIBZ_LIBS = @LIBZ_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBC = @LTLIBC@ @@ -243,6 +249,8 @@ VORBIS_CFLAGS = @VORBIS_CFLAGS@ VORBIS_LIBS = @VORBIS_LIBS@ WEED_CFLAGS = @WEED_CFLAGS@ +WEED_COMPAT_CFLAGS = @WEED_COMPAT_CFLAGS@ +WEED_COMPAT_LIBS = @WEED_COMPAT_LIBS@ WEED_LIBS = @WEED_LIBS@ WEED_PLUGIN_UTILS_CFLAGS = @WEED_PLUGIN_UTILS_CFLAGS@ WEED_PLUGIN_UTILS_LIBS = @WEED_PLUGIN_UTILS_LIBS@
View file
LiVES-1.4.8.tar.bz2/lives-plugins/themes/crayons/Makefile.in -> LiVES-1.4.9.tar.bz2/lives-plugins/themes/crayons/Makefile.in
Changed
@@ -161,6 +161,10 @@ LIBAVCODEC_LIBS = @LIBAVCODEC_LIBS@ LIBAVFORMAT_CFLAGS = @LIBAVFORMAT_CFLAGS@ LIBAVFORMAT_LIBS = @LIBAVFORMAT_LIBS@ +LIBAVUTIL_CFLAGS = @LIBAVUTIL_CFLAGS@ +LIBAVUTIL_LIBS = @LIBAVUTIL_LIBS@ +LIBBZ_CFLAGS = @LIBBZ_CFLAGS@ +LIBBZ_LIBS = @LIBBZ_LIBS@ LIBDV_CFLAGS = @LIBDV_CFLAGS@ LIBDV_LIBS = @LIBDV_LIBS@ LIBICONV = @LIBICONV@ @@ -174,6 +178,8 @@ LIBSWSCALE_LIBS = @LIBSWSCALE_LIBS@ LIBTHREAD = @LIBTHREAD@ LIBTOOL = @LIBTOOL@ +LIBZ_CFLAGS = @LIBZ_CFLAGS@ +LIBZ_LIBS = @LIBZ_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBC = @LTLIBC@ @@ -243,6 +249,8 @@ VORBIS_CFLAGS = @VORBIS_CFLAGS@ VORBIS_LIBS = @VORBIS_LIBS@ WEED_CFLAGS = @WEED_CFLAGS@ +WEED_COMPAT_CFLAGS = @WEED_COMPAT_CFLAGS@ +WEED_COMPAT_LIBS = @WEED_COMPAT_LIBS@ WEED_LIBS = @WEED_LIBS@ WEED_PLUGIN_UTILS_CFLAGS = @WEED_PLUGIN_UTILS_CFLAGS@ WEED_PLUGIN_UTILS_LIBS = @WEED_PLUGIN_UTILS_LIBS@
View file
LiVES-1.4.8.tar.bz2/lives-plugins/themes/cutting_room/Makefile.in -> LiVES-1.4.9.tar.bz2/lives-plugins/themes/cutting_room/Makefile.in
Changed
@@ -161,6 +161,10 @@ LIBAVCODEC_LIBS = @LIBAVCODEC_LIBS@ LIBAVFORMAT_CFLAGS = @LIBAVFORMAT_CFLAGS@ LIBAVFORMAT_LIBS = @LIBAVFORMAT_LIBS@ +LIBAVUTIL_CFLAGS = @LIBAVUTIL_CFLAGS@ +LIBAVUTIL_LIBS = @LIBAVUTIL_LIBS@ +LIBBZ_CFLAGS = @LIBBZ_CFLAGS@ +LIBBZ_LIBS = @LIBBZ_LIBS@ LIBDV_CFLAGS = @LIBDV_CFLAGS@ LIBDV_LIBS = @LIBDV_LIBS@ LIBICONV = @LIBICONV@ @@ -174,6 +178,8 @@ LIBSWSCALE_LIBS = @LIBSWSCALE_LIBS@ LIBTHREAD = @LIBTHREAD@ LIBTOOL = @LIBTOOL@ +LIBZ_CFLAGS = @LIBZ_CFLAGS@ +LIBZ_LIBS = @LIBZ_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBC = @LTLIBC@ @@ -243,6 +249,8 @@ VORBIS_CFLAGS = @VORBIS_CFLAGS@ VORBIS_LIBS = @VORBIS_LIBS@ WEED_CFLAGS = @WEED_CFLAGS@ +WEED_COMPAT_CFLAGS = @WEED_COMPAT_CFLAGS@ +WEED_COMPAT_LIBS = @WEED_COMPAT_LIBS@ WEED_LIBS = @WEED_LIBS@ WEED_PLUGIN_UTILS_CFLAGS = @WEED_PLUGIN_UTILS_CFLAGS@ WEED_PLUGIN_UTILS_LIBS = @WEED_PLUGIN_UTILS_LIBS@
View file
LiVES-1.4.8.tar.bz2/lives-plugins/themes/editor/Makefile.in -> LiVES-1.4.9.tar.bz2/lives-plugins/themes/editor/Makefile.in
Changed
@@ -161,6 +161,10 @@ LIBAVCODEC_LIBS = @LIBAVCODEC_LIBS@ LIBAVFORMAT_CFLAGS = @LIBAVFORMAT_CFLAGS@ LIBAVFORMAT_LIBS = @LIBAVFORMAT_LIBS@ +LIBAVUTIL_CFLAGS = @LIBAVUTIL_CFLAGS@ +LIBAVUTIL_LIBS = @LIBAVUTIL_LIBS@ +LIBBZ_CFLAGS = @LIBBZ_CFLAGS@ +LIBBZ_LIBS = @LIBBZ_LIBS@ LIBDV_CFLAGS = @LIBDV_CFLAGS@ LIBDV_LIBS = @LIBDV_LIBS@ LIBICONV = @LIBICONV@ @@ -174,6 +178,8 @@ LIBSWSCALE_LIBS = @LIBSWSCALE_LIBS@ LIBTHREAD = @LIBTHREAD@ LIBTOOL = @LIBTOOL@ +LIBZ_CFLAGS = @LIBZ_CFLAGS@ +LIBZ_LIBS = @LIBZ_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBC = @LTLIBC@ @@ -243,6 +249,8 @@ VORBIS_CFLAGS = @VORBIS_CFLAGS@ VORBIS_LIBS = @VORBIS_LIBS@ WEED_CFLAGS = @WEED_CFLAGS@ +WEED_COMPAT_CFLAGS = @WEED_COMPAT_CFLAGS@ +WEED_COMPAT_LIBS = @WEED_COMPAT_LIBS@ WEED_LIBS = @WEED_LIBS@ WEED_PLUGIN_UTILS_CFLAGS = @WEED_PLUGIN_UTILS_CFLAGS@ WEED_PLUGIN_UTILS_LIBS = @WEED_PLUGIN_UTILS_LIBS@
View file
LiVES-1.4.8.tar.bz2/lives-plugins/themes/pinks/Makefile.in -> LiVES-1.4.9.tar.bz2/lives-plugins/themes/pinks/Makefile.in
Changed
@@ -161,6 +161,10 @@ LIBAVCODEC_LIBS = @LIBAVCODEC_LIBS@ LIBAVFORMAT_CFLAGS = @LIBAVFORMAT_CFLAGS@ LIBAVFORMAT_LIBS = @LIBAVFORMAT_LIBS@ +LIBAVUTIL_CFLAGS = @LIBAVUTIL_CFLAGS@ +LIBAVUTIL_LIBS = @LIBAVUTIL_LIBS@ +LIBBZ_CFLAGS = @LIBBZ_CFLAGS@ +LIBBZ_LIBS = @LIBBZ_LIBS@ LIBDV_CFLAGS = @LIBDV_CFLAGS@ LIBDV_LIBS = @LIBDV_LIBS@ LIBICONV = @LIBICONV@ @@ -174,6 +178,8 @@ LIBSWSCALE_LIBS = @LIBSWSCALE_LIBS@ LIBTHREAD = @LIBTHREAD@ LIBTOOL = @LIBTOOL@ +LIBZ_CFLAGS = @LIBZ_CFLAGS@ +LIBZ_LIBS = @LIBZ_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBC = @LTLIBC@ @@ -243,6 +249,8 @@ VORBIS_CFLAGS = @VORBIS_CFLAGS@ VORBIS_LIBS = @VORBIS_LIBS@ WEED_CFLAGS = @WEED_CFLAGS@ +WEED_COMPAT_CFLAGS = @WEED_COMPAT_CFLAGS@ +WEED_COMPAT_LIBS = @WEED_COMPAT_LIBS@ WEED_LIBS = @WEED_LIBS@ WEED_PLUGIN_UTILS_CFLAGS = @WEED_PLUGIN_UTILS_CFLAGS@ WEED_PLUGIN_UTILS_LIBS = @WEED_PLUGIN_UTILS_LIBS@
View file
LiVES-1.4.8.tar.bz2/lives-plugins/weed-plugins/Makefile.in -> LiVES-1.4.9.tar.bz2/lives-plugins/weed-plugins/Makefile.in
Changed
@@ -356,6 +356,10 @@ LIBAVCODEC_LIBS = @LIBAVCODEC_LIBS@ LIBAVFORMAT_CFLAGS = @LIBAVFORMAT_CFLAGS@ LIBAVFORMAT_LIBS = @LIBAVFORMAT_LIBS@ +LIBAVUTIL_CFLAGS = @LIBAVUTIL_CFLAGS@ +LIBAVUTIL_LIBS = @LIBAVUTIL_LIBS@ +LIBBZ_CFLAGS = @LIBBZ_CFLAGS@ +LIBBZ_LIBS = @LIBBZ_LIBS@ LIBDV_CFLAGS = @LIBDV_CFLAGS@ LIBDV_LIBS = @LIBDV_LIBS@ LIBICONV = @LIBICONV@ @@ -369,6 +373,8 @@ LIBSWSCALE_LIBS = @LIBSWSCALE_LIBS@ LIBTHREAD = @LIBTHREAD@ LIBTOOL = @LIBTOOL@ +LIBZ_CFLAGS = @LIBZ_CFLAGS@ +LIBZ_LIBS = @LIBZ_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBC = @LTLIBC@ @@ -438,6 +444,8 @@ VORBIS_CFLAGS = @VORBIS_CFLAGS@ VORBIS_LIBS = @VORBIS_LIBS@ WEED_CFLAGS = @WEED_CFLAGS@ +WEED_COMPAT_CFLAGS = @WEED_COMPAT_CFLAGS@ +WEED_COMPAT_LIBS = @WEED_COMPAT_LIBS@ WEED_LIBS = @WEED_LIBS@ WEED_PLUGIN_UTILS_CFLAGS = @WEED_PLUGIN_UTILS_CFLAGS@ WEED_PLUGIN_UTILS_LIBS = @WEED_PLUGIN_UTILS_LIBS@
View file
LiVES-1.4.8.tar.bz2/lives-plugins/weed-plugins/frei0r.c -> LiVES-1.4.9.tar.bz2/lives-plugins/weed-plugins/frei0r.c
Changed
@@ -1,5 +1,5 @@ /* Frei0r wrapper for Weed - author: Salsaman (G. Finch) <salsaman@xs4all.nl> + author: Salsaman (G. Finch) <salsaman@xs4all.nl,salsaman@gmail.com> Released under the Lesser Gnu Public License (LGPL) 3 or later See www.gnu.org for details
View file
LiVES-1.4.8.tar.bz2/lives-plugins/weed-plugins/gdk/Makefile.in -> LiVES-1.4.9.tar.bz2/lives-plugins/weed-plugins/gdk/Makefile.in
Changed
@@ -205,6 +205,10 @@ LIBAVCODEC_LIBS = @LIBAVCODEC_LIBS@ LIBAVFORMAT_CFLAGS = @LIBAVFORMAT_CFLAGS@ LIBAVFORMAT_LIBS = @LIBAVFORMAT_LIBS@ +LIBAVUTIL_CFLAGS = @LIBAVUTIL_CFLAGS@ +LIBAVUTIL_LIBS = @LIBAVUTIL_LIBS@ +LIBBZ_CFLAGS = @LIBBZ_CFLAGS@ +LIBBZ_LIBS = @LIBBZ_LIBS@ LIBDV_CFLAGS = @LIBDV_CFLAGS@ LIBDV_LIBS = @LIBDV_LIBS@ LIBICONV = @LIBICONV@ @@ -218,6 +222,8 @@ LIBSWSCALE_LIBS = @LIBSWSCALE_LIBS@ LIBTHREAD = @LIBTHREAD@ LIBTOOL = @LIBTOOL@ +LIBZ_CFLAGS = @LIBZ_CFLAGS@ +LIBZ_LIBS = @LIBZ_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBC = @LTLIBC@ @@ -287,6 +293,8 @@ VORBIS_CFLAGS = @VORBIS_CFLAGS@ VORBIS_LIBS = @VORBIS_LIBS@ WEED_CFLAGS = @WEED_CFLAGS@ +WEED_COMPAT_CFLAGS = @WEED_COMPAT_CFLAGS@ +WEED_COMPAT_LIBS = @WEED_COMPAT_LIBS@ WEED_LIBS = @WEED_LIBS@ WEED_PLUGIN_UTILS_CFLAGS = @WEED_PLUGIN_UTILS_CFLAGS@ WEED_PLUGIN_UTILS_LIBS = @WEED_PLUGIN_UTILS_LIBS@
View file
LiVES-1.4.8.tar.bz2/lives-plugins/weed-plugins/gdk/vjack_rcv.c -> LiVES-1.4.9.tar.bz2/lives-plugins/weed-plugins/gdk/vjack_rcv.c
Changed
@@ -1,5 +1,5 @@ /* videojack test plugin for Weed - authors: Salsaman (G. Finch) <salsaman@xs4all.nl> + authors: Salsaman (G. Finch) <salsaman@xs4all.nl,salsaman@gmail.com> // released under the GNU GPL 3 or higher // see file COPYING or www.gnu.org for details
View file
LiVES-1.4.8.tar.bz2/lives-plugins/weed-plugins/libvis.c -> LiVES-1.4.9.tar.bz2/lives-plugins/weed-plugins/libvis.c
Changed
@@ -1,5 +1,5 @@ /* libvisual plugin for Weed - authors: Salsaman (G. Finch) <salsaman@xs4all.nl> + authors: Salsaman (G. Finch) <salsaman@xs4all.nl,salsaman@gmail.com> Dennis Smit <synap@yourbase.nl> Duilio J. Protti <dprotti@users.sourceforge.net>
View file
LiVES-1.4.8.tar.bz2/lives-plugins/weed-plugins/warpTV.c -> LiVES-1.4.9.tar.bz2/lives-plugins/weed-plugins/warpTV.c
Changed
@@ -10,7 +10,7 @@ * by sam lantinga slouken@devolution.com */ -/* ported to Weed by G. Finch (salsaman@xs4all.nl) +/* ported to Weed by G. Finch (salsaman@xs4all.nl,salsaman@gmail.com) modifications (c) salsaman 2005 */
View file
LiVES-1.4.8.tar.bz2/m4/Makefile.in -> LiVES-1.4.9.tar.bz2/m4/Makefile.in
Changed
@@ -137,6 +137,10 @@ LIBAVCODEC_LIBS = @LIBAVCODEC_LIBS@ LIBAVFORMAT_CFLAGS = @LIBAVFORMAT_CFLAGS@ LIBAVFORMAT_LIBS = @LIBAVFORMAT_LIBS@ +LIBAVUTIL_CFLAGS = @LIBAVUTIL_CFLAGS@ +LIBAVUTIL_LIBS = @LIBAVUTIL_LIBS@ +LIBBZ_CFLAGS = @LIBBZ_CFLAGS@ +LIBBZ_LIBS = @LIBBZ_LIBS@ LIBDV_CFLAGS = @LIBDV_CFLAGS@ LIBDV_LIBS = @LIBDV_LIBS@ LIBICONV = @LIBICONV@ @@ -150,6 +154,8 @@ LIBSWSCALE_LIBS = @LIBSWSCALE_LIBS@ LIBTHREAD = @LIBTHREAD@ LIBTOOL = @LIBTOOL@ +LIBZ_CFLAGS = @LIBZ_CFLAGS@ +LIBZ_LIBS = @LIBZ_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBC = @LTLIBC@ @@ -219,6 +225,8 @@ VORBIS_CFLAGS = @VORBIS_CFLAGS@ VORBIS_LIBS = @VORBIS_LIBS@ WEED_CFLAGS = @WEED_CFLAGS@ +WEED_COMPAT_CFLAGS = @WEED_COMPAT_CFLAGS@ +WEED_COMPAT_LIBS = @WEED_COMPAT_LIBS@ WEED_LIBS = @WEED_LIBS@ WEED_PLUGIN_UTILS_CFLAGS = @WEED_PLUGIN_UTILS_CFLAGS@ WEED_PLUGIN_UTILS_LIBS = @WEED_PLUGIN_UTILS_LIBS@
View file
LiVES-1.4.8.tar.bz2/po/ar.po -> LiVES-1.4.9.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-11-26 09:19-0300\n" +"POT-Creation-Date: 2011-12-08 14:51-0300\n" "PO-Revision-Date: 2011-08-18 11:57+0000\n" "Last-Translator: salsaman <salsaman@gmail.com>\n" "Language-Team: Arabic <ar@li.org>\n" @@ -401,7 +401,7 @@ msgid "-debug : try to debug crashes (requires 'gdb' installed)\n" msgstr "- صَحّح : حاول تصحيح الأعطاب (يحتاج تثبيت 'gdb')\n" -#: src/main.c:1818 src/gui.c:1062 +#: src/main.c:1818 src/gui.c:1088 msgid "Starting GUI..." msgstr "بداية تشغيل الواجة الرسومية..." @@ -613,22 +613,22 @@ msgid "LiVES-%s: <No File>" msgstr "" -#: src/main.c:3793 +#: src/main.c:3801 #, c-format msgid "rec %9d/%d" msgstr "" -#: src/main.c:3795 +#: src/main.c:3803 #, c-format msgid "!rec %9d/%d" msgstr "" -#: src/main.c:4013 src/main.c:4014 src/gui.c:2006 src/gui.c:2979 -#: src/saveplay.c:1793 +#: src/main.c:4021 src/main.c:4022 src/gui.c:2032 src/gui.c:3011 +#: src/saveplay.c:1795 msgid "Play" msgstr "شغّل" -#: src/main.c:4477 +#: src/main.c:4497 msgid "" "LiVES was unable to capture this image\n" "\n" @@ -636,35 +636,35 @@ "لم يتمكن برنامج لايفز من إلتقاط هذه الصورة\n" "\n" -#: src/main.c:4575 +#: src/main.c:4599 #, c-format msgid "Closed file %s\n" msgstr "ملف مغلق %s\n" -#: src/main.c:4741 src/gui.c:596 src/utils.c:2618 src/utils.c:2650 -#: src/saveplay.c:2758 src/multitrack.c:3882 src/multitrack.c:5393 +#: src/main.c:4765 src/gui.c:622 src/utils.c:2618 src/utils.c:2650 +#: src/saveplay.c:2760 src/multitrack.c:3884 src/multitrack.c:5426 msgid "_Undo" msgstr "_تراجع" -#: src/main.c:4742 src/gui.c:609 src/utils.c:2619 src/utils.c:2651 -#: src/saveplay.c:2759 src/multitrack.c:3903 src/multitrack.c:5416 +#: src/main.c:4766 src/gui.c:635 src/utils.c:2619 src/utils.c:2651 +#: src/saveplay.c:2761 src/multitrack.c:3905 src/multitrack.c:5449 msgid "_Redo" msgstr "_كرّر" -#: src/main.c:4768 src/interface.c:642 src/gui.c:2164 src/preferences.c:2381 +#: src/main.c:4792 src/interface.c:642 src/gui.c:2190 src/preferences.c:2381 #: src/resample.c:1790 msgid "Video" msgstr "فيديو" -#: src/main.c:4769 src/interface.c:661 src/gui.c:2183 +#: src/main.c:4793 src/interface.c:661 src/gui.c:2209 msgid "Left Audio" msgstr "الصوت الأيسر" -#: src/main.c:4770 src/gui.c:2201 +#: src/main.c:4794 src/gui.c:2227 msgid "Right Audio" msgstr "الصوت الأيمن" -#: src/main.c:4815 +#: src/main.c:4839 msgid "" "\n" "\n" @@ -793,7 +793,7 @@ msgid "Use _mplayer audio player" msgstr "" -#: src/startup.c:402 src/startup.c:591 src/interface.c:1988 +#: src/startup.c:402 src/startup.c:591 src/interface.c:2111 msgid "_Next" msgstr "" @@ -955,10 +955,10 @@ msgid "If this is set, frames will be deinterlaced as they are imported." msgstr "" -#: src/interface.c:190 src/callbacks.c:7763 src/gui.c:2982 src/gui.c:3523 -#: src/saveplay.c:1796 src/saveplay.c:2425 src/dialogs.c:859 src/dialogs.c:860 +#: src/interface.c:190 src/callbacks.c:7908 src/gui.c:3014 src/gui.c:3555 +#: src/saveplay.c:1798 src/saveplay.c:2427 src/dialogs.c:859 src/dialogs.c:860 #: src/dialogs.c:1035 src/dialogs.c:1036 src/framedraw.c:189 -#: src/multitrack.c:6965 +#: src/multitrack.c:6998 msgid "Preview" msgstr "معاينة" @@ -987,7 +987,7 @@ "Remember to switch off effects (ctrl-0) afterwards !" msgstr "" -#: src/interface.c:339 src/callbacks.c:7535 src/callbacks.c:7567 +#: src/interface.c:339 src/callbacks.c:7680 src/callbacks.c:7712 #: src/dialogs.c:1846 msgid "" "\n" @@ -1012,7 +1012,7 @@ msgid "Paus_e" msgstr "" -#: src/interface.c:409 src/callbacks.c:7564 +#: src/interface.c:409 src/callbacks.c:7709 msgid "Pause/_Enough" msgstr "" @@ -1040,7 +1040,7 @@ msgid "Total time" msgstr "إجمالي الوقت" -#: src/interface.c:623 src/interface.c:2508 +#: src/interface.c:623 src/interface.c:2635 msgid "FPS" msgstr "" @@ -1160,11 +1160,15 @@ msgid " Number of frames to open" msgstr " عدد من الأطر لفتح" -#: src/interface.c:1691 +#: src/interface.c:1702 msgid "LiVES: - Open Location" msgstr "" -#: src/interface.c:1696 +#: src/interface.c:1704 +msgid "LiVES: - Open Youtube Clip" +msgstr "" + +#: src/interface.c:1710 msgid "" "\n" "\n" @@ -1174,19 +1178,55 @@ "\n" msgstr "" -#: src/interface.c:1708 +#: src/interface.c:1713 +msgid "" +"\n" +"\n" +"To open a clip from Youtube, LiVES will first download it with youtube-dl.\n" +"Please make sure you have the latest version of that tool installed.\n" +"\n" +msgstr "" + +#: src/interface.c:1722 +msgid "" +"Enter the URL of the clip below.\n" +"E.g: http://www.youtube.com/watch?v=WCR6f6WzjP8\n" +"\n" +msgstr "" + +#: src/interface.c:1737 msgid "URL : " msgstr "" -#: src/interface.c:1724 +#: src/interface.c:1739 +msgid "Youtube URL : " +msgstr "" + +#: src/interface.c:1759 msgid "Do not send bandwidth information" msgstr "لا ترسل معلومات النطاق الترددي" -#: src/interface.c:1725 +#: src/interface.c:1760 msgid "Try this setting if you are having problems getting a stream" msgstr "حاول هذا الإعداد إذا كنت تواجه مشاكل في الحصول على دفق" -#: src/interface.c:1838 +#: src/interface.c:1797
View file
LiVES-1.4.8.tar.bz2/po/ca.po -> LiVES-1.4.9.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-11-26 09:19-0300\n" +"POT-Creation-Date: 2011-12-08 14:51-0300\n" "PO-Revision-Date: 2011-08-18 12:08+0000\n" "Last-Translator: salsaman <salsaman@gmail.com>\n" "Language-Team: Catalan <ca@li.org>\n" @@ -395,7 +395,7 @@ msgstr "" "-debug : tractar d'accidents de depuració (requereix 'gdb' instal lat)\n" -#: src/main.c:1818 src/gui.c:1062 +#: src/main.c:1818 src/gui.c:1088 msgid "Starting GUI..." msgstr "A partir GUI ..." @@ -546,56 +546,56 @@ msgid "LiVES-%s: <No File>" msgstr "LiVES-%s: <N d'arxiu>" -#: src/main.c:3793 +#: src/main.c:3801 #, c-format msgid "rec %9d/%d" msgstr "" -#: src/main.c:3795 +#: src/main.c:3803 #, c-format msgid "!rec %9d/%d" msgstr "" -#: src/main.c:4013 src/main.c:4014 src/gui.c:2006 src/gui.c:2979 -#: src/saveplay.c:1793 +#: src/main.c:4021 src/main.c:4022 src/gui.c:2032 src/gui.c:3011 +#: src/saveplay.c:1795 msgid "Play" msgstr "Reprodueix" -#: src/main.c:4477 +#: src/main.c:4497 msgid "" "LiVES was unable to capture this image\n" "\n" msgstr "" -#: src/main.c:4575 +#: src/main.c:4599 #, c-format msgid "Closed file %s\n" msgstr "Tancat el fitxer %s\n" -#: src/main.c:4741 src/gui.c:596 src/utils.c:2618 src/utils.c:2650 -#: src/saveplay.c:2758 src/multitrack.c:3882 src/multitrack.c:5393 +#: src/main.c:4765 src/gui.c:622 src/utils.c:2618 src/utils.c:2650 +#: src/saveplay.c:2760 src/multitrack.c:3884 src/multitrack.c:5426 msgid "_Undo" msgstr "_Desfés" -#: src/main.c:4742 src/gui.c:609 src/utils.c:2619 src/utils.c:2651 -#: src/saveplay.c:2759 src/multitrack.c:3903 src/multitrack.c:5416 +#: src/main.c:4766 src/gui.c:635 src/utils.c:2619 src/utils.c:2651 +#: src/saveplay.c:2761 src/multitrack.c:3905 src/multitrack.c:5449 msgid "_Redo" msgstr "_Refés" -#: src/main.c:4768 src/interface.c:642 src/gui.c:2164 src/preferences.c:2381 +#: src/main.c:4792 src/interface.c:642 src/gui.c:2190 src/preferences.c:2381 #: src/resample.c:1790 msgid "Video" msgstr "Vídeo" -#: src/main.c:4769 src/interface.c:661 src/gui.c:2183 +#: src/main.c:4793 src/interface.c:661 src/gui.c:2209 msgid "Left Audio" msgstr "" -#: src/main.c:4770 src/gui.c:2201 +#: src/main.c:4794 src/gui.c:2227 msgid "Right Audio" msgstr "" -#: src/main.c:4815 +#: src/main.c:4839 msgid "" "\n" "\n" @@ -722,7 +722,7 @@ msgid "Use _mplayer audio player" msgstr "" -#: src/startup.c:402 src/startup.c:591 src/interface.c:1988 +#: src/startup.c:402 src/startup.c:591 src/interface.c:2111 msgid "_Next" msgstr "_Següent" @@ -884,10 +884,10 @@ msgid "If this is set, frames will be deinterlaced as they are imported." msgstr "" -#: src/interface.c:190 src/callbacks.c:7763 src/gui.c:2982 src/gui.c:3523 -#: src/saveplay.c:1796 src/saveplay.c:2425 src/dialogs.c:859 src/dialogs.c:860 +#: src/interface.c:190 src/callbacks.c:7908 src/gui.c:3014 src/gui.c:3555 +#: src/saveplay.c:1798 src/saveplay.c:2427 src/dialogs.c:859 src/dialogs.c:860 #: src/dialogs.c:1035 src/dialogs.c:1036 src/framedraw.c:189 -#: src/multitrack.c:6965 +#: src/multitrack.c:6998 msgid "Preview" msgstr "Visualització prèvia" @@ -921,7 +921,7 @@ "\n" "Recordeu apagar els efectes (ctrl-0) després !" -#: src/interface.c:339 src/callbacks.c:7535 src/callbacks.c:7567 +#: src/interface.c:339 src/callbacks.c:7680 src/callbacks.c:7712 #: src/dialogs.c:1846 msgid "" "\n" @@ -946,7 +946,7 @@ msgid "Paus_e" msgstr "" -#: src/interface.c:409 src/callbacks.c:7564 +#: src/interface.c:409 src/callbacks.c:7709 msgid "Pause/_Enough" msgstr "" @@ -974,7 +974,7 @@ msgid "Total time" msgstr "Temps total" -#: src/interface.c:623 src/interface.c:2508 +#: src/interface.c:623 src/interface.c:2635 msgid "FPS" msgstr "QPS" @@ -1094,11 +1094,16 @@ msgid " Number of frames to open" msgstr "" -#: src/interface.c:1691 +#: src/interface.c:1702 msgid "LiVES: - Open Location" msgstr "" -#: src/interface.c:1696 +#: src/interface.c:1704 +#, fuzzy +msgid "LiVES: - Open Youtube Clip" +msgstr "LiVES: - De selecció obert" + +#: src/interface.c:1710 msgid "" "\n" "\n" @@ -1108,20 +1113,57 @@ "\n" msgstr "" -#: src/interface.c:1708 +#: src/interface.c:1713 +msgid "" +"\n" +"\n" +"To open a clip from Youtube, LiVES will first download it with youtube-dl.\n" +"Please make sure you have the latest version of that tool installed.\n" +"\n" +msgstr "" + +#: src/interface.c:1722 +msgid "" +"Enter the URL of the clip below.\n" +"E.g: http://www.youtube.com/watch?v=WCR6f6WzjP8\n" +"\n" +msgstr "" + +#: src/interface.c:1737 msgid "URL : " msgstr "URL : " -#: src/interface.c:1724 +#: src/interface.c:1739 +#, fuzzy +msgid "Youtube URL : " +msgstr "URL : " + +#: src/interface.c:1759 msgid "Do not send bandwidth information" msgstr "No enviï informació d'ample de banda" -#: src/interface.c:1725 +#: src/interface.c:1760 msgid "Try this setting if you are having problems getting a stream" msgstr "" "Proveu aquesta opció si vostè està tenint problemes per aconseguir un flux de" -#: src/interface.c:1838
View file
LiVES-1.4.8.tar.bz2/po/cs.po -> LiVES-1.4.9.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-11-26 09:19-0300\n" +"POT-Creation-Date: 2011-12-08 14:51-0300\n" "PO-Revision-Date: 2011-08-18 12:09+0000\n" "Last-Translator: salsaman <salsaman@gmail.com>\n" "Language-Team: <martin@svobodicz.com, ales@mur.at>\n" @@ -395,7 +395,7 @@ msgid "-debug : try to debug crashes (requires 'gdb' installed)\n" msgstr "-debug : próby debugowania awarii (wymaga 'gdb' zainstalowane)\n" -#: src/main.c:1818 src/gui.c:1062 +#: src/main.c:1818 src/gui.c:1088 msgid "Starting GUI..." msgstr "Startuji grafické rozhraní..." @@ -604,22 +604,22 @@ msgid "LiVES-%s: <No File>" msgstr "LiVES-%s: <žádný soubor>" -#: src/main.c:3793 +#: src/main.c:3801 #, c-format msgid "rec %9d/%d" msgstr "" -#: src/main.c:3795 +#: src/main.c:3803 #, c-format msgid "!rec %9d/%d" msgstr "" -#: src/main.c:4013 src/main.c:4014 src/gui.c:2006 src/gui.c:2979 -#: src/saveplay.c:1793 +#: src/main.c:4021 src/main.c:4022 src/gui.c:2032 src/gui.c:3011 +#: src/saveplay.c:1795 msgid "Play" msgstr "Přehrát" -#: src/main.c:4477 +#: src/main.c:4497 msgid "" "LiVES was unable to capture this image\n" "\n" @@ -627,35 +627,35 @@ "LiVES nebyl schopen zachytit tento obrázek\n" "\n" -#: src/main.c:4575 +#: src/main.c:4599 #, c-format msgid "Closed file %s\n" msgstr "Zavřený soubor %s\n" -#: src/main.c:4741 src/gui.c:596 src/utils.c:2618 src/utils.c:2650 -#: src/saveplay.c:2758 src/multitrack.c:3882 src/multitrack.c:5393 +#: src/main.c:4765 src/gui.c:622 src/utils.c:2618 src/utils.c:2650 +#: src/saveplay.c:2760 src/multitrack.c:3884 src/multitrack.c:5426 msgid "_Undo" msgstr "_Zpět" -#: src/main.c:4742 src/gui.c:609 src/utils.c:2619 src/utils.c:2651 -#: src/saveplay.c:2759 src/multitrack.c:3903 src/multitrack.c:5416 +#: src/main.c:4766 src/gui.c:635 src/utils.c:2619 src/utils.c:2651 +#: src/saveplay.c:2761 src/multitrack.c:3905 src/multitrack.c:5449 msgid "_Redo" msgstr "_Znovu" -#: src/main.c:4768 src/interface.c:642 src/gui.c:2164 src/preferences.c:2381 +#: src/main.c:4792 src/interface.c:642 src/gui.c:2190 src/preferences.c:2381 #: src/resample.c:1790 msgid "Video" msgstr "Video" -#: src/main.c:4769 src/interface.c:661 src/gui.c:2183 +#: src/main.c:4793 src/interface.c:661 src/gui.c:2209 msgid "Left Audio" msgstr "Levý zvuk" -#: src/main.c:4770 src/gui.c:2201 +#: src/main.c:4794 src/gui.c:2227 msgid "Right Audio" msgstr "Pravý zvuk" -#: src/main.c:4815 +#: src/main.c:4839 msgid "" "\n" "\n" @@ -789,7 +789,7 @@ msgid "Use _mplayer audio player" msgstr "Použijte _mplayer audio přehrávač" -#: src/startup.c:402 src/startup.c:591 src/interface.c:1988 +#: src/startup.c:402 src/startup.c:591 src/interface.c:2111 msgid "_Next" msgstr "" @@ -953,10 +953,10 @@ "Je-li zapnuto, ze snímků bude odstraněno prokládání tak, jak jsou " "importovány." -#: src/interface.c:190 src/callbacks.c:7763 src/gui.c:2982 src/gui.c:3523 -#: src/saveplay.c:1796 src/saveplay.c:2425 src/dialogs.c:859 src/dialogs.c:860 +#: src/interface.c:190 src/callbacks.c:7908 src/gui.c:3014 src/gui.c:3555 +#: src/saveplay.c:1798 src/saveplay.c:2427 src/dialogs.c:859 src/dialogs.c:860 #: src/dialogs.c:1035 src/dialogs.c:1036 src/framedraw.c:189 -#: src/multitrack.c:6965 +#: src/multitrack.c:6998 msgid "Preview" msgstr "Náhled" @@ -991,7 +991,7 @@ "\n" "Nezapomeňte poté vypnout (ctrl-0) efekty!" -#: src/interface.c:339 src/callbacks.c:7535 src/callbacks.c:7567 +#: src/interface.c:339 src/callbacks.c:7680 src/callbacks.c:7712 #: src/dialogs.c:1846 msgid "" "\n" @@ -1016,7 +1016,7 @@ msgid "Paus_e" msgstr "" -#: src/interface.c:409 src/callbacks.c:7564 +#: src/interface.c:409 src/callbacks.c:7709 msgid "Pause/_Enough" msgstr "" @@ -1044,7 +1044,7 @@ msgid "Total time" msgstr "Celkovy čas" -#: src/interface.c:623 src/interface.c:2508 +#: src/interface.c:623 src/interface.c:2635 msgid "FPS" msgstr "FPS" @@ -1168,11 +1168,16 @@ msgid " Number of frames to open" msgstr " Počet snímků k otevření" -#: src/interface.c:1691 +#: src/interface.c:1702 msgid "LiVES: - Open Location" msgstr "LiVES: - Otevřít umístění" -#: src/interface.c:1696 +#: src/interface.c:1704 +#, fuzzy +msgid "LiVES: - Open Youtube Clip" +msgstr "LiVES: - Přejmenovat klip" + +#: src/interface.c:1710 msgid "" "\n" "\n" @@ -1188,19 +1193,56 @@ "Dále se ujistěte, zda máte nastavenou šířku pásma v Nastavení > Streamování\n" "\n" -#: src/interface.c:1708 +#: src/interface.c:1713 +msgid "" +"\n" +"\n" +"To open a clip from Youtube, LiVES will first download it with youtube-dl.\n" +"Please make sure you have the latest version of that tool installed.\n" +"\n" +msgstr "" + +#: src/interface.c:1722 +msgid "" +"Enter the URL of the clip below.\n" +"E.g: http://www.youtube.com/watch?v=WCR6f6WzjP8\n" +"\n" +msgstr "" + +#: src/interface.c:1737 msgid "URL : " msgstr "URL : " -#: src/interface.c:1724 +#: src/interface.c:1739 +#, fuzzy +msgid "Youtube URL : " +msgstr "URL : " + +#: src/interface.c:1759 msgid "Do not send bandwidth information" msgstr "Neposílat informace o šířce pásma" -#: src/interface.c:1725 +#: src/interface.c:1760 msgid "Try this setting if you are having problems getting a stream" msgstr "Máte-li problém s příjmem, zkuste toto nastavení"
View file
LiVES-1.4.8.tar.bz2/po/da.po -> LiVES-1.4.9.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-11-26 09:19-0300\n" +"POT-Creation-Date: 2011-12-08 14:51-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" @@ -373,7 +373,7 @@ msgid "-debug : try to debug crashes (requires 'gdb' installed)\n" msgstr "" -#: src/main.c:1818 src/gui.c:1062 +#: src/main.c:1818 src/gui.c:1088 msgid "Starting GUI..." msgstr "" @@ -524,56 +524,56 @@ msgid "LiVES-%s: <No File>" msgstr "" -#: src/main.c:3793 +#: src/main.c:3801 #, c-format msgid "rec %9d/%d" msgstr "" -#: src/main.c:3795 +#: src/main.c:3803 #, c-format msgid "!rec %9d/%d" msgstr "" -#: src/main.c:4013 src/main.c:4014 src/gui.c:2006 src/gui.c:2979 -#: src/saveplay.c:1793 +#: src/main.c:4021 src/main.c:4022 src/gui.c:2032 src/gui.c:3011 +#: src/saveplay.c:1795 msgid "Play" msgstr "Afspil" -#: src/main.c:4477 +#: src/main.c:4497 msgid "" "LiVES was unable to capture this image\n" "\n" msgstr "" -#: src/main.c:4575 +#: src/main.c:4599 #, c-format msgid "Closed file %s\n" msgstr "" -#: src/main.c:4741 src/gui.c:596 src/utils.c:2618 src/utils.c:2650 -#: src/saveplay.c:2758 src/multitrack.c:3882 src/multitrack.c:5393 +#: src/main.c:4765 src/gui.c:622 src/utils.c:2618 src/utils.c:2650 +#: src/saveplay.c:2760 src/multitrack.c:3884 src/multitrack.c:5426 msgid "_Undo" msgstr "Fortryd" -#: src/main.c:4742 src/gui.c:609 src/utils.c:2619 src/utils.c:2651 -#: src/saveplay.c:2759 src/multitrack.c:3903 src/multitrack.c:5416 +#: src/main.c:4766 src/gui.c:635 src/utils.c:2619 src/utils.c:2651 +#: src/saveplay.c:2761 src/multitrack.c:3905 src/multitrack.c:5449 msgid "_Redo" msgstr "" -#: src/main.c:4768 src/interface.c:642 src/gui.c:2164 src/preferences.c:2381 +#: src/main.c:4792 src/interface.c:642 src/gui.c:2190 src/preferences.c:2381 #: src/resample.c:1790 msgid "Video" msgstr "Video" -#: src/main.c:4769 src/interface.c:661 src/gui.c:2183 +#: src/main.c:4793 src/interface.c:661 src/gui.c:2209 msgid "Left Audio" msgstr "" -#: src/main.c:4770 src/gui.c:2201 +#: src/main.c:4794 src/gui.c:2227 msgid "Right Audio" msgstr "" -#: src/main.c:4815 +#: src/main.c:4839 msgid "" "\n" "\n" @@ -700,7 +700,7 @@ msgid "Use _mplayer audio player" msgstr "" -#: src/startup.c:402 src/startup.c:591 src/interface.c:1988 +#: src/startup.c:402 src/startup.c:591 src/interface.c:2111 msgid "_Next" msgstr "_Næste" @@ -862,10 +862,10 @@ msgid "If this is set, frames will be deinterlaced as they are imported." msgstr "" -#: src/interface.c:190 src/callbacks.c:7763 src/gui.c:2982 src/gui.c:3523 -#: src/saveplay.c:1796 src/saveplay.c:2425 src/dialogs.c:859 src/dialogs.c:860 +#: src/interface.c:190 src/callbacks.c:7908 src/gui.c:3014 src/gui.c:3555 +#: src/saveplay.c:1798 src/saveplay.c:2427 src/dialogs.c:859 src/dialogs.c:860 #: src/dialogs.c:1035 src/dialogs.c:1036 src/framedraw.c:189 -#: src/multitrack.c:6965 +#: src/multitrack.c:6998 msgid "Preview" msgstr "Forhåndsvisning" @@ -894,7 +894,7 @@ "Remember to switch off effects (ctrl-0) afterwards !" msgstr "" -#: src/interface.c:339 src/callbacks.c:7535 src/callbacks.c:7567 +#: src/interface.c:339 src/callbacks.c:7680 src/callbacks.c:7712 #: src/dialogs.c:1846 msgid "" "\n" @@ -919,7 +919,7 @@ msgid "Paus_e" msgstr "" -#: src/interface.c:409 src/callbacks.c:7564 +#: src/interface.c:409 src/callbacks.c:7709 msgid "Pause/_Enough" msgstr "" @@ -947,7 +947,7 @@ msgid "Total time" msgstr "Tid i alt" -#: src/interface.c:623 src/interface.c:2508 +#: src/interface.c:623 src/interface.c:2635 msgid "FPS" msgstr "FPS" @@ -1067,11 +1067,16 @@ msgid " Number of frames to open" msgstr "" -#: src/interface.c:1691 +#: src/interface.c:1702 msgid "LiVES: - Open Location" msgstr "" -#: src/interface.c:1696 +#: src/interface.c:1704 +#, fuzzy +msgid "LiVES: - Open Youtube Clip" +msgstr "LiVES: - Indstillinger" + +#: src/interface.c:1710 msgid "" "\n" "\n" @@ -1081,19 +1086,56 @@ "\n" msgstr "" -#: src/interface.c:1708 +#: src/interface.c:1713 +msgid "" +"\n" +"\n" +"To open a clip from Youtube, LiVES will first download it with youtube-dl.\n" +"Please make sure you have the latest version of that tool installed.\n" +"\n" +msgstr "" + +#: src/interface.c:1722 +msgid "" +"Enter the URL of the clip below.\n" +"E.g: http://www.youtube.com/watch?v=WCR6f6WzjP8\n" +"\n" +msgstr "" + +#: src/interface.c:1737 msgid "URL : " msgstr "URL : " -#: src/interface.c:1724 +#: src/interface.c:1739 +#, fuzzy +msgid "Youtube URL : " +msgstr "URL : " + +#: src/interface.c:1759 msgid "Do not send bandwidth information" msgstr "" -#: src/interface.c:1725 +#: src/interface.c:1760 msgid "Try this setting if you are having problems getting a stream" msgstr "" -#: src/interface.c:1838 +#: src/interface.c:1797
View file
LiVES-1.4.8.tar.bz2/po/de_DE.po -> LiVES-1.4.9.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-11-26 09:19-0300\n" +"POT-Creation-Date: 2011-12-08 14:51-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" @@ -401,7 +401,7 @@ msgstr "" "-debug : versuchen, Abstürze zu debuggen (erfordert installiertes 'gdb')\n" -#: src/main.c:1818 src/gui.c:1062 +#: src/main.c:1818 src/gui.c:1088 msgid "Starting GUI..." msgstr "Starte die grafische Oberfläche..." @@ -615,22 +615,22 @@ msgid "LiVES-%s: <No File>" msgstr "LiVES-%s: <Keine Datei geöffnet>" -#: src/main.c:3793 +#: src/main.c:3801 #, c-format msgid "rec %9d/%d" msgstr "" -#: src/main.c:3795 +#: src/main.c:3803 #, c-format msgid "!rec %9d/%d" msgstr "" -#: src/main.c:4013 src/main.c:4014 src/gui.c:2006 src/gui.c:2979 -#: src/saveplay.c:1793 +#: src/main.c:4021 src/main.c:4022 src/gui.c:2032 src/gui.c:3011 +#: src/saveplay.c:1795 msgid "Play" msgstr "Spiele" -#: src/main.c:4477 +#: src/main.c:4497 msgid "" "LiVES was unable to capture this image\n" "\n" @@ -638,35 +638,35 @@ "LiVES konnte dieses Abbild nicht aufzeichnen\n" "\n" -#: src/main.c:4575 +#: src/main.c:4599 #, c-format msgid "Closed file %s\n" msgstr "Datei %s geschlossen\n" -#: src/main.c:4741 src/gui.c:596 src/utils.c:2618 src/utils.c:2650 -#: src/saveplay.c:2758 src/multitrack.c:3882 src/multitrack.c:5393 +#: src/main.c:4765 src/gui.c:622 src/utils.c:2618 src/utils.c:2650 +#: src/saveplay.c:2760 src/multitrack.c:3884 src/multitrack.c:5426 msgid "_Undo" msgstr "_Rückgängig machen" -#: src/main.c:4742 src/gui.c:609 src/utils.c:2619 src/utils.c:2651 -#: src/saveplay.c:2759 src/multitrack.c:3903 src/multitrack.c:5416 +#: src/main.c:4766 src/gui.c:635 src/utils.c:2619 src/utils.c:2651 +#: src/saveplay.c:2761 src/multitrack.c:3905 src/multitrack.c:5449 msgid "_Redo" msgstr "_Wiederholen" -#: src/main.c:4768 src/interface.c:642 src/gui.c:2164 src/preferences.c:2381 +#: src/main.c:4792 src/interface.c:642 src/gui.c:2190 src/preferences.c:2381 #: src/resample.c:1790 msgid "Video" msgstr "Film" -#: src/main.c:4769 src/interface.c:661 src/gui.c:2183 +#: src/main.c:4793 src/interface.c:661 src/gui.c:2209 msgid "Left Audio" msgstr "Linker Tonkanal" -#: src/main.c:4770 src/gui.c:2201 +#: src/main.c:4794 src/gui.c:2227 msgid "Right Audio" msgstr "Rechter Tonkanal" -#: src/main.c:4815 +#: src/main.c:4839 msgid "" "\n" "\n" @@ -837,7 +837,7 @@ msgid "Use _mplayer audio player" msgstr "Benutze _MPlayer Audioplayer" -#: src/startup.c:402 src/startup.c:591 src/interface.c:1988 +#: src/startup.c:402 src/startup.c:591 src/interface.c:2111 msgid "_Next" msgstr "_Nächste" @@ -1009,10 +1009,10 @@ msgid "If this is set, frames will be deinterlaced as they are imported." msgstr "Wenn aktiviert, werden Frames beim Import deinterlaced." -#: src/interface.c:190 src/callbacks.c:7763 src/gui.c:2982 src/gui.c:3523 -#: src/saveplay.c:1796 src/saveplay.c:2425 src/dialogs.c:859 src/dialogs.c:860 +#: src/interface.c:190 src/callbacks.c:7908 src/gui.c:3014 src/gui.c:3555 +#: src/saveplay.c:1798 src/saveplay.c:2427 src/dialogs.c:859 src/dialogs.c:860 #: src/dialogs.c:1035 src/dialogs.c:1036 src/framedraw.c:189 -#: src/multitrack.c:6965 +#: src/multitrack.c:6998 msgid "Preview" msgstr "Vorschau" @@ -1049,7 +1049,7 @@ "\n" "Denken sie daran, die Effekte danach auszuschalten (Strg-0)!" -#: src/interface.c:339 src/callbacks.c:7535 src/callbacks.c:7567 +#: src/interface.c:339 src/callbacks.c:7680 src/callbacks.c:7712 #: src/dialogs.c:1846 msgid "" "\n" @@ -1074,7 +1074,7 @@ msgid "Paus_e" msgstr "" -#: src/interface.c:409 src/callbacks.c:7564 +#: src/interface.c:409 src/callbacks.c:7709 msgid "Pause/_Enough" msgstr "" @@ -1102,7 +1102,7 @@ msgid "Total time" msgstr "Gesamtzeit" -#: src/interface.c:623 src/interface.c:2508 +#: src/interface.c:623 src/interface.c:2635 msgid "FPS" msgstr "BPS (Bilder pro Sekunde)" @@ -1230,11 +1230,16 @@ msgid " Number of frames to open" msgstr " Anzahl der einzulesenden Bilder" -#: src/interface.c:1691 +#: src/interface.c:1702 msgid "LiVES: - Open Location" msgstr "LiVES: - Öffne im Netzwerk" -#: src/interface.c:1696 +#: src/interface.c:1704 +#, fuzzy +msgid "LiVES: - Open Youtube Clip" +msgstr "LiVES: - Filmausschnitt umbenennen" + +#: src/interface.c:1710 msgid "" "\n" "\n" @@ -1250,21 +1255,58 @@ "und dass sie die Bandbreite über Einstelungen/Streaming gesetzt haben.\n" "\n" -#: src/interface.c:1708 +#: src/interface.c:1713 +msgid "" +"\n" +"\n" +"To open a clip from Youtube, LiVES will first download it with youtube-dl.\n" +"Please make sure you have the latest version of that tool installed.\n" +"\n" +msgstr "" + +#: src/interface.c:1722 +msgid "" +"Enter the URL of the clip below.\n" +"E.g: http://www.youtube.com/watch?v=WCR6f6WzjP8\n" +"\n" +msgstr "" + +#: src/interface.c:1737 msgid "URL : " msgstr "URL: " -#: src/interface.c:1724 +#: src/interface.c:1739 +#, fuzzy +msgid "Youtube URL : " +msgstr "URL: " + +#: src/interface.c:1759 msgid "Do not send bandwidth information" msgstr "Sende keine Informationen über die verwendete Bandbreite" -#: src/interface.c:1725 +#: src/interface.c:1760 msgid "Try this setting if you are having problems getting a stream" msgstr "" "Versuchen Sie diese Einstellung falls Sie Probleme beim Empfang des "
View file
LiVES-1.4.8.tar.bz2/po/en_GB.po -> LiVES-1.4.9.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-11-26 09:19-0300\n" +"POT-Creation-Date: 2011-12-08 14:51-0300\n" "PO-Revision-Date: 2011-08-18 12:08+0000\n" "Last-Translator: salsaman <salsaman@gmail.com>\n" "Language-Team: English (United Kingdom) <en_GB@li.org>\n" @@ -401,7 +401,7 @@ msgid "-debug : try to debug crashes (requires 'gdb' installed)\n" msgstr "-debug : try to debug crashes (requires 'gdb' installed)\n" -#: src/main.c:1818 src/gui.c:1062 +#: src/main.c:1818 src/gui.c:1088 msgid "Starting GUI..." msgstr "Starting GUI..." @@ -612,22 +612,22 @@ msgid "LiVES-%s: <No File>" msgstr "LiVES-%s: <No File>" -#: src/main.c:3793 +#: src/main.c:3801 #, c-format msgid "rec %9d/%d" msgstr "" -#: src/main.c:3795 +#: src/main.c:3803 #, c-format msgid "!rec %9d/%d" msgstr "" -#: src/main.c:4013 src/main.c:4014 src/gui.c:2006 src/gui.c:2979 -#: src/saveplay.c:1793 +#: src/main.c:4021 src/main.c:4022 src/gui.c:2032 src/gui.c:3011 +#: src/saveplay.c:1795 msgid "Play" msgstr "Play" -#: src/main.c:4477 +#: src/main.c:4497 msgid "" "LiVES was unable to capture this image\n" "\n" @@ -635,35 +635,35 @@ "LiVES was unable to capture this image\n" "\n" -#: src/main.c:4575 +#: src/main.c:4599 #, c-format msgid "Closed file %s\n" msgstr "Closed file %s\n" -#: src/main.c:4741 src/gui.c:596 src/utils.c:2618 src/utils.c:2650 -#: src/saveplay.c:2758 src/multitrack.c:3882 src/multitrack.c:5393 +#: src/main.c:4765 src/gui.c:622 src/utils.c:2618 src/utils.c:2650 +#: src/saveplay.c:2760 src/multitrack.c:3884 src/multitrack.c:5426 msgid "_Undo" msgstr "_Undo" -#: src/main.c:4742 src/gui.c:609 src/utils.c:2619 src/utils.c:2651 -#: src/saveplay.c:2759 src/multitrack.c:3903 src/multitrack.c:5416 +#: src/main.c:4766 src/gui.c:635 src/utils.c:2619 src/utils.c:2651 +#: src/saveplay.c:2761 src/multitrack.c:3905 src/multitrack.c:5449 msgid "_Redo" msgstr "_Redo" -#: src/main.c:4768 src/interface.c:642 src/gui.c:2164 src/preferences.c:2381 +#: src/main.c:4792 src/interface.c:642 src/gui.c:2190 src/preferences.c:2381 #: src/resample.c:1790 msgid "Video" msgstr "Video" -#: src/main.c:4769 src/interface.c:661 src/gui.c:2183 +#: src/main.c:4793 src/interface.c:661 src/gui.c:2209 msgid "Left Audio" msgstr "Left Audio" -#: src/main.c:4770 src/gui.c:2201 +#: src/main.c:4794 src/gui.c:2227 msgid "Right Audio" msgstr "Right Audio" -#: src/main.c:4815 +#: src/main.c:4839 msgid "" "\n" "\n" @@ -795,7 +795,7 @@ msgid "Use _mplayer audio player" msgstr "" -#: src/startup.c:402 src/startup.c:591 src/interface.c:1988 +#: src/startup.c:402 src/startup.c:591 src/interface.c:2111 msgid "_Next" msgstr "_Next" @@ -957,10 +957,10 @@ msgid "If this is set, frames will be deinterlaced as they are imported." msgstr "If this is set, frames will be deinterlaced as they are imported." -#: src/interface.c:190 src/callbacks.c:7763 src/gui.c:2982 src/gui.c:3523 -#: src/saveplay.c:1796 src/saveplay.c:2425 src/dialogs.c:859 src/dialogs.c:860 +#: src/interface.c:190 src/callbacks.c:7908 src/gui.c:3014 src/gui.c:3555 +#: src/saveplay.c:1798 src/saveplay.c:2427 src/dialogs.c:859 src/dialogs.c:860 #: src/dialogs.c:1035 src/dialogs.c:1036 src/framedraw.c:189 -#: src/multitrack.c:6965 +#: src/multitrack.c:6998 msgid "Preview" msgstr "Preview" @@ -994,7 +994,7 @@ "\n" "Remember to switch off effects (ctrl-0) afterwards !" -#: src/interface.c:339 src/callbacks.c:7535 src/callbacks.c:7567 +#: src/interface.c:339 src/callbacks.c:7680 src/callbacks.c:7712 #: src/dialogs.c:1846 msgid "" "\n" @@ -1019,7 +1019,7 @@ msgid "Paus_e" msgstr "" -#: src/interface.c:409 src/callbacks.c:7564 +#: src/interface.c:409 src/callbacks.c:7709 msgid "Pause/_Enough" msgstr "" @@ -1047,7 +1047,7 @@ msgid "Total time" msgstr "Total time" -#: src/interface.c:623 src/interface.c:2508 +#: src/interface.c:623 src/interface.c:2635 msgid "FPS" msgstr "FPS" @@ -1171,11 +1171,16 @@ msgid " Number of frames to open" msgstr " Number of frames to open" -#: src/interface.c:1691 +#: src/interface.c:1702 msgid "LiVES: - Open Location" msgstr "LiVES: - Open Location" -#: src/interface.c:1696 +#: src/interface.c:1704 +#, fuzzy +msgid "LiVES: - Open Youtube Clip" +msgstr "LiVES: - Rename Clip" + +#: src/interface.c:1710 msgid "" "\n" "\n" @@ -1191,19 +1196,56 @@ "Also make sure you have set your bandwidth in Preferences|Streaming\n" "\n" -#: src/interface.c:1708 +#: src/interface.c:1713 +msgid "" +"\n" +"\n" +"To open a clip from Youtube, LiVES will first download it with youtube-dl.\n" +"Please make sure you have the latest version of that tool installed.\n" +"\n" +msgstr "" + +#: src/interface.c:1722 +msgid "" +"Enter the URL of the clip below.\n" +"E.g: http://www.youtube.com/watch?v=WCR6f6WzjP8\n" +"\n" +msgstr "" + +#: src/interface.c:1737 msgid "URL : " msgstr "URL : " -#: src/interface.c:1724 +#: src/interface.c:1739 +#, fuzzy +msgid "Youtube URL : " +msgstr "URL : " + +#: src/interface.c:1759 msgid "Do not send bandwidth information" msgstr "Do not send bandwidth information" -#: src/interface.c:1725 +#: src/interface.c:1760 msgid "Try this setting if you are having problems getting a stream" msgstr "Try this setting if you are having problems getting a stream"
View file
LiVES-1.4.8.tar.bz2/po/es.po -> LiVES-1.4.9.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-11-26 09:19-0300\n" +"POT-Creation-Date: 2011-12-08 14:51-0300\n" "PO-Revision-Date: 2011-11-06 20:39+0000\n" "Last-Translator: Fitoschido <fitoschido@gmail.com>\n" "Language-Team: Spanish <es@li.org>\n" @@ -410,7 +410,7 @@ msgid "-debug : try to debug crashes (requires 'gdb' installed)\n" msgstr "-depurar: trata de errores de depuración (requiere 'gdb' instalado)\n" -#: src/main.c:1818 src/gui.c:1062 +#: src/main.c:1818 src/gui.c:1088 msgid "Starting GUI..." msgstr "Iniciando GUI..." @@ -621,22 +621,22 @@ msgid "LiVES-%s: <No File>" msgstr "LiVES-%s: <No hay archivo>" -#: src/main.c:3793 +#: src/main.c:3801 #, c-format msgid "rec %9d/%d" msgstr "rec %9d/%d" -#: src/main.c:3795 +#: src/main.c:3803 #, c-format msgid "!rec %9d/%d" msgstr "!rec %9d/%d" -#: src/main.c:4013 src/main.c:4014 src/gui.c:2006 src/gui.c:2979 -#: src/saveplay.c:1793 +#: src/main.c:4021 src/main.c:4022 src/gui.c:2032 src/gui.c:3011 +#: src/saveplay.c:1795 msgid "Play" msgstr "Reproducir" -#: src/main.c:4477 +#: src/main.c:4497 msgid "" "LiVES was unable to capture this image\n" "\n" @@ -644,35 +644,35 @@ "LiVES no pudo capturar esta imagen\n" "\n" -#: src/main.c:4575 +#: src/main.c:4599 #, c-format msgid "Closed file %s\n" msgstr "Archivo %s cerrado\n" -#: src/main.c:4741 src/gui.c:596 src/utils.c:2618 src/utils.c:2650 -#: src/saveplay.c:2758 src/multitrack.c:3882 src/multitrack.c:5393 +#: src/main.c:4765 src/gui.c:622 src/utils.c:2618 src/utils.c:2650 +#: src/saveplay.c:2760 src/multitrack.c:3884 src/multitrack.c:5426 msgid "_Undo" msgstr "_Deshacer" -#: src/main.c:4742 src/gui.c:609 src/utils.c:2619 src/utils.c:2651 -#: src/saveplay.c:2759 src/multitrack.c:3903 src/multitrack.c:5416 +#: src/main.c:4766 src/gui.c:635 src/utils.c:2619 src/utils.c:2651 +#: src/saveplay.c:2761 src/multitrack.c:3905 src/multitrack.c:5449 msgid "_Redo" msgstr "_Rehacer" -#: src/main.c:4768 src/interface.c:642 src/gui.c:2164 src/preferences.c:2381 +#: src/main.c:4792 src/interface.c:642 src/gui.c:2190 src/preferences.c:2381 #: src/resample.c:1790 msgid "Video" msgstr "Vídeo" -#: src/main.c:4769 src/interface.c:661 src/gui.c:2183 +#: src/main.c:4793 src/interface.c:661 src/gui.c:2209 msgid "Left Audio" msgstr "Audio izquierda" -#: src/main.c:4770 src/gui.c:2201 +#: src/main.c:4794 src/gui.c:2227 msgid "Right Audio" msgstr "Audio derecha" -#: src/main.c:4815 +#: src/main.c:4839 msgid "" "\n" "\n" @@ -840,7 +840,7 @@ msgid "Use _mplayer audio player" msgstr "Usar reproductor _mplayer audio" -#: src/startup.c:402 src/startup.c:591 src/interface.c:1988 +#: src/startup.c:402 src/startup.c:591 src/interface.c:2111 msgid "_Next" msgstr "_Siguiente" @@ -1023,10 +1023,10 @@ msgstr "" "Si esto se elige, los cuadros serán desentrelazados mientras son importados." -#: src/interface.c:190 src/callbacks.c:7763 src/gui.c:2982 src/gui.c:3523 -#: src/saveplay.c:1796 src/saveplay.c:2425 src/dialogs.c:859 src/dialogs.c:860 +#: src/interface.c:190 src/callbacks.c:7908 src/gui.c:3014 src/gui.c:3555 +#: src/saveplay.c:1798 src/saveplay.c:2427 src/dialogs.c:859 src/dialogs.c:860 #: src/dialogs.c:1035 src/dialogs.c:1036 src/framedraw.c:189 -#: src/multitrack.c:6965 +#: src/multitrack.c:6998 msgid "Preview" msgstr "Previsualización" @@ -1062,7 +1062,7 @@ "\n" "¡Recuerde desactivar los efectos (ctrl-0) después!" -#: src/interface.c:339 src/callbacks.c:7535 src/callbacks.c:7567 +#: src/interface.c:339 src/callbacks.c:7680 src/callbacks.c:7712 #: src/dialogs.c:1846 msgid "" "\n" @@ -1087,7 +1087,7 @@ msgid "Paus_e" msgstr "Pau_sa" -#: src/interface.c:409 src/callbacks.c:7564 +#: src/interface.c:409 src/callbacks.c:7709 msgid "Pause/_Enough" msgstr "" @@ -1115,7 +1115,7 @@ msgid "Total time" msgstr "Tiempo total" -#: src/interface.c:623 src/interface.c:2508 +#: src/interface.c:623 src/interface.c:2635 msgid "FPS" msgstr "CPS" @@ -1237,11 +1237,16 @@ msgid " Number of frames to open" msgstr " Número de cuadros a abrir" -#: src/interface.c:1691 +#: src/interface.c:1702 msgid "LiVES: - Open Location" msgstr "LiVES: - Abrir Lugar" -#: src/interface.c:1696 +#: src/interface.c:1704 +#, fuzzy +msgid "LiVES: - Open Youtube Clip" +msgstr "LIVES: Renombrar Clip" + +#: src/interface.c:1710 msgid "" "\n" "\n" @@ -1258,20 +1263,57 @@ "Streaming\n" "\n" -#: src/interface.c:1708 +#: src/interface.c:1713 +msgid "" +"\n" +"\n" +"To open a clip from Youtube, LiVES will first download it with youtube-dl.\n" +"Please make sure you have the latest version of that tool installed.\n" +"\n" +msgstr "" + +#: src/interface.c:1722 +msgid "" +"Enter the URL of the clip below.\n" +"E.g: http://www.youtube.com/watch?v=WCR6f6WzjP8\n" +"\n" +msgstr "" + +#: src/interface.c:1737 msgid "URL : " msgstr "URL : " -#: src/interface.c:1724 +#: src/interface.c:1739 +#, fuzzy +msgid "Youtube URL : " +msgstr "URL : " + +#: src/interface.c:1759 msgid "Do not send bandwidth information" msgstr "No enviar información de ancho de banda" -#: src/interface.c:1725 +#: src/interface.c:1760 msgid "Try this setting if you are having problems getting a stream" msgstr "" "Intente esta configuración si está teniendo problemas al obtener un stream"
View file
LiVES-1.4.8.tar.bz2/po/et.po -> LiVES-1.4.9.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-11-26 09:19-0300\n" +"POT-Creation-Date: 2011-12-08 14:51-0300\n" "PO-Revision-Date: 2011-08-18 12:02+0000\n" "Last-Translator: Tarmo Ilves <tarmo.ilves.001@mail.ee>\n" "Language-Team: Estonian <et@li.org>\n" @@ -387,7 +387,7 @@ msgid "-debug : try to debug crashes (requires 'gdb' installed)\n" msgstr "" -#: src/main.c:1818 src/gui.c:1062 +#: src/main.c:1818 src/gui.c:1088 msgid "Starting GUI..." msgstr "" @@ -538,56 +538,56 @@ msgid "LiVES-%s: <No File>" msgstr "" -#: src/main.c:3793 +#: src/main.c:3801 #, c-format msgid "rec %9d/%d" msgstr "" -#: src/main.c:3795 +#: src/main.c:3803 #, c-format msgid "!rec %9d/%d" msgstr "" -#: src/main.c:4013 src/main.c:4014 src/gui.c:2006 src/gui.c:2979 -#: src/saveplay.c:1793 +#: src/main.c:4021 src/main.c:4022 src/gui.c:2032 src/gui.c:3011 +#: src/saveplay.c:1795 msgid "Play" msgstr "Esita" -#: src/main.c:4477 +#: src/main.c:4497 msgid "" "LiVES was unable to capture this image\n" "\n" msgstr "" -#: src/main.c:4575 +#: src/main.c:4599 #, c-format msgid "Closed file %s\n" msgstr "" -#: src/main.c:4741 src/gui.c:596 src/utils.c:2618 src/utils.c:2650 -#: src/saveplay.c:2758 src/multitrack.c:3882 src/multitrack.c:5393 +#: src/main.c:4765 src/gui.c:622 src/utils.c:2618 src/utils.c:2650 +#: src/saveplay.c:2760 src/multitrack.c:3884 src/multitrack.c:5426 msgid "_Undo" msgstr "Võta _tagasi" -#: src/main.c:4742 src/gui.c:609 src/utils.c:2619 src/utils.c:2651 -#: src/saveplay.c:2759 src/multitrack.c:3903 src/multitrack.c:5416 +#: src/main.c:4766 src/gui.c:635 src/utils.c:2619 src/utils.c:2651 +#: src/saveplay.c:2761 src/multitrack.c:3905 src/multitrack.c:5449 msgid "_Redo" msgstr "_Taasta" -#: src/main.c:4768 src/interface.c:642 src/gui.c:2164 src/preferences.c:2381 +#: src/main.c:4792 src/interface.c:642 src/gui.c:2190 src/preferences.c:2381 #: src/resample.c:1790 msgid "Video" msgstr "Video" -#: src/main.c:4769 src/interface.c:661 src/gui.c:2183 +#: src/main.c:4793 src/interface.c:661 src/gui.c:2209 msgid "Left Audio" msgstr "" -#: src/main.c:4770 src/gui.c:2201 +#: src/main.c:4794 src/gui.c:2227 msgid "Right Audio" msgstr "" -#: src/main.c:4815 +#: src/main.c:4839 msgid "" "\n" "\n" @@ -714,7 +714,7 @@ msgid "Use _mplayer audio player" msgstr "" -#: src/startup.c:402 src/startup.c:591 src/interface.c:1988 +#: src/startup.c:402 src/startup.c:591 src/interface.c:2111 msgid "_Next" msgstr "" @@ -876,10 +876,10 @@ msgid "If this is set, frames will be deinterlaced as they are imported." msgstr "" -#: src/interface.c:190 src/callbacks.c:7763 src/gui.c:2982 src/gui.c:3523 -#: src/saveplay.c:1796 src/saveplay.c:2425 src/dialogs.c:859 src/dialogs.c:860 +#: src/interface.c:190 src/callbacks.c:7908 src/gui.c:3014 src/gui.c:3555 +#: src/saveplay.c:1798 src/saveplay.c:2427 src/dialogs.c:859 src/dialogs.c:860 #: src/dialogs.c:1035 src/dialogs.c:1036 src/framedraw.c:189 -#: src/multitrack.c:6965 +#: src/multitrack.c:6998 msgid "Preview" msgstr "Eelvaade" @@ -908,7 +908,7 @@ "Remember to switch off effects (ctrl-0) afterwards !" msgstr "" -#: src/interface.c:339 src/callbacks.c:7535 src/callbacks.c:7567 +#: src/interface.c:339 src/callbacks.c:7680 src/callbacks.c:7712 #: src/dialogs.c:1846 msgid "" "\n" @@ -933,7 +933,7 @@ msgid "Paus_e" msgstr "" -#: src/interface.c:409 src/callbacks.c:7564 +#: src/interface.c:409 src/callbacks.c:7709 msgid "Pause/_Enough" msgstr "" @@ -961,7 +961,7 @@ msgid "Total time" msgstr "Aeg kokku" -#: src/interface.c:623 src/interface.c:2508 +#: src/interface.c:623 src/interface.c:2635 msgid "FPS" msgstr "FPS" @@ -1081,11 +1081,15 @@ msgid " Number of frames to open" msgstr "" -#: src/interface.c:1691 +#: src/interface.c:1702 msgid "LiVES: - Open Location" msgstr "" -#: src/interface.c:1696 +#: src/interface.c:1704 +msgid "LiVES: - Open Youtube Clip" +msgstr "" + +#: src/interface.c:1710 msgid "" "\n" "\n" @@ -1095,19 +1099,56 @@ "\n" msgstr "" -#: src/interface.c:1708 +#: src/interface.c:1713 +msgid "" +"\n" +"\n" +"To open a clip from Youtube, LiVES will first download it with youtube-dl.\n" +"Please make sure you have the latest version of that tool installed.\n" +"\n" +msgstr "" + +#: src/interface.c:1722 +msgid "" +"Enter the URL of the clip below.\n" +"E.g: http://www.youtube.com/watch?v=WCR6f6WzjP8\n" +"\n" +msgstr "" + +#: src/interface.c:1737 msgid "URL : " msgstr "URL : " -#: src/interface.c:1724 +#: src/interface.c:1739 +#, fuzzy +msgid "Youtube URL : " +msgstr "URL : " + +#: src/interface.c:1759 msgid "Do not send bandwidth information" msgstr "" -#: src/interface.c:1725 +#: src/interface.c:1760 msgid "Try this setting if you are having problems getting a stream" msgstr "" -#: src/interface.c:1838 +#: src/interface.c:1797 +msgid "Download to _Directory : "
View file
LiVES-1.4.8.tar.bz2/po/fi.po -> LiVES-1.4.9.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-11-26 09:19-0300\n" +"POT-Creation-Date: 2011-12-08 14:51-0300\n" "PO-Revision-Date: 2011-10-18 16:25+0000\n" "Last-Translator: Juhani Numminen <juhaninumminen0@gmail.com>\n" "Language-Team: Finnish <fi@li.org>\n" @@ -408,7 +408,7 @@ "-debug : yritä jäljittää kaatumisen aiheuttavaa vikaa (\"gdb\" " "oltava asennettuna)\n" -#: src/main.c:1818 src/gui.c:1062 +#: src/main.c:1818 src/gui.c:1088 msgid "Starting GUI..." msgstr "Käynnistetään graafinen käyttöliittymä..." @@ -594,22 +594,22 @@ msgid "LiVES-%s: <No File>" msgstr "LiVES-%s: <Ei tiedostoa>" -#: src/main.c:3793 +#: src/main.c:3801 #, c-format msgid "rec %9d/%d" msgstr "" -#: src/main.c:3795 +#: src/main.c:3803 #, c-format msgid "!rec %9d/%d" msgstr "" -#: src/main.c:4013 src/main.c:4014 src/gui.c:2006 src/gui.c:2979 -#: src/saveplay.c:1793 +#: src/main.c:4021 src/main.c:4022 src/gui.c:2032 src/gui.c:3011 +#: src/saveplay.c:1795 msgid "Play" msgstr "Toista" -#: src/main.c:4477 +#: src/main.c:4497 msgid "" "LiVES was unable to capture this image\n" "\n" @@ -617,35 +617,35 @@ "LiVES ei pystynyt kaappaamaan tätä kuvaa\n" "\n" -#: src/main.c:4575 +#: src/main.c:4599 #, c-format msgid "Closed file %s\n" msgstr "Tiedosto %s suljettiin\n" -#: src/main.c:4741 src/gui.c:596 src/utils.c:2618 src/utils.c:2650 -#: src/saveplay.c:2758 src/multitrack.c:3882 src/multitrack.c:5393 +#: src/main.c:4765 src/gui.c:622 src/utils.c:2618 src/utils.c:2650 +#: src/saveplay.c:2760 src/multitrack.c:3884 src/multitrack.c:5426 msgid "_Undo" msgstr "Kum_oa" -#: src/main.c:4742 src/gui.c:609 src/utils.c:2619 src/utils.c:2651 -#: src/saveplay.c:2759 src/multitrack.c:3903 src/multitrack.c:5416 +#: src/main.c:4766 src/gui.c:635 src/utils.c:2619 src/utils.c:2651 +#: src/saveplay.c:2761 src/multitrack.c:3905 src/multitrack.c:5449 msgid "_Redo" msgstr "_Tee uudestaan" -#: src/main.c:4768 src/interface.c:642 src/gui.c:2164 src/preferences.c:2381 +#: src/main.c:4792 src/interface.c:642 src/gui.c:2190 src/preferences.c:2381 #: src/resample.c:1790 msgid "Video" msgstr "Video" -#: src/main.c:4769 src/interface.c:661 src/gui.c:2183 +#: src/main.c:4793 src/interface.c:661 src/gui.c:2209 msgid "Left Audio" msgstr "Vasen ääni" -#: src/main.c:4770 src/gui.c:2201 +#: src/main.c:4794 src/gui.c:2227 msgid "Right Audio" msgstr "Oikea ääni" -#: src/main.c:4815 +#: src/main.c:4839 msgid "" "\n" "\n" @@ -808,7 +808,7 @@ msgid "Use _mplayer audio player" msgstr "Käytä _mplayer-äänisoitinta" -#: src/startup.c:402 src/startup.c:591 src/interface.c:1988 +#: src/startup.c:402 src/startup.c:591 src/interface.c:2111 msgid "_Next" msgstr "_Seuraava" @@ -974,10 +974,10 @@ msgid "If this is set, frames will be deinterlaced as they are imported." msgstr "" -#: src/interface.c:190 src/callbacks.c:7763 src/gui.c:2982 src/gui.c:3523 -#: src/saveplay.c:1796 src/saveplay.c:2425 src/dialogs.c:859 src/dialogs.c:860 +#: src/interface.c:190 src/callbacks.c:7908 src/gui.c:3014 src/gui.c:3555 +#: src/saveplay.c:1798 src/saveplay.c:2427 src/dialogs.c:859 src/dialogs.c:860 #: src/dialogs.c:1035 src/dialogs.c:1036 src/framedraw.c:189 -#: src/multitrack.c:6965 +#: src/multitrack.c:6998 msgid "Preview" msgstr "Esikatselu" @@ -1013,7 +1013,7 @@ "\n" "Muista poistaa tehosteet käytöstä (ctrl-0) myöhemmin!" -#: src/interface.c:339 src/callbacks.c:7535 src/callbacks.c:7567 +#: src/interface.c:339 src/callbacks.c:7680 src/callbacks.c:7712 #: src/dialogs.c:1846 msgid "" "\n" @@ -1038,7 +1038,7 @@ msgid "Paus_e" msgstr "" -#: src/interface.c:409 src/callbacks.c:7564 +#: src/interface.c:409 src/callbacks.c:7709 msgid "Pause/_Enough" msgstr "" @@ -1066,7 +1066,7 @@ msgid "Total time" msgstr "Kokonaisaika" -#: src/interface.c:623 src/interface.c:2508 +#: src/interface.c:623 src/interface.c:2635 msgid "FPS" msgstr "FPS" @@ -1188,11 +1188,16 @@ msgid " Number of frames to open" msgstr " Useita kehyksiä avata" -#: src/interface.c:1691 +#: src/interface.c:1702 msgid "LiVES: - Open Location" msgstr "LiVES: - Avaa sijainti" -#: src/interface.c:1696 +#: src/interface.c:1704 +#, fuzzy +msgid "LiVES: - Open Youtube Clip" +msgstr "LiVES: - Nimeä leike uudelleen" + +#: src/interface.c:1710 msgid "" "\n" "\n" @@ -1202,19 +1207,56 @@ "\n" msgstr "" -#: src/interface.c:1708 +#: src/interface.c:1713 +msgid "" +"\n" +"\n" +"To open a clip from Youtube, LiVES will first download it with youtube-dl.\n" +"Please make sure you have the latest version of that tool installed.\n" +"\n" +msgstr "" + +#: src/interface.c:1722 +msgid "" +"Enter the URL of the clip below.\n" +"E.g: http://www.youtube.com/watch?v=WCR6f6WzjP8\n" +"\n" +msgstr "" + +#: src/interface.c:1737 msgid "URL : " msgstr "URL : " -#: src/interface.c:1724 +#: src/interface.c:1739 +#, fuzzy +msgid "Youtube URL : " +msgstr "URL : " + +#: src/interface.c:1759 msgid "Do not send bandwidth information" msgstr "Älä lähetä kaistanleveystietoja" -#: src/interface.c:1725 +#: src/interface.c:1760 msgid "Try this setting if you are having problems getting a stream" msgstr ""
View file
LiVES-1.4.8.tar.bz2/po/fr.po -> LiVES-1.4.9.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-11-26 09:19-0300\n" +"POT-Creation-Date: 2011-12-08 14:51-0300\n" "PO-Revision-Date: 2011-08-18 12:06+0000\n" "Last-Translator: salsaman <salsaman@gmail.com>\n" "Language-Team: Français <kwizart@gmail.com>\n" @@ -410,7 +410,7 @@ msgid "-debug : try to debug crashes (requires 'gdb' installed)\n" msgstr "-debug : essayer de debugger les crashs (nécessite 'gdb' installé)\n" -#: src/main.c:1818 src/gui.c:1062 +#: src/main.c:1818 src/gui.c:1088 msgid "Starting GUI..." msgstr "Démarrage de l'interface graphique..." @@ -625,22 +625,22 @@ msgid "LiVES-%s: <No File>" msgstr "LiVES-%s: <Pas de Fichier>" -#: src/main.c:3793 +#: src/main.c:3801 #, c-format msgid "rec %9d/%d" msgstr "" -#: src/main.c:3795 +#: src/main.c:3803 #, c-format msgid "!rec %9d/%d" msgstr "" -#: src/main.c:4013 src/main.c:4014 src/gui.c:2006 src/gui.c:2979 -#: src/saveplay.c:1793 +#: src/main.c:4021 src/main.c:4022 src/gui.c:2032 src/gui.c:3011 +#: src/saveplay.c:1795 msgid "Play" msgstr "Lecture" -#: src/main.c:4477 +#: src/main.c:4497 msgid "" "LiVES was unable to capture this image\n" "\n" @@ -648,35 +648,35 @@ "LiVES ne peut capturer cette image\n" "\n" -#: src/main.c:4575 +#: src/main.c:4599 #, c-format msgid "Closed file %s\n" msgstr "Fichier Fermé %s\n" -#: src/main.c:4741 src/gui.c:596 src/utils.c:2618 src/utils.c:2650 -#: src/saveplay.c:2758 src/multitrack.c:3882 src/multitrack.c:5393 +#: src/main.c:4765 src/gui.c:622 src/utils.c:2618 src/utils.c:2650 +#: src/saveplay.c:2760 src/multitrack.c:3884 src/multitrack.c:5426 msgid "_Undo" msgstr "_Annuler" -#: src/main.c:4742 src/gui.c:609 src/utils.c:2619 src/utils.c:2651 -#: src/saveplay.c:2759 src/multitrack.c:3903 src/multitrack.c:5416 +#: src/main.c:4766 src/gui.c:635 src/utils.c:2619 src/utils.c:2651 +#: src/saveplay.c:2761 src/multitrack.c:3905 src/multitrack.c:5449 msgid "_Redo" msgstr "_Rétablir" -#: src/main.c:4768 src/interface.c:642 src/gui.c:2164 src/preferences.c:2381 +#: src/main.c:4792 src/interface.c:642 src/gui.c:2190 src/preferences.c:2381 #: src/resample.c:1790 msgid "Video" msgstr "Vidéo" -#: src/main.c:4769 src/interface.c:661 src/gui.c:2183 +#: src/main.c:4793 src/interface.c:661 src/gui.c:2209 msgid "Left Audio" msgstr "Audio Gauche" -#: src/main.c:4770 src/gui.c:2201 +#: src/main.c:4794 src/gui.c:2227 msgid "Right Audio" msgstr "Audio Droite" -#: src/main.c:4815 +#: src/main.c:4839 msgid "" "\n" "\n" @@ -828,7 +828,7 @@ msgid "Use _mplayer audio player" msgstr "Utilise le lecteur audui _mplayer" -#: src/startup.c:402 src/startup.c:591 src/interface.c:1988 +#: src/startup.c:402 src/startup.c:591 src/interface.c:2111 msgid "_Next" msgstr "_Suivant" @@ -992,10 +992,10 @@ "Si vous sélectionnez cela, la vidéo sera désentrelacée durant son " "importation." -#: src/interface.c:190 src/callbacks.c:7763 src/gui.c:2982 src/gui.c:3523 -#: src/saveplay.c:1796 src/saveplay.c:2425 src/dialogs.c:859 src/dialogs.c:860 +#: src/interface.c:190 src/callbacks.c:7908 src/gui.c:3014 src/gui.c:3555 +#: src/saveplay.c:1798 src/saveplay.c:2427 src/dialogs.c:859 src/dialogs.c:860 #: src/dialogs.c:1035 src/dialogs.c:1036 src/framedraw.c:189 -#: src/multitrack.c:6965 +#: src/multitrack.c:6998 msgid "Preview" msgstr "Voir" @@ -1031,7 +1031,7 @@ "\n" "N'oubliez pas de désactiver les effets (ctrl-0) par la suite !" -#: src/interface.c:339 src/callbacks.c:7535 src/callbacks.c:7567 +#: src/interface.c:339 src/callbacks.c:7680 src/callbacks.c:7712 #: src/dialogs.c:1846 msgid "" "\n" @@ -1056,7 +1056,7 @@ msgid "Paus_e" msgstr "" -#: src/interface.c:409 src/callbacks.c:7564 +#: src/interface.c:409 src/callbacks.c:7709 msgid "Pause/_Enough" msgstr "" @@ -1084,7 +1084,7 @@ msgid "Total time" msgstr "Temps Total" -#: src/interface.c:623 src/interface.c:2508 +#: src/interface.c:623 src/interface.c:2635 msgid "FPS" msgstr "IPS" @@ -1209,11 +1209,16 @@ msgid " Number of frames to open" msgstr " Nombre d'images à ouvrir" -#: src/interface.c:1691 +#: src/interface.c:1702 msgid "LiVES: - Open Location" msgstr "LiVES: - Ouvrir emplacement" -#: src/interface.c:1696 +#: src/interface.c:1704 +#, fuzzy +msgid "LiVES: - Open Youtube Clip" +msgstr "LiVES: - Renommer Clip" + +#: src/interface.c:1710 msgid "" "\n" "\n" @@ -1230,20 +1235,57 @@ "Préférences|Streaming\n" "\n" -#: src/interface.c:1708 +#: src/interface.c:1713 +msgid "" +"\n" +"\n" +"To open a clip from Youtube, LiVES will first download it with youtube-dl.\n" +"Please make sure you have the latest version of that tool installed.\n" +"\n" +msgstr "" + +#: src/interface.c:1722 +msgid "" +"Enter the URL of the clip below.\n" +"E.g: http://www.youtube.com/watch?v=WCR6f6WzjP8\n" +"\n" +msgstr "" + +#: src/interface.c:1737 msgid "URL : " msgstr "URL : " -#: src/interface.c:1724 +#: src/interface.c:1739 +#, fuzzy +msgid "Youtube URL : " +msgstr "URL : " + +#: src/interface.c:1759 msgid "Do not send bandwidth information" msgstr "Ne pas envoyer les infos de bande passante" -#: src/interface.c:1725 +#: src/interface.c:1760 msgid "Try this setting if you are having problems getting a stream" msgstr "" "Essayez cette option si vous avez des problèmes de chargement sur un stream"
View file
LiVES-1.4.8.tar.bz2/po/gl.po -> LiVES-1.4.9.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-11-26 09:19-0300\n" +"POT-Creation-Date: 2011-12-08 14:51-0300\n" "PO-Revision-Date: 2011-08-18 12:09+0000\n" "Last-Translator: salsaman <salsaman@gmail.com>\n" "Language-Team: Galician <gl@li.org>\n" @@ -394,7 +394,7 @@ msgid "-debug : try to debug crashes (requires 'gdb' installed)\n" msgstr "-debug : tentar depurar erros (require 'gdb' instalado)\n" -#: src/main.c:1818 src/gui.c:1062 +#: src/main.c:1818 src/gui.c:1088 msgid "Starting GUI..." msgstr "" @@ -545,22 +545,22 @@ msgid "LiVES-%s: <No File>" msgstr "LiVES-%s: <No ficheiro>" -#: src/main.c:3793 +#: src/main.c:3801 #, c-format msgid "rec %9d/%d" msgstr "" -#: src/main.c:3795 +#: src/main.c:3803 #, c-format msgid "!rec %9d/%d" msgstr "" -#: src/main.c:4013 src/main.c:4014 src/gui.c:2006 src/gui.c:2979 -#: src/saveplay.c:1793 +#: src/main.c:4021 src/main.c:4022 src/gui.c:2032 src/gui.c:3011 +#: src/saveplay.c:1795 msgid "Play" msgstr "Reproducir" -#: src/main.c:4477 +#: src/main.c:4497 msgid "" "LiVES was unable to capture this image\n" "\n" @@ -568,35 +568,35 @@ "LiVES non puido capturar esta foto\n" "\n" -#: src/main.c:4575 +#: src/main.c:4599 #, c-format msgid "Closed file %s\n" msgstr "Pechado o ficheiro %s\n" -#: src/main.c:4741 src/gui.c:596 src/utils.c:2618 src/utils.c:2650 -#: src/saveplay.c:2758 src/multitrack.c:3882 src/multitrack.c:5393 +#: src/main.c:4765 src/gui.c:622 src/utils.c:2618 src/utils.c:2650 +#: src/saveplay.c:2760 src/multitrack.c:3884 src/multitrack.c:5426 msgid "_Undo" msgstr "_Desfacer" -#: src/main.c:4742 src/gui.c:609 src/utils.c:2619 src/utils.c:2651 -#: src/saveplay.c:2759 src/multitrack.c:3903 src/multitrack.c:5416 +#: src/main.c:4766 src/gui.c:635 src/utils.c:2619 src/utils.c:2651 +#: src/saveplay.c:2761 src/multitrack.c:3905 src/multitrack.c:5449 msgid "_Redo" msgstr "_Refacer" -#: src/main.c:4768 src/interface.c:642 src/gui.c:2164 src/preferences.c:2381 +#: src/main.c:4792 src/interface.c:642 src/gui.c:2190 src/preferences.c:2381 #: src/resample.c:1790 msgid "Video" msgstr "Vídeo" -#: src/main.c:4769 src/interface.c:661 src/gui.c:2183 +#: src/main.c:4793 src/interface.c:661 src/gui.c:2209 msgid "Left Audio" msgstr "" -#: src/main.c:4770 src/gui.c:2201 +#: src/main.c:4794 src/gui.c:2227 msgid "Right Audio" msgstr "" -#: src/main.c:4815 +#: src/main.c:4839 msgid "" "\n" "\n" @@ -723,7 +723,7 @@ msgid "Use _mplayer audio player" msgstr "" -#: src/startup.c:402 src/startup.c:591 src/interface.c:1988 +#: src/startup.c:402 src/startup.c:591 src/interface.c:2111 msgid "_Next" msgstr "_Seguinte" @@ -885,10 +885,10 @@ msgid "If this is set, frames will be deinterlaced as they are imported." msgstr "" -#: src/interface.c:190 src/callbacks.c:7763 src/gui.c:2982 src/gui.c:3523 -#: src/saveplay.c:1796 src/saveplay.c:2425 src/dialogs.c:859 src/dialogs.c:860 +#: src/interface.c:190 src/callbacks.c:7908 src/gui.c:3014 src/gui.c:3555 +#: src/saveplay.c:1798 src/saveplay.c:2427 src/dialogs.c:859 src/dialogs.c:860 #: src/dialogs.c:1035 src/dialogs.c:1036 src/framedraw.c:189 -#: src/multitrack.c:6965 +#: src/multitrack.c:6998 msgid "Preview" msgstr "Previsualización" @@ -922,7 +922,7 @@ "\n" "Lembre apagar efectos (ctrl) despois !" -#: src/interface.c:339 src/callbacks.c:7535 src/callbacks.c:7567 +#: src/interface.c:339 src/callbacks.c:7680 src/callbacks.c:7712 #: src/dialogs.c:1846 msgid "" "\n" @@ -947,7 +947,7 @@ msgid "Paus_e" msgstr "" -#: src/interface.c:409 src/callbacks.c:7564 +#: src/interface.c:409 src/callbacks.c:7709 msgid "Pause/_Enough" msgstr "" @@ -975,7 +975,7 @@ msgid "Total time" msgstr "Tempo total" -#: src/interface.c:623 src/interface.c:2508 +#: src/interface.c:623 src/interface.c:2635 msgid "FPS" msgstr "FPS" @@ -1099,11 +1099,16 @@ msgid " Number of frames to open" msgstr " Número de cadros para abrir" -#: src/interface.c:1691 +#: src/interface.c:1702 msgid "LiVES: - Open Location" msgstr "LiVES: - Abrir Local" -#: src/interface.c:1696 +#: src/interface.c:1704 +#, fuzzy +msgid "LiVES: - Open Youtube Clip" +msgstr "LiVES: - Renomear Clip" + +#: src/interface.c:1710 msgid "" "\n" "\n" @@ -1119,19 +1124,56 @@ "Tamén asegúrese de ter definido a súa banda Preferencias | Streaming\n" "\n" -#: src/interface.c:1708 +#: src/interface.c:1713 +msgid "" +"\n" +"\n" +"To open a clip from Youtube, LiVES will first download it with youtube-dl.\n" +"Please make sure you have the latest version of that tool installed.\n" +"\n" +msgstr "" + +#: src/interface.c:1722 +msgid "" +"Enter the URL of the clip below.\n" +"E.g: http://www.youtube.com/watch?v=WCR6f6WzjP8\n" +"\n" +msgstr "" + +#: src/interface.c:1737 msgid "URL : " msgstr "URL : " -#: src/interface.c:1724 +#: src/interface.c:1739 +#, fuzzy +msgid "Youtube URL : " +msgstr "URL : " + +#: src/interface.c:1759 msgid "Do not send bandwidth information" msgstr "Non enviar información de ancho de banda" -#: src/interface.c:1725 +#: src/interface.c:1760 msgid "Try this setting if you are having problems getting a stream" msgstr "Probe esta configuración se está tendo problemas para obter un fluxo"
View file
LiVES-1.4.8.tar.bz2/po/he.po -> LiVES-1.4.9.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-11-26 09:19-0300\n" +"POT-Creation-Date: 2011-12-08 14:51-0300\n" "PO-Revision-Date: 2011-08-18 12:10+0000\n" "Last-Translator: salsaman <salsaman@gmail.com>\n" "Language-Team: Hebrew <he@li.org>\n" @@ -405,7 +405,7 @@ msgid "-debug : try to debug crashes (requires 'gdb' installed)\n" msgstr "-debug : try to debug crashes (requires 'gdb' installed)\n" -#: src/main.c:1818 src/gui.c:1062 +#: src/main.c:1818 src/gui.c:1088 msgid "Starting GUI..." msgstr "מפעיל את מנשק המשתמש הגרפי..." @@ -614,22 +614,22 @@ msgid "LiVES-%s: <No File>" msgstr "LiVES-%s <ללא קובץ>" -#: src/main.c:3793 +#: src/main.c:3801 #, c-format msgid "rec %9d/%d" msgstr "הקלטה %9d/%d" -#: src/main.c:3795 +#: src/main.c:3803 #, c-format msgid "!rec %9d/%d" msgstr "!הקלטה %9d/%d" -#: src/main.c:4013 src/main.c:4014 src/gui.c:2006 src/gui.c:2979 -#: src/saveplay.c:1793 +#: src/main.c:4021 src/main.c:4022 src/gui.c:2032 src/gui.c:3011 +#: src/saveplay.c:1795 msgid "Play" msgstr "נגן" -#: src/main.c:4477 +#: src/main.c:4497 msgid "" "LiVES was unable to capture this image\n" "\n" @@ -637,35 +637,35 @@ "ל־LiVES לא הית אפשרות ללכוד תמונה זו\n" "\n" -#: src/main.c:4575 +#: src/main.c:4599 #, c-format msgid "Closed file %s\n" msgstr "הקובץ %s נסגר\n" -#: src/main.c:4741 src/gui.c:596 src/utils.c:2618 src/utils.c:2650 -#: src/saveplay.c:2758 src/multitrack.c:3882 src/multitrack.c:5393 +#: src/main.c:4765 src/gui.c:622 src/utils.c:2618 src/utils.c:2650 +#: src/saveplay.c:2760 src/multitrack.c:3884 src/multitrack.c:5426 msgid "_Undo" msgstr "_ביטול" -#: src/main.c:4742 src/gui.c:609 src/utils.c:2619 src/utils.c:2651 -#: src/saveplay.c:2759 src/multitrack.c:3903 src/multitrack.c:5416 +#: src/main.c:4766 src/gui.c:635 src/utils.c:2619 src/utils.c:2651 +#: src/saveplay.c:2761 src/multitrack.c:3905 src/multitrack.c:5449 msgid "_Redo" msgstr "ב_צע שוב" -#: src/main.c:4768 src/interface.c:642 src/gui.c:2164 src/preferences.c:2381 +#: src/main.c:4792 src/interface.c:642 src/gui.c:2190 src/preferences.c:2381 #: src/resample.c:1790 msgid "Video" msgstr "וידאו" -#: src/main.c:4769 src/interface.c:661 src/gui.c:2183 +#: src/main.c:4793 src/interface.c:661 src/gui.c:2209 msgid "Left Audio" msgstr "ערוץ שמע שמאלי" -#: src/main.c:4770 src/gui.c:2201 +#: src/main.c:4794 src/gui.c:2227 msgid "Right Audio" msgstr "ערוץ שמע ימני" -#: src/main.c:4815 +#: src/main.c:4839 msgid "" "\n" "\n" @@ -831,7 +831,7 @@ msgid "Use _mplayer audio player" msgstr "שימוש בנגן השמע _mplayer" -#: src/startup.c:402 src/startup.c:591 src/interface.c:1988 +#: src/startup.c:402 src/startup.c:591 src/interface.c:2111 msgid "_Next" msgstr "_הבא" @@ -1006,10 +1006,10 @@ msgid "If this is set, frames will be deinterlaced as they are imported." msgstr "באם מוגדר, תבוצע פעולת deinterlace על השקופיות בעת הייבוא." -#: src/interface.c:190 src/callbacks.c:7763 src/gui.c:2982 src/gui.c:3523 -#: src/saveplay.c:1796 src/saveplay.c:2425 src/dialogs.c:859 src/dialogs.c:860 +#: src/interface.c:190 src/callbacks.c:7908 src/gui.c:3014 src/gui.c:3555 +#: src/saveplay.c:1798 src/saveplay.c:2427 src/dialogs.c:859 src/dialogs.c:860 #: src/dialogs.c:1035 src/dialogs.c:1036 src/framedraw.c:189 -#: src/multitrack.c:6965 +#: src/multitrack.c:6998 msgid "Preview" msgstr "תצוגה מקדימה" @@ -1043,7 +1043,7 @@ "\n" "נא לזכור לכבות את האפקטים (Ctrl-0) לאחר מכן !" -#: src/interface.c:339 src/callbacks.c:7535 src/callbacks.c:7567 +#: src/interface.c:339 src/callbacks.c:7680 src/callbacks.c:7712 #: src/dialogs.c:1846 msgid "" "\n" @@ -1068,7 +1068,7 @@ msgid "Paus_e" msgstr "הש_הייה" -#: src/interface.c:409 src/callbacks.c:7564 +#: src/interface.c:409 src/callbacks.c:7709 msgid "Pause/_Enough" msgstr "השהייה/_מספיק" @@ -1096,7 +1096,7 @@ msgid "Total time" msgstr "זמן כולל" -#: src/interface.c:623 src/interface.c:2508 +#: src/interface.c:623 src/interface.c:2635 msgid "FPS" msgstr "שקופיות לשנייה" @@ -1220,11 +1220,16 @@ msgid " Number of frames to open" msgstr " מספר שקופיות לפתיחה" -#: src/interface.c:1691 +#: src/interface.c:1702 msgid "LiVES: - Open Location" msgstr "LiVES: - פתיחת מיקום" -#: src/interface.c:1696 +#: src/interface.c:1704 +#, fuzzy +msgid "LiVES: - Open Youtube Clip" +msgstr "LiVES: -שינוי שם של קטע" + +#: src/interface.c:1710 msgid "" "\n" "\n" @@ -1239,19 +1244,56 @@ "בנוסף, יש לוודא כי רוחב הפס העצמי הוגדר תחת העדפות|מדיה זורמת\n" "\n" -#: src/interface.c:1708 +#: src/interface.c:1713 +msgid "" +"\n" +"\n" +"To open a clip from Youtube, LiVES will first download it with youtube-dl.\n" +"Please make sure you have the latest version of that tool installed.\n" +"\n" +msgstr "" + +#: src/interface.c:1722 +msgid "" +"Enter the URL of the clip below.\n" +"E.g: http://www.youtube.com/watch?v=WCR6f6WzjP8\n" +"\n" +msgstr "" + +#: src/interface.c:1737 msgid "URL : " msgstr "כתובת אינטרנט : " -#: src/interface.c:1724 +#: src/interface.c:1739 +#, fuzzy +msgid "Youtube URL : " +msgstr "כתובת אינטרנט : " + +#: src/interface.c:1759 msgid "Do not send bandwidth information" msgstr "אין לשלוח מידע אודות רוחב הפס" -#: src/interface.c:1725 +#: src/interface.c:1760 msgid "Try this setting if you are having problems getting a stream" msgstr "ניתן לנסות הגדרה זו אם צצות בעיות בקבלת תזרים מדיה."
View file
LiVES-1.4.8.tar.bz2/po/hr.po -> LiVES-1.4.9.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-11-26 09:19-0300\n" +"POT-Creation-Date: 2011-12-08 14:51-0300\n" "PO-Revision-Date: 2011-08-18 11:59+0000\n" "Last-Translator: salsaman <salsaman@gmail.com>\n" "Language-Team: Croatian <hr@li.org>\n" @@ -395,7 +395,7 @@ msgid "-debug : try to debug crashes (requires 'gdb' installed)\n" msgstr "" -#: src/main.c:1818 src/gui.c:1062 +#: src/main.c:1818 src/gui.c:1088 msgid "Starting GUI..." msgstr "Početna GUI..." @@ -546,22 +546,22 @@ msgid "LiVES-%s: <No File>" msgstr "LiVES-%s: <Nema datoteka>" -#: src/main.c:3793 +#: src/main.c:3801 #, c-format msgid "rec %9d/%d" msgstr "rec %9d/%d" -#: src/main.c:3795 +#: src/main.c:3803 #, c-format msgid "!rec %9d/%d" msgstr "!rec %9d/%d" -#: src/main.c:4013 src/main.c:4014 src/gui.c:2006 src/gui.c:2979 -#: src/saveplay.c:1793 +#: src/main.c:4021 src/main.c:4022 src/gui.c:2032 src/gui.c:3011 +#: src/saveplay.c:1795 msgid "Play" msgstr "Reproduciraj" -#: src/main.c:4477 +#: src/main.c:4497 msgid "" "LiVES was unable to capture this image\n" "\n" @@ -569,35 +569,35 @@ "LiVES nije bio u mogućnosti to hvatanje ovu sliku\n" "\n" -#: src/main.c:4575 +#: src/main.c:4599 #, c-format msgid "Closed file %s\n" msgstr "Zatvoreno datoteke %s\n" -#: src/main.c:4741 src/gui.c:596 src/utils.c:2618 src/utils.c:2650 -#: src/saveplay.c:2758 src/multitrack.c:3882 src/multitrack.c:5393 +#: src/main.c:4765 src/gui.c:622 src/utils.c:2618 src/utils.c:2650 +#: src/saveplay.c:2760 src/multitrack.c:3884 src/multitrack.c:5426 msgid "_Undo" msgstr "_Poništi" -#: src/main.c:4742 src/gui.c:609 src/utils.c:2619 src/utils.c:2651 -#: src/saveplay.c:2759 src/multitrack.c:3903 src/multitrack.c:5416 +#: src/main.c:4766 src/gui.c:635 src/utils.c:2619 src/utils.c:2651 +#: src/saveplay.c:2761 src/multitrack.c:3905 src/multitrack.c:5449 msgid "_Redo" msgstr "_Ponovi" -#: src/main.c:4768 src/interface.c:642 src/gui.c:2164 src/preferences.c:2381 +#: src/main.c:4792 src/interface.c:642 src/gui.c:2190 src/preferences.c:2381 #: src/resample.c:1790 msgid "Video" msgstr "Video" -#: src/main.c:4769 src/interface.c:661 src/gui.c:2183 +#: src/main.c:4793 src/interface.c:661 src/gui.c:2209 msgid "Left Audio" msgstr "" -#: src/main.c:4770 src/gui.c:2201 +#: src/main.c:4794 src/gui.c:2227 msgid "Right Audio" msgstr "" -#: src/main.c:4815 +#: src/main.c:4839 msgid "" "\n" "\n" @@ -736,7 +736,7 @@ msgid "Use _mplayer audio player" msgstr "" -#: src/startup.c:402 src/startup.c:591 src/interface.c:1988 +#: src/startup.c:402 src/startup.c:591 src/interface.c:2111 msgid "_Next" msgstr "_Slijedeće" @@ -905,10 +905,10 @@ msgid "If this is set, frames will be deinterlaced as they are imported." msgstr "" -#: src/interface.c:190 src/callbacks.c:7763 src/gui.c:2982 src/gui.c:3523 -#: src/saveplay.c:1796 src/saveplay.c:2425 src/dialogs.c:859 src/dialogs.c:860 +#: src/interface.c:190 src/callbacks.c:7908 src/gui.c:3014 src/gui.c:3555 +#: src/saveplay.c:1798 src/saveplay.c:2427 src/dialogs.c:859 src/dialogs.c:860 #: src/dialogs.c:1035 src/dialogs.c:1036 src/framedraw.c:189 -#: src/multitrack.c:6965 +#: src/multitrack.c:6998 msgid "Preview" msgstr "Pregled" @@ -937,7 +937,7 @@ "Remember to switch off effects (ctrl-0) afterwards !" msgstr "" -#: src/interface.c:339 src/callbacks.c:7535 src/callbacks.c:7567 +#: src/interface.c:339 src/callbacks.c:7680 src/callbacks.c:7712 #: src/dialogs.c:1846 msgid "" "\n" @@ -962,7 +962,7 @@ msgid "Paus_e" msgstr "Pauz_a" -#: src/interface.c:409 src/callbacks.c:7564 +#: src/interface.c:409 src/callbacks.c:7709 msgid "Pause/_Enough" msgstr "Pauza/_Dosta" @@ -990,7 +990,7 @@ msgid "Total time" msgstr "Ukupno vrijeme" -#: src/interface.c:623 src/interface.c:2508 +#: src/interface.c:623 src/interface.c:2635 msgid "FPS" msgstr "FPS" @@ -1113,11 +1113,16 @@ msgid " Number of frames to open" msgstr " Broj okvira za otvaranje" -#: src/interface.c:1691 +#: src/interface.c:1702 msgid "LiVES: - Open Location" msgstr "LiVES: - Otvori Lokacija" -#: src/interface.c:1696 +#: src/interface.c:1704 +#, fuzzy +msgid "LiVES: - Open Youtube Clip" +msgstr "LiVES: - Preimenuj Clip" + +#: src/interface.c:1710 msgid "" "\n" "\n" @@ -1127,19 +1132,56 @@ "\n" msgstr "" -#: src/interface.c:1708 +#: src/interface.c:1713 +msgid "" +"\n" +"\n" +"To open a clip from Youtube, LiVES will first download it with youtube-dl.\n" +"Please make sure you have the latest version of that tool installed.\n" +"\n" +msgstr "" + +#: src/interface.c:1722 +msgid "" +"Enter the URL of the clip below.\n" +"E.g: http://www.youtube.com/watch?v=WCR6f6WzjP8\n" +"\n" +msgstr "" + +#: src/interface.c:1737 msgid "URL : " msgstr "URL : " -#: src/interface.c:1724 +#: src/interface.c:1739 +#, fuzzy +msgid "Youtube URL : " +msgstr "URL : " + +#: src/interface.c:1759 msgid "Do not send bandwidth information" msgstr "Nemojte slati propusnost informacija" -#: src/interface.c:1725 +#: src/interface.c:1760 msgid "Try this setting if you are having problems getting a stream" msgstr "Isprobajte ovu postavku ako imate problema s dobivanje potok"
View file
LiVES-1.4.8.tar.bz2/po/hu.po -> LiVES-1.4.9.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-11-26 09:19-0300\n" +"POT-Creation-Date: 2011-12-08 14:51-0300\n" "PO-Revision-Date: 2011-08-18 11:58+0000\n" "Last-Translator: Krasznecz Zoltán <zoltan.krasznecz@gmail.com>\n" "Language-Team: Magyar <lisovszki@gmail.com>\n" @@ -404,7 +404,7 @@ "-debug : megpróbálja kideríteni az összeomlás okát ('gdb' program megléte " "szükséges)\n" -#: src/main.c:1818 src/gui.c:1062 +#: src/main.c:1818 src/gui.c:1088 msgid "Starting GUI..." msgstr "Grafikus felhasználói felület indítása..." @@ -616,22 +616,22 @@ msgid "LiVES-%s: <No File>" msgstr "LiVES-%s: <Nincs fájl>" -#: src/main.c:3793 +#: src/main.c:3801 #, c-format msgid "rec %9d/%d" msgstr "" -#: src/main.c:3795 +#: src/main.c:3803 #, c-format msgid "!rec %9d/%d" msgstr "" -#: src/main.c:4013 src/main.c:4014 src/gui.c:2006 src/gui.c:2979 -#: src/saveplay.c:1793 +#: src/main.c:4021 src/main.c:4022 src/gui.c:2032 src/gui.c:3011 +#: src/saveplay.c:1795 msgid "Play" msgstr "Lejátszás" -#: src/main.c:4477 +#: src/main.c:4497 msgid "" "LiVES was unable to capture this image\n" "\n" @@ -639,35 +639,35 @@ "LiVES nem tudja rögzíteni ezt a képet\n" "\n" -#: src/main.c:4575 +#: src/main.c:4599 #, c-format msgid "Closed file %s\n" msgstr "%s fájl bezárva\n" -#: src/main.c:4741 src/gui.c:596 src/utils.c:2618 src/utils.c:2650 -#: src/saveplay.c:2758 src/multitrack.c:3882 src/multitrack.c:5393 +#: src/main.c:4765 src/gui.c:622 src/utils.c:2618 src/utils.c:2650 +#: src/saveplay.c:2760 src/multitrack.c:3884 src/multitrack.c:5426 msgid "_Undo" msgstr "_Visszavonás" -#: src/main.c:4742 src/gui.c:609 src/utils.c:2619 src/utils.c:2651 -#: src/saveplay.c:2759 src/multitrack.c:3903 src/multitrack.c:5416 +#: src/main.c:4766 src/gui.c:635 src/utils.c:2619 src/utils.c:2651 +#: src/saveplay.c:2761 src/multitrack.c:3905 src/multitrack.c:5449 msgid "_Redo" msgstr "Új_ra" -#: src/main.c:4768 src/interface.c:642 src/gui.c:2164 src/preferences.c:2381 +#: src/main.c:4792 src/interface.c:642 src/gui.c:2190 src/preferences.c:2381 #: src/resample.c:1790 msgid "Video" msgstr "Videó" -#: src/main.c:4769 src/interface.c:661 src/gui.c:2183 +#: src/main.c:4793 src/interface.c:661 src/gui.c:2209 msgid "Left Audio" msgstr "Bal oldali hang" -#: src/main.c:4770 src/gui.c:2201 +#: src/main.c:4794 src/gui.c:2227 msgid "Right Audio" msgstr "Jobb oldali hang" -#: src/main.c:4815 +#: src/main.c:4839 msgid "" "\n" "\n" @@ -828,7 +828,7 @@ msgid "Use _mplayer audio player" msgstr "_mplayer használata" -#: src/startup.c:402 src/startup.c:591 src/interface.c:1988 +#: src/startup.c:402 src/startup.c:591 src/interface.c:2111 msgid "_Next" msgstr "_Következő" @@ -992,10 +992,10 @@ "Ha ez be van állítva, a képkockák deinterlacelve lesznek amint importálják " "őket." -#: src/interface.c:190 src/callbacks.c:7763 src/gui.c:2982 src/gui.c:3523 -#: src/saveplay.c:1796 src/saveplay.c:2425 src/dialogs.c:859 src/dialogs.c:860 +#: src/interface.c:190 src/callbacks.c:7908 src/gui.c:3014 src/gui.c:3555 +#: src/saveplay.c:1798 src/saveplay.c:2427 src/dialogs.c:859 src/dialogs.c:860 #: src/dialogs.c:1035 src/dialogs.c:1036 src/framedraw.c:189 -#: src/multitrack.c:6965 +#: src/multitrack.c:6998 msgid "Preview" msgstr "Előnézet" @@ -1029,7 +1029,7 @@ "\n" "Ne felejtsd el kikapcsolni az effekteket (ctr-0) utána!" -#: src/interface.c:339 src/callbacks.c:7535 src/callbacks.c:7567 +#: src/interface.c:339 src/callbacks.c:7680 src/callbacks.c:7712 #: src/dialogs.c:1846 msgid "" "\n" @@ -1054,7 +1054,7 @@ msgid "Paus_e" msgstr "" -#: src/interface.c:409 src/callbacks.c:7564 +#: src/interface.c:409 src/callbacks.c:7709 msgid "Pause/_Enough" msgstr "" @@ -1082,7 +1082,7 @@ msgid "Total time" msgstr "Idő (összesen)" -#: src/interface.c:623 src/interface.c:2508 +#: src/interface.c:623 src/interface.c:2635 msgid "FPS" msgstr "FPS" @@ -1206,11 +1206,16 @@ msgid " Number of frames to open" msgstr " Megnyitott képkockák száma" -#: src/interface.c:1691 +#: src/interface.c:1702 msgid "LiVES: - Open Location" msgstr "LiVES: - Hely megnyitása" -#: src/interface.c:1696 +#: src/interface.c:1704 +#, fuzzy +msgid "LiVES: - Open Youtube Clip" +msgstr "LiVES: - Klip átnevezése" + +#: src/interface.c:1710 msgid "" "\n" "\n" @@ -1226,19 +1231,56 @@ "Ne feledd leellenőrini a beállításokat a beállítások|adatfolyamok menüben\n" "\n" -#: src/interface.c:1708 +#: src/interface.c:1713 +msgid "" +"\n" +"\n" +"To open a clip from Youtube, LiVES will first download it with youtube-dl.\n" +"Please make sure you have the latest version of that tool installed.\n" +"\n" +msgstr "" + +#: src/interface.c:1722 +msgid "" +"Enter the URL of the clip below.\n" +"E.g: http://www.youtube.com/watch?v=WCR6f6WzjP8\n" +"\n" +msgstr "" + +#: src/interface.c:1737 msgid "URL : " msgstr "URL : " -#: src/interface.c:1724 +#: src/interface.c:1739 +#, fuzzy +msgid "Youtube URL : " +msgstr "URL : " + +#: src/interface.c:1759 msgid "Do not send bandwidth information" msgstr "Ne küldd el a sávszélesség információkat" -#: src/interface.c:1725 +#: src/interface.c:1760 msgid "Try this setting if you are having problems getting a stream" msgstr "Próbáld ezt a beállítást, ha problémád van a lejátszással"
View file
LiVES-1.4.8.tar.bz2/po/it.po -> LiVES-1.4.9.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-11-26 09:19-0300\n" +"POT-Creation-Date: 2011-12-08 14:51-0300\n" "PO-Revision-Date: 2011-08-18 12:01+0000\n" "Last-Translator: salsaman <salsaman@gmail.com>\n" "Language-Team: Italian <it@li.org>\n" @@ -406,7 +406,7 @@ msgid "-debug : try to debug crashes (requires 'gdb' installed)\n" msgstr "-debug : prova a risolvere dei crash\n" -#: src/main.c:1818 src/gui.c:1062 +#: src/main.c:1818 src/gui.c:1088 msgid "Starting GUI..." msgstr "Avviamento della GUI in corso..." @@ -619,22 +619,22 @@ msgid "LiVES-%s: <No File>" msgstr "LiVES-%s: <Nessun File>" -#: src/main.c:3793 +#: src/main.c:3801 #, c-format msgid "rec %9d/%d" msgstr "rec %9d/%d" -#: src/main.c:3795 +#: src/main.c:3803 #, c-format msgid "!rec %9d/%d" msgstr "!rec %9d/%d" -#: src/main.c:4013 src/main.c:4014 src/gui.c:2006 src/gui.c:2979 -#: src/saveplay.c:1793 +#: src/main.c:4021 src/main.c:4022 src/gui.c:2032 src/gui.c:3011 +#: src/saveplay.c:1795 msgid "Play" msgstr "Riproduci" -#: src/main.c:4477 +#: src/main.c:4497 msgid "" "LiVES was unable to capture this image\n" "\n" @@ -642,35 +642,35 @@ "LiVES non è stato in grado di catturare questa immagine\n" "\n" -#: src/main.c:4575 +#: src/main.c:4599 #, c-format msgid "Closed file %s\n" msgstr "Chiuso il file %s\n" -#: src/main.c:4741 src/gui.c:596 src/utils.c:2618 src/utils.c:2650 -#: src/saveplay.c:2758 src/multitrack.c:3882 src/multitrack.c:5393 +#: src/main.c:4765 src/gui.c:622 src/utils.c:2618 src/utils.c:2650 +#: src/saveplay.c:2760 src/multitrack.c:3884 src/multitrack.c:5426 msgid "_Undo" msgstr "_Annulla" -#: src/main.c:4742 src/gui.c:609 src/utils.c:2619 src/utils.c:2651 -#: src/saveplay.c:2759 src/multitrack.c:3903 src/multitrack.c:5416 +#: src/main.c:4766 src/gui.c:635 src/utils.c:2619 src/utils.c:2651 +#: src/saveplay.c:2761 src/multitrack.c:3905 src/multitrack.c:5449 msgid "_Redo" msgstr "_Ripeti" -#: src/main.c:4768 src/interface.c:642 src/gui.c:2164 src/preferences.c:2381 +#: src/main.c:4792 src/interface.c:642 src/gui.c:2190 src/preferences.c:2381 #: src/resample.c:1790 msgid "Video" msgstr "Video" -#: src/main.c:4769 src/interface.c:661 src/gui.c:2183 +#: src/main.c:4793 src/interface.c:661 src/gui.c:2209 msgid "Left Audio" msgstr "Audio Sinistro" -#: src/main.c:4770 src/gui.c:2201 +#: src/main.c:4794 src/gui.c:2227 msgid "Right Audio" msgstr "Audio Destro" -#: src/main.c:4815 +#: src/main.c:4839 msgid "" "\n" "\n" @@ -835,7 +835,7 @@ msgid "Use _mplayer audio player" msgstr "Utilizza il lettore audio _mplayer" -#: src/startup.c:402 src/startup.c:591 src/interface.c:1988 +#: src/startup.c:402 src/startup.c:591 src/interface.c:2111 msgid "_Next" msgstr "_Successivo" @@ -999,10 +999,10 @@ "Se questo viene impostato, i fotogrammi verranno deinterlacciati appena " "vengono importati." -#: src/interface.c:190 src/callbacks.c:7763 src/gui.c:2982 src/gui.c:3523 -#: src/saveplay.c:1796 src/saveplay.c:2425 src/dialogs.c:859 src/dialogs.c:860 +#: src/interface.c:190 src/callbacks.c:7908 src/gui.c:3014 src/gui.c:3555 +#: src/saveplay.c:1798 src/saveplay.c:2427 src/dialogs.c:859 src/dialogs.c:860 #: src/dialogs.c:1035 src/dialogs.c:1036 src/framedraw.c:189 -#: src/multitrack.c:6965 +#: src/multitrack.c:6998 msgid "Preview" msgstr "Anteprima" @@ -1037,7 +1037,7 @@ "\n" "Ricordati di disattivare gli effetti (ctrl-0) dopo !" -#: src/interface.c:339 src/callbacks.c:7535 src/callbacks.c:7567 +#: src/interface.c:339 src/callbacks.c:7680 src/callbacks.c:7712 #: src/dialogs.c:1846 msgid "" "\n" @@ -1062,7 +1062,7 @@ msgid "Paus_e" msgstr "" -#: src/interface.c:409 src/callbacks.c:7564 +#: src/interface.c:409 src/callbacks.c:7709 msgid "Pause/_Enough" msgstr "" @@ -1090,7 +1090,7 @@ msgid "Total time" msgstr "Tempo totale" -#: src/interface.c:623 src/interface.c:2508 +#: src/interface.c:623 src/interface.c:2635 msgid "FPS" msgstr "FPS" @@ -1216,11 +1216,16 @@ msgid " Number of frames to open" msgstr " Numero di fotogrammi da aprire" -#: src/interface.c:1691 +#: src/interface.c:1702 msgid "LiVES: - Open Location" msgstr "LiVES: - Apri Posizione" -#: src/interface.c:1696 +#: src/interface.c:1704 +#, fuzzy +msgid "LiVES: - Open Youtube Clip" +msgstr "LiVES: - Rinomina Clip" + +#: src/interface.c:1710 msgid "" "\n" "\n" @@ -1237,20 +1242,57 @@ "Flussi\n" "\n" -#: src/interface.c:1708 +#: src/interface.c:1713 +msgid "" +"\n" +"\n" +"To open a clip from Youtube, LiVES will first download it with youtube-dl.\n" +"Please make sure you have the latest version of that tool installed.\n" +"\n" +msgstr "" + +#: src/interface.c:1722 +msgid "" +"Enter the URL of the clip below.\n" +"E.g: http://www.youtube.com/watch?v=WCR6f6WzjP8\n" +"\n" +msgstr "" + +#: src/interface.c:1737 msgid "URL : " msgstr "URL : " -#: src/interface.c:1724 +#: src/interface.c:1739 +#, fuzzy +msgid "Youtube URL : " +msgstr "URL : " + +#: src/interface.c:1759 msgid "Do not send bandwidth information" msgstr "Non inviare informazioni sulla larghezza della banda" -#: src/interface.c:1725 +#: src/interface.c:1760 msgid "Try this setting if you are having problems getting a stream" msgstr "" "Prova questa impostazione se stai avendo problemi ad ottenere un flusso"
View file
LiVES-1.4.8.tar.bz2/po/ja.po -> LiVES-1.4.9.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-11-26 09:19-0300\n" +"POT-Creation-Date: 2011-12-08 14:51-0300\n" "PO-Revision-Date: 2011-11-24 01:44+0000\n" "Last-Translator: Takashi Sakamoto <Unknown>\n" "Language-Team: Japanese <ja@li.org>\n" @@ -414,7 +414,7 @@ msgstr "" "-debug : クラッシュのデバックを試みる (gdbのインストールが必要)\n" -#: src/main.c:1818 src/gui.c:1062 +#: src/main.c:1818 src/gui.c:1088 msgid "Starting GUI..." msgstr "GUIを開始..." @@ -625,22 +625,22 @@ msgid "LiVES-%s: <No File>" msgstr "LiVES-%s: <ファイル未設定>" -#: src/main.c:3793 +#: src/main.c:3801 #, c-format msgid "rec %9d/%d" msgstr "記録 %9d/%d" -#: src/main.c:3795 +#: src/main.c:3803 #, c-format msgid "!rec %9d/%d" msgstr "!記録 %9d/%d" -#: src/main.c:4013 src/main.c:4014 src/gui.c:2006 src/gui.c:2979 -#: src/saveplay.c:1793 +#: src/main.c:4021 src/main.c:4022 src/gui.c:2032 src/gui.c:3011 +#: src/saveplay.c:1795 msgid "Play" msgstr "再生" -#: src/main.c:4477 +#: src/main.c:4497 msgid "" "LiVES was unable to capture this image\n" "\n" @@ -648,35 +648,35 @@ "LiVESはこの画像をキャプチャできませんでした\n" "\n" -#: src/main.c:4575 +#: src/main.c:4599 #, c-format msgid "Closed file %s\n" msgstr "ファイル %s を閉じました\n" -#: src/main.c:4741 src/gui.c:596 src/utils.c:2618 src/utils.c:2650 -#: src/saveplay.c:2758 src/multitrack.c:3882 src/multitrack.c:5393 +#: src/main.c:4765 src/gui.c:622 src/utils.c:2618 src/utils.c:2650 +#: src/saveplay.c:2760 src/multitrack.c:3884 src/multitrack.c:5426 msgid "_Undo" msgstr "元に戻す(_U)" -#: src/main.c:4742 src/gui.c:609 src/utils.c:2619 src/utils.c:2651 -#: src/saveplay.c:2759 src/multitrack.c:3903 src/multitrack.c:5416 +#: src/main.c:4766 src/gui.c:635 src/utils.c:2619 src/utils.c:2651 +#: src/saveplay.c:2761 src/multitrack.c:3905 src/multitrack.c:5449 msgid "_Redo" msgstr "やり直す(_R)" -#: src/main.c:4768 src/interface.c:642 src/gui.c:2164 src/preferences.c:2381 +#: src/main.c:4792 src/interface.c:642 src/gui.c:2190 src/preferences.c:2381 #: src/resample.c:1790 msgid "Video" msgstr "ビデオ" -#: src/main.c:4769 src/interface.c:661 src/gui.c:2183 +#: src/main.c:4793 src/interface.c:661 src/gui.c:2209 msgid "Left Audio" msgstr "左音声" -#: src/main.c:4770 src/gui.c:2201 +#: src/main.c:4794 src/gui.c:2227 msgid "Right Audio" msgstr "右音声" -#: src/main.c:4815 +#: src/main.c:4839 msgid "" "\n" "\n" @@ -845,7 +845,7 @@ msgid "Use _mplayer audio player" msgstr "mplayerを使用する(_M)" -#: src/startup.c:402 src/startup.c:591 src/interface.c:1988 +#: src/startup.c:402 src/startup.c:591 src/interface.c:2111 msgid "_Next" msgstr "次へ(_N)" @@ -1028,10 +1028,10 @@ "これを設定すると、フレームがインポートされたときにインターレースを解除しま" "す。" -#: src/interface.c:190 src/callbacks.c:7763 src/gui.c:2982 src/gui.c:3523 -#: src/saveplay.c:1796 src/saveplay.c:2425 src/dialogs.c:859 src/dialogs.c:860 +#: src/interface.c:190 src/callbacks.c:7908 src/gui.c:3014 src/gui.c:3555 +#: src/saveplay.c:1798 src/saveplay.c:2427 src/dialogs.c:859 src/dialogs.c:860 #: src/dialogs.c:1035 src/dialogs.c:1036 src/framedraw.c:189 -#: src/multitrack.c:6965 +#: src/multitrack.c:6998 msgid "Preview" msgstr "プレビュー" @@ -1065,7 +1065,7 @@ "\n" "忘れないよう後でエフェクトを停止(ctrl-0)させてください!" -#: src/interface.c:339 src/callbacks.c:7535 src/callbacks.c:7567 +#: src/interface.c:339 src/callbacks.c:7680 src/callbacks.c:7712 #: src/dialogs.c:1846 msgid "" "\n" @@ -1090,7 +1090,7 @@ msgid "Paus_e" msgstr "一時停止(_E)" -#: src/interface.c:409 src/callbacks.c:7564 +#: src/interface.c:409 src/callbacks.c:7709 msgid "Pause/_Enough" msgstr "一時停止（_E）" @@ -1118,7 +1118,7 @@ msgid "Total time" msgstr "全時間" -#: src/interface.c:623 src/interface.c:2508 +#: src/interface.c:623 src/interface.c:2635 msgid "FPS" msgstr "FPS" @@ -1240,11 +1240,16 @@ msgid " Number of frames to open" msgstr " 開くフレーム数" -#: src/interface.c:1691 +#: src/interface.c:1702 msgid "LiVES: - Open Location" msgstr "LiVES: - 場所を開く" -#: src/interface.c:1696 +#: src/interface.c:1704 +#, fuzzy +msgid "LiVES: - Open Youtube Clip" +msgstr "LiVES: - クリップの名称変更" + +#: src/interface.c:1710 msgid "" "\n" "\n" @@ -1260,19 +1265,56 @@ "また、「設定 | ストリーミング」でバンド幅の設定も確認してください。\n" "\n" -#: src/interface.c:1708 +#: src/interface.c:1713 +msgid "" +"\n" +"\n" +"To open a clip from Youtube, LiVES will first download it with youtube-dl.\n" +"Please make sure you have the latest version of that tool installed.\n" +"\n" +msgstr "" + +#: src/interface.c:1722 +msgid "" +"Enter the URL of the clip below.\n" +"E.g: http://www.youtube.com/watch?v=WCR6f6WzjP8\n" +"\n" +msgstr "" + +#: src/interface.c:1737 msgid "URL : " msgstr "URL : " -#: src/interface.c:1724 +#: src/interface.c:1739 +#, fuzzy +msgid "Youtube URL : " +msgstr "URL : " + +#: src/interface.c:1759 msgid "Do not send bandwidth information" msgstr "バンド幅情報を送らない" -#: src/interface.c:1725 +#: src/interface.c:1760 msgid "Try this setting if you are having problems getting a stream" msgstr "ストリームの取得に問題がある場合はこの設定を試してください"
View file
LiVES-1.4.8.tar.bz2/po/lives.pot -> LiVES-1.4.9.tar.bz2/po/lives.pot
Changed
@@ -6,10 +6,10 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: lives 1.4.8\n" +"Project-Id-Version: lives 1.4.9\n" "Report-Msgid-Bugs-To: http://www.sourceforge.net/tracker/?" "group_id=64341&atid=507139\n" -"POT-Creation-Date: 2011-11-26 09:19-0300\n" +"POT-Creation-Date: 2011-12-08 14:51-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" @@ -372,7 +372,7 @@ msgid "-debug : try to debug crashes (requires 'gdb' installed)\n" msgstr "" -#: src/main.c:1818 src/gui.c:1062 +#: src/main.c:1818 src/gui.c:1088 msgid "Starting GUI..." msgstr "" @@ -523,56 +523,56 @@ msgid "LiVES-%s: <No File>" msgstr "" -#: src/main.c:3793 +#: src/main.c:3801 #, c-format msgid "rec %9d/%d" msgstr "" -#: src/main.c:3795 +#: src/main.c:3803 #, c-format msgid "!rec %9d/%d" msgstr "" -#: src/main.c:4013 src/main.c:4014 src/gui.c:2006 src/gui.c:2979 -#: src/saveplay.c:1793 +#: src/main.c:4021 src/main.c:4022 src/gui.c:2032 src/gui.c:3011 +#: src/saveplay.c:1795 msgid "Play" msgstr "" -#: src/main.c:4477 +#: src/main.c:4497 msgid "" "LiVES was unable to capture this image\n" "\n" msgstr "" -#: src/main.c:4575 +#: src/main.c:4599 #, c-format msgid "Closed file %s\n" msgstr "" -#: src/main.c:4741 src/gui.c:596 src/utils.c:2618 src/utils.c:2650 -#: src/saveplay.c:2758 src/multitrack.c:3882 src/multitrack.c:5393 +#: src/main.c:4765 src/gui.c:622 src/utils.c:2618 src/utils.c:2650 +#: src/saveplay.c:2760 src/multitrack.c:3884 src/multitrack.c:5426 msgid "_Undo" msgstr "" -#: src/main.c:4742 src/gui.c:609 src/utils.c:2619 src/utils.c:2651 -#: src/saveplay.c:2759 src/multitrack.c:3903 src/multitrack.c:5416 +#: src/main.c:4766 src/gui.c:635 src/utils.c:2619 src/utils.c:2651 +#: src/saveplay.c:2761 src/multitrack.c:3905 src/multitrack.c:5449 msgid "_Redo" msgstr "" -#: src/main.c:4768 src/interface.c:642 src/gui.c:2164 src/preferences.c:2381 +#: src/main.c:4792 src/interface.c:642 src/gui.c:2190 src/preferences.c:2381 #: src/resample.c:1790 msgid "Video" msgstr "" -#: src/main.c:4769 src/interface.c:661 src/gui.c:2183 +#: src/main.c:4793 src/interface.c:661 src/gui.c:2209 msgid "Left Audio" msgstr "" -#: src/main.c:4770 src/gui.c:2201 +#: src/main.c:4794 src/gui.c:2227 msgid "Right Audio" msgstr "" -#: src/main.c:4815 +#: src/main.c:4839 msgid "" "\n" "\n" @@ -699,7 +699,7 @@ msgid "Use _mplayer audio player" msgstr "" -#: src/startup.c:402 src/startup.c:591 src/interface.c:1988 +#: src/startup.c:402 src/startup.c:591 src/interface.c:2111 msgid "_Next" msgstr "" @@ -861,10 +861,10 @@ msgid "If this is set, frames will be deinterlaced as they are imported." msgstr "" -#: src/interface.c:190 src/callbacks.c:7763 src/gui.c:2982 src/gui.c:3523 -#: src/saveplay.c:1796 src/saveplay.c:2425 src/dialogs.c:859 src/dialogs.c:860 +#: src/interface.c:190 src/callbacks.c:7908 src/gui.c:3014 src/gui.c:3555 +#: src/saveplay.c:1798 src/saveplay.c:2427 src/dialogs.c:859 src/dialogs.c:860 #: src/dialogs.c:1035 src/dialogs.c:1036 src/framedraw.c:189 -#: src/multitrack.c:6965 +#: src/multitrack.c:6998 msgid "Preview" msgstr "" @@ -893,7 +893,7 @@ "Remember to switch off effects (ctrl-0) afterwards !" msgstr "" -#: src/interface.c:339 src/callbacks.c:7535 src/callbacks.c:7567 +#: src/interface.c:339 src/callbacks.c:7680 src/callbacks.c:7712 #: src/dialogs.c:1846 msgid "" "\n" @@ -916,7 +916,7 @@ msgid "Paus_e" msgstr "" -#: src/interface.c:409 src/callbacks.c:7564 +#: src/interface.c:409 src/callbacks.c:7709 msgid "Pause/_Enough" msgstr "" @@ -944,7 +944,7 @@ msgid "Total time" msgstr "" -#: src/interface.c:623 src/interface.c:2508 +#: src/interface.c:623 src/interface.c:2635 msgid "FPS" msgstr "" @@ -1064,11 +1064,15 @@ msgid " Number of frames to open" msgstr "" -#: src/interface.c:1691 +#: src/interface.c:1702 msgid "LiVES: - Open Location" msgstr "" -#: src/interface.c:1696 +#: src/interface.c:1704 +msgid "LiVES: - Open Youtube Clip" +msgstr "" + +#: src/interface.c:1710 msgid "" "\n" "\n" @@ -1078,19 +1082,55 @@ "\n" msgstr "" -#: src/interface.c:1708 +#: src/interface.c:1713 +msgid "" +"\n" +"\n" +"To open a clip from Youtube, LiVES will first download it with youtube-dl.\n" +"Please make sure you have the latest version of that tool installed.\n" +"\n" +msgstr "" + +#: src/interface.c:1722 +msgid "" +"Enter the URL of the clip below.\n" +"E.g: http://www.youtube.com/watch?v=WCR6f6WzjP8\n" +"\n" +msgstr "" + +#: src/interface.c:1737 msgid "URL : " msgstr "" -#: src/interface.c:1724 +#: src/interface.c:1739 +msgid "Youtube URL : " +msgstr "" + +#: src/interface.c:1759 msgid "Do not send bandwidth information" msgstr "" -#: src/interface.c:1725 +#: src/interface.c:1760 msgid "Try this setting if you are having problems getting a stream" msgstr ""
View file
LiVES-1.4.8.tar.bz2/po/nl_NL.po -> LiVES-1.4.9.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-11-26 09:19-0300\n" +"POT-Creation-Date: 2011-12-08 14:51-0300\n" "PO-Revision-Date: 2010-01-12 10:14+0000\n" "Last-Translator: cumulus007 <cumulus0007@gmail.com>\n" "Language-Team: \n" @@ -374,7 +374,7 @@ msgid "-debug : try to debug crashes (requires 'gdb' installed)\n" msgstr "" -#: src/main.c:1818 src/gui.c:1062 +#: src/main.c:1818 src/gui.c:1088 msgid "Starting GUI..." msgstr "" @@ -577,22 +577,22 @@ msgid "LiVES-%s: <No File>" msgstr "" -#: src/main.c:3793 +#: src/main.c:3801 #, c-format msgid "rec %9d/%d" msgstr "" -#: src/main.c:3795 +#: src/main.c:3803 #, c-format msgid "!rec %9d/%d" msgstr "" -#: src/main.c:4013 src/main.c:4014 src/gui.c:2006 src/gui.c:2979 -#: src/saveplay.c:1793 +#: src/main.c:4021 src/main.c:4022 src/gui.c:2032 src/gui.c:3011 +#: src/saveplay.c:1795 msgid "Play" msgstr "Afspelen" -#: src/main.c:4477 +#: src/main.c:4497 msgid "" "LiVES was unable to capture this image\n" "\n" @@ -600,35 +600,35 @@ "LiVES niet in staat dit 'image' te 'capturen'\n" "\n" -#: src/main.c:4575 +#: src/main.c:4599 #, c-format msgid "Closed file %s\n" msgstr "" -#: src/main.c:4741 src/gui.c:596 src/utils.c:2618 src/utils.c:2650 -#: src/saveplay.c:2758 src/multitrack.c:3882 src/multitrack.c:5393 +#: src/main.c:4765 src/gui.c:622 src/utils.c:2618 src/utils.c:2650 +#: src/saveplay.c:2760 src/multitrack.c:3884 src/multitrack.c:5426 msgid "_Undo" msgstr "_Ongedaan maken" -#: src/main.c:4742 src/gui.c:609 src/utils.c:2619 src/utils.c:2651 -#: src/saveplay.c:2759 src/multitrack.c:3903 src/multitrack.c:5416 +#: src/main.c:4766 src/gui.c:635 src/utils.c:2619 src/utils.c:2651 +#: src/saveplay.c:2761 src/multitrack.c:3905 src/multitrack.c:5449 msgid "_Redo" msgstr "Op_nieuw uitvoeren" -#: src/main.c:4768 src/interface.c:642 src/gui.c:2164 src/preferences.c:2381 +#: src/main.c:4792 src/interface.c:642 src/gui.c:2190 src/preferences.c:2381 #: src/resample.c:1790 msgid "Video" msgstr "Beeld" -#: src/main.c:4769 src/interface.c:661 src/gui.c:2183 +#: src/main.c:4793 src/interface.c:661 src/gui.c:2209 msgid "Left Audio" msgstr "Audio Links" -#: src/main.c:4770 src/gui.c:2201 +#: src/main.c:4794 src/gui.c:2227 msgid "Right Audio" msgstr "Audio rechts" -#: src/main.c:4815 +#: src/main.c:4839 msgid "" "\n" "\n" @@ -755,7 +755,7 @@ msgid "Use _mplayer audio player" msgstr "" -#: src/startup.c:402 src/startup.c:591 src/interface.c:1988 +#: src/startup.c:402 src/startup.c:591 src/interface.c:2111 msgid "_Next" msgstr "" @@ -927,10 +927,10 @@ msgid "If this is set, frames will be deinterlaced as they are imported." msgstr "" -#: src/interface.c:190 src/callbacks.c:7763 src/gui.c:2982 src/gui.c:3523 -#: src/saveplay.c:1796 src/saveplay.c:2425 src/dialogs.c:859 src/dialogs.c:860 +#: src/interface.c:190 src/callbacks.c:7908 src/gui.c:3014 src/gui.c:3555 +#: src/saveplay.c:1798 src/saveplay.c:2427 src/dialogs.c:859 src/dialogs.c:860 #: src/dialogs.c:1035 src/dialogs.c:1036 src/framedraw.c:189 -#: src/multitrack.c:6965 +#: src/multitrack.c:6998 msgid "Preview" msgstr "Voorbeeld" @@ -964,7 +964,7 @@ "\n" "Vergeet niet naderhand de effecten uit te schakelen (ctrl-0)!" -#: src/interface.c:339 src/callbacks.c:7535 src/callbacks.c:7567 +#: src/interface.c:339 src/callbacks.c:7680 src/callbacks.c:7712 #: src/dialogs.c:1846 msgid "" "\n" @@ -990,7 +990,7 @@ msgid "Paus_e" msgstr "Pauseren" -#: src/interface.c:409 src/callbacks.c:7564 +#: src/interface.c:409 src/callbacks.c:7709 msgid "Pause/_Enough" msgstr "" @@ -1018,7 +1018,7 @@ msgid "Total time" msgstr "Totale tijd" -#: src/interface.c:623 src/interface.c:2508 +#: src/interface.c:623 src/interface.c:2635 msgid "FPS" msgstr "FPS" @@ -1138,11 +1138,16 @@ msgid " Number of frames to open" msgstr "" -#: src/interface.c:1691 +#: src/interface.c:1702 msgid "LiVES: - Open Location" msgstr "" -#: src/interface.c:1696 +#: src/interface.c:1704 +#, fuzzy +msgid "LiVES: - Open Youtube Clip" +msgstr "LiVES: - Hernoem Clip" + +#: src/interface.c:1710 msgid "" "\n" "\n" @@ -1152,19 +1157,56 @@ "\n" msgstr "" -#: src/interface.c:1708 +#: src/interface.c:1713 +msgid "" +"\n" +"\n" +"To open a clip from Youtube, LiVES will first download it with youtube-dl.\n" +"Please make sure you have the latest version of that tool installed.\n" +"\n" +msgstr "" + +#: src/interface.c:1722 +msgid "" +"Enter the URL of the clip below.\n" +"E.g: http://www.youtube.com/watch?v=WCR6f6WzjP8\n" +"\n" +msgstr "" + +#: src/interface.c:1737 msgid "URL : " msgstr "URL : " -#: src/interface.c:1724 +#: src/interface.c:1739 +#, fuzzy +msgid "Youtube URL : " +msgstr "URL : " + +#: src/interface.c:1759 msgid "Do not send bandwidth information" msgstr "Verstuur geen informatie over bandbreedte" -#: src/interface.c:1725 +#: src/interface.c:1760 msgid "Try this setting if you are having problems getting a stream" msgstr "Probeer dit als je problemen hebt om een stream te krijgen"
View file
LiVES-1.4.8.tar.bz2/po/oc.po -> LiVES-1.4.9.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-11-26 09:19-0300\n" +"POT-Creation-Date: 2011-12-08 14:51-0300\n" "PO-Revision-Date: 2011-08-18 12:12+0000\n" "Last-Translator: Cédric VALMARY (Tot en òc) <cvalmary@yahoo.fr>\n" "Language-Team: Occitan (post 1500) <oc@li.org>\n" @@ -382,7 +382,7 @@ msgid "-debug : try to debug crashes (requires 'gdb' installed)\n" msgstr "" -#: src/main.c:1818 src/gui.c:1062 +#: src/main.c:1818 src/gui.c:1088 msgid "Starting GUI..." msgstr "Aviada de l'interfàcia grafica..." @@ -533,56 +533,56 @@ msgid "LiVES-%s: <No File>" msgstr "LiVES-%s: <Pas de Fichièr>" -#: src/main.c:3793 +#: src/main.c:3801 #, c-format msgid "rec %9d/%d" msgstr "" -#: src/main.c:3795 +#: src/main.c:3803 #, c-format msgid "!rec %9d/%d" msgstr "" -#: src/main.c:4013 src/main.c:4014 src/gui.c:2006 src/gui.c:2979 -#: src/saveplay.c:1793 +#: src/main.c:4021 src/main.c:4022 src/gui.c:2032 src/gui.c:3011 +#: src/saveplay.c:1795 msgid "Play" msgstr "Lectura" -#: src/main.c:4477 +#: src/main.c:4497 msgid "" "LiVES was unable to capture this image\n" "\n" msgstr "" -#: src/main.c:4575 +#: src/main.c:4599 #, c-format msgid "Closed file %s\n" msgstr "Fichièr Tampat %s\n" -#: src/main.c:4741 src/gui.c:596 src/utils.c:2618 src/utils.c:2650 -#: src/saveplay.c:2758 src/multitrack.c:3882 src/multitrack.c:5393 +#: src/main.c:4765 src/gui.c:622 src/utils.c:2618 src/utils.c:2650 +#: src/saveplay.c:2760 src/multitrack.c:3884 src/multitrack.c:5426 msgid "_Undo" msgstr "An_ullar" -#: src/main.c:4742 src/gui.c:609 src/utils.c:2619 src/utils.c:2651 -#: src/saveplay.c:2759 src/multitrack.c:3903 src/multitrack.c:5416 +#: src/main.c:4766 src/gui.c:635 src/utils.c:2619 src/utils.c:2651 +#: src/saveplay.c:2761 src/multitrack.c:3905 src/multitrack.c:5449 msgid "_Redo" msgstr "_Restablir" -#: src/main.c:4768 src/interface.c:642 src/gui.c:2164 src/preferences.c:2381 +#: src/main.c:4792 src/interface.c:642 src/gui.c:2190 src/preferences.c:2381 #: src/resample.c:1790 msgid "Video" msgstr "Vidèo" -#: src/main.c:4769 src/interface.c:661 src/gui.c:2183 +#: src/main.c:4793 src/interface.c:661 src/gui.c:2209 msgid "Left Audio" msgstr "Àudio Esquèrra" -#: src/main.c:4770 src/gui.c:2201 +#: src/main.c:4794 src/gui.c:2227 msgid "Right Audio" msgstr "Àudio Drecha" -#: src/main.c:4815 +#: src/main.c:4839 msgid "" "\n" "\n" @@ -709,7 +709,7 @@ msgid "Use _mplayer audio player" msgstr "Utiliza lo lector audui _mplayer" -#: src/startup.c:402 src/startup.c:591 src/interface.c:1988 +#: src/startup.c:402 src/startup.c:591 src/interface.c:2111 msgid "_Next" msgstr "_Seguent" @@ -871,10 +871,10 @@ msgid "If this is set, frames will be deinterlaced as they are imported." msgstr "" -#: src/interface.c:190 src/callbacks.c:7763 src/gui.c:2982 src/gui.c:3523 -#: src/saveplay.c:1796 src/saveplay.c:2425 src/dialogs.c:859 src/dialogs.c:860 +#: src/interface.c:190 src/callbacks.c:7908 src/gui.c:3014 src/gui.c:3555 +#: src/saveplay.c:1798 src/saveplay.c:2427 src/dialogs.c:859 src/dialogs.c:860 #: src/dialogs.c:1035 src/dialogs.c:1036 src/framedraw.c:189 -#: src/multitrack.c:6965 +#: src/multitrack.c:6998 msgid "Preview" msgstr "Apercebut" @@ -903,7 +903,7 @@ "Remember to switch off effects (ctrl-0) afterwards !" msgstr "" -#: src/interface.c:339 src/callbacks.c:7535 src/callbacks.c:7567 +#: src/interface.c:339 src/callbacks.c:7680 src/callbacks.c:7712 #: src/dialogs.c:1846 msgid "" "\n" @@ -928,7 +928,7 @@ msgid "Paus_e" msgstr "Paus_a" -#: src/interface.c:409 src/callbacks.c:7564 +#: src/interface.c:409 src/callbacks.c:7709 msgid "Pause/_Enough" msgstr "Pausa/_Pro" @@ -956,7 +956,7 @@ msgid "Total time" msgstr "Temps Total" -#: src/interface.c:623 src/interface.c:2508 +#: src/interface.c:623 src/interface.c:2635 msgid "FPS" msgstr "FPS" @@ -1076,11 +1076,16 @@ msgid " Number of frames to open" msgstr " Nombre d'imatges de dobrir" -#: src/interface.c:1691 +#: src/interface.c:1702 msgid "LiVES: - Open Location" msgstr "LiVES: - Dobrir l'emplaçament" -#: src/interface.c:1696 +#: src/interface.c:1704 +#, fuzzy +msgid "LiVES: - Open Youtube Clip" +msgstr "LiVES: - Tornar nomenar un Clip" + +#: src/interface.c:1710 msgid "" "\n" "\n" @@ -1090,19 +1095,56 @@ "\n" msgstr "" -#: src/interface.c:1708 +#: src/interface.c:1713 +msgid "" +"\n" +"\n" +"To open a clip from Youtube, LiVES will first download it with youtube-dl.\n" +"Please make sure you have the latest version of that tool installed.\n" +"\n" +msgstr "" + +#: src/interface.c:1722 +msgid "" +"Enter the URL of the clip below.\n" +"E.g: http://www.youtube.com/watch?v=WCR6f6WzjP8\n" +"\n" +msgstr "" + +#: src/interface.c:1737 msgid "URL : " msgstr "URL : " -#: src/interface.c:1724 +#: src/interface.c:1739 +#, fuzzy +msgid "Youtube URL : " +msgstr "URL : " + +#: src/interface.c:1759 msgid "Do not send bandwidth information" msgstr "" -#: src/interface.c:1725 +#: src/interface.c:1760 msgid "Try this setting if you are having problems getting a stream" msgstr "" -#: src/interface.c:1838 +#: src/interface.c:1797
View file
LiVES-1.4.8.tar.bz2/po/pl.po -> LiVES-1.4.9.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-11-26 09:19-0300\n" +"POT-Creation-Date: 2011-12-08 14:51-0300\n" "PO-Revision-Date: 2011-09-18 02:25+0000\n" "Last-Translator: pp/bs <Unknown>\n" "Language-Team: Polish <pl@li.org>\n" @@ -392,7 +392,7 @@ msgid "-debug : try to debug crashes (requires 'gdb' installed)\n" msgstr "" -#: src/main.c:1818 src/gui.c:1062 +#: src/main.c:1818 src/gui.c:1088 msgid "Starting GUI..." msgstr "" @@ -543,56 +543,56 @@ msgid "LiVES-%s: <No File>" msgstr "" -#: src/main.c:3793 +#: src/main.c:3801 #, c-format msgid "rec %9d/%d" msgstr "" -#: src/main.c:3795 +#: src/main.c:3803 #, c-format msgid "!rec %9d/%d" msgstr "" -#: src/main.c:4013 src/main.c:4014 src/gui.c:2006 src/gui.c:2979 -#: src/saveplay.c:1793 +#: src/main.c:4021 src/main.c:4022 src/gui.c:2032 src/gui.c:3011 +#: src/saveplay.c:1795 msgid "Play" msgstr "Odtwarzaj" -#: src/main.c:4477 +#: src/main.c:4497 msgid "" "LiVES was unable to capture this image\n" "\n" msgstr "" -#: src/main.c:4575 +#: src/main.c:4599 #, c-format msgid "Closed file %s\n" msgstr "" -#: src/main.c:4741 src/gui.c:596 src/utils.c:2618 src/utils.c:2650 -#: src/saveplay.c:2758 src/multitrack.c:3882 src/multitrack.c:5393 +#: src/main.c:4765 src/gui.c:622 src/utils.c:2618 src/utils.c:2650 +#: src/saveplay.c:2760 src/multitrack.c:3884 src/multitrack.c:5426 msgid "_Undo" msgstr "_Cofnij" -#: src/main.c:4742 src/gui.c:609 src/utils.c:2619 src/utils.c:2651 -#: src/saveplay.c:2759 src/multitrack.c:3903 src/multitrack.c:5416 +#: src/main.c:4766 src/gui.c:635 src/utils.c:2619 src/utils.c:2651 +#: src/saveplay.c:2761 src/multitrack.c:3905 src/multitrack.c:5449 msgid "_Redo" msgstr "_Powtórz" -#: src/main.c:4768 src/interface.c:642 src/gui.c:2164 src/preferences.c:2381 +#: src/main.c:4792 src/interface.c:642 src/gui.c:2190 src/preferences.c:2381 #: src/resample.c:1790 msgid "Video" msgstr "Wideo" -#: src/main.c:4769 src/interface.c:661 src/gui.c:2183 +#: src/main.c:4793 src/interface.c:661 src/gui.c:2209 msgid "Left Audio" msgstr "" -#: src/main.c:4770 src/gui.c:2201 +#: src/main.c:4794 src/gui.c:2227 msgid "Right Audio" msgstr "" -#: src/main.c:4815 +#: src/main.c:4839 msgid "" "\n" "\n" @@ -721,7 +721,7 @@ msgid "Use _mplayer audio player" msgstr "Użyj _mplayer odtwarzacz audio" -#: src/startup.c:402 src/startup.c:591 src/interface.c:1988 +#: src/startup.c:402 src/startup.c:591 src/interface.c:2111 msgid "_Next" msgstr "" @@ -894,10 +894,10 @@ msgid "If this is set, frames will be deinterlaced as they are imported." msgstr "" -#: src/interface.c:190 src/callbacks.c:7763 src/gui.c:2982 src/gui.c:3523 -#: src/saveplay.c:1796 src/saveplay.c:2425 src/dialogs.c:859 src/dialogs.c:860 +#: src/interface.c:190 src/callbacks.c:7908 src/gui.c:3014 src/gui.c:3555 +#: src/saveplay.c:1798 src/saveplay.c:2427 src/dialogs.c:859 src/dialogs.c:860 #: src/dialogs.c:1035 src/dialogs.c:1036 src/framedraw.c:189 -#: src/multitrack.c:6965 +#: src/multitrack.c:6998 msgid "Preview" msgstr "Podgląd" @@ -926,7 +926,7 @@ "Remember to switch off effects (ctrl-0) afterwards !" msgstr "" -#: src/interface.c:339 src/callbacks.c:7535 src/callbacks.c:7567 +#: src/interface.c:339 src/callbacks.c:7680 src/callbacks.c:7712 #: src/dialogs.c:1846 msgid "" "\n" @@ -951,7 +951,7 @@ msgid "Paus_e" msgstr "" -#: src/interface.c:409 src/callbacks.c:7564 +#: src/interface.c:409 src/callbacks.c:7709 msgid "Pause/_Enough" msgstr "" @@ -979,7 +979,7 @@ msgid "Total time" msgstr "Całkowity czas" -#: src/interface.c:623 src/interface.c:2508 +#: src/interface.c:623 src/interface.c:2635 msgid "FPS" msgstr "Klatki na sekundę" @@ -1099,11 +1099,16 @@ msgid " Number of frames to open" msgstr " Liczba klatek, aby otworzyć" -#: src/interface.c:1691 +#: src/interface.c:1702 msgid "LiVES: - Open Location" msgstr "" -#: src/interface.c:1696 +#: src/interface.c:1704 +#, fuzzy +msgid "LiVES: - Open Youtube Clip" +msgstr "LiVES: odzyskać układu ?" + +#: src/interface.c:1710 msgid "" "\n" "\n" @@ -1113,19 +1118,56 @@ "\n" msgstr "" -#: src/interface.c:1708 +#: src/interface.c:1713 +msgid "" +"\n" +"\n" +"To open a clip from Youtube, LiVES will first download it with youtube-dl.\n" +"Please make sure you have the latest version of that tool installed.\n" +"\n" +msgstr "" + +#: src/interface.c:1722 +msgid "" +"Enter the URL of the clip below.\n" +"E.g: http://www.youtube.com/watch?v=WCR6f6WzjP8\n" +"\n" +msgstr "" + +#: src/interface.c:1737 msgid "URL : " msgstr "Adres : " -#: src/interface.c:1724 +#: src/interface.c:1739 +#, fuzzy +msgid "Youtube URL : " +msgstr "Adres : " + +#: src/interface.c:1759 msgid "Do not send bandwidth information" msgstr "Nie wysyłaj przepustowości informacji" -#: src/interface.c:1725 +#: src/interface.c:1760 msgid "Try this setting if you are having problems getting a stream" msgstr "Wypróbuj tę funkcję, jeśli mają problemy ze znalezieniem strumień" -#: src/interface.c:1838 +#: src/interface.c:1797
View file
LiVES-1.4.8.tar.bz2/po/pt.po -> LiVES-1.4.9.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-11-26 09:19-0300\n" +"POT-Creation-Date: 2011-12-08 14:51-0300\n" "PO-Revision-Date: 2011-08-18 12:00+0000\n" "Last-Translator: salsaman <salsaman@gmail.com>\n" "Language-Team: pixel <vjpixel@gmail.com>\n" @@ -391,7 +391,7 @@ msgid "-debug : try to debug crashes (requires 'gdb' installed)\n" msgstr "" -#: src/main.c:1818 src/gui.c:1062 +#: src/main.c:1818 src/gui.c:1088 msgid "Starting GUI..." msgstr "A iniciar GUI..." @@ -603,22 +603,22 @@ msgid "LiVES-%s: <No File>" msgstr "LiVES-%s: <Nenhum Arquivo>" -#: src/main.c:3793 +#: src/main.c:3801 #, c-format msgid "rec %9d/%d" msgstr "grv %9d/%d" -#: src/main.c:3795 +#: src/main.c:3803 #, c-format msgid "!rec %9d/%d" msgstr "!grv %9d/%d" -#: src/main.c:4013 src/main.c:4014 src/gui.c:2006 src/gui.c:2979 -#: src/saveplay.c:1793 +#: src/main.c:4021 src/main.c:4022 src/gui.c:2032 src/gui.c:3011 +#: src/saveplay.c:1795 msgid "Play" msgstr "Tocar" -#: src/main.c:4477 +#: src/main.c:4497 msgid "" "LiVES was unable to capture this image\n" "\n" @@ -626,35 +626,35 @@ "LiVES não conseguiu capturar esta imagem\n" "\n" -#: src/main.c:4575 +#: src/main.c:4599 #, c-format msgid "Closed file %s\n" msgstr "Arquivo %s fechado\n" -#: src/main.c:4741 src/gui.c:596 src/utils.c:2618 src/utils.c:2650 -#: src/saveplay.c:2758 src/multitrack.c:3882 src/multitrack.c:5393 +#: src/main.c:4765 src/gui.c:622 src/utils.c:2618 src/utils.c:2650 +#: src/saveplay.c:2760 src/multitrack.c:3884 src/multitrack.c:5426 msgid "_Undo" msgstr "Desfazer [_U]" -#: src/main.c:4742 src/gui.c:609 src/utils.c:2619 src/utils.c:2651 -#: src/saveplay.c:2759 src/multitrack.c:3903 src/multitrack.c:5416 +#: src/main.c:4766 src/gui.c:635 src/utils.c:2619 src/utils.c:2651 +#: src/saveplay.c:2761 src/multitrack.c:3905 src/multitrack.c:5449 msgid "_Redo" msgstr "_Refazer" -#: src/main.c:4768 src/interface.c:642 src/gui.c:2164 src/preferences.c:2381 +#: src/main.c:4792 src/interface.c:642 src/gui.c:2190 src/preferences.c:2381 #: src/resample.c:1790 msgid "Video" msgstr "Vídeo" -#: src/main.c:4769 src/interface.c:661 src/gui.c:2183 +#: src/main.c:4793 src/interface.c:661 src/gui.c:2209 msgid "Left Audio" msgstr "Áudio Esquerdo" -#: src/main.c:4770 src/gui.c:2201 +#: src/main.c:4794 src/gui.c:2227 msgid "Right Audio" msgstr "Áudio Direito" -#: src/main.c:4815 +#: src/main.c:4839 msgid "" "\n" "\n" @@ -787,7 +787,7 @@ msgid "Use _mplayer audio player" msgstr "" -#: src/startup.c:402 src/startup.c:591 src/interface.c:1988 +#: src/startup.c:402 src/startup.c:591 src/interface.c:2111 msgid "_Next" msgstr "_Próximo" @@ -951,10 +951,10 @@ "Se isso for selecionado, frames vão ser desinterlaçados enquanto forem " "importados." -#: src/interface.c:190 src/callbacks.c:7763 src/gui.c:2982 src/gui.c:3523 -#: src/saveplay.c:1796 src/saveplay.c:2425 src/dialogs.c:859 src/dialogs.c:860 +#: src/interface.c:190 src/callbacks.c:7908 src/gui.c:3014 src/gui.c:3555 +#: src/saveplay.c:1798 src/saveplay.c:2427 src/dialogs.c:859 src/dialogs.c:860 #: src/dialogs.c:1035 src/dialogs.c:1036 src/framedraw.c:189 -#: src/multitrack.c:6965 +#: src/multitrack.c:6998 msgid "Preview" msgstr "Visualizar" @@ -989,7 +989,7 @@ "\n" "Lembre de desligar os efeitos (ctrl-0) depois!" -#: src/interface.c:339 src/callbacks.c:7535 src/callbacks.c:7567 +#: src/interface.c:339 src/callbacks.c:7680 src/callbacks.c:7712 #: src/dialogs.c:1846 msgid "" "\n" @@ -1014,7 +1014,7 @@ msgid "Paus_e" msgstr "" -#: src/interface.c:409 src/callbacks.c:7564 +#: src/interface.c:409 src/callbacks.c:7709 msgid "Pause/_Enough" msgstr "" @@ -1042,7 +1042,7 @@ msgid "Total time" msgstr "Tempo total" -#: src/interface.c:623 src/interface.c:2508 +#: src/interface.c:623 src/interface.c:2635 msgid "FPS" msgstr "FPS" @@ -1166,11 +1166,16 @@ msgid " Number of frames to open" msgstr " Número de frames a abrir" -#: src/interface.c:1691 +#: src/interface.c:1702 msgid "LiVES: - Open Location" msgstr "LiVES: - Abrir Stream" -#: src/interface.c:1696 +#: src/interface.c:1704 +#, fuzzy +msgid "LiVES: - Open Youtube Clip" +msgstr "LiVES: - Renomear Clipe" + +#: src/interface.c:1710 msgid "" "\n" "\n" @@ -1186,19 +1191,56 @@ "Também certifique-se de ter marcado sua banda em Preferências|Streaming\n" "\n" -#: src/interface.c:1708 +#: src/interface.c:1713 +msgid "" +"\n" +"\n" +"To open a clip from Youtube, LiVES will first download it with youtube-dl.\n" +"Please make sure you have the latest version of that tool installed.\n" +"\n" +msgstr "" + +#: src/interface.c:1722 +msgid "" +"Enter the URL of the clip below.\n" +"E.g: http://www.youtube.com/watch?v=WCR6f6WzjP8\n" +"\n" +msgstr "" + +#: src/interface.c:1737 msgid "URL : " msgstr "URL : " -#: src/interface.c:1724 +#: src/interface.c:1739 +#, fuzzy +msgid "Youtube URL : " +msgstr "URL : " + +#: src/interface.c:1759 msgid "Do not send bandwidth information" msgstr "Não enviar informação de banda" -#: src/interface.c:1725 +#: src/interface.c:1760 msgid "Try this setting if you are having problems getting a stream" msgstr "Tente esta configuração se está tendo problemas ao pegar um stream"
View file
LiVES-1.4.8.tar.bz2/po/pt_BR.po -> LiVES-1.4.9.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-11-26 09:19-0300\n" +"POT-Creation-Date: 2011-12-08 14:51-0300\n" "PO-Revision-Date: 2011-08-18 12:03+0000\n" "Last-Translator: salsaman <salsaman@gmail.com>\n" "Language-Team: pixel <vjpixel@gmail.com>\n" @@ -404,7 +404,7 @@ "-debug : tentativa de debug falhou (necessita do 'gdb' " "instalado)\n" -#: src/main.c:1818 src/gui.c:1062 +#: src/main.c:1818 src/gui.c:1088 msgid "Starting GUI..." msgstr "Iniciando interface gráfica..." @@ -616,22 +616,22 @@ msgid "LiVES-%s: <No File>" msgstr "LiVES-%s: <Nenhum Arquivo>" -#: src/main.c:3793 +#: src/main.c:3801 #, c-format msgid "rec %9d/%d" msgstr "grv %9d/%d" -#: src/main.c:3795 +#: src/main.c:3803 #, c-format msgid "!rec %9d/%d" msgstr "!grv %9d/%d" -#: src/main.c:4013 src/main.c:4014 src/gui.c:2006 src/gui.c:2979 -#: src/saveplay.c:1793 +#: src/main.c:4021 src/main.c:4022 src/gui.c:2032 src/gui.c:3011 +#: src/saveplay.c:1795 msgid "Play" msgstr "Tocar" -#: src/main.c:4477 +#: src/main.c:4497 msgid "" "LiVES was unable to capture this image\n" "\n" @@ -639,35 +639,35 @@ "LiVES não conseguiu capturar esta imagem\n" "\n" -#: src/main.c:4575 +#: src/main.c:4599 #, c-format msgid "Closed file %s\n" msgstr "Arquivo %s fechado\n" -#: src/main.c:4741 src/gui.c:596 src/utils.c:2618 src/utils.c:2650 -#: src/saveplay.c:2758 src/multitrack.c:3882 src/multitrack.c:5393 +#: src/main.c:4765 src/gui.c:622 src/utils.c:2618 src/utils.c:2650 +#: src/saveplay.c:2760 src/multitrack.c:3884 src/multitrack.c:5426 msgid "_Undo" msgstr "Desfazer [_U]" -#: src/main.c:4742 src/gui.c:609 src/utils.c:2619 src/utils.c:2651 -#: src/saveplay.c:2759 src/multitrack.c:3903 src/multitrack.c:5416 +#: src/main.c:4766 src/gui.c:635 src/utils.c:2619 src/utils.c:2651 +#: src/saveplay.c:2761 src/multitrack.c:3905 src/multitrack.c:5449 msgid "_Redo" msgstr "_Refazer" -#: src/main.c:4768 src/interface.c:642 src/gui.c:2164 src/preferences.c:2381 +#: src/main.c:4792 src/interface.c:642 src/gui.c:2190 src/preferences.c:2381 #: src/resample.c:1790 msgid "Video" msgstr "Vídeo" -#: src/main.c:4769 src/interface.c:661 src/gui.c:2183 +#: src/main.c:4793 src/interface.c:661 src/gui.c:2209 msgid "Left Audio" msgstr "Áudio Esquerdo" -#: src/main.c:4770 src/gui.c:2201 +#: src/main.c:4794 src/gui.c:2227 msgid "Right Audio" msgstr "Áudio Direito" -#: src/main.c:4815 +#: src/main.c:4839 msgid "" "\n" "\n" @@ -832,7 +832,7 @@ msgid "Use _mplayer audio player" msgstr "Usar _mplayer audio player" -#: src/startup.c:402 src/startup.c:591 src/interface.c:1988 +#: src/startup.c:402 src/startup.c:591 src/interface.c:2111 msgid "_Next" msgstr "_Próximo" @@ -1017,10 +1017,10 @@ "Se isso for selecionado, frames vão ser desinterlaçados enquanto forem " "importados." -#: src/interface.c:190 src/callbacks.c:7763 src/gui.c:2982 src/gui.c:3523 -#: src/saveplay.c:1796 src/saveplay.c:2425 src/dialogs.c:859 src/dialogs.c:860 +#: src/interface.c:190 src/callbacks.c:7908 src/gui.c:3014 src/gui.c:3555 +#: src/saveplay.c:1798 src/saveplay.c:2427 src/dialogs.c:859 src/dialogs.c:860 #: src/dialogs.c:1035 src/dialogs.c:1036 src/framedraw.c:189 -#: src/multitrack.c:6965 +#: src/multitrack.c:6998 msgid "Preview" msgstr "Visualizar" @@ -1055,7 +1055,7 @@ "\n" "Lembre de desligar os efeitos (ctrl-0) depois!" -#: src/interface.c:339 src/callbacks.c:7535 src/callbacks.c:7567 +#: src/interface.c:339 src/callbacks.c:7680 src/callbacks.c:7712 #: src/dialogs.c:1846 msgid "" "\n" @@ -1080,7 +1080,7 @@ msgid "Paus_e" msgstr "Pausar" -#: src/interface.c:409 src/callbacks.c:7564 +#: src/interface.c:409 src/callbacks.c:7709 msgid "Pause/_Enough" msgstr "Pausa/Sufici_ente" @@ -1108,7 +1108,7 @@ msgid "Total time" msgstr "Tempo total" -#: src/interface.c:623 src/interface.c:2508 +#: src/interface.c:623 src/interface.c:2635 msgid "FPS" msgstr "FPS" @@ -1232,11 +1232,16 @@ msgid " Number of frames to open" msgstr " Número de frames a abrir" -#: src/interface.c:1691 +#: src/interface.c:1702 msgid "LiVES: - Open Location" msgstr "LiVES: - Abrir Stream" -#: src/interface.c:1696 +#: src/interface.c:1704 +#, fuzzy +msgid "LiVES: - Open Youtube Clip" +msgstr "LiVES: - Renomear Clipe" + +#: src/interface.c:1710 msgid "" "\n" "\n" @@ -1252,19 +1257,56 @@ "Também certifique-se de ter marcado sua banda em Preferências|Streaming\n" "\n" -#: src/interface.c:1708 +#: src/interface.c:1713 +msgid "" +"\n" +"\n" +"To open a clip from Youtube, LiVES will first download it with youtube-dl.\n" +"Please make sure you have the latest version of that tool installed.\n" +"\n" +msgstr "" + +#: src/interface.c:1722 +msgid "" +"Enter the URL of the clip below.\n" +"E.g: http://www.youtube.com/watch?v=WCR6f6WzjP8\n" +"\n" +msgstr "" + +#: src/interface.c:1737 msgid "URL : " msgstr "URL : " -#: src/interface.c:1724 +#: src/interface.c:1739 +#, fuzzy +msgid "Youtube URL : " +msgstr "URL : " + +#: src/interface.c:1759 msgid "Do not send bandwidth information" msgstr "Não enviar informação de banda" -#: src/interface.c:1725 +#: src/interface.c:1760 msgid "Try this setting if you are having problems getting a stream" msgstr "Tente esta configuração se está tendo problemas ao pegar um stream"
View file
LiVES-1.4.8.tar.bz2/po/ro.po -> LiVES-1.4.9.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-11-26 09:19-0300\n" +"POT-Creation-Date: 2011-12-08 14:51-0300\n" "PO-Revision-Date: 2011-08-18 11:57+0000\n" "Last-Translator: salsaman <salsaman@gmail.com>\n" "Language-Team: Romanian <ro@li.org>\n" @@ -402,7 +402,7 @@ msgstr "" "-debug : încerca să se blochează de depanare (necesită 'gdb' instalat)\n" -#: src/main.c:1818 src/gui.c:1062 +#: src/main.c:1818 src/gui.c:1088 msgid "Starting GUI..." msgstr "Incepand GUI ..." @@ -563,22 +563,22 @@ msgid "LiVES-%s: <No File>" msgstr "LiVES-%s: <Nici un fişier>" -#: src/main.c:3793 +#: src/main.c:3801 #, c-format msgid "rec %9d/%d" msgstr "" -#: src/main.c:3795 +#: src/main.c:3803 #, c-format msgid "!rec %9d/%d" msgstr "" -#: src/main.c:4013 src/main.c:4014 src/gui.c:2006 src/gui.c:2979 -#: src/saveplay.c:1793 +#: src/main.c:4021 src/main.c:4022 src/gui.c:2032 src/gui.c:3011 +#: src/saveplay.c:1795 msgid "Play" msgstr "Rulează" -#: src/main.c:4477 +#: src/main.c:4497 msgid "" "LiVES was unable to capture this image\n" "\n" @@ -586,35 +586,35 @@ "LiVES nu a putut pentru a capta această imagine\n" "\n" -#: src/main.c:4575 +#: src/main.c:4599 #, c-format msgid "Closed file %s\n" msgstr "Închis de fişiere% s\n" -#: src/main.c:4741 src/gui.c:596 src/utils.c:2618 src/utils.c:2650 -#: src/saveplay.c:2758 src/multitrack.c:3882 src/multitrack.c:5393 +#: src/main.c:4765 src/gui.c:622 src/utils.c:2618 src/utils.c:2650 +#: src/saveplay.c:2760 src/multitrack.c:3884 src/multitrack.c:5426 msgid "_Undo" msgstr "An_ulează ultima acțiune" -#: src/main.c:4742 src/gui.c:609 src/utils.c:2619 src/utils.c:2651 -#: src/saveplay.c:2759 src/multitrack.c:3903 src/multitrack.c:5416 +#: src/main.c:4766 src/gui.c:635 src/utils.c:2619 src/utils.c:2651 +#: src/saveplay.c:2761 src/multitrack.c:3905 src/multitrack.c:5449 msgid "_Redo" msgstr "_Refă ultima acțiune" -#: src/main.c:4768 src/interface.c:642 src/gui.c:2164 src/preferences.c:2381 +#: src/main.c:4792 src/interface.c:642 src/gui.c:2190 src/preferences.c:2381 #: src/resample.c:1790 msgid "Video" msgstr "Video" -#: src/main.c:4769 src/interface.c:661 src/gui.c:2183 +#: src/main.c:4793 src/interface.c:661 src/gui.c:2209 msgid "Left Audio" msgstr "" -#: src/main.c:4770 src/gui.c:2201 +#: src/main.c:4794 src/gui.c:2227 msgid "Right Audio" msgstr "" -#: src/main.c:4815 +#: src/main.c:4839 msgid "" "\n" "\n" @@ -741,7 +741,7 @@ msgid "Use _mplayer audio player" msgstr "" -#: src/startup.c:402 src/startup.c:591 src/interface.c:1988 +#: src/startup.c:402 src/startup.c:591 src/interface.c:2111 msgid "_Next" msgstr "Î_nainte" @@ -903,10 +903,10 @@ msgid "If this is set, frames will be deinterlaced as they are imported." msgstr "" -#: src/interface.c:190 src/callbacks.c:7763 src/gui.c:2982 src/gui.c:3523 -#: src/saveplay.c:1796 src/saveplay.c:2425 src/dialogs.c:859 src/dialogs.c:860 +#: src/interface.c:190 src/callbacks.c:7908 src/gui.c:3014 src/gui.c:3555 +#: src/saveplay.c:1798 src/saveplay.c:2427 src/dialogs.c:859 src/dialogs.c:860 #: src/dialogs.c:1035 src/dialogs.c:1036 src/framedraw.c:189 -#: src/multitrack.c:6965 +#: src/multitrack.c:6998 msgid "Preview" msgstr "Previzionează" @@ -940,7 +940,7 @@ "\n" "Amintiţi-vă pentru a opri efectele (Ctrl-0) dupa aceea !" -#: src/interface.c:339 src/callbacks.c:7535 src/callbacks.c:7567 +#: src/interface.c:339 src/callbacks.c:7680 src/callbacks.c:7712 #: src/dialogs.c:1846 msgid "" "\n" @@ -965,7 +965,7 @@ msgid "Paus_e" msgstr "" -#: src/interface.c:409 src/callbacks.c:7564 +#: src/interface.c:409 src/callbacks.c:7709 msgid "Pause/_Enough" msgstr "" @@ -993,7 +993,7 @@ msgid "Total time" msgstr "Timp total" -#: src/interface.c:623 src/interface.c:2508 +#: src/interface.c:623 src/interface.c:2635 msgid "FPS" msgstr "FPS" @@ -1115,11 +1115,16 @@ msgid " Number of frames to open" msgstr " Numărul de cadre pentru a deschide" -#: src/interface.c:1691 +#: src/interface.c:1702 msgid "LiVES: - Open Location" msgstr "" -#: src/interface.c:1696 +#: src/interface.c:1704 +#, fuzzy +msgid "LiVES: - Open Youtube Clip" +msgstr "LiVES: - Redenumiţi Clip" + +#: src/interface.c:1710 msgid "" "\n" "\n" @@ -1129,19 +1134,56 @@ "\n" msgstr "" -#: src/interface.c:1708 +#: src/interface.c:1713 +msgid "" +"\n" +"\n" +"To open a clip from Youtube, LiVES will first download it with youtube-dl.\n" +"Please make sure you have the latest version of that tool installed.\n" +"\n" +msgstr "" + +#: src/interface.c:1722 +msgid "" +"Enter the URL of the clip below.\n" +"E.g: http://www.youtube.com/watch?v=WCR6f6WzjP8\n" +"\n" +msgstr "" + +#: src/interface.c:1737 msgid "URL : " msgstr "URL : " -#: src/interface.c:1724 +#: src/interface.c:1739 +#, fuzzy +msgid "Youtube URL : " +msgstr "URL : " + +#: src/interface.c:1759 msgid "Do not send bandwidth information" msgstr "Nu trimiteţi informaţiile latime de banda" -#: src/interface.c:1725 +#: src/interface.c:1760 msgid "Try this setting if you are having problems getting a stream" msgstr "Încercaţi această setare dacă aveţi probleme cu obţinerea unui flux de"
View file
LiVES-1.4.8.tar.bz2/po/ru.po -> LiVES-1.4.9.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-11-26 09:19-0300\n" +"POT-Creation-Date: 2011-12-08 14:51-0300\n" "PO-Revision-Date: 2011-08-18 11:56+0000\n" "Last-Translator: Alexey Ivanov <alexey.ivanes@gmail.com>\n" "Language-Team: Russian <ru@li.org>\n" @@ -410,7 +410,7 @@ msgstr "" "-debug : использовать для отладки ошибок (требуется установленный 'gdb')\n" -#: src/main.c:1818 src/gui.c:1062 +#: src/main.c:1818 src/gui.c:1088 msgid "Starting GUI..." msgstr "Запуск графической оболочки..." @@ -620,22 +620,22 @@ msgid "LiVES-%s: <No File>" msgstr "LiVES-%s: <Нет файла>" -#: src/main.c:3793 +#: src/main.c:3801 #, c-format msgid "rec %9d/%d" msgstr "" -#: src/main.c:3795 +#: src/main.c:3803 #, c-format msgid "!rec %9d/%d" msgstr "" -#: src/main.c:4013 src/main.c:4014 src/gui.c:2006 src/gui.c:2979 -#: src/saveplay.c:1793 +#: src/main.c:4021 src/main.c:4022 src/gui.c:2032 src/gui.c:3011 +#: src/saveplay.c:1795 msgid "Play" msgstr "Воспроизвести" -#: src/main.c:4477 +#: src/main.c:4497 msgid "" "LiVES was unable to capture this image\n" "\n" @@ -643,35 +643,35 @@ "LiVES не может загрузить это изображение\n" "\n" -#: src/main.c:4575 +#: src/main.c:4599 #, c-format msgid "Closed file %s\n" msgstr "Закрыть файл %s\n" -#: src/main.c:4741 src/gui.c:596 src/utils.c:2618 src/utils.c:2650 -#: src/saveplay.c:2758 src/multitrack.c:3882 src/multitrack.c:5393 +#: src/main.c:4765 src/gui.c:622 src/utils.c:2618 src/utils.c:2650 +#: src/saveplay.c:2760 src/multitrack.c:3884 src/multitrack.c:5426 msgid "_Undo" msgstr "_Отменить" -#: src/main.c:4742 src/gui.c:609 src/utils.c:2619 src/utils.c:2651 -#: src/saveplay.c:2759 src/multitrack.c:3903 src/multitrack.c:5416 +#: src/main.c:4766 src/gui.c:635 src/utils.c:2619 src/utils.c:2651 +#: src/saveplay.c:2761 src/multitrack.c:3905 src/multitrack.c:5449 msgid "_Redo" msgstr "_Вернуть" -#: src/main.c:4768 src/interface.c:642 src/gui.c:2164 src/preferences.c:2381 +#: src/main.c:4792 src/interface.c:642 src/gui.c:2190 src/preferences.c:2381 #: src/resample.c:1790 msgid "Video" msgstr "Видео" -#: src/main.c:4769 src/interface.c:661 src/gui.c:2183 +#: src/main.c:4793 src/interface.c:661 src/gui.c:2209 msgid "Left Audio" msgstr "Левый звуковой канал" -#: src/main.c:4770 src/gui.c:2201 +#: src/main.c:4794 src/gui.c:2227 msgid "Right Audio" msgstr "Правый звуковой канал" -#: src/main.c:4815 +#: src/main.c:4839 msgid "" "\n" "\n" @@ -841,7 +841,7 @@ msgid "Use _mplayer audio player" msgstr "Использовать аудиоплеер _mplayer" -#: src/startup.c:402 src/startup.c:591 src/interface.c:1988 +#: src/startup.c:402 src/startup.c:591 src/interface.c:2111 msgid "_Next" msgstr "_Далее" @@ -1020,10 +1020,10 @@ msgid "If this is set, frames will be deinterlaced as they are imported." msgstr "Если включить, чересстрочная развёртка будет устранена при импорте." -#: src/interface.c:190 src/callbacks.c:7763 src/gui.c:2982 src/gui.c:3523 -#: src/saveplay.c:1796 src/saveplay.c:2425 src/dialogs.c:859 src/dialogs.c:860 +#: src/interface.c:190 src/callbacks.c:7908 src/gui.c:3014 src/gui.c:3555 +#: src/saveplay.c:1798 src/saveplay.c:2427 src/dialogs.c:859 src/dialogs.c:860 #: src/dialogs.c:1035 src/dialogs.c:1036 src/framedraw.c:189 -#: src/multitrack.c:6965 +#: src/multitrack.c:6998 msgid "Preview" msgstr "Предпросмотр" @@ -1059,7 +1059,7 @@ "\n" "Не забудьте отключить эффекты (ctrl-0) позже!" -#: src/interface.c:339 src/callbacks.c:7535 src/callbacks.c:7567 +#: src/interface.c:339 src/callbacks.c:7680 src/callbacks.c:7712 #: src/dialogs.c:1846 msgid "" "\n" @@ -1084,7 +1084,7 @@ msgid "Paus_e" msgstr "" -#: src/interface.c:409 src/callbacks.c:7564 +#: src/interface.c:409 src/callbacks.c:7709 msgid "Pause/_Enough" msgstr "" @@ -1112,7 +1112,7 @@ msgid "Total time" msgstr "Общая продолжительность" -#: src/interface.c:623 src/interface.c:2508 +#: src/interface.c:623 src/interface.c:2635 msgid "FPS" msgstr "FPS" @@ -1240,11 +1240,16 @@ msgid " Number of frames to open" msgstr " Число кадров, которые будут открыты" -#: src/interface.c:1691 +#: src/interface.c:1702 msgid "LiVES: - Open Location" msgstr "LiVES: - Открыть путь" -#: src/interface.c:1696 +#: src/interface.c:1704 +#, fuzzy +msgid "LiVES: - Open Youtube Clip" +msgstr "LiVES: - Переименовать клип" + +#: src/interface.c:1710 msgid "" "\n" "\n" @@ -1261,19 +1266,56 @@ "Потоки\n" "\n" -#: src/interface.c:1708 +#: src/interface.c:1713 +msgid "" +"\n" +"\n" +"To open a clip from Youtube, LiVES will first download it with youtube-dl.\n" +"Please make sure you have the latest version of that tool installed.\n" +"\n" +msgstr "" + +#: src/interface.c:1722 +msgid "" +"Enter the URL of the clip below.\n" +"E.g: http://www.youtube.com/watch?v=WCR6f6WzjP8\n" +"\n" +msgstr "" + +#: src/interface.c:1737 msgid "URL : " msgstr "URL: " -#: src/interface.c:1724 +#: src/interface.c:1739 +#, fuzzy +msgid "Youtube URL : " +msgstr "URL: " + +#: src/interface.c:1759 msgid "Do not send bandwidth information" msgstr "Не посылать сведения о пропускной способности" -#: src/interface.c:1725 +#: src/interface.c:1760 msgid "Try this setting if you are having problems getting a stream" msgstr "Попробуйте эту настройку, если возникли проблемы с получением потока"
View file
LiVES-1.4.8.tar.bz2/po/sk.po -> LiVES-1.4.9.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-11-26 09:19-0300\n" +"POT-Creation-Date: 2011-12-08 14:51-0300\n" "PO-Revision-Date: 2011-11-01 11:47+0000\n" "Last-Translator: milboy <Unknown>\n" "Language-Team: Slovak <sk@li.org>\n" @@ -404,7 +404,7 @@ msgid "-debug : try to debug crashes (requires 'gdb' installed)\n" msgstr "-debug : skúsiť ladenie zlyhania (vyžaduje nainštalovaný 'gdb' )\n" -#: src/main.c:1818 src/gui.c:1062 +#: src/main.c:1818 src/gui.c:1088 msgid "Starting GUI..." msgstr "Spúšťam GUI..." @@ -614,22 +614,22 @@ msgid "LiVES-%s: <No File>" msgstr "LiVES-%s: <No File>" -#: src/main.c:3793 +#: src/main.c:3801 #, c-format msgid "rec %9d/%d" msgstr "rec %9d/%d" -#: src/main.c:3795 +#: src/main.c:3803 #, c-format msgid "!rec %9d/%d" msgstr "!rec %9d/%d" -#: src/main.c:4013 src/main.c:4014 src/gui.c:2006 src/gui.c:2979 -#: src/saveplay.c:1793 +#: src/main.c:4021 src/main.c:4022 src/gui.c:2032 src/gui.c:3011 +#: src/saveplay.c:1795 msgid "Play" msgstr "Prehrať" -#: src/main.c:4477 +#: src/main.c:4497 msgid "" "LiVES was unable to capture this image\n" "\n" @@ -637,35 +637,35 @@ "LiVES nebol schopný zachytiť tento obrázok\n" "\n" -#: src/main.c:4575 +#: src/main.c:4599 #, c-format msgid "Closed file %s\n" msgstr "Zatvorený súbor %s\n" -#: src/main.c:4741 src/gui.c:596 src/utils.c:2618 src/utils.c:2650 -#: src/saveplay.c:2758 src/multitrack.c:3882 src/multitrack.c:5393 +#: src/main.c:4765 src/gui.c:622 src/utils.c:2618 src/utils.c:2650 +#: src/saveplay.c:2760 src/multitrack.c:3884 src/multitrack.c:5426 msgid "_Undo" msgstr "_Späť" -#: src/main.c:4742 src/gui.c:609 src/utils.c:2619 src/utils.c:2651 -#: src/saveplay.c:2759 src/multitrack.c:3903 src/multitrack.c:5416 +#: src/main.c:4766 src/gui.c:635 src/utils.c:2619 src/utils.c:2651 +#: src/saveplay.c:2761 src/multitrack.c:3905 src/multitrack.c:5449 msgid "_Redo" msgstr "_Znova" -#: src/main.c:4768 src/interface.c:642 src/gui.c:2164 src/preferences.c:2381 +#: src/main.c:4792 src/interface.c:642 src/gui.c:2190 src/preferences.c:2381 #: src/resample.c:1790 msgid "Video" msgstr "Video" -#: src/main.c:4769 src/interface.c:661 src/gui.c:2183 +#: src/main.c:4793 src/interface.c:661 src/gui.c:2209 msgid "Left Audio" msgstr "Ľavý audio kanál" -#: src/main.c:4770 src/gui.c:2201 +#: src/main.c:4794 src/gui.c:2227 msgid "Right Audio" msgstr "Pravý audio kanál" -#: src/main.c:4815 +#: src/main.c:4839 msgid "" "\n" "\n" @@ -835,7 +835,7 @@ msgid "Use _mplayer audio player" msgstr "Použi _mplayer audio prehrávač" -#: src/startup.c:402 src/startup.c:591 src/interface.c:1988 +#: src/startup.c:402 src/startup.c:591 src/interface.c:2111 msgid "_Next" msgstr "_Nasledujúci" @@ -1016,10 +1016,10 @@ "Ak je zapnuté, zo snímkov bude odstránené prekladanie tak, ako sú " "importované." -#: src/interface.c:190 src/callbacks.c:7763 src/gui.c:2982 src/gui.c:3523 -#: src/saveplay.c:1796 src/saveplay.c:2425 src/dialogs.c:859 src/dialogs.c:860 +#: src/interface.c:190 src/callbacks.c:7908 src/gui.c:3014 src/gui.c:3555 +#: src/saveplay.c:1798 src/saveplay.c:2427 src/dialogs.c:859 src/dialogs.c:860 #: src/dialogs.c:1035 src/dialogs.c:1036 src/framedraw.c:189 -#: src/multitrack.c:6965 +#: src/multitrack.c:6998 msgid "Preview" msgstr "Náhľad" @@ -1054,7 +1054,7 @@ "\n" "Nezabudnite potom vypnúť efekty (ctrl-0) !" -#: src/interface.c:339 src/callbacks.c:7535 src/callbacks.c:7567 +#: src/interface.c:339 src/callbacks.c:7680 src/callbacks.c:7712 #: src/dialogs.c:1846 msgid "" "\n" @@ -1079,7 +1079,7 @@ msgid "Paus_e" msgstr "" -#: src/interface.c:409 src/callbacks.c:7564 +#: src/interface.c:409 src/callbacks.c:7709 msgid "Pause/_Enough" msgstr "" @@ -1107,7 +1107,7 @@ msgid "Total time" msgstr "Celkový čas" -#: src/interface.c:623 src/interface.c:2508 +#: src/interface.c:623 src/interface.c:2635 msgid "FPS" msgstr "FPS" @@ -1229,11 +1229,16 @@ msgid " Number of frames to open" msgstr " Počet snímkov k otvoreniu" -#: src/interface.c:1691 +#: src/interface.c:1702 msgid "LiVES: - Open Location" msgstr "LiVES: - Otvoriť umiestnenie" -#: src/interface.c:1696 +#: src/interface.c:1704 +#, fuzzy +msgid "LiVES: - Open Youtube Clip" +msgstr "LiVES: - Premenovať klip" + +#: src/interface.c:1710 msgid "" "\n" "\n" @@ -1249,19 +1254,56 @@ "Tiež sa presvedčte, či máte nastavenú šírku pásma v Nastavenia|Streaming\n" "\n" -#: src/interface.c:1708 +#: src/interface.c:1713 +msgid "" +"\n" +"\n" +"To open a clip from Youtube, LiVES will first download it with youtube-dl.\n" +"Please make sure you have the latest version of that tool installed.\n" +"\n" +msgstr "" + +#: src/interface.c:1722 +msgid "" +"Enter the URL of the clip below.\n" +"E.g: http://www.youtube.com/watch?v=WCR6f6WzjP8\n" +"\n" +msgstr "" + +#: src/interface.c:1737 msgid "URL : " msgstr "URL: " -#: src/interface.c:1724 +#: src/interface.c:1739 +#, fuzzy +msgid "Youtube URL : " +msgstr "URL: " + +#: src/interface.c:1759 msgid "Do not send bandwidth information" msgstr "Neposielať informácie o šírke pásma" -#: src/interface.c:1725 +#: src/interface.c:1760 msgid "Try this setting if you are having problems getting a stream" msgstr "Ak máte problém s príjmom, skúste tieto nastavenia"
View file
LiVES-1.4.8.tar.bz2/po/te.po -> LiVES-1.4.9.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-11-26 09:19-0300\n" +"POT-Creation-Date: 2011-12-08 14:51-0300\n" "PO-Revision-Date: 2011-11-06 17:53+0000\n" "Last-Translator: Praveen Illa <mail2ipn@gmail.com>\n" "Language-Team: Telugu <te@li.org>\n" @@ -373,7 +373,7 @@ msgid "-debug : try to debug crashes (requires 'gdb' installed)\n" msgstr "" -#: src/main.c:1818 src/gui.c:1062 +#: src/main.c:1818 src/gui.c:1088 msgid "Starting GUI..." msgstr "" @@ -524,56 +524,56 @@ msgid "LiVES-%s: <No File>" msgstr "" -#: src/main.c:3793 +#: src/main.c:3801 #, c-format msgid "rec %9d/%d" msgstr "" -#: src/main.c:3795 +#: src/main.c:3803 #, c-format msgid "!rec %9d/%d" msgstr "" -#: src/main.c:4013 src/main.c:4014 src/gui.c:2006 src/gui.c:2979 -#: src/saveplay.c:1793 +#: src/main.c:4021 src/main.c:4022 src/gui.c:2032 src/gui.c:3011 +#: src/saveplay.c:1795 msgid "Play" msgstr "ఆడించు" -#: src/main.c:4477 +#: src/main.c:4497 msgid "" "LiVES was unable to capture this image\n" "\n" msgstr "" -#: src/main.c:4575 +#: src/main.c:4599 #, c-format msgid "Closed file %s\n" msgstr "" -#: src/main.c:4741 src/gui.c:596 src/utils.c:2618 src/utils.c:2650 -#: src/saveplay.c:2758 src/multitrack.c:3882 src/multitrack.c:5393 +#: src/main.c:4765 src/gui.c:622 src/utils.c:2618 src/utils.c:2650 +#: src/saveplay.c:2760 src/multitrack.c:3884 src/multitrack.c:5426 msgid "_Undo" msgstr "చేసింది రద్దు (_U)" -#: src/main.c:4742 src/gui.c:609 src/utils.c:2619 src/utils.c:2651 -#: src/saveplay.c:2759 src/multitrack.c:3903 src/multitrack.c:5416 +#: src/main.c:4766 src/gui.c:635 src/utils.c:2619 src/utils.c:2651 +#: src/saveplay.c:2761 src/multitrack.c:3905 src/multitrack.c:5449 msgid "_Redo" msgstr "మళ్ళీచేయి (_R)" -#: src/main.c:4768 src/interface.c:642 src/gui.c:2164 src/preferences.c:2381 +#: src/main.c:4792 src/interface.c:642 src/gui.c:2190 src/preferences.c:2381 #: src/resample.c:1790 msgid "Video" msgstr "వీడియో" -#: src/main.c:4769 src/interface.c:661 src/gui.c:2183 +#: src/main.c:4793 src/interface.c:661 src/gui.c:2209 msgid "Left Audio" msgstr "" -#: src/main.c:4770 src/gui.c:2201 +#: src/main.c:4794 src/gui.c:2227 msgid "Right Audio" msgstr "" -#: src/main.c:4815 +#: src/main.c:4839 msgid "" "\n" "\n" @@ -700,7 +700,7 @@ msgid "Use _mplayer audio player" msgstr "" -#: src/startup.c:402 src/startup.c:591 src/interface.c:1988 +#: src/startup.c:402 src/startup.c:591 src/interface.c:2111 msgid "_Next" msgstr "" @@ -862,10 +862,10 @@ msgid "If this is set, frames will be deinterlaced as they are imported." msgstr "" -#: src/interface.c:190 src/callbacks.c:7763 src/gui.c:2982 src/gui.c:3523 -#: src/saveplay.c:1796 src/saveplay.c:2425 src/dialogs.c:859 src/dialogs.c:860 +#: src/interface.c:190 src/callbacks.c:7908 src/gui.c:3014 src/gui.c:3555 +#: src/saveplay.c:1798 src/saveplay.c:2427 src/dialogs.c:859 src/dialogs.c:860 #: src/dialogs.c:1035 src/dialogs.c:1036 src/framedraw.c:189 -#: src/multitrack.c:6965 +#: src/multitrack.c:6998 msgid "Preview" msgstr "మునుజూపు" @@ -894,7 +894,7 @@ "Remember to switch off effects (ctrl-0) afterwards !" msgstr "" -#: src/interface.c:339 src/callbacks.c:7535 src/callbacks.c:7567 +#: src/interface.c:339 src/callbacks.c:7680 src/callbacks.c:7712 #: src/dialogs.c:1846 msgid "" "\n" @@ -919,7 +919,7 @@ msgid "Paus_e" msgstr "" -#: src/interface.c:409 src/callbacks.c:7564 +#: src/interface.c:409 src/callbacks.c:7709 msgid "Pause/_Enough" msgstr "" @@ -947,7 +947,7 @@ msgid "Total time" msgstr "" -#: src/interface.c:623 src/interface.c:2508 +#: src/interface.c:623 src/interface.c:2635 msgid "FPS" msgstr "" @@ -1067,11 +1067,15 @@ msgid " Number of frames to open" msgstr "" -#: src/interface.c:1691 +#: src/interface.c:1702 msgid "LiVES: - Open Location" msgstr "" -#: src/interface.c:1696 +#: src/interface.c:1704 +msgid "LiVES: - Open Youtube Clip" +msgstr "" + +#: src/interface.c:1710 msgid "" "\n" "\n" @@ -1081,19 +1085,55 @@ "\n" msgstr "" -#: src/interface.c:1708 +#: src/interface.c:1713 +msgid "" +"\n" +"\n" +"To open a clip from Youtube, LiVES will first download it with youtube-dl.\n" +"Please make sure you have the latest version of that tool installed.\n" +"\n" +msgstr "" + +#: src/interface.c:1722 +msgid "" +"Enter the URL of the clip below.\n" +"E.g: http://www.youtube.com/watch?v=WCR6f6WzjP8\n" +"\n" +msgstr "" + +#: src/interface.c:1737 msgid "URL : " msgstr "" -#: src/interface.c:1724 +#: src/interface.c:1739 +msgid "Youtube URL : " +msgstr "" + +#: src/interface.c:1759 msgid "Do not send bandwidth information" msgstr "" -#: src/interface.c:1725 +#: src/interface.c:1760 msgid "Try this setting if you are having problems getting a stream" msgstr "" -#: src/interface.c:1838 +#: src/interface.c:1797 +msgid "Download to _Directory : " +msgstr ""
View file
LiVES-1.4.8.tar.bz2/po/tr.po -> LiVES-1.4.9.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-11-26 09:19-0300\n" +"POT-Creation-Date: 2011-12-08 14:51-0300\n" "PO-Revision-Date: 2011-08-18 12:12+0000\n" "Last-Translator: salsaman <salsaman@gmail.com>\n" "Language-Team: Turkish <tr@li.org>\n" @@ -401,7 +401,7 @@ "-debug : Çöküş nedeni bulmak için ('gdb' kurulu olması " "gereklidir)\n" -#: src/main.c:1818 src/gui.c:1062 +#: src/main.c:1818 src/gui.c:1088 msgid "Starting GUI..." msgstr "Grafiksel kullanıcı arayüzü başlıyor..." @@ -611,22 +611,22 @@ msgid "LiVES-%s: <No File>" msgstr "LiVES-%s: <Dosya Yok>" -#: src/main.c:3793 +#: src/main.c:3801 #, c-format msgid "rec %9d/%d" msgstr "kayıt %9d/%d" -#: src/main.c:3795 +#: src/main.c:3803 #, c-format msgid "!rec %9d/%d" msgstr "!kayıt %9d/%d" -#: src/main.c:4013 src/main.c:4014 src/gui.c:2006 src/gui.c:2979 -#: src/saveplay.c:1793 +#: src/main.c:4021 src/main.c:4022 src/gui.c:2032 src/gui.c:3011 +#: src/saveplay.c:1795 msgid "Play" msgstr "Oynat" -#: src/main.c:4477 +#: src/main.c:4497 msgid "" "LiVES was unable to capture this image\n" "\n" @@ -634,35 +634,35 @@ "LiVES görüntü yakalanamadı\n" "\n" -#: src/main.c:4575 +#: src/main.c:4599 #, c-format msgid "Closed file %s\n" msgstr "Dosya kapandı %s\n" -#: src/main.c:4741 src/gui.c:596 src/utils.c:2618 src/utils.c:2650 -#: src/saveplay.c:2758 src/multitrack.c:3882 src/multitrack.c:5393 +#: src/main.c:4765 src/gui.c:622 src/utils.c:2618 src/utils.c:2650 +#: src/saveplay.c:2760 src/multitrack.c:3884 src/multitrack.c:5426 msgid "_Undo" msgstr "_Geri Al" -#: src/main.c:4742 src/gui.c:609 src/utils.c:2619 src/utils.c:2651 -#: src/saveplay.c:2759 src/multitrack.c:3903 src/multitrack.c:5416 +#: src/main.c:4766 src/gui.c:635 src/utils.c:2619 src/utils.c:2651 +#: src/saveplay.c:2761 src/multitrack.c:3905 src/multitrack.c:5449 msgid "_Redo" msgstr "_Yinele" -#: src/main.c:4768 src/interface.c:642 src/gui.c:2164 src/preferences.c:2381 +#: src/main.c:4792 src/interface.c:642 src/gui.c:2190 src/preferences.c:2381 #: src/resample.c:1790 msgid "Video" msgstr "Video" -#: src/main.c:4769 src/interface.c:661 src/gui.c:2183 +#: src/main.c:4793 src/interface.c:661 src/gui.c:2209 msgid "Left Audio" msgstr "Sol Ses" -#: src/main.c:4770 src/gui.c:2201 +#: src/main.c:4794 src/gui.c:2227 msgid "Right Audio" msgstr "Sağ ses" -#: src/main.c:4815 +#: src/main.c:4839 msgid "" "\n" "\n" @@ -824,7 +824,7 @@ msgid "Use _mplayer audio player" msgstr "_mplayer ses çalıcısı kullan" -#: src/startup.c:402 src/startup.c:591 src/interface.c:1988 +#: src/startup.c:402 src/startup.c:591 src/interface.c:2111 msgid "_Next" msgstr "_Sonraki" @@ -1001,10 +1001,10 @@ msgid "If this is set, frames will be deinterlaced as they are imported." msgstr "" -#: src/interface.c:190 src/callbacks.c:7763 src/gui.c:2982 src/gui.c:3523 -#: src/saveplay.c:1796 src/saveplay.c:2425 src/dialogs.c:859 src/dialogs.c:860 +#: src/interface.c:190 src/callbacks.c:7908 src/gui.c:3014 src/gui.c:3555 +#: src/saveplay.c:1798 src/saveplay.c:2427 src/dialogs.c:859 src/dialogs.c:860 #: src/dialogs.c:1035 src/dialogs.c:1036 src/framedraw.c:189 -#: src/multitrack.c:6965 +#: src/multitrack.c:6998 msgid "Preview" msgstr "Önizleme" @@ -1036,7 +1036,7 @@ "\n" "Lütfen Bekleyin" -#: src/interface.c:339 src/callbacks.c:7535 src/callbacks.c:7567 +#: src/interface.c:339 src/callbacks.c:7680 src/callbacks.c:7712 #: src/dialogs.c:1846 msgid "" "\n" @@ -1061,7 +1061,7 @@ msgid "Paus_e" msgstr "Durakla_t" -#: src/interface.c:409 src/callbacks.c:7564 +#: src/interface.c:409 src/callbacks.c:7709 msgid "Pause/_Enough" msgstr "Duraklat/_Yeterli" @@ -1089,7 +1089,7 @@ msgid "Total time" msgstr "Toplam süre" -#: src/interface.c:623 src/interface.c:2508 +#: src/interface.c:623 src/interface.c:2635 msgid "FPS" msgstr "FPS" @@ -1214,11 +1214,16 @@ msgid " Number of frames to open" msgstr " Açılacak kare sayısı" -#: src/interface.c:1691 +#: src/interface.c:1702 msgid "LiVES: - Open Location" msgstr "LIVES - Açma Konumu" -#: src/interface.c:1696 +#: src/interface.c:1704 +#, fuzzy +msgid "LiVES: - Open Youtube Clip" +msgstr "LiVES: - klip in ismini değiştir" + +#: src/interface.c:1710 msgid "" "\n" "\n" @@ -1235,19 +1240,56 @@ "olun\n" "\n" -#: src/interface.c:1708 +#: src/interface.c:1713 +msgid "" +"\n" +"\n" +"To open a clip from Youtube, LiVES will first download it with youtube-dl.\n" +"Please make sure you have the latest version of that tool installed.\n" +"\n" +msgstr "" + +#: src/interface.c:1722 +msgid "" +"Enter the URL of the clip below.\n" +"E.g: http://www.youtube.com/watch?v=WCR6f6WzjP8\n" +"\n" +msgstr "" + +#: src/interface.c:1737 msgid "URL : " msgstr "URL : " -#: src/interface.c:1724 +#: src/interface.c:1739 +#, fuzzy +msgid "Youtube URL : " +msgstr "URL : " + +#: src/interface.c:1759 msgid "Do not send bandwidth information" msgstr "bant genişliği bilgisi gönderme" -#: src/interface.c:1725 +#: src/interface.c:1760 msgid "Try this setting if you are having problems getting a stream" msgstr "Eğer akışta problem yaşıyorsanız bu ayarı deneyin"
View file
LiVES-1.4.8.tar.bz2/po/ug.po -> LiVES-1.4.9.tar.bz2/po/ug.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-11-26 09:19-0300\n" +"POT-Creation-Date: 2011-12-08 14:51-0300\n" "PO-Revision-Date: 2011-11-07 04:09+0000\n" "Last-Translator: Gheyret T.Kenji <Unknown>\n" "Language-Team: Uyghur <ug@li.org>\n" @@ -373,7 +373,7 @@ msgid "-debug : try to debug crashes (requires 'gdb' installed)\n" msgstr "" -#: src/main.c:1818 src/gui.c:1062 +#: src/main.c:1818 src/gui.c:1088 msgid "Starting GUI..." msgstr "" @@ -524,56 +524,56 @@ msgid "LiVES-%s: <No File>" msgstr "" -#: src/main.c:3793 +#: src/main.c:3801 #, c-format msgid "rec %9d/%d" msgstr "" -#: src/main.c:3795 +#: src/main.c:3803 #, c-format msgid "!rec %9d/%d" msgstr "" -#: src/main.c:4013 src/main.c:4014 src/gui.c:2006 src/gui.c:2979 -#: src/saveplay.c:1793 +#: src/main.c:4021 src/main.c:4022 src/gui.c:2032 src/gui.c:3011 +#: src/saveplay.c:1795 msgid "Play" msgstr "قوي" -#: src/main.c:4477 +#: src/main.c:4497 msgid "" "LiVES was unable to capture this image\n" "\n" msgstr "" -#: src/main.c:4575 +#: src/main.c:4599 #, c-format msgid "Closed file %s\n" msgstr "" -#: src/main.c:4741 src/gui.c:596 src/utils.c:2618 src/utils.c:2650 -#: src/saveplay.c:2758 src/multitrack.c:3882 src/multitrack.c:5393 +#: src/main.c:4765 src/gui.c:622 src/utils.c:2618 src/utils.c:2650 +#: src/saveplay.c:2760 src/multitrack.c:3884 src/multitrack.c:5426 msgid "_Undo" msgstr "يېنىۋال(_U)" -#: src/main.c:4742 src/gui.c:609 src/utils.c:2619 src/utils.c:2651 -#: src/saveplay.c:2759 src/multitrack.c:3903 src/multitrack.c:5416 +#: src/main.c:4766 src/gui.c:635 src/utils.c:2619 src/utils.c:2651 +#: src/saveplay.c:2761 src/multitrack.c:3905 src/multitrack.c:5449 msgid "_Redo" msgstr "قايتىلا(_R)" -#: src/main.c:4768 src/interface.c:642 src/gui.c:2164 src/preferences.c:2381 +#: src/main.c:4792 src/interface.c:642 src/gui.c:2190 src/preferences.c:2381 #: src/resample.c:1790 msgid "Video" msgstr "سىن" -#: src/main.c:4769 src/interface.c:661 src/gui.c:2183 +#: src/main.c:4793 src/interface.c:661 src/gui.c:2209 msgid "Left Audio" msgstr "سول ئۈن" -#: src/main.c:4770 src/gui.c:2201 +#: src/main.c:4794 src/gui.c:2227 msgid "Right Audio" msgstr "ئوڭ ئۈن" -#: src/main.c:4815 +#: src/main.c:4839 msgid "" "\n" "\n" @@ -700,7 +700,7 @@ msgid "Use _mplayer audio player" msgstr "" -#: src/startup.c:402 src/startup.c:591 src/interface.c:1988 +#: src/startup.c:402 src/startup.c:591 src/interface.c:2111 msgid "_Next" msgstr "كېيىنكى(_N)" @@ -862,10 +862,10 @@ msgid "If this is set, frames will be deinterlaced as they are imported." msgstr "" -#: src/interface.c:190 src/callbacks.c:7763 src/gui.c:2982 src/gui.c:3523 -#: src/saveplay.c:1796 src/saveplay.c:2425 src/dialogs.c:859 src/dialogs.c:860 +#: src/interface.c:190 src/callbacks.c:7908 src/gui.c:3014 src/gui.c:3555 +#: src/saveplay.c:1798 src/saveplay.c:2427 src/dialogs.c:859 src/dialogs.c:860 #: src/dialogs.c:1035 src/dialogs.c:1036 src/framedraw.c:189 -#: src/multitrack.c:6965 +#: src/multitrack.c:6998 msgid "Preview" msgstr "ئالدىن كۆزەت" @@ -894,7 +894,7 @@ "Remember to switch off effects (ctrl-0) afterwards !" msgstr "" -#: src/interface.c:339 src/callbacks.c:7535 src/callbacks.c:7567 +#: src/interface.c:339 src/callbacks.c:7680 src/callbacks.c:7712 #: src/dialogs.c:1846 msgid "" "\n" @@ -919,7 +919,7 @@ msgid "Paus_e" msgstr "" -#: src/interface.c:409 src/callbacks.c:7564 +#: src/interface.c:409 src/callbacks.c:7709 msgid "Pause/_Enough" msgstr "" @@ -947,7 +947,7 @@ msgid "Total time" msgstr "ئومۇمىي ۋاقىت" -#: src/interface.c:623 src/interface.c:2508 +#: src/interface.c:623 src/interface.c:2635 msgid "FPS" msgstr "FPS" @@ -1067,11 +1067,15 @@ msgid " Number of frames to open" msgstr "" -#: src/interface.c:1691 +#: src/interface.c:1702 msgid "LiVES: - Open Location" msgstr "" -#: src/interface.c:1696 +#: src/interface.c:1704 +msgid "LiVES: - Open Youtube Clip" +msgstr "" + +#: src/interface.c:1710 msgid "" "\n" "\n" @@ -1081,19 +1085,56 @@ "\n" msgstr "" -#: src/interface.c:1708 +#: src/interface.c:1713 +msgid "" +"\n" +"\n" +"To open a clip from Youtube, LiVES will first download it with youtube-dl.\n" +"Please make sure you have the latest version of that tool installed.\n" +"\n" +msgstr "" + +#: src/interface.c:1722 +msgid "" +"Enter the URL of the clip below.\n" +"E.g: http://www.youtube.com/watch?v=WCR6f6WzjP8\n" +"\n" +msgstr "" + +#: src/interface.c:1737 msgid "URL : " msgstr "URL : " -#: src/interface.c:1724 +#: src/interface.c:1739 +#, fuzzy +msgid "Youtube URL : " +msgstr "URL : " + +#: src/interface.c:1759 msgid "Do not send bandwidth information" msgstr "" -#: src/interface.c:1725 +#: src/interface.c:1760 msgid "Try this setting if you are having problems getting a stream" msgstr "" -#: src/interface.c:1838 +#: src/interface.c:1797 +msgid "Download to _Directory : "
View file
LiVES-1.4.8.tar.bz2/po/uk.po -> LiVES-1.4.9.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-11-26 09:19-0300\n" +"POT-Creation-Date: 2011-12-08 14:51-0300\n" "PO-Revision-Date: 2011-11-07 13:09+0000\n" "Last-Translator: Yuri Chornoivan <yurchor@gmail.com>\n" "Language-Team: Ukrainian <translation@linux.org.ua>\n" @@ -436,7 +436,7 @@ "-debug : спробувати виконати діагностику аварії (доведеться " "встановити «gdb»)\n" -#: src/main.c:1818 src/gui.c:1062 +#: src/main.c:1818 src/gui.c:1088 msgid "Starting GUI..." msgstr "Запуск графічного інтерфейсу..." @@ -653,22 +653,22 @@ msgid "LiVES-%s: <No File>" msgstr "LiVES-%s: <файла не вказано>" -#: src/main.c:3793 +#: src/main.c:3801 #, c-format msgid "rec %9d/%d" msgstr "зап %9d/%d" -#: src/main.c:3795 +#: src/main.c:3803 #, c-format msgid "!rec %9d/%d" msgstr "!зап %9d/%d" -#: src/main.c:4013 src/main.c:4014 src/gui.c:2006 src/gui.c:2979 -#: src/saveplay.c:1793 +#: src/main.c:4021 src/main.c:4022 src/gui.c:2032 src/gui.c:3011 +#: src/saveplay.c:1795 msgid "Play" msgstr "Пуск" -#: src/main.c:4477 +#: src/main.c:4497 msgid "" "LiVES was unable to capture this image\n" "\n" @@ -676,35 +676,35 @@ "LiVES не вдалося захопити це зображення.\n" "\n" -#: src/main.c:4575 +#: src/main.c:4599 #, c-format msgid "Closed file %s\n" msgstr "Закритий файл %s\n" -#: src/main.c:4741 src/gui.c:596 src/utils.c:2618 src/utils.c:2650 -#: src/saveplay.c:2758 src/multitrack.c:3882 src/multitrack.c:5393 +#: src/main.c:4765 src/gui.c:622 src/utils.c:2618 src/utils.c:2650 +#: src/saveplay.c:2760 src/multitrack.c:3884 src/multitrack.c:5426 msgid "_Undo" msgstr "В_ернути" -#: src/main.c:4742 src/gui.c:609 src/utils.c:2619 src/utils.c:2651 -#: src/saveplay.c:2759 src/multitrack.c:3903 src/multitrack.c:5416 +#: src/main.c:4766 src/gui.c:635 src/utils.c:2619 src/utils.c:2651 +#: src/saveplay.c:2761 src/multitrack.c:3905 src/multitrack.c:5449 msgid "_Redo" msgstr "Повт_орити" -#: src/main.c:4768 src/interface.c:642 src/gui.c:2164 src/preferences.c:2381 +#: src/main.c:4792 src/interface.c:642 src/gui.c:2190 src/preferences.c:2381 #: src/resample.c:1790 msgid "Video" msgstr "Відео" -#: src/main.c:4769 src/interface.c:661 src/gui.c:2183 +#: src/main.c:4793 src/interface.c:661 src/gui.c:2209 msgid "Left Audio" msgstr "Лівий канал звуку" -#: src/main.c:4770 src/gui.c:2201 +#: src/main.c:4794 src/gui.c:2227 msgid "Right Audio" msgstr "Правий канал звуку" -#: src/main.c:4815 +#: src/main.c:4839 msgid "" "\n" "\n" @@ -874,7 +874,7 @@ msgid "Use _mplayer audio player" msgstr "В_икористовувати звуковий програвач mplayer" -#: src/startup.c:402 src/startup.c:591 src/interface.c:1988 +#: src/startup.c:402 src/startup.c:591 src/interface.c:2111 msgid "_Next" msgstr "_Далі" @@ -1064,10 +1064,10 @@ "Якщо позначити цей пункт, програма усуватиме черезрядковість з кадрів під " "час імпортування." -#: src/interface.c:190 src/callbacks.c:7763 src/gui.c:2982 src/gui.c:3523 -#: src/saveplay.c:1796 src/saveplay.c:2425 src/dialogs.c:859 src/dialogs.c:860 +#: src/interface.c:190 src/callbacks.c:7908 src/gui.c:3014 src/gui.c:3555 +#: src/saveplay.c:1798 src/saveplay.c:2427 src/dialogs.c:859 src/dialogs.c:860 #: src/dialogs.c:1035 src/dialogs.c:1036 src/framedraw.c:189 -#: src/multitrack.c:6965 +#: src/multitrack.c:6998 msgid "Preview" msgstr "Перегляд" @@ -1103,7 +1103,7 @@ "\n" "Не забудьте потім вимкнути ефекти (ctrl-0)!" -#: src/interface.c:339 src/callbacks.c:7535 src/callbacks.c:7567 +#: src/interface.c:339 src/callbacks.c:7680 src/callbacks.c:7712 #: src/dialogs.c:1846 msgid "" "\n" @@ -1128,7 +1128,7 @@ msgid "Paus_e" msgstr "Приз_упинити" -#: src/interface.c:409 src/callbacks.c:7564 +#: src/interface.c:409 src/callbacks.c:7709 msgid "Pause/_Enough" msgstr "Призупинити/_Досить" @@ -1156,7 +1156,7 @@ msgid "Total time" msgstr "Загальний час" -#: src/interface.c:623 src/interface.c:2508 +#: src/interface.c:623 src/interface.c:2635 msgid "FPS" msgstr "кадрів/с" @@ -1281,11 +1281,16 @@ msgid " Number of frames to open" msgstr " Кількість кадрів, які буде відкрито" -#: src/interface.c:1691 +#: src/interface.c:1702 msgid "LiVES: - Open Location" msgstr "LiVES: - Відкриття адреси" -#: src/interface.c:1696 +#: src/interface.c:1704 +#, fuzzy +msgid "LiVES: - Open Youtube Clip" +msgstr "LiVES: - Перейменування кліпу" + +#: src/interface.c:1710 msgid "" "\n" "\n" @@ -1302,21 +1307,58 @@ "Потокові дані\n" "\n" -#: src/interface.c:1708 +#: src/interface.c:1713 +msgid "" +"\n" +"\n" +"To open a clip from Youtube, LiVES will first download it with youtube-dl.\n" +"Please make sure you have the latest version of that tool installed.\n" +"\n" +msgstr "" + +#: src/interface.c:1722 +msgid "" +"Enter the URL of the clip below.\n" +"E.g: http://www.youtube.com/watch?v=WCR6f6WzjP8\n" +"\n" +msgstr "" + +#: src/interface.c:1737 msgid "URL : " msgstr "URL: " -#: src/interface.c:1724 +#: src/interface.c:1739 +#, fuzzy +msgid "Youtube URL : " +msgstr "URL: " + +#: src/interface.c:1759 msgid "Do not send bandwidth information" msgstr "Не надсилати даних щодо потужності каналу" -#: src/interface.c:1725 +#: src/interface.c:1760 msgid "Try this setting if you are having problems getting a stream" msgstr "" "Спробуйте скористатися цим пунктом, якщо у вас виникають проблеми з "
View file
LiVES-1.4.8.tar.bz2/po/uz.po -> LiVES-1.4.9.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-11-26 09:19-0300\n" +"POT-Creation-Date: 2011-12-08 14:51-0300\n" "PO-Revision-Date: 2011-11-10 17:30+0000\n" "Last-Translator: Akmal Xushvaqov <akmalxster@gmail.com>\n" "Language-Team: Uzbek <uz@li.org>\n" @@ -400,7 +400,7 @@ msgid "-debug : try to debug crashes (requires 'gdb' installed)\n" msgstr "" -#: src/main.c:1818 src/gui.c:1062 +#: src/main.c:1818 src/gui.c:1088 msgid "Starting GUI..." msgstr "" @@ -551,56 +551,56 @@ msgid "LiVES-%s: <No File>" msgstr "" -#: src/main.c:3793 +#: src/main.c:3801 #, c-format msgid "rec %9d/%d" msgstr "" -#: src/main.c:3795 +#: src/main.c:3803 #, c-format msgid "!rec %9d/%d" msgstr "" -#: src/main.c:4013 src/main.c:4014 src/gui.c:2006 src/gui.c:2979 -#: src/saveplay.c:1793 +#: src/main.c:4021 src/main.c:4022 src/gui.c:2032 src/gui.c:3011 +#: src/saveplay.c:1795 msgid "Play" msgstr "Ўйнаш" -#: src/main.c:4477 +#: src/main.c:4497 msgid "" "LiVES was unable to capture this image\n" "\n" msgstr "" -#: src/main.c:4575 +#: src/main.c:4599 #, c-format msgid "Closed file %s\n" msgstr "" -#: src/main.c:4741 src/gui.c:596 src/utils.c:2618 src/utils.c:2650 -#: src/saveplay.c:2758 src/multitrack.c:3882 src/multitrack.c:5393 +#: src/main.c:4765 src/gui.c:622 src/utils.c:2618 src/utils.c:2650 +#: src/saveplay.c:2760 src/multitrack.c:3884 src/multitrack.c:5426 msgid "_Undo" msgstr "_Бекор қилиш" -#: src/main.c:4742 src/gui.c:609 src/utils.c:2619 src/utils.c:2651 -#: src/saveplay.c:2759 src/multitrack.c:3903 src/multitrack.c:5416 +#: src/main.c:4766 src/gui.c:635 src/utils.c:2619 src/utils.c:2651 +#: src/saveplay.c:2761 src/multitrack.c:3905 src/multitrack.c:5449 msgid "_Redo" msgstr "_Қайтариш" -#: src/main.c:4768 src/interface.c:642 src/gui.c:2164 src/preferences.c:2381 +#: src/main.c:4792 src/interface.c:642 src/gui.c:2190 src/preferences.c:2381 #: src/resample.c:1790 msgid "Video" msgstr "Видео" -#: src/main.c:4769 src/interface.c:661 src/gui.c:2183 +#: src/main.c:4793 src/interface.c:661 src/gui.c:2209 msgid "Left Audio" msgstr "" -#: src/main.c:4770 src/gui.c:2201 +#: src/main.c:4794 src/gui.c:2227 msgid "Right Audio" msgstr "" -#: src/main.c:4815 +#: src/main.c:4839 msgid "" "\n" "\n" @@ -727,7 +727,7 @@ msgid "Use _mplayer audio player" msgstr "" -#: src/startup.c:402 src/startup.c:591 src/interface.c:1988 +#: src/startup.c:402 src/startup.c:591 src/interface.c:2111 msgid "_Next" msgstr "" @@ -889,10 +889,10 @@ msgid "If this is set, frames will be deinterlaced as they are imported." msgstr "" -#: src/interface.c:190 src/callbacks.c:7763 src/gui.c:2982 src/gui.c:3523 -#: src/saveplay.c:1796 src/saveplay.c:2425 src/dialogs.c:859 src/dialogs.c:860 +#: src/interface.c:190 src/callbacks.c:7908 src/gui.c:3014 src/gui.c:3555 +#: src/saveplay.c:1798 src/saveplay.c:2427 src/dialogs.c:859 src/dialogs.c:860 #: src/dialogs.c:1035 src/dialogs.c:1036 src/framedraw.c:189 -#: src/multitrack.c:6965 +#: src/multitrack.c:6998 msgid "Preview" msgstr "Олдиндан кўриш" @@ -921,7 +921,7 @@ "Remember to switch off effects (ctrl-0) afterwards !" msgstr "" -#: src/interface.c:339 src/callbacks.c:7535 src/callbacks.c:7567 +#: src/interface.c:339 src/callbacks.c:7680 src/callbacks.c:7712 #: src/dialogs.c:1846 msgid "" "\n" @@ -944,7 +944,7 @@ msgid "Paus_e" msgstr "" -#: src/interface.c:409 src/callbacks.c:7564 +#: src/interface.c:409 src/callbacks.c:7709 msgid "Pause/_Enough" msgstr "" @@ -972,7 +972,7 @@ msgid "Total time" msgstr "" -#: src/interface.c:623 src/interface.c:2508 +#: src/interface.c:623 src/interface.c:2635 msgid "FPS" msgstr "FPS" @@ -1092,11 +1092,15 @@ msgid " Number of frames to open" msgstr "" -#: src/interface.c:1691 +#: src/interface.c:1702 msgid "LiVES: - Open Location" msgstr "" -#: src/interface.c:1696 +#: src/interface.c:1704 +msgid "LiVES: - Open Youtube Clip" +msgstr "" + +#: src/interface.c:1710 msgid "" "\n" "\n" @@ -1106,19 +1110,55 @@ "\n" msgstr "" -#: src/interface.c:1708 +#: src/interface.c:1713 +msgid "" +"\n" +"\n" +"To open a clip from Youtube, LiVES will first download it with youtube-dl.\n" +"Please make sure you have the latest version of that tool installed.\n" +"\n" +msgstr "" + +#: src/interface.c:1722 +msgid "" +"Enter the URL of the clip below.\n" +"E.g: http://www.youtube.com/watch?v=WCR6f6WzjP8\n" +"\n" +msgstr "" + +#: src/interface.c:1737 msgid "URL : " msgstr "" -#: src/interface.c:1724 +#: src/interface.c:1739 +msgid "Youtube URL : " +msgstr "" + +#: src/interface.c:1759 msgid "Do not send bandwidth information" msgstr "" -#: src/interface.c:1725 +#: src/interface.c:1760 msgid "Try this setting if you are having problems getting a stream" msgstr "" -#: src/interface.c:1838 +#: src/interface.c:1797 +msgid "Download to _Directory : " +msgstr ""
View file
LiVES-1.4.8.tar.bz2/po/zh_CN.po -> LiVES-1.4.9.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-11-26 09:19-0300\n" +"POT-Creation-Date: 2011-12-08 14:51-0300\n" "PO-Revision-Date: 2011-11-07 16:24+0000\n" "Last-Translator: lhquark <Unknown>\n" "Language-Team: Simplified Chinese <zh_CN@li.org>\n" @@ -405,7 +405,7 @@ msgid "-debug : try to debug crashes (requires 'gdb' installed)\n" msgstr "-debug : 尝试调试崩溃（需要安装 gdb）\n" -#: src/main.c:1818 src/gui.c:1062 +#: src/main.c:1818 src/gui.c:1088 msgid "Starting GUI..." msgstr "正在启动图形用户界面..." @@ -612,22 +612,22 @@ msgid "LiVES-%s: <No File>" msgstr "LiVES-%s: <没有文件>" -#: src/main.c:3793 +#: src/main.c:3801 #, c-format msgid "rec %9d/%d" msgstr "" -#: src/main.c:3795 +#: src/main.c:3803 #, c-format msgid "!rec %9d/%d" msgstr "" -#: src/main.c:4013 src/main.c:4014 src/gui.c:2006 src/gui.c:2979 -#: src/saveplay.c:1793 +#: src/main.c:4021 src/main.c:4022 src/gui.c:2032 src/gui.c:3011 +#: src/saveplay.c:1795 msgid "Play" msgstr "播放" -#: src/main.c:4477 +#: src/main.c:4497 msgid "" "LiVES was unable to capture this image\n" "\n" @@ -635,35 +635,35 @@ "LiVES 无法捕获此图片\n" "\n" -#: src/main.c:4575 +#: src/main.c:4599 #, c-format msgid "Closed file %s\n" msgstr "已关闭文件 %s\n" -#: src/main.c:4741 src/gui.c:596 src/utils.c:2618 src/utils.c:2650 -#: src/saveplay.c:2758 src/multitrack.c:3882 src/multitrack.c:5393 +#: src/main.c:4765 src/gui.c:622 src/utils.c:2618 src/utils.c:2650 +#: src/saveplay.c:2760 src/multitrack.c:3884 src/multitrack.c:5426 msgid "_Undo" msgstr "撤消(_U)" -#: src/main.c:4742 src/gui.c:609 src/utils.c:2619 src/utils.c:2651 -#: src/saveplay.c:2759 src/multitrack.c:3903 src/multitrack.c:5416 +#: src/main.c:4766 src/gui.c:635 src/utils.c:2619 src/utils.c:2651 +#: src/saveplay.c:2761 src/multitrack.c:3905 src/multitrack.c:5449 msgid "_Redo" msgstr "重做(_R)" -#: src/main.c:4768 src/interface.c:642 src/gui.c:2164 src/preferences.c:2381 +#: src/main.c:4792 src/interface.c:642 src/gui.c:2190 src/preferences.c:2381 #: src/resample.c:1790 msgid "Video" msgstr "视频" -#: src/main.c:4769 src/interface.c:661 src/gui.c:2183 +#: src/main.c:4793 src/interface.c:661 src/gui.c:2209 msgid "Left Audio" msgstr "左声道" -#: src/main.c:4770 src/gui.c:2201 +#: src/main.c:4794 src/gui.c:2227 msgid "Right Audio" msgstr "右声道" -#: src/main.c:4815 +#: src/main.c:4839 msgid "" "\n" "\n" @@ -829,7 +829,7 @@ msgid "Use _mplayer audio player" msgstr "音频播放器使用_mplayer" -#: src/startup.c:402 src/startup.c:591 src/interface.c:1988 +#: src/startup.c:402 src/startup.c:591 src/interface.c:2111 msgid "_Next" msgstr "下一步(_N)" @@ -1003,10 +1003,10 @@ msgid "If this is set, frames will be deinterlaced as they are imported." msgstr "如果设置此项，视频在导入时将被反交错化。" -#: src/interface.c:190 src/callbacks.c:7763 src/gui.c:2982 src/gui.c:3523 -#: src/saveplay.c:1796 src/saveplay.c:2425 src/dialogs.c:859 src/dialogs.c:860 +#: src/interface.c:190 src/callbacks.c:7908 src/gui.c:3014 src/gui.c:3555 +#: src/saveplay.c:1798 src/saveplay.c:2427 src/dialogs.c:859 src/dialogs.c:860 #: src/dialogs.c:1035 src/dialogs.c:1036 src/framedraw.c:189 -#: src/multitrack.c:6965 +#: src/multitrack.c:6998 msgid "Preview" msgstr "预览" @@ -1040,7 +1040,7 @@ "\n" "请不要忘记之后关闭效果（ctrl-0）！" -#: src/interface.c:339 src/callbacks.c:7535 src/callbacks.c:7567 +#: src/interface.c:339 src/callbacks.c:7680 src/callbacks.c:7712 #: src/dialogs.c:1846 msgid "" "\n" @@ -1065,7 +1065,7 @@ msgid "Paus_e" msgstr "暂停(_E)" -#: src/interface.c:409 src/callbacks.c:7564 +#: src/interface.c:409 src/callbacks.c:7709 msgid "Pause/_Enough" msgstr "" @@ -1093,7 +1093,7 @@ msgid "Total time" msgstr "总时间" -#: src/interface.c:623 src/interface.c:2508 +#: src/interface.c:623 src/interface.c:2635 msgid "FPS" msgstr "帧每秒" @@ -1215,11 +1215,16 @@ msgid " Number of frames to open" msgstr " 打开帧数" -#: src/interface.c:1691 +#: src/interface.c:1702 msgid "LiVES: - Open Location" msgstr "LiVES: - 打开位置" -#: src/interface.c:1696 +#: src/interface.c:1704 +#, fuzzy +msgid "LiVES: - Open Youtube Clip" +msgstr "LiVES: - 重命名剪辑" + +#: src/interface.c:1710 msgid "" "\n" "\n" @@ -1234,19 +1239,56 @@ "并保证在 首选向|流媒体 中设置了带宽\n" "\n" -#: src/interface.c:1708 +#: src/interface.c:1713 +msgid "" +"\n" +"\n" +"To open a clip from Youtube, LiVES will first download it with youtube-dl.\n" +"Please make sure you have the latest version of that tool installed.\n" +"\n" +msgstr "" + +#: src/interface.c:1722 +msgid "" +"Enter the URL of the clip below.\n" +"E.g: http://www.youtube.com/watch?v=WCR6f6WzjP8\n" +"\n" +msgstr "" + +#: src/interface.c:1737 msgid "URL : " msgstr "URL : " -#: src/interface.c:1724 +#: src/interface.c:1739 +#, fuzzy +msgid "Youtube URL : " +msgstr "URL : " + +#: src/interface.c:1759 msgid "Do not send bandwidth information" msgstr "不发送带宽信息" -#: src/interface.c:1725 +#: src/interface.c:1760 msgid "Try this setting if you are having problems getting a stream" msgstr "如果获取流媒体有问题是请尝试此选项"
View file
LiVES-1.4.8.tar.bz2/resources/Makefile.in -> LiVES-1.4.9.tar.bz2/resources/Makefile.in
Changed
@@ -163,6 +163,10 @@ LIBAVCODEC_LIBS = @LIBAVCODEC_LIBS@ LIBAVFORMAT_CFLAGS = @LIBAVFORMAT_CFLAGS@ LIBAVFORMAT_LIBS = @LIBAVFORMAT_LIBS@ +LIBAVUTIL_CFLAGS = @LIBAVUTIL_CFLAGS@ +LIBAVUTIL_LIBS = @LIBAVUTIL_LIBS@ +LIBBZ_CFLAGS = @LIBBZ_CFLAGS@ +LIBBZ_LIBS = @LIBBZ_LIBS@ LIBDV_CFLAGS = @LIBDV_CFLAGS@ LIBDV_LIBS = @LIBDV_LIBS@ LIBICONV = @LIBICONV@ @@ -176,6 +180,8 @@ LIBSWSCALE_LIBS = @LIBSWSCALE_LIBS@ LIBTHREAD = @LIBTHREAD@ LIBTOOL = @LIBTOOL@ +LIBZ_CFLAGS = @LIBZ_CFLAGS@ +LIBZ_LIBS = @LIBZ_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBC = @LTLIBC@ @@ -245,6 +251,8 @@ VORBIS_CFLAGS = @VORBIS_CFLAGS@ VORBIS_LIBS = @VORBIS_LIBS@ WEED_CFLAGS = @WEED_CFLAGS@ +WEED_COMPAT_CFLAGS = @WEED_COMPAT_CFLAGS@ +WEED_COMPAT_LIBS = @WEED_COMPAT_LIBS@ WEED_LIBS = @WEED_LIBS@ WEED_PLUGIN_UTILS_CFLAGS = @WEED_PLUGIN_UTILS_CFLAGS@ WEED_PLUGIN_UTILS_LIBS = @WEED_PLUGIN_UTILS_LIBS@
View file
LiVES-1.4.8.tar.bz2/smogrify -> LiVES-1.4.9.tar.bz2/smogrify
Changed
@@ -32,7 +32,7 @@ # Do not change these except for testing ! $background=1; -$version="1.4.8"; +$version="1.4.9"; #$dyneversion="LIVES-20091209"; @@ -1974,12 +1974,13 @@ } unlink <*.tar>; - system ("tar -cf header.tar $audio header* extended* event.* subs.* 2>/dev/null"); + system ("tar -cf header.tar $audio header* extended* event.* subs.* file* 2>/dev/null"); $img_ext=&get_img_ext($curtmpdir,$start); if ($start>0) { # we have to add frames 100 at a time, otherwise tar complains about 'too many parameters' + # TODO - rewrite using xargs or pattern exclude (like projects) $oend=$end; $nexthundred=int($start/100)+1; if ($end>$nexthundred*100-1) { @@ -2733,6 +2734,42 @@ } + if ($command eq "download_clip") { + my $url=$ARGV[2]; + my $dfile=$ARGV[3]; + + if ($url =~ /youtube/) { + # youtube-dl + + if (-f $dfile) { + unlink $dfile; + } + + if (-f $dfile) { + &sig_error; + exit 2; + } + + $com="youtube-dl -o \"$dfile\" -f 43 -q --no-part \"$url\""; + + $res=system($com); + if ($res || !(-f $dfile) || -z $dfile) { + + if (-f $dfile) { + unlink $dfile; + } + + &sig_error; + exit 1; + } + } + + &sig_complete; + exit 0; + } + + + if ($command eq "cdopen") { $cdda2wav_command=&location("cdda2wav");
View file
LiVES-1.4.8.tar.bz2/src/Makefile.am -> LiVES-1.4.9.tar.bz2/src/Makefile.am
Changed
@@ -23,7 +23,6 @@ solaris_CFLAGS=-DIS_SOLARIS=1 endif - INCLUDES = \ -DPACKAGE_DATA_DIR=\""$(datadir)"\" \ -DLIVES_DIR=\""$(livesdir)"\" \ @@ -180,7 +179,8 @@ $(giw_SOURCES) lives_exe_LDADD = @GTK_LIBS_NODYNAMIC@ @X11_LIBS@ @MJPEGTOOLS_LIBS@ $(osc_LDADD) $(jack_LDADD) $(ldvgrab_LDADD) \ - $(oil_LDADD) $(alsa_LDADD) $(pulse_LDADD) $(png_LDADD) $(swscale_LDADD) -lpthread $(libweed_LDADD) $(giw_LDADD) $(v4l1_LDADD) \ + $(oil_LDADD) $(alsa_LDADD) $(pulse_LDADD) $(png_LDADD) $(swscale_LDADD) -lpthread $(libweed_LDADD) \ + $(giw_LDADD) $(v4l1_LDADD) $(lives_exe_LDFLAGS) \ @UNICAP_LIBS@ AM_CFLAGS = -Wstrict-aliasing=0 $(yuv4mpeg_CFLAGS) $(ldvgrab_CFLAGS) $(dvgrab_CFLAGS) $(oil_CFLAGS) \ @@ -189,3 +189,12 @@ -DLIVES_LIBDIR=\""$(libdir)"\" $(gtk_def) +if HAVE_AVFORMAT +if HAVE_AVCODEC +if HAVE_AVUTIL +AM_CFLAGS += -DHAVE_WEBM=1 +endif +endif +endif + +
View file
LiVES-1.4.8.tar.bz2/src/Makefile.in -> LiVES-1.4.9.tar.bz2/src/Makefile.in
Changed
@@ -39,6 +39,7 @@ @ENABLE_JACK_TRANSPORT_TRUE@@ENABLE_JACK_TRUE@am__append_1 = -DENABLE_JACK_TRANSPORT @HAVE_GTK_VERSION214_TRUE@am__append_2 = -DHAVE_GTK_NICE_VERSION=1 @HAVE_GTK_VERSION216_TRUE@am__append_3 = -DHAVE_GTK_VERSION216=1 +@HAVE_AVCODEC_TRUE@@HAVE_AVFORMAT_TRUE@@HAVE_AVUTIL_TRUE@am__append_4 = -DHAVE_WEBM=1 subdir = src DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -210,6 +211,10 @@ LIBAVCODEC_LIBS = @LIBAVCODEC_LIBS@ LIBAVFORMAT_CFLAGS = @LIBAVFORMAT_CFLAGS@ LIBAVFORMAT_LIBS = @LIBAVFORMAT_LIBS@ +LIBAVUTIL_CFLAGS = @LIBAVUTIL_CFLAGS@ +LIBAVUTIL_LIBS = @LIBAVUTIL_LIBS@ +LIBBZ_CFLAGS = @LIBBZ_CFLAGS@ +LIBBZ_LIBS = @LIBBZ_LIBS@ LIBDV_CFLAGS = @LIBDV_CFLAGS@ LIBDV_LIBS = @LIBDV_LIBS@ LIBICONV = @LIBICONV@ @@ -223,6 +228,8 @@ LIBSWSCALE_LIBS = @LIBSWSCALE_LIBS@ LIBTHREAD = @LIBTHREAD@ LIBTOOL = @LIBTOOL@ +LIBZ_CFLAGS = @LIBZ_CFLAGS@ +LIBZ_LIBS = @LIBZ_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBC = @LTLIBC@ @@ -292,6 +299,8 @@ VORBIS_CFLAGS = @VORBIS_CFLAGS@ VORBIS_LIBS = @VORBIS_LIBS@ WEED_CFLAGS = @WEED_CFLAGS@ +WEED_COMPAT_CFLAGS = @WEED_COMPAT_CFLAGS@ +WEED_COMPAT_LIBS = @WEED_COMPAT_LIBS@ WEED_LIBS = @WEED_LIBS@ WEED_PLUGIN_UTILS_CFLAGS = @WEED_PLUGIN_UTILS_CFLAGS@ WEED_PLUGIN_UTILS_LIBS = @WEED_PLUGIN_UTILS_LIBS@ @@ -458,14 +467,16 @@ $(giw_SOURCES) lives_exe_LDADD = @GTK_LIBS_NODYNAMIC@ @X11_LIBS@ @MJPEGTOOLS_LIBS@ $(osc_LDADD) $(jack_LDADD) $(ldvgrab_LDADD) \ - $(oil_LDADD) $(alsa_LDADD) $(pulse_LDADD) $(png_LDADD) $(swscale_LDADD) -lpthread $(libweed_LDADD) $(giw_LDADD) $(v4l1_LDADD) \ + $(oil_LDADD) $(alsa_LDADD) $(pulse_LDADD) $(png_LDADD) $(swscale_LDADD) -lpthread $(libweed_LDADD) \ + $(giw_LDADD) $(v4l1_LDADD) $(lives_exe_LDFLAGS) \ @UNICAP_LIBS@ -AM_CFLAGS = -Wstrict-aliasing=0 $(yuv4mpeg_CFLAGS) $(ldvgrab_CFLAGS) $(dvgrab_CFLAGS) $(oil_CFLAGS) \ - $(darwin_CFLAGS) $(irix_CFLAGS) $(linux_CFLAGS) $(solaris_CFLAGS) $(osc_CFLAGS) $(alsa_CFLAGS) $(png_CFLAGS) $(swscale_CFLAGS) \ - $(jack_CFLAGS) $(pulse_CFLAGS) $(giw_CFLAGS) $(unicap_CFLAGS) $(libweed_CFLAGS) \ - -DLIVES_LIBDIR=\""$(libdir)"\" $(gtk_def) - +AM_CFLAGS = -Wstrict-aliasing=0 $(yuv4mpeg_CFLAGS) $(ldvgrab_CFLAGS) \ + $(dvgrab_CFLAGS) $(oil_CFLAGS) $(darwin_CFLAGS) $(irix_CFLAGS) \ + $(linux_CFLAGS) $(solaris_CFLAGS) $(osc_CFLAGS) $(alsa_CFLAGS) \ + $(png_CFLAGS) $(swscale_CFLAGS) $(jack_CFLAGS) $(pulse_CFLAGS) \ + $(giw_CFLAGS) $(unicap_CFLAGS) $(libweed_CFLAGS) \ + -DLIVES_LIBDIR=\""$(libdir)"\" $(gtk_def) $(am__append_4) all: all-am .SUFFIXES:
View file
LiVES-1.4.8.tar.bz2/src/callbacks.c -> LiVES-1.4.9.tar.bz2/src/callbacks.c
Changed
@@ -1,6 +1,6 @@ // callbacks.c // LiVES -// (c) G. Finch 2003 - 2011 <salsaman@xs4all.nl> +// (c) G. Finch 2003 - 2011 <salsaman@xs4all.nl,salsaman@gmail.com> // released under the GNU GPL 3 or later // see file ../COPYING for licensing details @@ -301,10 +301,13 @@ save_future_prefs(); // stop valgrind from complaining - if (mainw->preview_image!=NULL) gtk_image_set_from_pixbuf(GTK_IMAGE(mainw->preview_image), NULL); + if (mainw->preview_image!=NULL && GTK_IS_IMAGE(mainw->preview_image)) + gtk_image_set_from_pixbuf(GTK_IMAGE(mainw->preview_image), NULL); if (mainw->image272!=NULL) gtk_image_set_from_pixbuf(GTK_IMAGE(mainw->image272), NULL); if (mainw->image273!=NULL) gtk_image_set_from_pixbuf(GTK_IMAGE(mainw->image273), NULL); + if (mainw->frame_layer!=NULL) weed_layer_free(mainw->frame_layer); + if (mainw->sep_win&&(mainw->playing_file>-1||prefs->sepwin_type==1)) { threaded_dialog_spin(); kill_play_window(); @@ -544,13 +547,34 @@ gtk_widget_set_sensitive (mainw->m_playbutton, TRUE); } - locw=create_location_dialog(); + locw=create_location_dialog(1); gtk_widget_show(locw->dialog); } void +on_open_utube_activate (GtkMenuItem *menuitem, + gpointer user_data) { + + if (mainw->multitrack!=NULL) { + if (mainw->multitrack->idlefunc>0) { + g_source_remove(mainw->multitrack->idlefunc); + mainw->multitrack->idlefunc=0; + } + mt_desensitise(mainw->multitrack); + gtk_widget_set_sensitive(mainw->multitrack->playall,TRUE); + gtk_widget_set_sensitive (mainw->m_playbutton, TRUE); + } + + locw=create_location_dialog(2); + gtk_widget_show(locw->dialog); +} + + + + +void on_autoreload_toggled (GtkToggleButton *togglebutton, gpointer user_data) { @@ -658,6 +682,126 @@ + +void on_utube_select (GtkButton *button, gpointer user_data) { + gchar *fname=ensure_extension(gtk_entry_get_text(GTK_ENTRY(locw->name_entry)),".webm"); + gchar *url; + gchar *dirname; + gchar *dfile; + gchar *com; + gchar *msg; + gint current_file=mainw->current_file; + + if (!strlen(fname)) { + do_blocking_error_dialog(_("Please enter the name of the file to save the clip as.\n")); + g_free(fname); + return; + } + + url=g_strdup(gtk_entry_get_text(GTK_ENTRY(locw->entry))); + + if (!strlen(url)) { + do_blocking_error_dialog(_("Please enter a valid URL for the download.\n")); + g_free(fname); + g_free(url); + return; + } + + dirname=g_strdup(gtk_entry_get_text(GTK_ENTRY(locw->dir_entry))); + + gtk_widget_destroy(locw->dialog); + while (g_main_context_iteration (NULL,FALSE)); + g_free(locw); + + dfile=g_build_filename(dirname,fname,NULL); + + if (!check_file(dfile,TRUE)) { + g_free(dirname); + g_free(fname); + g_free(url); + g_free(dfile); + return; + } + + mainw->error=FALSE; + + msg=g_strdup_printf(_("Downloading %s to %s..."),url,dfile); + d_print(msg); + g_free(msg); + + if (current_file==-1) { + if (!get_temp_handle(mainw->first_free_file,TRUE)) { + d_print_failed(); + return; + } + } + + mainw->no_switch_dprint=TRUE; + + unlink(cfile->info_file); + + com=g_strdup_printf("smogrify download_clip %s \"%s\" \"%s\"",cfile->handle,url,dfile); + dummyvar=system(com); + g_free(com); + + if (!do_progress_dialog(TRUE,TRUE,_("Downloading clip"))||mainw->error) { + // user cancelled or error + + if (current_file==-1) { + com=g_strdup_printf("smogrify close %s",cfile->handle); + dummyvar=system(com); + g_free(com); + g_free(cfile); + cfile=NULL; + mainw->current_file=-1; + } + + if (mainw->error) { + d_print_failed(); + do_blocking_error_dialog(_("\nLiVES was unable to download the clip.\nPlease check the clip URL and make sure you have \nthe latest youtube-dl installed.\n")); + mainw->error=FALSE; + } + + unlink(dfile); + + g_free(dirname); + g_free(fname); + g_free(url); + g_free(dfile); + + sensitize(); + mainw->no_switch_dprint=FALSE; + return; + } + + if (current_file==-1) { + com=g_strdup_printf("smogrify close %s",cfile->handle); + dummyvar=system(com); + g_free(com); + g_free(cfile); + cfile=NULL; + mainw->current_file=-1; + } + + g_free(dirname); + g_free(fname); + g_free(url); + + mainw->no_switch_dprint=FALSE; + open_file(dfile); + g_free(dfile); + + if (mainw->multitrack!=NULL) { + polymorph(mainw->multitrack,POLY_NONE); + polymorph(mainw->multitrack,POLY_CLIPS); + mt_sensitise(mainw->multitrack); + mainw->multitrack->idlefunc=mt_idle_add(mainw->multitrack); + } + +} + + + void on_check_clicked(void) { int cframes=cfile->frames; get_frame_count(mainw->current_file); @@ -4571,7 +4715,7 @@ "name", "LiVES", "version", LiVES_VERSION, "comments",comments, - "copyright", "(C) 2002-2011 salsaman <salsaman@xs4all.nl> and others", + "copyright", "(C) 2002-2011 salsaman <salsaman@xs4all.nl,salsaman@gmail.com> and others", "website", "http://lives.sourceforge.net", // "authors", authors, "license", license, @@ -4583,7 +4727,7 @@ #else - gchar *mesg=g_strdup_printf(_ ("LiVES Version %s\n(c) G. Finch (salsaman) %s\n\nReleased under the GPL 3 or later (http://www.gnu.org/licenses/gpl.txt)\nLiVES is distributed WITHOUT WARRANTY\n\nContact the author at:\nsalsaman@xs4all.nl\nHomepage: http://lives.sourceforge.net"),LiVES_VERSION,"2002-2011");
View file
LiVES-1.4.8.tar.bz2/src/callbacks.h -> LiVES-1.4.9.tar.bz2/src/callbacks.h
Changed
@@ -1,6 +1,6 @@ // callbacks.h // LiVES -// (c) G. Finch <salsaman@xs4all.nl> 2003 - 2010 +// (c) G. Finch <salsaman@xs4all.nl,salsaman@gmail.com> 2003 - 2011 // Released under the GPL 3 or later // see file ../COPYING for licensing details @@ -29,6 +29,10 @@ gpointer user_data); void +on_open_utube_activate (GtkMenuItem *menuitem, + gpointer user_data); + +void on_stop_clicked (GtkMenuItem *menuitem, gpointer user_data); @@ -201,6 +205,10 @@ gpointer user_data); void +on_utube_select (GtkButton *button, + gpointer user_data); + +void on_autoreload_toggled (GtkToggleButton *togglebutton, gpointer user_data);
View file
LiVES-1.4.8.tar.bz2/src/colourspace.c -> LiVES-1.4.9.tar.bz2/src/colourspace.c
Changed
@@ -1,6 +1,6 @@ // colourspace.h // LiVES -// (c) G. Finch 2004 - 2011 <salsaman@xs4all.nl> +// (c) G. Finch 2004 - 2011 <salsaman@xs4all.nl,salsaman@gmail.com> // Released under the GPL 3 or later // see file ../COPYING for licensing details @@ -45,27 +45,22 @@ #include "weed/weed-effects.h" #include "weed/weed-host.h" -#ifdef USE_SWSCALE - -#ifdef HAVE_SYSTEM_WEED_COMPAT -#include "weed/weed-compat.h" -#else -#include "../libweed/weed-compat.h" -#endif // HAVE_SYSTEM_WEED_COMPAT - -#endif // USE_SWSCALE - #else // HAVE_SYSTEM_WEED #include "../libweed/weed.h" #include "../libweed/weed-palettes.h" #include "../libweed/weed-effects.h" #include "../libweed/weed-host.h" +#endif #ifdef USE_SWSCALE + +#ifdef HAVE_SYSTEM_WEED_COMPAT +#include "weed/weed-compat.h" +#else #include "../libweed/weed-compat.h" -#endif // USE_SWSCALE +#endif // HAVE_SYSTEM_WEED_COMPAT -#endif // HAVE_SYSTEM_WEED +#endif // USE_SWSCALE #include "support.h" #include "main.h" @@ -294,7 +289,7 @@ Cr_Gc[i] = myround(-0.418688 * (gdouble)i * 224./255. * (1<<FP_BITS)); Cr_Rc[i] = myround((-0.081312 * (gdouble)i - * 224./255. + 128.) * (1<<FP_BITS)); + * 224./255. + 128.) * (1<<FP_BITS)); } @@ -319,7 +314,7 @@ Cr_Gu[i] = myround(-0.418688 * (gdouble)i * (1<<FP_BITS)); Cr_Ru[i] = myround((-0.081312 * (gdouble)i - + 128.) * (1<<FP_BITS)); + + 128.) * (1<<FP_BITS)); } @@ -335,50 +330,50 @@ for (i = 0; i < 256; i++) { HY_Rc[i] = myround(0.183 * (gdouble)i - * (1<<FP_BITS)); // Kr + * (1<<FP_BITS)); // Kr HY_Gc[i] = myround(0.614 * (gdouble)i - * (1<<FP_BITS)); // Kb + * (1<<FP_BITS)); // Kb HY_Bc[i] = myround((0.062 * (gdouble)i - // here we add the 16 which goes into all components + // here we add the 16 which goes into all components + 16.) * (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)); + * (1<<FP_BITS)); HCb_Rc[i] = myround((0.439 * (gdouble)i - + 128.) * (1<<FP_BITS)); + + 128.) * (1<<FP_BITS)); HCr_Bc[i] = myround(0.439 * (gdouble)i - * (1<<FP_BITS)); + * (1<<FP_BITS)); HCr_Gc[i] = myround(-0.399 * (gdouble)i - * (1<<FP_BITS)); + * (1<<FP_BITS)); HCr_Rc[i] = myround((-0.040 * (gdouble)i - + 128.) * (1<<FP_BITS)); + + 128.) * (1<<FP_BITS)); } for (i = 0; i < 256; i++) { HY_Ru[i] = myround(0.213 * (gdouble)i - * (1<<FP_BITS)); // Kr + * (1<<FP_BITS)); // Kr HY_Gu[i] = myround(0.715 * (gdouble)i - * (1<<FP_BITS)); // Kb + * (1<<FP_BITS)); // Kb HY_Bu[i] = myround(0.0722 * (gdouble)i - * (1<<FP_BITS)); + * (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)); + * (1<<FP_BITS)); HCb_Ru[i] = myround((0.5 * (gdouble)i - + 128.) * (1<<FP_BITS)); + + 128.) * (1<<FP_BITS)); HCr_Bu[i] = myround(0.5 * (gdouble)i - * (1<<FP_BITS)); + * (1<<FP_BITS)); HCr_Gu[i] = myround(-0.4542 * (gdouble)i - * (1<<FP_BITS)); + * (1<<FP_BITS)); HCr_Ru[i] = myround((-0.4554 * (gdouble)i - + 128.) * (1<<FP_BITS)); + + 128.) * (1<<FP_BITS)); } @@ -594,25 +589,25 @@ break; case WEED_YUV_SUBSPACE_BT709: //untested - Y_R=HY_Rc; - Y_G=HY_Gc; - Y_B=HY_Bc; + Y_R=HY_Rc; + Y_G=HY_Gc; + Y_B=HY_Bc; - Cb_R=HCb_Rc; - Cb_G=HCb_Gc; - Cb_B=HCb_Bc; + Cb_R=HCb_Rc; + Cb_G=HCb_Gc; + Cb_B=HCb_Bc; - Cr_R=HCr_Rc; - Cr_G=HCr_Gc; - Cr_B=HCr_Bc; + Cr_R=HCr_Rc; + Cr_G=HCr_Gc; + Cr_B=HCr_Bc; - RGB_Y=HRGB_Yc; + RGB_Y=HRGB_Yc; - R_Cr=HR_Crc; - G_Cr=HG_Crc; - G_Cb=HG_Cbc; - B_Cb=HB_Cbc; - break; + R_Cr=HR_Crc; + G_Cr=HG_Crc; + G_Cb=HG_Cbc; + B_Cb=HB_Cbc; + break; } if (!avg_inited) init_average(); @@ -2351,7 +2346,7 @@ void *convert_uyvy_to_rgb_frame_thread(void *data) { lives_cc_params *ccparams=(lives_cc_params *)data; convert_uyvy_to_rgb_frame(ccparams->src,ccparams->hsize,ccparams->vsize,ccparams->orowstrides[0], - ccparams->dest,ccparams->out_alpha,ccparams->in_clamped,ccparams->thread_id); + ccparams->dest,ccparams->out_alpha,ccparams->in_clamped,ccparams->thread_id); return NULL; } @@ -2432,7 +2427,7 @@ void *convert_uyvy_to_bgr_frame_thread(void *data) { lives_cc_params *ccparams=(lives_cc_params *)data; convert_uyvy_to_bgr_frame(ccparams->src,ccparams->hsize,ccparams->vsize,ccparams->orowstrides[0], - ccparams->dest,ccparams->out_alpha,ccparams->in_clamped,ccparams->thread_id); + ccparams->dest,ccparams->out_alpha,ccparams->in_clamped,ccparams->thread_id); return NULL; } @@ -2511,7 +2506,7 @@ void *convert_yuyv_to_rgb_frame_thread(void *data) { lives_cc_params *ccparams=(lives_cc_params *)data; convert_yuyv_to_rgb_frame(ccparams->src,ccparams->hsize,ccparams->vsize,ccparams->orowstrides[0], - ccparams->dest,ccparams->out_alpha,ccparams->in_clamped,ccparams->thread_id); + ccparams->dest,ccparams->out_alpha,ccparams->in_clamped,ccparams->thread_id); return NULL; } @@ -2587,7 +2582,7 @@ void *convert_yuyv_to_bgr_frame_thread(void *data) { lives_cc_params *ccparams=(lives_cc_params *)data; convert_yuyv_to_bgr_frame(ccparams->src,ccparams->hsize,ccparams->vsize,ccparams->orowstrides[0],
View file
LiVES-1.4.8.tar.bz2/src/colourspace.h -> LiVES-1.4.9.tar.bz2/src/colourspace.h
Changed
@@ -1,6 +1,6 @@ // colourspace.h // LiVES -// (c) G. Finch 2004 - 2010 <salsaman@xs4all.nl> +// (c) G. Finch 2004 - 2010 <salsaman@xs4all.nl,salsaman@gmail.com> // Released under the GPL 3 or later // see file ../COPYING for licensing details @@ -94,7 +94,7 @@ void resize_layer (weed_plant_t *layer, int width, int height, int interp); void letterbox_layer (weed_plant_t *layer, int width, int height, int nwidth, int nheight); void compact_rowstrides(weed_plant_t *layer); -void create_empty_pixel_data(weed_plant_t *layer, gboolean black_fill); +void create_empty_pixel_data(weed_plant_t *layer, gboolean black_fill, gboolean may_contig); void pixel_data_planar_from_membuf(void **pixel_data, void *data, size_t size, int palette); GdkPixbuf *layer_to_pixbuf (weed_plant_t *layer); gboolean pixbuf_to_layer(weed_plant_t *layer, GdkPixbuf *);
View file
LiVES-1.4.8.tar.bz2/src/cvirtual.c -> LiVES-1.4.9.tar.bz2/src/cvirtual.c
Changed
@@ -1,6 +1,6 @@ // cvirtual.c // LiVES -// (c) G. Finch 2008 - 2009 <salsaman@xs4all.nl> +// (c) G. Finch 2008 - 2009 <salsaman@xs4all.nl,salsaman@gmail.com> // released under the GNU GPL 3 or later // see file ../COPYING or www.gnu.org for licensing details
View file
LiVES-1.4.8.tar.bz2/src/cvirtual.h -> LiVES-1.4.9.tar.bz2/src/cvirtual.h
Changed
@@ -1,6 +1,6 @@ // cvirtual.h // LiVES -// (c) G. Finch 2008 - 2009 <salsaman@xs4all.nl> +// (c) G. Finch 2008 - 2009 <salsaman@xs4all.nl,salsaman@gmail.com> // released under the GNU GPL 3 or later // see file ../COPYING or www.gnu.org for licensing details
View file
LiVES-1.4.8.tar.bz2/src/effects-weed.c -> LiVES-1.4.9.tar.bz2/src/effects-weed.c
Changed
@@ -1,6 +1,6 @@ // effects-weed.c // LiVES (lives-exe) -// (c) G. Finch 2005 - 2011 (salsaman@xs4all.nl) +// (c) G. Finch 2005 - 2011 (salsaman@xs4all.nl,salsaman@gmail.com) // Released under the GPL 3 or later // see file ../COPYING for licensing details @@ -604,6 +604,17 @@ } +gboolean is_pure_audio(weed_plant_t *plant, gboolean count_opt) { + int error; + weed_plant_t *filter=plant; + if (WEED_PLANT_IS_FILTER_INSTANCE(plant)) filter=weed_get_plantptr_value(plant,"filter_class",&error); + if ((has_audio_chans_in(filter,count_opt) || has_audio_chans_out(filter,count_opt)) && + !(has_video_chans_in(filter,count_opt)) && (!has_video_chans_out(filter,count_opt))) return TRUE; + return FALSE; +} + + + gboolean weed_parameter_has_variable_elements_strict(weed_plant_t *inst, weed_plant_t *ptmpl) { /** see if param has variable elements, using the strictest check */ weed_plant_t **chans,*ctmpl; @@ -877,24 +888,83 @@ } -static gboolean align (void **pixel_data, size_t alignment, int numplanes, int height, int *rowstrides) { +static gboolean align (void **pixel_data, size_t alignment, int numplanes, int height, int *rowstrides, + int *contiguous) { // returns TRUE on success int i; + int memerror; + gboolean needs_change=FALSE; + void *npixel_data; + void **new_pixel_data; + size_t size,totsize=0; + +#ifndef HAVE_POSIX_MEMALIGN + return FALSE; +#endif + for (i=0;i<numplanes;i++) { if (((gulong)(pixel_data[i]))%alignment==0) continue; -#ifdef HAVE_POSIX_MEMALIGN - else { - int memerror; - void *new_pixel_data; - if ((memerror=posix_memalign(&new_pixel_data,alignment,height*rowstrides[i]))) return FALSE; - memcpy(new_pixel_data,pixel_data[i],height*rowstrides[i]); - g_free(pixel_data[i]); - pixel_data[i]=new_pixel_data; + needs_change=TRUE; + } + + if (!needs_change) return TRUE; + + for (i=0;i<numplanes;i++) { + size=height*rowstrides[i]; + totsize+=CEIL(size,32); + } + + // try contiguous first + if ((memerror=posix_memalign(&npixel_data,alignment,totsize))) return FALSE; + + new_pixel_data=g_malloc(numplanes*(sizeof(void *))); + + // recheck + needs_change=FALSE; + + for (i=0;i<numplanes;i++) { + if (((gulong)(pixel_data[i]))%alignment==0) continue; + needs_change=TRUE; + } + + if (!needs_change) { + for (i=0;i<numplanes;i++) { + memcpy(npixel_data,pixel_data[i],height*rowstrides[i]); + new_pixel_data[i]=npixel_data; + size=height*rowstrides[i]; + npixel_data+=CEIL(size,32); } -#else - return FALSE; -#endif + + for (i=0;i<numplanes;i++) { + if (i==0||!(*contiguous)) + g_free(pixel_data[i]); + pixel_data[i]=new_pixel_data[i]; + } + + g_free(new_pixel_data); + if (numplanes>1) *contiguous=TRUE; + else *contiguous=FALSE; + return TRUE; + } + + g_free(npixel_data); + + // non-contiguous + for (i=0;i<numplanes;i++) { + if ((memerror=posix_memalign(&npixel_data,alignment,height*rowstrides[i]))) return FALSE; + memcpy(npixel_data,pixel_data[i],height*rowstrides[i]); + new_pixel_data[i]=npixel_data; + } + + for (i=0;i<numplanes;i++) { + if (i==0||!(*contiguous)) + g_free(pixel_data[i]); + pixel_data[i]=new_pixel_data[i]; } + + g_free(new_pixel_data); + *contiguous=FALSE; + return TRUE; } @@ -1237,7 +1307,7 @@ return FILTER_ERROR_NO_IN_CHANNELS; } - if (!has_video_chans_in(filter,TRUE)||!has_video_chans_out(filter,TRUE)) { + if (is_pure_audio(filter,TRUE)) { weed_free(in_channels); return FILTER_ERROR_IS_AUDIO; // we process audio effects elsewhere } @@ -1545,17 +1615,29 @@ weed_set_int64_value(channel,"timecode",tc); pixel_data=weed_get_voidptr_array(layer,"pixel_data",&error); - + // align memory if necessary if (weed_plant_has_leaf(chantmpl,"alignment")) { int alignment=weed_get_int_value(chantmpl,"alignment",&error); - align(pixel_data,alignment,numplanes,height,rowstrides); + gboolean contiguous=FALSE; + if (weed_plant_has_leaf(layer,"host_pixel_data_contiguous") && + weed_get_boolean_value(layer,"host_pixel_data_contiguous",&error)==WEED_TRUE) contiguous=TRUE; + align(pixel_data,alignment,numplanes,height,rowstrides,&contiguous); weed_set_voidptr_array(layer,"pixel_data",numplanes,pixel_data); + if (contiguous) weed_set_boolean_value(layer,"host_pixel_data_contiguous",WEED_TRUE); + else if (weed_plant_has_leaf(layer,"host_pixel_data_contiguous")) + weed_leaf_delete(layer,"host_pixel_data_contiguous"); } weed_free(rowstrides); weed_set_voidptr_array(channel,"pixel_data",numplanes,pixel_data); weed_free(pixel_data); + if (weed_plant_has_leaf(layer,"host_pixel_data_contiguous")) + weed_set_boolean_value(channel,"host_pixel_data_contiguous", + weed_get_boolean_value(layer,"host_pixel_data_contiguous",&error)); + else if (weed_plant_has_leaf(channel,"host_pixel_data_contiguous")) + weed_leaf_delete(channel,"host_pixel_data_contiguous"); + } // we may need to disable some channels for the plugin @@ -1622,6 +1704,11 @@ weed_free(pixel_data); weed_set_boolean_value(channel,"inplace",WEED_TRUE); inplace=TRUE; + if (weed_plant_has_leaf(def_channel,"host_pixel_data_contiguous")) + weed_set_boolean_value(channel,"host_pixel_data_contiguous", + weed_get_boolean_value(def_channel,"host_pixel_data_contiguous",&error)); + else if (weed_plant_has_leaf(channel,"host_pixel_data_contiguous")) + weed_leaf_delete(channel,"host_pixel_data_contiguous"); } weed_free(palettes); } @@ -1675,7 +1762,8 @@ set_channel_size(channel,opwidth/weed_palette_get_pixels_per_macropixel(palette),opheight,1,NULL); - create_empty_pixel_data(channel,FALSE); // this will look at width, height, current_palette, and create an empty pixel_data and set rowstrides + // this will look at width, height, current_palette, and create an empty pixel_data and set rowstrides + create_empty_pixel_data(channel,FALSE,TRUE); // and update width and height if necessary numplanes=weed_leaf_num_elements(channel,"rowstrides"); @@ -1683,11 +1771,21 @@ // align memory if necessary if (weed_plant_has_leaf(chantmpl,"alignment")) { int alignment=weed_get_int_value(chantmpl,"alignment",&error); + gboolean contiguous=FALSE; + if (weed_plant_has_leaf(channel,"host_pixel_data_contiguous") && + weed_get_boolean_value(channel,"host_pixel_data_contiguous",&error)==WEED_TRUE) contiguous=TRUE; + pixel_data=weed_get_voidptr_array(channel,"pixel_data",&error); + height=weed_get_int_value(channel,"height",&error); - align(pixel_data,alignment,numplanes,height,layer_rows); + + align(pixel_data,alignment,numplanes,height,layer_rows,&contiguous); +
View file
LiVES-1.4.8.tar.bz2/src/effects-weed.h -> LiVES-1.4.9.tar.bz2/src/effects-weed.h
Changed
@@ -46,6 +46,7 @@ gboolean is_audio_channel_out(weed_plant_t *inst, int chnum); gboolean has_video_chans_out(weed_plant_t *filter, gboolean count_opt); gboolean has_audio_chans_out(weed_plant_t *filter, gboolean count_opt); +gboolean is_pure_audio(weed_plant_t *filter_or_instance, gboolean count_opt); ///< TRUE if audio in or out and no vid in/out gint weed_filter_categorise (weed_plant_t *pl, int in_channels, int out_channels); gint weed_filter_subcategorise (weed_plant_t *pl, int category, gboolean count_opt);
View file
LiVES-1.4.8.tar.bz2/src/events.c -> LiVES-1.4.9.tar.bz2/src/events.c
Changed
@@ -1,6 +1,6 @@ // events.c // LiVES -// (c) G. Finch 2005 - 2010 <salsaman@xs4all.nl> +// (c) G. Finch 2005 - 2010 <salsaman@xs4all.nl,salsaman@gmail.com> // released under the GNU GPL 3 or later // see file ../COPYING or www.gnu.org for licensing details
View file
LiVES-1.4.8.tar.bz2/src/events.h -> LiVES-1.4.9.tar.bz2/src/events.h
Changed
@@ -1,6 +1,6 @@ // events.h // LiVES -// (c) G. Finch 2005 - 2010 <salsaman@xs4all.nl> +// (c) G. Finch 2005 - 2010 <salsaman@xs4all.nl,salsaman@gmail.com> // released under the GNU GPL 3 or later // see file ../COPYING or www.gnu.org for licensing details
View file
LiVES-1.4.8.tar.bz2/src/framedraw.c -> LiVES-1.4.9.tar.bz2/src/framedraw.c
Changed
@@ -1,6 +1,6 @@ // framedraw.c // LiVES -// (c) G. Finch (salsaman@xs4all.nl) 2002 - 2010 +// (c) G. Finch (salsaman@xs4all.nl,salsaman@gmail.com) 2002 - 2010 // see file COPYING for licensing details : released under the GNU GPL 3 or later // functions for the 'framedraw' widget - lets users draw on frames :-)
View file
LiVES-1.4.8.tar.bz2/src/framedraw.h -> LiVES-1.4.9.tar.bz2/src/framedraw.h
Changed
@@ -1,6 +1,6 @@ // LiVES // framedraw.h -// (c) G. Finch (salsaman@xs4all.nl) +// (c) G. Finch (salsaman@xs4all.nl,salsaman@gmail.com) // see file COPYING for licensing details : released under the GNU GPL 3 or later #ifndef _HAS_FRAMEDRAW_H
View file
LiVES-1.4.8.tar.bz2/src/gui.c -> LiVES-1.4.9.tar.bz2/src/gui.c
Changed
@@ -1,6 +1,6 @@ // gui.c // LiVES -// (c) G. Finch 2004 - 2011 <salsaman@xs4all.nl> +// (c) G. Finch 2004 - 2011 <salsaman@xs4all.nl,salsaman@gmail.com> // Released under the GNU GPL 3 or later // see file ../COPYING for licensing details @@ -254,6 +254,8 @@ mainw->current_file=-1; + mainw->preview_image=NULL; + mainw->sep_image = gtk_image_new_from_pixbuf (NULL); mainw->image272 = gtk_image_new_from_pixbuf (NULL); mainw->image273 = gtk_image_new_from_pixbuf (NULL); @@ -342,11 +344,31 @@ gtk_container_add (GTK_CONTAINER (menuitem11_menu), mainw->open_sel); + + mainw->open_loc = gtk_menu_item_new_with_mnemonic (_("Open _Location/Stream...")); + +#ifdef HAVE_WEBM + + mainw->open_loc_menu = gtk_menu_item_new_with_mnemonic (_("Open _Location/Stream...")); + gtk_container_add (GTK_CONTAINER (menuitem11_menu), mainw->open_loc_menu); + + mainw->open_loc_submenu=gtk_menu_new(); + gtk_menu_item_set_submenu (GTK_MENU_ITEM (mainw->open_loc_menu), mainw->open_loc_submenu); + if (palette->style&STYLE_1) { + gtk_widget_modify_bg(mainw->open_loc_submenu, GTK_STATE_NORMAL, &palette->menu_and_bars); + } + + mainw->open_utube = gtk_menu_item_new_with_mnemonic (_("Open _Youtube Clip...")); + gtk_container_add (GTK_CONTAINER (mainw->open_loc_submenu), mainw->open_utube); + + gtk_container_add (GTK_CONTAINER (mainw->open_loc_submenu), mainw->open_loc); + +#else + gtk_container_add (GTK_CONTAINER (menuitem11_menu), mainw->open_loc); - gtk_widget_add_accelerator (mainw->open_loc, "activate", mainw->accel_group, - GDK_l, GDK_CONTROL_MASK, - GTK_ACCEL_VISIBLE); + +#endif mainw->open_vcd_menu = gtk_menu_item_new_with_mnemonic (_("Import from _dvd/vcd...")); gtk_container_add (GTK_CONTAINER (menuitem11_menu), mainw->open_vcd_menu); @@ -392,7 +414,11 @@ gtk_widget_show (mainw->open_dvd); gtk_widget_show (mainw->open_vcd); #endif +#ifdef HAVE_WEBM + gtk_widget_show_all (mainw->open_loc_menu); +#else gtk_widget_show (mainw->open_loc); +#endif } mainw->add_live_menu = gtk_menu_item_new_with_mnemonic (_("_Add Webcam/TV card...")); @@ -2341,6 +2367,12 @@ g_signal_connect (GTK_OBJECT (mainw->open_loc), "activate", G_CALLBACK (on_open_loc_activate), NULL); +#ifdef HAVE_WEBM + g_signal_connect (GTK_OBJECT (mainw->open_utube), "activate", + G_CALLBACK (on_open_utube_activate), + NULL); +#endif + #ifdef HAVE_LDVGRAB g_signal_connect (GTK_OBJECT (mainw->open_firewire), "activate", G_CALLBACK (on_open_fw_activate),
View file
LiVES-1.4.8.tar.bz2/src/htmsocket.c -> LiVES-1.4.9.tar.bz2/src/htmsocket.c
Changed
@@ -1,6 +1,6 @@ // htmsocket.c // LiVES -// (c) G. Finch 2008 <salsaman@xs4all.nl> +// (c) G. Finch 2008 <salsaman@xs4all.nl,salsaman@gmail.com> // released under the GNU GPL 3 or later // see file ../COPYING for licensing details
View file
LiVES-1.4.8.tar.bz2/src/interface.c -> LiVES-1.4.9.tar.bz2/src/interface.c
Changed
@@ -1,6 +1,6 @@ // interface.c // LiVES -// (c) G. Finch 2003 - 2011 <salsaman@xs4all.nl> +// (c) G. Finch 2003 - 2011 <salsaman@xs4all.nl,salsaman@gmail.com> // Released under the GNU GPL 3 or later // see file ../COPYING for licensing details @@ -1655,28 +1655,32 @@ // TODO - move all prefs stuff into prefs.c -_entryw* -create_location_dialog (void) -{ - GtkWidget *dialog_vbox13; - GtkWidget *hbox19; - GtkWidget *label83; - GtkWidget *dialog_action_area13; - GtkWidget *cancelbutton11; - GtkWidget *okbutton10; +_entryw* create_location_dialog (int type) { + // type 1 is open location + // type 2 is open youtube: - 3 fields:= URL, directory, file name + + GtkWidget *dialog_vbox; + GtkWidget *dialog_action_area; + GtkWidget *cancelbutton; + GtkWidget *okbutton; GtkWidget *label; GtkWidget *checkbutton; GtkWidget *eventbox; GtkWidget *hbox; + GtkWidget *buttond; _entryw *locw=(_entryw*)(g_malloc(sizeof(_entryw))); + GtkAccelGroup *accel_group=GTK_ACCEL_GROUP(gtk_accel_group_new ()); + locw->dialog = gtk_dialog_new (); if (palette->style&STYLE_1) { gtk_dialog_set_has_separator(GTK_DIALOG(locw->dialog),FALSE); gtk_widget_modify_bg (locw->dialog, GTK_STATE_NORMAL, &palette->normal_back); } + gtk_window_add_accel_group (GTK_WINDOW (locw->dialog), accel_group); + if (prefs->show_gui) { if (mainw->multitrack==NULL) gtk_window_set_transient_for(GTK_WINDOW(locw->dialog),GTK_WINDOW(mainw->LiVES)); else gtk_window_set_transient_for(GTK_WINDOW(locw->dialog),GTK_WINDOW(mainw->multitrack->window)); @@ -1685,99 +1689,215 @@ 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); + if (type==1) + gtk_window_set_default_size (GTK_WINDOW (locw->dialog), 300, 200); + else + gtk_window_set_default_size (GTK_WINDOW (locw->dialog), 650, 450); + gtk_container_set_border_width (GTK_CONTAINER (locw->dialog), 10); - gtk_window_set_title (GTK_WINDOW (locw->dialog), _("LiVES: - Open Location")); - dialog_vbox13 = GTK_DIALOG (locw->dialog)->vbox; - gtk_widget_show (dialog_vbox13); - label = gtk_label_new (_("\n\nTo open a stream, you must make sure that you have the correct libraries compiled in mplayer.\nAlso make sure you have set your bandwidth in Preferences|Streaming\n\n")); + if (type==1) + gtk_window_set_title (GTK_WINDOW (locw->dialog), _("LiVES: - Open Location")); + else + gtk_window_set_title (GTK_WINDOW (locw->dialog), _("LiVES: - Open Youtube Clip")); + + dialog_vbox = GTK_DIALOG (locw->dialog)->vbox; + gtk_widget_show (dialog_vbox); + + if (type==1) { + label = gtk_label_new (_("\n\nTo open a stream, you must make sure that you have the correct libraries compiled in mplayer.\nAlso make sure you have set your bandwidth in Preferences|Streaming\n\n")); + } + else { + label = gtk_label_new (_("\n\nTo open a clip from Youtube, LiVES will first download it with youtube-dl.\nPlease make sure you have the latest version of that tool installed.\n\n")); + + gtk_widget_show (label); + gtk_box_pack_start (GTK_BOX (dialog_vbox), label, FALSE, FALSE, 0); + gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_CENTER); + if (palette->style&STYLE_1) { + gtk_widget_modify_fg (label, GTK_STATE_NORMAL, &palette->normal_fore); + } + + label=gtk_label_new(_("Enter the URL of the clip below.\nE.g: http://www.youtube.com/watch?v=WCR6f6WzjP8\n\n")); + + } gtk_widget_show (label); - gtk_box_pack_start (GTK_BOX (dialog_vbox13), label, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (dialog_vbox), label, FALSE, FALSE, 0); gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_CENTER); if (palette->style&STYLE_1) { gtk_widget_modify_fg (label, GTK_STATE_NORMAL, &palette->normal_fore); } - hbox19 = gtk_hbox_new (FALSE, 0); - gtk_widget_show (hbox19); - gtk_box_pack_start (GTK_BOX (dialog_vbox13), hbox19, TRUE, TRUE, 0); - - label83 = gtk_label_new (_ ("URL : ")); - gtk_widget_show (label83); - gtk_box_pack_start (GTK_BOX (hbox19), label83, FALSE, FALSE, 0); - gtk_label_set_justify (GTK_LABEL (label83), GTK_JUSTIFY_LEFT); + hbox = gtk_hbox_new (FALSE, 0); + gtk_widget_show (hbox); + gtk_box_pack_start (GTK_BOX (dialog_vbox), hbox, TRUE, TRUE, 0); + + if (type==1) + label = gtk_label_new (_ ("URL : ")); + else + label = gtk_label_new (_ ("Youtube URL : ")); + + gtk_widget_show (label); + gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); + gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT); if (palette->style&STYLE_1) { - gtk_widget_modify_fg (label83, GTK_STATE_NORMAL, &palette->normal_fore); + gtk_widget_modify_fg (label, GTK_STATE_NORMAL, &palette->normal_fore); } locw->entry = gtk_entry_new_with_max_length (32768); gtk_widget_show (locw->entry); - gtk_box_pack_start (GTK_BOX (hbox19), locw->entry, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (hbox), locw->entry, TRUE, TRUE, 0); gtk_entry_set_activates_default (GTK_ENTRY (locw->entry), TRUE); - hbox=gtk_hbox_new (FALSE, 0); - checkbutton = gtk_check_button_new (); - eventbox=gtk_event_box_new(); - label=gtk_label_new_with_mnemonic (_("Do not send bandwidth information")); - gtk_tooltips_set_tip (mainw->tooltips, checkbutton,_("Try this setting if you are having problems getting a stream"), NULL); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton),prefs->no_bandwidth); - gtk_label_set_mnemonic_widget (GTK_LABEL (label),checkbutton); - gtk_container_add(GTK_CONTAINER(eventbox),label); - g_signal_connect (GTK_OBJECT (eventbox), "button_press_event", - G_CALLBACK (label_act_toggle), - checkbutton); - if (palette->style&STYLE_1) { - gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore); - gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore); - gtk_widget_modify_bg (eventbox, GTK_STATE_NORMAL, &palette->normal_back); + if (type==1) { + hbox=gtk_hbox_new (FALSE, 0); + checkbutton = gtk_check_button_new (); + eventbox=gtk_event_box_new(); + label=gtk_label_new_with_mnemonic (_("Do not send bandwidth information")); + gtk_tooltips_set_tip (mainw->tooltips, checkbutton,_("Try this setting if you are having problems getting a stream"), NULL); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton),prefs->no_bandwidth); + + gtk_label_set_mnemonic_widget (GTK_LABEL (label),checkbutton); + gtk_container_add(GTK_CONTAINER(eventbox),label); + g_signal_connect (GTK_OBJECT (eventbox), "button_press_event", + G_CALLBACK (label_act_toggle), + checkbutton); + + if (palette->style&STYLE_1) { + gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore); + gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore); + gtk_widget_modify_bg (eventbox, GTK_STATE_NORMAL, &palette->normal_back); + } + + gtk_box_pack_start (GTK_BOX(dialog_vbox), hbox, FALSE, FALSE, 10); + gtk_box_pack_start (GTK_BOX (hbox), checkbutton, FALSE, FALSE, 10); + gtk_box_pack_start (GTK_BOX (hbox), eventbox, FALSE, FALSE, 10); + GTK_WIDGET_SET_FLAGS (checkbutton, GTK_CAN_DEFAULT|GTK_CAN_FOCUS); + + g_signal_connect (GTK_OBJECT (checkbutton), "toggled", + G_CALLBACK (on_boolean_toggled), + &prefs->no_bandwidth); + + gtk_widget_show_all(hbox); + + add_deinterlace_checkbox(GTK_BOX(dialog_vbox)); + } - - gtk_box_pack_start (GTK_BOX(dialog_vbox13), hbox, FALSE, FALSE, 10); - gtk_box_pack_start (GTK_BOX (hbox), checkbutton, FALSE, FALSE, 10); - gtk_box_pack_start (GTK_BOX (hbox), eventbox, FALSE, FALSE, 10); - GTK_WIDGET_SET_FLAGS (checkbutton, GTK_CAN_DEFAULT|GTK_CAN_FOCUS); - g_signal_connect (GTK_OBJECT (checkbutton), "toggled", - G_CALLBACK (on_boolean_toggled), - &prefs->no_bandwidth); + if (type==2) { + hbox=gtk_hbox_new (FALSE, 0); + + gtk_box_pack_start(GTK_BOX(dialog_vbox),hbox,TRUE,FALSE,0); - gtk_widget_show_all(hbox); + locw->dir_entry = gtk_entry_new_with_max_length (32768); + + label=gtk_label_new_with_mnemonic (_("Download to _Directory : "));
View file
LiVES-1.4.8.tar.bz2/src/interface.h -> LiVES-1.4.9.tar.bz2/src/interface.h
Changed
@@ -1,6 +1,6 @@ // interface.h // LiVES -// (c) G. Finch 2003 - 2010 <salsaman@xs4all.nl> +// (c) G. Finch 2003 - 2010 <salsaman@xs4all.nl,salsaman@gmail.com> // Released under the GNU GPL 3 or later // see file ../COPYING for licensing details @@ -45,12 +45,14 @@ typedef struct { GtkWidget *dialog; GtkWidget *entry; + GtkWidget *dir_entry; + GtkWidget *name_entry; GtkWidget *warn_checkbutton; GList *setlist; } _entryw; _entryw* create_rename_dialog (gint type); -_entryw* create_location_dialog (void); +_entryw* create_location_dialog (gint type); _entryw* create_cds_dialog (gint type); typedef struct __insertw {
View file
LiVES-1.4.8.tar.bz2/src/keyboard.c -> LiVES-1.4.9.tar.bz2/src/keyboard.c
Changed
@@ -1,6 +1,6 @@ // keyboard.c // LiVES -// (c) G. Finch 2004 - 2011 <salsaman@xs4all.nl> +// (c) G. Finch 2004 - 2011 <salsaman@xs4all.nl,salsaman@gmail.com> // released under the GNU GPL 3 or later // see file ../COPYING for licensing details
View file
LiVES-1.4.8.tar.bz2/src/keyboard.h -> LiVES-1.4.9.tar.bz2/src/keyboard.h
Changed
@@ -1,6 +1,6 @@ // keyboard.h // LiVES -// (c) G. Finch 2004 - 2009 <salsaman@xs4all.nl> +// (c) G. Finch 2004 - 2009 <salsaman@xs4all.nl,salsaman@gmail.com> // see file ../COPYING for licensing details // repeating keys
View file
LiVES-1.4.8.tar.bz2/src/ldvcallbacks.c -> LiVES-1.4.9.tar.bz2/src/ldvcallbacks.c
Changed
@@ -1,6 +1,6 @@ // ldvcallbacks.c // LiVES -// (c) G. Finch 2006 <salsaman@xs4all.nl> +// (c) G. Finch 2006 <salsaman@xs4all.nl,salsaman@gmail.com> // released under the GNU GPL 3 or later // see file ../COPYING for licensing details
View file
LiVES-1.4.8.tar.bz2/src/ldvcallbacks.h -> LiVES-1.4.9.tar.bz2/src/ldvcallbacks.h
Changed
@@ -1,6 +1,6 @@ // ldvcallbacks.h // LiVES -// (c) G. Finch 2006 <salsaman@xs4all.nl> +// (c) G. Finch 2006 <salsaman@xs4all.nl,salsaman@gmail.com> // released under the GNU GPL 3 or later // see file ../COPYING for licensing details
View file
LiVES-1.4.8.tar.bz2/src/ldvgrab.c -> LiVES-1.4.9.tar.bz2/src/ldvgrab.c
Changed
@@ -1,6 +1,6 @@ // ldvgrab.c // LiVES -// (c) G. Finch 2006 <salsaman@xs4all.nl> +// (c) G. Finch 2006 <salsaman@xs4all.nl,salsaman@gmail.com> // released under the GNU GPL 3 or later // see file ../COPYING for licensing details
View file
LiVES-1.4.8.tar.bz2/src/ldvgrab.h -> LiVES-1.4.9.tar.bz2/src/ldvgrab.h
Changed
@@ -1,6 +1,6 @@ // ldvgrab.h // LiVES -// (c) G. Finch 2006 <salsaman@xs4all.nl> +// (c) G. Finch 2006 <salsaman@xs4all.nl,salsaman@gmail.com> // released under the GNU GPL 3 or later // see file ../COPYING for licensing details
View file
LiVES-1.4.8.tar.bz2/src/ldvinterface.c -> LiVES-1.4.9.tar.bz2/src/ldvinterface.c
Changed
@@ -1,6 +1,6 @@ // ldvinterface.c // LiVES -// (c) G. Finch 2006-2011 <salsaman@xs4all.nl> +// (c) G. Finch 2006-2011 <salsaman@xs4all.nl,salsaman@gmail.com> // released under the GNU GPL 3 or later // see file ../COPYING for licensing details
View file
LiVES-1.4.8.tar.bz2/src/ldvinterface.h -> LiVES-1.4.9.tar.bz2/src/ldvinterface.h
Changed
@@ -1,6 +1,6 @@ // ldvinterface.h // LiVES -// (c) G. Finch 2006 <salsaman@xs4all.nl> +// (c) G. Finch 2006 <salsaman@xs4all.nl,salsaman@gmail.com> // released under the GNU GPL 3 or later // see file ../COPYING for licensing details
View file
LiVES-1.4.8.tar.bz2/src/lives-yuv4mpeg.c -> LiVES-1.4.9.tar.bz2/src/lives-yuv4mpeg.c
Changed
@@ -1,6 +1,6 @@ // yuv4mpeg.c // LiVES -// (c) G. Finch 2004 - 2010 <salsaman@xs4all.nl> +// (c) G. Finch 2004 - 2010 <salsaman@xs4all.nl,salsaman@gmail.com> // released under the GNU GPL 3 or later // see file ../COPYING or www.gnu.org for licensing details @@ -256,13 +256,12 @@ weed_set_int_value(layer,"current_palette",WEED_PALETTE_YUV420P); weed_set_int_value(layer,"YUV_subspace",WEED_YUV_SUBSPACE_YCBCR); + create_empty_pixel_data(layer,FALSE,TRUE); + if (!yuv4mpeg->ready) { - create_empty_pixel_data(layer,FALSE); return; } - create_empty_pixel_data(layer,FALSE); - yuv4mpeg->pixel_data=weed_get_voidptr_array(layer,"pixel_data",&error); // create a thread to open the stream header
View file
LiVES-1.4.8.tar.bz2/src/main.c -> LiVES-1.4.9.tar.bz2/src/main.c
Changed
@@ -1756,7 +1756,7 @@ void print_notice() { g_printerr("\nLiVES %s\n",LiVES_VERSION); - g_printerr("Copyright 2002-2011 Gabriel Finch (salsaman@xs4all.nl) and others.\n"); + g_printerr("Copyright 2002-2011 Gabriel Finch (salsaman@xs4all.nl,salsaman@gmail.com) and others.\n"); g_printerr("LiVES comes with ABSOLUTELY NO WARRANTY\nThis is free software, and you are welcome to redistribute it\nunder certain conditions; see the file COPYING for details.\n\n"); } @@ -2038,7 +2038,7 @@ gtk_init (&argc, &argv); // don't crash on GTK+ fatals - //g_log_set_always_fatal (0); + g_log_set_always_fatal (0); theme_expected=pre_init(); // mainw->foreign is set if we are grabbing an external window @@ -2330,7 +2330,11 @@ gtk_widget_set_sensitive (mainw->open, TRUE); gtk_widget_set_sensitive (mainw->open_sel, TRUE); gtk_widget_set_sensitive (mainw->open_vcd_menu, TRUE); +#ifdef HAVE_WEBM + gtk_widget_set_sensitive (mainw->open_loc_menu, TRUE); +#else gtk_widget_set_sensitive (mainw->open_loc, TRUE); +#endif gtk_widget_set_sensitive (mainw->open_device_menu, TRUE); gtk_widget_set_sensitive (mainw->restore, TRUE); gtk_widget_set_sensitive (mainw->recent_menu, TRUE); @@ -2473,7 +2477,11 @@ gtk_widget_set_sensitive (mainw->open, FALSE); gtk_widget_set_sensitive (mainw->open_sel, FALSE); gtk_widget_set_sensitive (mainw->open_vcd_menu, FALSE); +#ifdef HAVE_WEBM + gtk_widget_set_sensitive (mainw->open_loc_menu, FALSE); +#else gtk_widget_set_sensitive (mainw->open_loc, FALSE); +#endif gtk_widget_set_sensitive (mainw->open_device_menu, FALSE); #ifdef HAVE_YUV4MPEG gtk_widget_set_sensitive (mainw->open_yuv4m, FALSE); @@ -3356,7 +3364,7 @@ if (image_ext==NULL||!strcmp(image_ext,"jpg")) weed_set_int_value(layer,"current_palette",WEED_PALETTE_RGB24); else weed_set_int_value(layer,"current_palette",WEED_PALETTE_RGBA32); } - create_empty_pixel_data(layer,TRUE); + create_empty_pixel_data(layer,TRUE,TRUE); return TRUE; } else if (clip==mainw->scrap_file) { @@ -3394,7 +3402,7 @@ weed_set_int_value(layer,"YUV_clamping",dplug->cdata->YUV_clamping); weed_set_int_value(layer,"YUV_subspace",dplug->cdata->YUV_subspace); } - create_empty_pixel_data(layer,FALSE); + create_empty_pixel_data(layer,FALSE,TRUE); pixel_data=weed_get_voidptr_array(layer,"pixel_data",&error); rowstrides=weed_get_int_array(layer,"rowstrides",&error); @@ -4149,8 +4157,9 @@ layer_palette=weed_layer_get_palette(mainw->frame_layer); if (!(mainw->vpp->capabilities&VPP_LOCAL_DISPLAY) && - weed_palette_is_rgb_palette(layer_palette) && - !(weed_palette_is_rgb_palette(mainw->vpp->palette))) { + ((weed_palette_is_rgb_palette(layer_palette) && + !(weed_palette_is_rgb_palette(mainw->vpp->palette))) || + (weed_palette_is_lower_quality(mainw->vpp->palette,layer_palette)))) { // mainw->frame_layer is RGB and so is our screen, but plugin is YUV // so copy layer and convert, retaining original frame_layer=weed_layer_copy(NULL,mainw->frame_layer); @@ -4278,19 +4287,22 @@ resize_layer(frame_layer,mainw->vpp->fwidth/weed_palette_get_pixels_per_macropixel(layer_palette), mainw->vpp->fheight,interp); } + + // resize_layer can change palette + layer_palette=weed_get_int_value(frame_layer,"current_palette",&weed_error); if (frame_layer==mainw->frame_layer && !(mainw->vpp->capabilities&VPP_LOCAL_DISPLAY) && - weed_palette_is_rgb_palette(layer_palette) && - !(weed_palette_is_rgb_palette(mainw->vpp->palette))) { + ((weed_palette_is_rgb_palette(layer_palette) && + !(weed_palette_is_rgb_palette(mainw->vpp->palette))) || + (weed_palette_is_lower_quality(mainw->vpp->palette,layer_palette)))) { // mainw->frame_layer is RGB and so is our screen, but plugin is YUV // so copy layer and convert, retaining original frame_layer=weed_layer_copy(NULL,mainw->frame_layer); } pwidth=weed_get_int_value(frame_layer,"width",&weed_error)* - weed_palette_get_pixels_per_macropixel(mainw->vpp->palette); - pheight=weed_get_int_value(frame_layer,"height",&weed_error)* - weed_palette_get_pixels_per_macropixel(mainw->vpp->palette); + weed_palette_get_pixels_per_macropixel(layer_palette); + pheight=weed_get_int_value(frame_layer,"height",&weed_error); if (mainw->fs&&(mainw->vpp->capabilities&VPP_LOCAL_DISPLAY)) { mainw->vpp->fwidth=mainw->scr_width; @@ -4298,10 +4310,18 @@ } if (mainw->vpp->fwidth!=pwidth||mainw->vpp->fheight!=pheight||lb_width!=0) { + + if (lb_width==0) { + lb_width=pwidth; + lb_height=pheight; + + calc_maxspect(mainw->vpp->fwidth,mainw->vpp->fheight,&lb_width,&lb_height); + } + letterbox_layer(frame_layer,lb_width/ - weed_palette_get_pixels_per_macropixel(mainw->vpp->palette), + weed_palette_get_pixels_per_macropixel(layer_palette), lb_height,mainw->vpp->fwidth/ - weed_palette_get_pixels_per_macropixel(mainw->vpp->palette), + weed_palette_get_pixels_per_macropixel(layer_palette), mainw->vpp->fheight); } @@ -4551,7 +4571,11 @@ gtk_widget_set_sensitive (mainw->recaudio_submenu, TRUE); gtk_widget_set_sensitive (mainw->open_vcd_menu, TRUE); gtk_widget_set_sensitive (mainw->full_screen, TRUE); +#ifdef HAVE_WEBM + gtk_widget_set_sensitive (mainw->open_loc_menu, TRUE); +#else gtk_widget_set_sensitive (mainw->open_loc, TRUE); +#endif gtk_widget_set_sensitive (mainw->open_device_menu, TRUE); gtk_widget_set_sensitive (mainw->recent_menu, TRUE); gtk_widget_set_sensitive (mainw->restore, TRUE);
View file
LiVES-1.4.8.tar.bz2/src/main.h -> LiVES-1.4.9.tar.bz2/src/main.h
Changed
@@ -1,6 +1,6 @@ // main.h // LiVES -// (c) G. Finch (salsaman@xs4all.nl) 2003 - 2011 +// (c) G. Finch (salsaman@xs4all.nl,salsaman@gmail.com) 2003 - 2011 // see file ../COPYING for full licensing details /* This program is free software; you can redistribute it and/or modify @@ -83,8 +83,6 @@ #define PREFIX PREFIX_DEFAULT #endif -//#define HAVE_UNICAP 1 - #define DOC_DIR "/share/doc/lives-" #define THEME_DIR "/share/lives/themes/" @@ -99,7 +97,7 @@ #define LIVES_MANUAL_URL "http://lives.sourceforge.net/manual/" #define LIVES_MANUAL_FILENAME "LiVES_manual.html" -#define LIVES_AUTHOR_EMAIL "mailto:salsaman@xs4all.nl" +#define LIVES_AUTHOR_EMAIL "mailto:salsaman@xs4all.nl,salsaman@gmail.com" #define LIVES_DONATE_URL "https://sourceforge.net/donate/index.php?group_id=64341" #define LIVES_BUG_URL "http://sourceforge.net/tracker/?group_id=64341&atid=507139" #define LIVES_FEATURE_URL "http://sourceforge.net/tracker/?group_id=64341&atid=507142" @@ -192,8 +190,6 @@ // see weed event spec. for more info - - /// need this for event_list_t * #include "events.h"
View file
LiVES-1.4.8.tar.bz2/src/mainwindow.h -> LiVES-1.4.9.tar.bz2/src/mainwindow.h
Changed
@@ -1,6 +1,6 @@ // mainwindow.h // LiVES (lives-exe) -// (c) G. Finch <salsaman@xs4all.nl> 2003 - 2011 +// (c) G. Finch <salsaman@xs4all.nl,salsaman@gmail.com> 2003 - 2011 // Released under the GPL 3 or later // see file ../COPYING for licensing details @@ -488,6 +488,9 @@ GtkWidget *open_vcd; GtkWidget *open_dvd; GtkWidget *open_loc; + GtkWidget *open_utube; + GtkWidget *open_loc_menu; + GtkWidget *open_loc_submenu; GtkWidget *open_yuv4m; GtkWidget *open_lives2lives; GtkWidget *send_lives2lives;
View file
LiVES-1.4.8.tar.bz2/src/multitrack.c -> LiVES-1.4.9.tar.bz2/src/multitrack.c
Changed
@@ -1,6 +1,6 @@ // multitrack.c // LiVES -// (c) G. Finch 2005 - 2010 <salsaman@xs4all.nl> +// (c) G. Finch 2005 - 2011 <salsaman@xs4all.nl,salsaman@gmail.com> // released under the GNU GPL 3 or later // see file ../COPYING for licensing details @@ -2333,7 +2333,7 @@ gboolean is_rendering=mainw->is_rendering; weed_timecode_t curr_tc; gint actual_frame; - weed_plant_t *frame_layer=weed_layer_copy(NULL,mainw->frame_layer); + weed_plant_t *frame_layer=mainw->frame_layer; gboolean internal_messaging=mainw->internal_messaging; gboolean needs_idlefunc=FALSE; @@ -2377,8 +2377,10 @@ } } - if (mainw->playing_file>-1) return; + if (mainw->playing_file>-1) { + return; + } // start "playback" at current pos, we just "play" one frame curr_tc=set_play_position(mt); actual_frame=(gint)((gdouble)(curr_tc/U_SECL)*cfile->fps+1.4999); @@ -2422,7 +2424,7 @@ deinit_render_effects(); // if we are previewing an effect we now need to deinit it - if (mainw->multitrack->current_rfx!=NULL&&mainw->multitrack->init_event!=NULL) { + if (mt->current_rfx!=NULL&&mt->init_event!=NULL) { if (mt->current_rfx->source_type==LIVES_RFX_SOURCE_WEED&&mt->current_rfx->source!=NULL) { weed_plant_t *inst=(weed_plant_t *)mt->current_rfx->source; weed_call_deinit_func(inst); @@ -2902,7 +2904,7 @@ return FALSE; } gtk_widget_reparent(mt->poly_box,gtk_notebook_get_nth_page(GTK_NOTEBOOK(nb),page)); - if (mt->selected_init_event!=NULL) { + if (mt->selected_init_event!=NULL&&mt->poly_state!=POLY_PARAMS) { fubar(mt); polymorph(mt,POLY_PARAMS); } @@ -4868,6 +4870,12 @@ GtkWidget *device_menu; GtkWidget *device_submenu; #endif + +#ifdef HAVE_WEBM + GtkWidget *open_loc_menu; + GtkWidget *open_loc_submenu; +#endif + GtkWidget *submenu_menu; GtkWidget *submenu_menu2; GtkWidget *submenu_menu3; @@ -5165,9 +5173,34 @@ NULL); if (capable->has_mplayer) { + +#ifdef HAVE_WEBM + open_loc_menu = gtk_menu_item_new_with_mnemonic (_("Open _Location/Stream...")); + gtk_container_add (GTK_CONTAINER (menuitem_menu2), open_loc_menu); + + open_loc_submenu=gtk_menu_new(); + gtk_menu_item_set_submenu (GTK_MENU_ITEM (open_loc_menu), open_loc_submenu); + if (palette->style&STYLE_1) { + gtk_widget_modify_bg(open_loc_submenu, GTK_STATE_NORMAL, &palette->menu_and_bars); + } + + menuitem = gtk_menu_item_new_with_mnemonic (_("Open _Youtube Clip...")); + gtk_container_add (GTK_CONTAINER (open_loc_submenu), menuitem); + + g_signal_connect (GTK_OBJECT (menuitem), "activate", + G_CALLBACK (on_open_utube_activate), + NULL); + + menuitem = gtk_menu_item_new_with_mnemonic (_("Open _Location/Stream...")); + gtk_container_add (GTK_CONTAINER (open_loc_submenu), menuitem); + +#else + menuitem = gtk_menu_item_new_with_mnemonic (_("Open _Location/Stream...")); gtk_container_add (GTK_CONTAINER (menuitem_menu2), menuitem); +#endif + g_signal_connect (GTK_OBJECT (menuitem), "activate", G_CALLBACK (on_open_loc_activate), NULL); @@ -10929,10 +10962,13 @@ g_free(mt->current_rfx); } mt->current_rfx=NULL; - gtk_widget_destroy(mt->fx_box); - mt->fx_box=NULL; - gtk_container_remove (GTK_CONTAINER(mt->poly_box),mt->fx_base_box); + if (mt->fx_box!=NULL) { + gtk_widget_destroy(mt->fx_box); + mt->fx_box=NULL; + + gtk_container_remove (GTK_CONTAINER(mt->poly_box),mt->fx_base_box); + } if (mt->mt_frame_preview) { // put blank back in preview window @@ -18198,7 +18234,7 @@ new_clip_index=g_malloc(num_tracks*sizint); new_frame_index=g_malloc(num_tracks*sizint); last_valid_frame=0; - #define DEBUG_MISSING_CLIPS + // #define DEBUG_MISSING_CLIPS #ifdef DEBUG_MISSING_CLIPS //g_print("pt zzz %d\n",num_tracks); #endif
View file
LiVES-1.4.8.tar.bz2/src/multitrack.h -> LiVES-1.4.9.tar.bz2/src/multitrack.h
Changed
@@ -1,6 +1,6 @@ // multitrack.h // LiVES -// (c) G. Finch 2005 - 2010 <salsaman@xs4all.nl> +// (c) G. Finch 2005 - 2010 <salsaman@xs4all.nl,salsaman@gmail.com> // released under the GNU GPL 3 or later // see file ../COPYING for licensing details
View file
LiVES-1.4.8.tar.bz2/src/paramspecial.c -> LiVES-1.4.9.tar.bz2/src/paramspecial.c
Changed
@@ -1,6 +1,6 @@ // paramspecial.c // LiVES -// (c) G. Finch 2004 - 2010 <salsaman@xs4all.nl> +// (c) G. Finch 2004 - 2010 <salsaman@xs4all.nl,salsaman@gmail.com> // released under the GNU GPL 3 or later // see file ../COPYING or www.gnu.org for licensing details
View file
LiVES-1.4.8.tar.bz2/src/paramspecial.h -> LiVES-1.4.9.tar.bz2/src/paramspecial.h
Changed
@@ -1,6 +1,6 @@ // paramspecial.h // LiVES -// (c) G. Finch 2004 - 2009 <salsaman@xs4all.nl> +// (c) G. Finch 2004 - 2009 <salsaman@xs4all.nl,salsaman@gmail.com> // released under the GNU GPL 3 or later // see file ../COPYING or www.gnu.org for licensing details
View file
LiVES-1.4.8.tar.bz2/src/paramwindow.c -> LiVES-1.4.9.tar.bz2/src/paramwindow.c
Changed
@@ -1,6 +1,6 @@ // paramwindow.c // LiVES -// (c) G. Finch 2004 - 2010 <salsaman@xs4all.nl> +// (c) G. Finch 2004 - 2010 <salsaman@xs4all.nl,salsaman@gmail.com> // released under the GNU GPL 3 or later // see file ../COPYING or www.gnu.org for licensing details
View file
LiVES-1.4.8.tar.bz2/src/paramwindow.h -> LiVES-1.4.9.tar.bz2/src/paramwindow.h
Changed
@@ -1,6 +1,6 @@ // paramwindow.h // LiVES -// (c) G. Finch 2004 - 2011 <salsaman@xs4all.nl> +// (c) G. Finch 2004 - 2011 <salsaman@xs4all.nl,salsaman@gmail.com> // released under the GNU GPL 3 or later // see file COPYING or www.gnu.org for licensing details
View file
LiVES-1.4.8.tar.bz2/src/plugins.c -> LiVES-1.4.9.tar.bz2/src/plugins.c
Changed
@@ -1,6 +1,6 @@ // plugins.c // LiVES -// (c) G. Finch 2003 - 2010 <salsaman@xs4all.nl> +// (c) G. Finch 2003 - 2010 <salsaman@xs4all.nl,salsaman@gmail.com> // released under the GNU GPL 3 or later // see file ../COPYING or www.gnu.org for licensing details
View file
LiVES-1.4.8.tar.bz2/src/plugins.h -> LiVES-1.4.9.tar.bz2/src/plugins.h
Changed
@@ -1,6 +1,6 @@ // plugins.h // LiVES -// (c) G. Finch 2003-2010 <salsaman@xs4all.nl> +// (c) G. Finch 2003-2010 <salsaman@xs4all.nl,salsaman@gmail.com> // released under the GNU GPL 3 or later // see file ../COPYING or www.gnu.org for licensing details
View file
LiVES-1.4.8.tar.bz2/src/preferences.c -> LiVES-1.4.9.tar.bz2/src/preferences.c
Changed
@@ -4537,7 +4537,8 @@ add_fill_to_box (GTK_BOX (vbox2)); gtk_file_chooser_button_set_width_chars(GTK_FILE_CHOOSER_BUTTON(buttond),16); - g_signal_connect (GTK_FILE_CHOOSER(buttond), "selection-changed",G_CALLBACK (on_fileread_clicked),(gpointer)prefsw->cdplay_entry); + g_signal_connect (GTK_FILE_CHOOSER(buttond), "selection-changed", + G_CALLBACK (on_fileread_clicked),(gpointer)prefsw->cdplay_entry); if (capable->has_cdda2wav) { gtk_widget_show (prefsw->cdplay_entry); @@ -5098,7 +5099,8 @@ add_fill_to_box (GTK_BOX (vbox2)); gtk_file_chooser_button_set_width_chars(GTK_FILE_CHOOSER_BUTTON(buttond),16); - g_signal_connect (GTK_FILE_CHOOSER(buttond), "selection-changed",G_CALLBACK (on_fileread_clicked),(gpointer)prefsw->omc_js_entry); + g_signal_connect (GTK_FILE_CHOOSER(buttond), "selection-changed",G_CALLBACK (on_fileread_clicked), + (gpointer)prefsw->omc_js_entry); #endif @@ -5109,7 +5111,8 @@ label = gtk_label_new_with_mnemonic(_("_MIDI events")); gtk_label_set_mnemonic_widget(GTK_LABEL(label), prefsw->checkbutton_omc_midi); gtk_container_add(GTK_CONTAINER(eventbox), label); - g_signal_connect(GTK_OBJECT(eventbox), "button_press_event", G_CALLBACK(label_act_toggle), prefsw->checkbutton_omc_midi); + g_signal_connect(GTK_OBJECT(eventbox), "button_press_event", G_CALLBACK(label_act_toggle), + prefsw->checkbutton_omc_midi); if (palette->style&STYLE_1) { gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore); gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore); @@ -5132,7 +5135,8 @@ prefsw->alsa_midi = gtk_radio_button_new(alsa_midi_group); alsa_midi_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (prefsw->alsa_midi)); - gtk_tooltips_set_tip (mainw->tooltips, prefsw->alsa_midi, (_("Create an ALSA MIDI port which other MIDI devices can be connected to")), NULL); + gtk_tooltips_set_tip (mainw->tooltips, prefsw->alsa_midi, + (_("Create an ALSA MIDI port which other MIDI devices can be connected to")), NULL); label = gtk_label_new_with_mnemonic(_("Use _ALSA MIDI (recommended)")); gtk_label_set_mnemonic_widget(GTK_LABEL(label), prefsw->alsa_midi); eventbox = gtk_event_box_new(); @@ -5206,7 +5210,8 @@ add_fill_to_box (GTK_BOX (vbox2)); gtk_file_chooser_button_set_width_chars(GTK_FILE_CHOOSER_BUTTON(prefsw->button_midid),16); - g_signal_connect (GTK_FILE_CHOOSER(buttond), "selection-changed",G_CALLBACK (on_fileread_clicked),(gpointer)prefsw->omc_midi_entry); + g_signal_connect (GTK_FILE_CHOOSER(buttond), "selection-changed", + G_CALLBACK (on_fileread_clicked),(gpointer)prefsw->omc_midi_entry); hseparator = gtk_hseparator_new (); gtk_widget_show (hseparator);
View file
LiVES-1.4.8.tar.bz2/src/resample.c -> LiVES-1.4.9.tar.bz2/src/resample.c
Changed
@@ -1,6 +1,6 @@ // resample.c // LiVES -// (c) G. Finch 2004 - 2011 <salsaman@xs4all.nl> +// (c) G. Finch 2004 - 2011 <salsaman@xs4all.nl,salsaman@gmail.com> // released under the GNU GPL 3 or later // see file ../COPYING or www.gnu.org for licensing details
View file
LiVES-1.4.8.tar.bz2/src/resample.h -> LiVES-1.4.9.tar.bz2/src/resample.h
Changed
@@ -1,6 +1,6 @@ // resample.h // LiVES -// (c) G. Finch 2004 - 2011 <salsaman@xs4all.nl> +// (c) G. Finch 2004 - 2011 <salsaman@xs4all.nl,salsaman@gmail.com> // released under the GNU GPL 3 or later // see file ../COPYING or www.gnu.org for licensing details
View file
LiVES-1.4.8.tar.bz2/src/rfx-builder.c -> LiVES-1.4.9.tar.bz2/src/rfx-builder.c
Changed
@@ -1,6 +1,6 @@ // rfx-builder.c // LiVES -// (c) G. Finch 2004 - 2010 <salsaman@xs4all.nl> +// (c) G. Finch 2004 - 2010 <salsaman@xs4all.nl,salsaman@gmail.com> // released under the GNU GPL 3 or later // see file ../COPYING or www.gnu.org for licensing details
View file
LiVES-1.4.8.tar.bz2/src/rfx-builder.h -> LiVES-1.4.9.tar.bz2/src/rfx-builder.h
Changed
@@ -1,6 +1,6 @@ // rfx-builder.h // LiVES -// (c) G. Finch 2004 - 2009 <salsaman@xs4all.nl> +// (c) G. Finch 2004 - 2009 <salsaman@xs4all.nl,salsaman@gmail.com> // released under the GNU GPL 3 or later // see file ../COPYING or www.gnu.org for licensing details
View file
LiVES-1.4.8.tar.bz2/src/saveplay.c -> LiVES-1.4.9.tar.bz2/src/saveplay.c
Changed
@@ -379,6 +379,8 @@ } } + save_frame_index(mainw->current_file); + if (tmp!=NULL) g_free(tmp); tmp=NULL; } @@ -4234,6 +4236,7 @@ if (mainw->current_file<1) continue; if (load_frame_index(mainw->current_file)) { + gboolean next=FALSE; while (1) { threaded_dialog_spin();
View file
LiVES-1.4.8.tar.bz2/src/startup.c -> LiVES-1.4.9.tar.bz2/src/startup.c
Changed
@@ -1,6 +1,6 @@ // startup.c // LiVES -// (c) G. Finch 2010 <salsaman@xs4all.nl> +// (c) G. Finch 2010 <salsaman@xs4all.nl,salsaman@gmail.com> // released under the GNU GPL 3 or later // see file ../COPYING for licensing details
View file
LiVES-1.4.8.tar.bz2/src/startup.h -> LiVES-1.4.9.tar.bz2/src/startup.h
Changed
@@ -1,6 +1,6 @@ // plugins.h // LiVES -// (c) G. Finch 2010 <salsaman@xs4all.nl> +// (c) G. Finch 2010 <salsaman@xs4all.nl,salsaman@gmail.com> // released under the GNU GPL 3 or later // see file ../COPYING or www.gnu.org for licensing details
View file
LiVES-1.4.8.tar.bz2/src/stream.c -> LiVES-1.4.9.tar.bz2/src/stream.c
Changed
@@ -1,6 +1,6 @@ // stream.c // LiVES -// (c) G. Finch 2008 - 2010 <salsaman@xs4all.nl> +// (c) G. Finch 2008 - 2010 <salsaman@xs4all.nl,salsaman@gmail.com> // released under the GNU GPL 3 or later // see file ../COPYING for licensing details @@ -817,6 +817,9 @@ // ...free old pixel_data int i,np=weed_leaf_num_elements(layer,"pixel_data"); pixel_data=weed_get_voidptr_array(layer,"pixel_data",&error); + if (weed_plant_has_leaf(layer,"host_pixel_data_contiguous") && + weed_get_boolean_value(layer,"host_pixel_data_contiguous",&error)==WEED_TRUE) + np=1; for (i=0;i<np;i++) { g_free(pixel_data[i]); } @@ -831,7 +834,7 @@ weed_set_int_value(layer,"height",lstream->vsize); weed_set_int_value(layer,"current_palette",lstream->palette); weed_set_int_value(layer,"YUV_clamping",lstream->YUV_clamping); - create_empty_pixel_data(layer,FALSE); + create_empty_pixel_data(layer,FALSE,TRUE); } pixel_data=weed_get_voidptr_array(layer,"pixel_data",&error);
View file
LiVES-1.4.8.tar.bz2/src/stream.h -> LiVES-1.4.9.tar.bz2/src/stream.h
Changed
@@ -1,6 +1,6 @@ // stream.h // LiVES -// (c) G. Finch 2008 <salsaman@xs4all.nl> +// (c) G. Finch 2008 <salsaman@xs4all.nl,salsaman@gmail.com> // released under the GNU GPL 3 or later // see file ../COPYING for licensing details
View file
LiVES-1.4.8.tar.bz2/src/utils.c -> LiVES-1.4.9.tar.bz2/src/utils.c
Changed
@@ -1,6 +1,6 @@ // utils.c // LiVES -// (c) G. Finch 2003 - 2011 <salsaman@xs4all.nl> +// (c) G. Finch 2003 - 2011 <salsaman@xs4all.nl,salsaman@gmail.com> // released under the GNU GPL 3 or later // see file ../COPYING or www.gnu.org for licensing details
View file
LiVES-1.4.8.tar.bz2/src/videodev.c -> LiVES-1.4.9.tar.bz2/src/videodev.c
Changed
@@ -1,5 +1,5 @@ // LiVES - videodev input -// (c) G. Finch 2010 <salsaman@xs4all.nl> +// (c) G. Finch 2010 <salsaman@xs4all.nl,salsaman@gmail.com> // released under the GNU GPL 3 or later // see file COPYING or www.gnu.org for details @@ -127,7 +127,7 @@ weed_set_int_value(layer,"YUV_sampling",WEED_YUV_SAMPLING_DEFAULT); // TODO - use ldev->YUV_sampling weed_set_int_value(layer,"YUV_clamping",ldev->YUV_clamping); - create_empty_pixel_data(layer,TRUE); + create_empty_pixel_data(layer,TRUE,TRUE); if (ldev->buffer_type==UNICAP_BUFFER_TYPE_USER) {
View file
LiVES-1.4.8.tar.bz2/src/videodev.h -> LiVES-1.4.9.tar.bz2/src/videodev.h
Changed
@@ -1,5 +1,5 @@ // LiVES - videodev input -// (c) G. Finch 2010 <salsaman@xs4all.nl> +// (c) G. Finch 2010 <salsaman@xs4all.nl,salsaman@gmail.com> // released under the GNU GPL 3 or later // see file COPYING or www.gnu.org for details
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
.