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 24
View file
LiVES.changes
Changed
@@ -1,4 +1,22 @@ ------------------------------------------------------------------- +Fri Feb 13 12:45:37 UTC 2015 - joerg.lorenzen@ki.tng.de + +- Update to 2.2.8: + * Fix crash in Insert Frames (regression). + * Compilation fix for gtk+ 2.x. + * Compilation fixes for freeBSD. + * Add check for avformat_close_input in libav. + * Fix crash in projectM plugin. + * Fix regression in x264_encoder. + * Fix audio codec bug in mencoder_encoder. + * Fix crash in "Show Details" after encoding failure. + * Fix regression in "Insert Silence" for clips with no existing audio. + * Check for avconv properly for Ubuntu in ffmpeg_encoder. + * Update dirac / multi_encoder to encode to dirac/vorbis/mkv. + * Add lossless dirac encoding. + * Updates to fix lives_mkv_encoder. + +------------------------------------------------------------------- Sat Jan 10 15:21:20 UTC 2015 - joerg.lorenzen@ki.tng.de - Update to 2.2.7:
View file
LiVES.spec
Changed
@@ -15,16 +15,15 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ Name: LiVES -Version: 2.2.7 -%define soname 0 +Version: 2.2.8 +%define soname 0 Release: 1 Summary: Video Editor and VJ Tool License: GPL-2.0+ Group: Productivity/Multimedia/Video/Editors and Convertors Source0: http://www.xs4all.nl/%7Esalsaman/lives/current/LiVES-%{version}.tar.bz2 Source99: LiVES-rpmlintrc -Patch0: LiVES-gtk_widget_ensure_style.patch -Patch1: LiVES-redefinition_of_typedef.patch +Patch0: LiVES-redefinition_of_typedef.patch Url: http://lives.sourceforge.net BuildRoot: %{_tmppath}/%{name}-%{version}-root @@ -45,13 +44,16 @@ BuildRequires: schroedinger-devel BuildRequires: dirac-devel BuildRequires: libpulse-devel +%if 0%{?suse_version} >= 1230 +BuildRequires: gtk3-devel +%else BuildRequires: gtk2-devel +%endif BuildRequires: libv4l-devel BuildRequires: sox MPlayer cdrkit-cdrtools-compat dvgrab BuildRequires: jack-devel BuildRequires: libGLee-devel BuildRequires: ladspa-devel -Requires: libvisual Requires: libvisual-plugins Requires: ladspa Requires: sox MPlayer cdrkit-cdrtools-compat dvgrab @@ -88,7 +90,6 @@ %prep %setup -q -n lives-%{version} %patch0 -p0 -%patch1 -p0 # fix wrong EOL %__sed -i 's/\r$//' weed-docs/*.txt
View file
LiVES-gtk_widget_ensure_style.patch
Deleted
@@ -1,11 +0,0 @@ ---- src/gui.c.orig 2015-01-10 16:30:07.367878370 +0100 -+++ src/gui.c 2015-01-10 16:30:07.403877694 +0100 -@@ -314,7 +314,7 @@ - #ifdef GUI_GTK - #if !GTK_CHECK_VERSION(3,0,0) - if (!mainw->foreign) { -- lives_widget_ensure_style(mainw->LiVES); -+ gtk_widget_ensure_style(mainw->LiVES); - } - #endif - #endif
View file
LiVES-redefinition_of_typedef.patch
Changed
@@ -17,3 +17,15 @@ #ifdef USE_SWSCALE #ifdef HAVE_SYSTEM_WEED_COMPAT +--- src/widget-helper-gtk.h.orig 2015-02-08 16:15:48.000000000 +0100 ++++ src/widget-helper-gtk.h 2015-02-13 14:39:13.971243600 +0100 +@@ -707,9 +707,6 @@ + #endif + + +- +-typedef GdkModifierType LiVESXModifierType; +- + #define LIVES_CONTROL_MASK GDK_CONTROL_MASK + #define LIVES_ALT_MASK GDK_MOD1_MASK + #define LIVES_SHIFT_MASK GDK_SHIFT_MASK
View file
LiVES-2.2.7.tar.bz2/ChangeLog -> LiVES-2.2.8.tar.bz2/ChangeLog
Changed
@@ -1,3 +1,22 @@ +Version 2.2.8 (8 Feb 2015) +-------------------------- +Fix crash in Insert Frames (regression). +Compilation fix for gtk+ 2.x +Compilation fixes for freeBSD +Add check for avformat_close_input in libav +Fix crash in projectM plugin. +Fix regression in x264_encoder. +Fix audio codec bug in mencoder_encoder. +Fix crash in "Show Details" after encoding failure. +Fix regression in "Insert Silence" for clips with no existing audio. +Check for avconv properly for Ubuntu in ffmpeg_encoder. +Update dirac / multi_encoder to encode to dirac/vorbis/mkv. +Add lossless dirac encoding. +Updates to fix lives_mkv_encoder. + + + + Version 2.2.7 (21 Dec 2014) --------------------------- Add support for audio triggered generators.
View file
LiVES-2.2.7.tar.bz2/LiVES.doxygen -> LiVES-2.2.8.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 = 2.2.7 +PROJECT_NUMBER = 2.2.8 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) # base path where the generated documentation will be put.
View file
LiVES-2.2.7.tar.bz2/Makefile.am -> LiVES-2.2.8.tar.bz2/Makefile.am
Changed
@@ -116,7 +116,7 @@ "$(top_srcdir)/po/update_with_plugins.sh" install "$(PACKAGE)" "$(prefix)" "$(DESTDIR)" install-exec-hook: - $(LN_S) "$(DESTDIR)$(bindir)/lives-exe" "$(DESTDIR)$(bindir)/lives" + $(LN_S) "lives-exe" "$(DESTDIR)$(bindir)/lives" uninstall-local:
View file
LiVES-2.2.7.tar.bz2/Makefile.in -> LiVES-2.2.8.tar.bz2/Makefile.in
Changed
@@ -398,8 +398,6 @@ PNG_LIBS = @PNG_LIBS@ POSUB = @POSUB@ PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@ -PROJECTM_CFLAGS = @PROJECTM_CFLAGS@ -PROJECTM_LIBS = @PROJECTM_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ PTHREAD_LIBS = @PTHREAD_LIBS@
View file
LiVES-2.2.7.tar.bz2/README -> LiVES-2.2.8.tar.bz2/README
Changed
@@ -64,16 +64,16 @@ If you got LiVES as a tar.gz or tar.bz2, at a terminal prompt, enter the following: - bzip2 -d LiVES-2.2.7.tar.bz2 + bzip2 -d LiVES-2.2.8.tar.bz2 or, - gzip -d LiVES-2.2.7.tar.gz + gzip -d LiVES-2.2.8.tar.gz depending on which version you have. Then: - tar xvf LIVES-2.2.7.tar + tar xvf LIVES-2.2.8.tar - cd lives-2.2.7 + cd lives-2.2.8
View file
LiVES-2.2.7.tar.bz2/build-lives-rfx-plugin -> LiVES-2.2.8.tar.bz2/build-lives-rfx-plugin
Changed
@@ -78,7 +78,7 @@ } -$builder_version="2.2.7"; +$builder_version="2.2.8"; if ($in_channels==0&&$properties&0x0004) { #batch mode generator
View file
LiVES-2.2.7.tar.bz2/configure -> LiVES-2.2.8.tar.bz2/configure
Changed
@@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for LiVES 2.2.7. +# Generated by GNU Autoconf 2.69 for LiVES 2.2.8. # # Report bugs to <https://sourceforge.net/p/lives/bugs/>. # @@ -590,8 +590,8 @@ # Identity of this package. PACKAGE_NAME='LiVES' PACKAGE_TARNAME='lives' -PACKAGE_VERSION='2.2.7' -PACKAGE_STRING='LiVES 2.2.7' +PACKAGE_VERSION='2.2.8' +PACKAGE_STRING='LiVES 2.2.8' PACKAGE_BUGREPORT='https://sourceforge.net/p/lives/bugs/' PACKAGE_URL='' @@ -675,8 +675,6 @@ HAVE_PROJECTM_TRUE LIBPROJECTM_LIBS LIBPROJECTM_CFLAGS -PROJECTM_LIBS -PROJECTM_CFLAGS HAVE_LIBVISUAL_FALSE HAVE_LIBVISUAL_TRUE LIBVISUAL_LIBS @@ -765,6 +763,8 @@ HAVE_AV_SET_PTS_INFO_TRUE HAVE_AVFORMAT_INTERNAL_H_FALSE HAVE_AVFORMAT_INTERNAL_H_TRUE +HAVE_AVFORMAT_CLOSE_INPUT_FALSE +HAVE_AVFORMAT_CLOSE_INPUT_TRUE HAVE_AVFORMAT_FIND_STREAM_INFO_FALSE HAVE_AVFORMAT_FIND_STREAM_INFO_TRUE HAVE_AVFORMAT_NEW_STREAM_FALSE @@ -1142,8 +1142,8 @@ PULSE_LIBS LIBVISUAL_CFLAGS LIBVISUAL_LIBS -PROJECTM_CFLAGS -PROJECTM_LIBS +LIBPROJECTM_CFLAGS +LIBPROJECTM_LIBS OIL_CFLAGS OIL_LIBS WEED_CFLAGS @@ -1696,7 +1696,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures LiVES 2.2.7 to adapt to many kinds of systems. +\`configure' configures LiVES 2.2.8 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1767,7 +1767,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of LiVES 2.2.7:";; + short | recursive ) echo "Configuration of LiVES 2.2.8:";; esac cat <<\_ACEOF @@ -1933,10 +1933,10 @@ C compiler flags for LIBVISUAL, overriding pkg-config LIBVISUAL_LIBS linker flags for LIBVISUAL, overriding pkg-config - PROJECTM_CFLAGS - C compiler flags for PROJECTM, overriding pkg-config - PROJECTM_LIBS - linker flags for PROJECTM, overriding pkg-config + LIBPROJECTM_CFLAGS + C compiler flags for LIBPROJECTM, overriding pkg-config + LIBPROJECTM_LIBS + linker flags for LIBPROJECTM, overriding pkg-config OIL_CFLAGS C compiler flags for OIL, overriding pkg-config OIL_LIBS linker flags for OIL, overriding pkg-config WEED_CFLAGS C compiler flags for WEED, overriding pkg-config @@ -2024,7 +2024,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -LiVES configure 2.2.7 +LiVES configure 2.2.8 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2751,7 +2751,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by LiVES $as_me 2.2.7, which was +It was created by LiVES $as_me 2.2.8, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3732,7 +3732,7 @@ # Define the identity of the package. PACKAGE='lives' - VERSION='2.2.7' + VERSION='2.2.8' cat >>confdefs.h <<_ACEOF @@ -25597,6 +25597,7 @@ HAVE_AV_CODEC_SET_PKT_TIMEBASE=false HAVE_AVFORMAT_NEW_STREAM=false HAVE_AVFORMAT_FIND_STREAM_INFO=false +HAVE_AVFORMAT_CLOSE_INPUT=false HAVE_AVFORMAT_INTERNAL_H=false HAVE_AV_SET_PTS_INFO=false HAVE_AVPRIV_SET_PTS_INFO=false @@ -25816,6 +25817,49 @@ fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for avformat_close_input in -lavformat" >&5 +$as_echo_n "checking for avformat_close_input in -lavformat... " >&6; } +if ${ac_cv_lib_avformat_avformat_close_input+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lavformat $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char avformat_close_input (); +int +main () +{ +return avformat_close_input (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_avformat_avformat_close_input=yes +else + ac_cv_lib_avformat_avformat_close_input=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_avformat_avformat_close_input" >&5 +$as_echo "$ac_cv_lib_avformat_avformat_close_input" >&6; } +if test "x$ac_cv_lib_avformat_avformat_close_input" = xyes; then : + HAVE_AVFORMAT_CLOSE_INPUT=true +else + HAVE_AVFORMAT_CLOSE_INPUT=false +fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for av_set_pts_info in -lavformat" >&5 $as_echo_n "checking for av_set_pts_info in -lavformat... " >&6; } if ${ac_cv_lib_avformat_av_set_pts_info+:} false; then : @@ -25965,6 +26009,14 @@ HAVE_AVFORMAT_FIND_STREAM_INFO_FALSE= fi + if $HAVE_AVFORMAT_CLOSE_INPUT; then + HAVE_AVFORMAT_CLOSE_INPUT_TRUE= + HAVE_AVFORMAT_CLOSE_INPUT_FALSE='#' +else + HAVE_AVFORMAT_CLOSE_INPUT_TRUE='#' + HAVE_AVFORMAT_CLOSE_INPUT_FALSE= +fi + if $HAVE_AVFORMAT_INTERNAL_H; then HAVE_AVFORMAT_INTERNAL_H_TRUE= HAVE_AVFORMAT_INTERNAL_H_FALSE='#' @@ -27865,11 +27917,11 @@ pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PROJECTM" >&5 -$as_echo_n "checking for PROJECTM... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBPROJECTM" >&5 +$as_echo_n "checking for LIBPROJECTM... " >&6; } -if test -n "$PROJECTM_CFLAGS"; then - pkg_cv_PROJECTM_CFLAGS="$PROJECTM_CFLAGS" +if test -n "$LIBPROJECTM_CFLAGS"; then + pkg_cv_LIBPROJECTM_CFLAGS="$LIBPROJECTM_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libprojectM\""; } >&5 @@ -27877,7 +27929,7 @@ ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
View file
LiVES-2.2.7.tar.bz2/configure.ac -> LiVES-2.2.8.tar.bz2/configure.ac
Changed
@@ -5,7 +5,7 @@ [m4_pattern_allow([^AC_.*])]) dnl IMPORTANT !! $version must also be set to exactly the same string in smogrify -AC_INIT(LiVES,2.2.7,https://sourceforge.net/p/lives/bugs/) +AC_INIT(LiVES,2.2.8,https://sourceforge.net/p/lives/bugs/) AC_CANONICAL_HOST AC_CANONICAL_TARGET @@ -471,6 +471,7 @@ HAVE_AV_CODEC_SET_PKT_TIMEBASE=false HAVE_AVFORMAT_NEW_STREAM=false HAVE_AVFORMAT_FIND_STREAM_INFO=false +HAVE_AVFORMAT_CLOSE_INPUT=false HAVE_AVFORMAT_INTERNAL_H=false HAVE_AV_SET_PTS_INFO=false HAVE_AVPRIV_SET_PTS_INFO=false @@ -485,6 +486,8 @@ AC_CHECK_LIB(avformat,avformat_new_stream,HAVE_AVFORMAT_NEW_STREAM=true,HAVE_AVFORMAT_NEW_STREAM=false) AC_CHECK_LIB(avformat,avformat_find_stream_info,HAVE_AVFORMAT_FIND_STREAM_INFO=true,HAVE_AVFORMAT_FIND_STREAM_INFO=false) +AC_CHECK_LIB(avformat,avformat_close_input,HAVE_AVFORMAT_CLOSE_INPUT=true,HAVE_AVFORMAT_CLOSE_INPUT=false) + AC_CHECK_LIB(avformat,av_set_pts_info,HAVE_AV_SET_PTS_INFO=true,HAVE_AV_SET_PTS_INFO=false) if test "$HAVE_AV_SET_PTS_INFO" = "false"; then @@ -504,6 +507,7 @@ AM_CONDITIONAL(HAVE_AV_CODEC_SET_PKT_TIMEBASE,$HAVE_AV_CODEC_SET_PKT_TIMEBASE) AM_CONDITIONAL(HAVE_AVFORMAT_NEW_STREAM,$HAVE_AVFORMAT_NEW_STREAM) AM_CONDITIONAL(HAVE_AVFORMAT_FIND_STREAM_INFO,$HAVE_AVFORMAT_FIND_STREAM_INFO) +AM_CONDITIONAL(HAVE_AVFORMAT_CLOSE_INPUT,$HAVE_AVFORMAT_CLOSE_INPUT) AM_CONDITIONAL(HAVE_AVFORMAT_INTERNAL_H,$HAVE_AVFORMAT_INTERNAL_H) AM_CONDITIONAL(HAVE_AV_SET_PTS_INFO,$HAVE_AV_SET_PTS_INFO) @@ -796,7 +800,7 @@ if test "x$disable_projectM" != "xyes" ; then dnl check for projectM -PKG_CHECK_MODULES(PROJECTM,libprojectM,HAVE_PROJECTM=true,HAVE_PROJECTM=false) +PKG_CHECK_MODULES(LIBPROJECTM,libprojectM,HAVE_PROJECTM=true,HAVE_PROJECTM=false) AC_SUBST(LIBPROJECTM_CFLAGS) AC_SUBST(LIBPROJECTM_LIBS) fi @@ -1001,7 +1005,7 @@ if test "$GTK310_WARN" = "true"; then echo echo "******************************************************************************************" -echo "WARNING: GTK+ 3.10.x is known to buggy with LiVES. This version of gtk+ should be avoided." +echo "WARNING: GTK+ 3.10.x is known to be buggy with LiVES. This version of gtk+ should be avoided." echo "******************************************************************************************" fi
View file
LiVES-2.2.7.tar.bz2/libOSC/Makefile.in -> LiVES-2.2.8.tar.bz2/libOSC/Makefile.in
Changed
@@ -399,8 +399,6 @@ PNG_LIBS = @PNG_LIBS@ POSUB = @POSUB@ PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@ -PROJECTM_CFLAGS = @PROJECTM_CFLAGS@ -PROJECTM_LIBS = @PROJECTM_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ PTHREAD_LIBS = @PTHREAD_LIBS@
View file
LiVES-2.2.7.tar.bz2/libOSC/client/Makefile.in -> LiVES-2.2.8.tar.bz2/libOSC/client/Makefile.in
Changed
@@ -341,8 +341,6 @@ PNG_LIBS = @PNG_LIBS@ POSUB = @POSUB@ PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@ -PROJECTM_CFLAGS = @PROJECTM_CFLAGS@ -PROJECTM_LIBS = @PROJECTM_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ PTHREAD_LIBS = @PTHREAD_LIBS@
View file
LiVES-2.2.7.tar.bz2/libOSC/sendOSC/Makefile.in -> LiVES-2.2.8.tar.bz2/libOSC/sendOSC/Makefile.in
Changed
@@ -341,8 +341,6 @@ PNG_LIBS = @PNG_LIBS@ POSUB = @POSUB@ PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@ -PROJECTM_CFLAGS = @PROJECTM_CFLAGS@ -PROJECTM_LIBS = @PROJECTM_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ PTHREAD_LIBS = @PTHREAD_LIBS@
View file
LiVES-2.2.7.tar.bz2/libweed/Makefile.in -> LiVES-2.2.8.tar.bz2/libweed/Makefile.in
Changed
@@ -396,8 +396,6 @@ PNG_LIBS = @PNG_LIBS@ POSUB = @POSUB@ PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@ -PROJECTM_CFLAGS = @PROJECTM_CFLAGS@ -PROJECTM_LIBS = @PROJECTM_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ PTHREAD_LIBS = @PTHREAD_LIBS@
View file
LiVES-2.2.7.tar.bz2/lives-plugins/Makefile.in -> LiVES-2.2.8.tar.bz2/lives-plugins/Makefile.in
Changed
@@ -345,8 +345,6 @@ PNG_LIBS = @PNG_LIBS@ POSUB = @POSUB@ PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@ -PROJECTM_CFLAGS = @PROJECTM_CFLAGS@ -PROJECTM_LIBS = @PROJECTM_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ PTHREAD_LIBS = @PTHREAD_LIBS@
View file
LiVES-2.2.7.tar.bz2/lives-plugins/icons/Makefile.in -> LiVES-2.2.8.tar.bz2/lives-plugins/icons/Makefile.in
Changed
@@ -315,8 +315,6 @@ PNG_LIBS = @PNG_LIBS@ POSUB = @POSUB@ PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@ -PROJECTM_CFLAGS = @PROJECTM_CFLAGS@ -PROJECTM_LIBS = @PROJECTM_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ PTHREAD_LIBS = @PTHREAD_LIBS@
View file
LiVES-2.2.7.tar.bz2/lives-plugins/marcos-encoders/Makefile.in -> LiVES-2.2.8.tar.bz2/lives-plugins/marcos-encoders/Makefile.in
Changed
@@ -317,8 +317,6 @@ PNG_LIBS = @PNG_LIBS@ POSUB = @POSUB@ PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@ -PROJECTM_CFLAGS = @PROJECTM_CFLAGS@ -PROJECTM_LIBS = @PROJECTM_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ PTHREAD_LIBS = @PTHREAD_LIBS@
View file
LiVES-2.2.7.tar.bz2/lives-plugins/marcos-encoders/lives_avi_encoder -> LiVES-2.2.8.tar.bz2/lives-plugins/marcos-encoders/lives_avi_encoder
Changed
@@ -5,7 +5,7 @@ locale.setlocale(locale.LC_NUMERIC,"C") """ -avi_encoder.py +lives_avi_encoder Front-end to various programs needed to create AVI movies with some image-enhancing capabilities through the use of @@ -41,10 +41,10 @@ usage = \ """ -avi_encoder.py -h -avi_encoder.py -V -avi_encoder.py -C -avi_encoder.py [-o out] [-p pre] [-d dir] [-a aspect] [-D delay] +lives_avi_encoder -h +lives_avi_encoder -V +lives_avi_encoder -C +lives_avi_encoder [-o out] [-p pre] [-d dir] [-a aspect] [-D delay] [-q|-v] [-t type] [-k] [-e [[-w dir] [-c geom] [-r geom]]] [-s sndfile] [-b sndrate] [-f fpscode] [-L lv1file] [firstframe lastframe] @@ -75,13 +75,13 @@ -p pre the encoder assumes that sound and images are named using LiVES' conventions i.e. "audio" and "00000001.ext", "00000002.ext"... where "ext" is either "jpg" or "png". - However, avi_encoder.py will create temporary files + However, lives_avi_encoder will create temporary files which can be saved for later use (for example, after enhancing the images with "-e" , which may take a long time). These temporary files will be named "pre_00000001.ext", etc... where "pre" is either "eimg" or "rimg" and will be kept if the "-k" option is used. - avi_encoder.py can then be run over the enhanced images + lives_avi_encoder can then be run over the enhanced images only by selecting the appropriate prefix ("eimg" or "rimg") here. See "-e" to see what each prefix means. Default: "" (an empty string). @@ -237,7 +237,7 @@ In this example the movie is assumed to be 16:9. Then, in order to create an AVI file you can simply do the following: - avi_encoder.py -d /tmp/livestmp/991319584 -o /movies/default.avi -a 3 + lives_avi_encoder -d /tmp/livestmp/991319584 -o /movies/default.avi -a 3 and the clip "default.avi" will be created in "/movies/" with the correct aspect ratio. @@ -251,7 +251,7 @@ images somewhat, so be careful about cropping/resizing, and remember to use dimensions which are multiples of 16): - avi_encoder.py -v -d /tmp/livestmp/991319584 -w /tmp/tmpavi \\ + lives_avi_encoder -v -d /tmp/livestmp/991319584 -w /tmp/tmpavi \\ -o /movies/download.avi -a 3 -k -e -c "704x464+5+6" -r "352x240" Since we use the "-k" flag the enhanced images are kept (both full-size @@ -261,17 +261,17 @@ to re-use the enhanced images. So, for example, creating a high-quality clip at full size can be accomplished now as follows: - avi_encoder.py -d /tmp/tmpavi -t hi -o /movies/archive.avi \\ + lives_avi_encoder -d /tmp/tmpavi -t hi -o /movies/archive.avi \\ -s /tmp/livestmp/991319584/audio -a 3 -k -p eimg If, for example, we only want to encode frames 100 to 150 we can run the following: - avi_encoder.py -v -d /tmp/tmpavi -o /movies/selection.avi \\ + lives_avi_encoder -v -d /tmp/tmpavi -o /movies/selection.avi \\ -a 3 -k -p eimg 100 150 Note that no audio has been selected ("-s"). This is because -avi_encoder.py cannot trim the audio to the appropriate length. +lives_avi_encoder cannot trim the audio to the appropriate length. You would need to use LiVES to do this. To delete all the enhanced images you can just remove "/tmp/tmpavi". @@ -280,7 +280,7 @@ near the end of the movie the video trails the audio by, say, 0.2s, you can use the "-D" option as follows: - avi_encoder.py -d /tmp/livestmp/991319584 -o test.avi -D 200 + lives_avi_encoder -d /tmp/livestmp/991319584 -o test.avi -D 200 Suppose that you have "movie1.lv1", "movie2.lv1" and "movie3.lv1". Batch-encoding can be done as follows (zsh-syntax): @@ -288,7 +288,7 @@ for i in movie?.lv1 do mkdir /tmp/$i:r - avi_encoder.py -d /tmp/$i:r -o /tmp/$i:r.avi -L $i + lives_avi_encoder -d /tmp/$i:r -o /tmp/$i:r.avi -L $i rm -rf /tmp/$i:r done @@ -601,7 +601,7 @@ raise SystemExit if '-V' in opts: - print 'avi_encoder.py version ' + version + print 'lives_avi_encoder version ' + version raise SystemExit if ('-v' in opts) or ('-C' in opts): @@ -835,7 +835,7 @@ """ CHANGELOG: -03 Jan 2005 : 0.0.1 : first release, based on mkv_encoder.py. +03 Jan 2005 : 0.0.1 : first release, based on mkv_encoder. 04 Jan 2005 : 0.0.2 : added support for h.264. 10 Mar 2005 : 0.0.3 : fixed snow quality settings. 26 Mar 2005 : 0.0.4 : use env python (hopefully >= 2.3).
View file
LiVES-2.2.7.tar.bz2/lives-plugins/marcos-encoders/lives_avi_encoder3 -> LiVES-2.2.8.tar.bz2/lives-plugins/marcos-encoders/lives_avi_encoder3
Changed
@@ -5,7 +5,7 @@ locale.setlocale(locale.LC_NUMERIC,"") """ -avi_encoder.py +lives_avi_encoder3 Front-end to various programs needed to create AVI movies with some image-enhancing capabilities through the use of @@ -34,10 +34,10 @@ usage = \ """ -avi_encoder.py -h -avi_encoder.py -V -avi_encoder.py -C -avi_encoder.py [-o out] [-p pre] [-d dir] [-a aspect] [-D delay] +lives_avi_encoder3 -h +lives_avi_encoder3 -V +lives_avi_encoder3 -C +lives_avi_encoder3 [-o out] [-p pre] [-d dir] [-a aspect] [-D delay] [-q|-v] [-t type] [-k] [-e [[-w dir] [-c geom] [-r geom]]] [-s sndfile] [-b sndrate] [-f fpscode] [-L lv1file] [firstframe lastframe] @@ -68,13 +68,13 @@ -p pre the encoder assumes that sound and images are named using LiVES' conventions i.e. "audio" and "00000001.ext", "00000002.ext"... where "ext" is either "jpg" or "png". - However, avi_encoder.py will create temporary files + However, lives_avi_encoder3 will create temporary files which can be saved for later use (for example, after enhancing the images with "-e" , which may take a long time). These temporary files will be named "pre_00000001.ext", etc... where "pre" is either "eimg" or "rimg" and will be kept if the "-k" option is used. - avi_encoder.py can then be run over the enhanced images + lives_avi_encoder3 can then be run over the enhanced images only by selecting the appropriate prefix ("eimg" or "rimg") here. See "-e" to see what each prefix means. Default: "" (an empty string). @@ -230,7 +230,7 @@ In this example the movie is assumed to be 16:9. Then, in order to create an AVI file you can simply do the following: - avi_encoder.py -d /tmp/livestmp/991319584 -o /movies/default.avi -a 3 + lives_avi_encoder3 -d /tmp/livestmp/991319584 -o /movies/default.avi -a 3 and the clip "default.avi" will be created in "/movies/" with the correct aspect ratio. @@ -244,7 +244,7 @@ images somewhat, so be careful about cropping/resizing, and remember to use dimensions which are multiples of 16): - avi_encoder.py -v -d /tmp/livestmp/991319584 -w /tmp/tmpavi \\ + lives_avi_encoder3 -v -d /tmp/livestmp/991319584 -w /tmp/tmpavi \\ -o /movies/download.avi -a 3 -k -e -c "704x464+5+6" -r "352x240" Since we use the "-k" flag the enhanced images are kept (both full-size @@ -254,17 +254,17 @@ to re-use the enhanced images. So, for example, creating a high-quality clip at full size can be accomplished now as follows: - avi_encoder.py -d /tmp/tmpavi -t hi -o /movies/archive.avi \\ + lives_avi_encoder3 -d /tmp/tmpavi -t hi -o /movies/archive.avi \\ -s /tmp/livestmp/991319584/audio -a 3 -k -p eimg If, for example, we only want to encode frames 100 to 150 we can run the following: - avi_encoder.py -v -d /tmp/tmpavi -o /movies/selection.avi \\ + lives_avi_encoder3 -v -d /tmp/tmpavi -o /movies/selection.avi \\ -a 3 -k -p eimg 100 150 Note that no audio has been selected ("-s"). This is because -avi_encoder.py cannot trim the audio to the appropriate length. +lives_avi_encoder3 cannot trim the audio to the appropriate length. You would need to use LiVES to do this. To delete all the enhanced images you can just remove "/tmp/tmpavi". @@ -273,7 +273,7 @@ near the end of the movie the video trails the audio by, say, 0.2s, you can use the "-D" option as follows: - avi_encoder.py -d /tmp/livestmp/991319584 -o test.avi -D 200 + lives_avi_encoder3 -d /tmp/livestmp/991319584 -o test.avi -D 200 Suppose that you have "movie1.lv1", "movie2.lv1" and "movie3.lv1". Batch-encoding can be done as follows (zsh-syntax): @@ -281,7 +281,7 @@ for i in movie?.lv1 do mkdir /tmp/$i:r - avi_encoder.py -d /tmp/$i:r -o /tmp/$i:r.avi -L $i + lives_avi_encoder3 -d /tmp/$i:r -o /tmp/$i:r.avi -L $i rm -rf /tmp/$i:r done @@ -581,7 +581,7 @@ raise SystemExit if '-V' in opts: - print('avi_encoder.py version ' + version) + print('lives_avi_encoder3 version ' + version) raise SystemExit if ('-v' in opts) or ('-C' in opts): @@ -815,7 +815,7 @@ """ CHANGELOG: -03 Jan 2005 : 0.0.1 : first release, based on mkv_encoder.py. +03 Jan 2005 : 0.0.1 : first release, based on mkv_encoder. 04 Jan 2005 : 0.0.2 : added support for h.264. 10 Mar 2005 : 0.0.3 : fixed snow quality settings. 26 Mar 2005 : 0.0.4 : use env python (hopefully >= 2.3).
View file
LiVES-2.2.7.tar.bz2/lives-plugins/marcos-encoders/lives_dirac_encoder -> LiVES-2.2.8.tar.bz2/lives-plugins/marcos-encoders/lives_dirac_encoder
Changed
@@ -6,7 +6,7 @@ """ -dirac_encoder.py +lives_dirac_encoder Front-end to various programs needed to create Dirac movies with some image-enhancing capabilities through the use of @@ -31,31 +31,35 @@ See my vids at http://amv.reimeika.ca ! -Updated by G. Finch (salsaman) 2010 +Updated by G. Finch (salsaman) 2010, 2015 """ -version = '0.1' +version = '0.2' import os if os.name == 'nt': convert = 'convert.exe' mencoder = 'mencoder.exe' + oggenc = 'oggenc.exe' + mkvmerge = 'mkvmerge.exe' dirac_encoder = 'dirac_encoder.exe' identify = 'identify.exe' else: convert = 'convert' mencoder = 'mencoder' + oggenc = 'oggenc' + mkvmerge = 'mkvmerge' dirac_encoder = 'dirac_encoder' identify = 'identify' usage = \ """ -dirac_encoder.py -h -dirac_encoder.py -V -dirac_encoder.py -C -dirac_encoder.py [-o out] [-p pre] [-d dir] [-a aspect] [-D delay*] +lives_dirac_encoder -h +lives_dirac_encoder -V +lives_dirac_encoder -C +lives_dirac_encoder [-o out] [-p pre] [-d dir] [-a aspect] [-D delay] [-q|-v] [-t type] [-k] [-e [[-w dir] [-c geom] [-r geom]]] - [-s sndfile*] [-b sndrate*] [-f fpscode] [-L lv1file] + [-s sndfile] [-b sndrate] [-f fpscode] [-L lv1file] [firstframe lastframe] """ @@ -84,13 +88,13 @@ -p pre the encoder assumes that sound and images are named using LiVES' conventions i.e. "audio" and "00000001.ext", "00000002.ext"... where "ext" is either "jpg" or "png". - However, dirac_encoder.py will create temporary files + However, lives_dirac_encoder will create temporary files which can be saved for later use (for example, after enhancing the images with "-e" , which may take a long time). These temporary files will be named "pre_00000001.ext", etc... where "pre" is either "eimg" or "rimg" and will be kept if the "-k" option is used. - dirac_encoder.py can then be run over the enhanced images + lives_dirac_encoder can then be run over the enhanced images only by selecting the appropriate prefix ("eimg" or "rimg") here. See "-e" to see what each prefix means. Default: "" (an empty string). @@ -119,6 +123,9 @@ -t type type of video created. The options here are: + "ll": lossless DIRAC file, suitable + for archiving images of any size + "hi": a very high quality MPEG-4 file, suitable for archiving images of 720x480. @@ -236,7 +243,7 @@ In this example the movie is assumed to be 16:9. Then, in order to create an drc file you can simply do the following: - dirac_encoder.py -d /tmp/livestmp/991319584 -o /movies/default.drc -a 3 + lives_dirac_encoder -d /tmp/livestmp/991319584 -o /movies/default.drc -a 3 and the clip "default.drc" will be created in "/movies/" with the correct aspect ratio. @@ -250,7 +257,7 @@ images somewhat, so be careful about cropping/resizing, and remember to use dimensions which are multiples of 16): - dirac_encoder.py -v -d /tmp/livestmp/991319584 -w /tmp/tmpdrc \\ + lives_dirac_encoder -v -d /tmp/livestmp/991319584 -w /tmp/tmpdrc \\ -o /movies/download.drc -a 3 -k -e -c "704x464+5+6" -r "352x240" Since we use the "-k" flag the enhanced images are kept (both full-size @@ -260,17 +267,17 @@ to re-use the enhanced images. So, for example, creating a high-quality clip at full size can be accomplished now as follows: - dirac_encoder.py -d /tmp/tmpdrc -t hi -o /movies/archive.drc \\ + lives_dirac_encoder -d /tmp/tmpdrc -t hi -o /movies/archive.drc \\ -s /tmp/livestmp/991319584/audio -a 3 -k -p eimg If, for example, we only want to encode frames 100 to 150 we can run the following: - dirac_encoder.py -v -d /tmp/tmpdrc -o /movies/selection.drc \\ + lives_dirac_encoder -v -d /tmp/tmpdrc -o /movies/selection.drc \\ -a 3 -k -p eimg 100 150 Note that no audio has been selected ("-s"). This is because -dirac_encoder.py cannot trim the audio to the appropriate length. +lives_dirac_encoder cannot trim the audio to the appropriate length. You would need to use LiVES to do this. To delete all the enhanced images you can just remove "/tmp/tmpdrc". @@ -279,7 +286,7 @@ near the end of the movie the video trails the audio by, say, 0.2s, you can use the "-D" option as follows: - dirac_encoder.py -d /tmp/livestmp/991319584 -o test.drc -D 200 + lives_dirac_encoder -d /tmp/livestmp/991319584 -o test.drc -D 200 Note that negative time values are also allowed. @@ -289,7 +296,7 @@ for i in movie?.lv1 do mkdir /tmp/$i:r - dirac_encoder.py -d /tmp/$i:r -o /tmp/$i:r.drc -L $i + lives_dirac_encoder -d /tmp/$i:r -o /tmp/$i:r.drc -L $i rm -rf /tmp/$i:r done @@ -386,6 +393,9 @@ 'dsize=%s,format=i420 -ovc raw -of rawvideo -o ' % aspect # dirac_opts = '-HD1080' dirac_opts = '' + if vtype == 'll': + dirac_opts = ' '.join([dirac_opts, '-lossless']) + oggenc_opts = '-q 10' if vtype == 'hi': dirac_opts = ' '.join([dirac_opts, '-qf 10']) oggenc_opts = '-q 9' @@ -438,39 +448,39 @@ all_vars.update(globals()) all_vars.update(locals()) + if vtype != 'll': + if fx == 1920 and fy == 1080: + if ffps == 50.: + dirac_opts = ' '.join([dirac_opts, '-HD1080P50']) + elif ffps == 60.: + dirac_opts = ' '.join([dirac_opts, '-HD1080P60']) + if fx == 1024 and fy == 720: + if ffps == 50.: + dirac_opts = ' '.join([dirac_opts, '-HD720P50']) + elif ffps == 60.: + dirac_opts = ' '.join([dirac_opts, '-HD720P60']) + if not quiet: print('Creating "%s"-quality Dirac file' % vtype) - if os.name == 'nt': - yuvcommand = """cd %(source_dir)s ; \\ -%(mencoder.exe)s mf://%(syml)s%(img_pre)s*%(ext)s %(mencoder_opts)s%(yuvv)s %(std)s - """ % all_vars - run(yuvcommand) - command = """cd %(source_dir)s ; \\ -%(dirac_encoder.exe)s -width %(fx)s -height %(fy)s -fr %(ffps)s %(be_verbose)s %(dirac_opts)s %(yuvv)s %(dyuvv)s.drc %(std)s -""" % all_vars - run(command) - else: - yuvcommand = """cd %(source_dir)s ; \\ -%(mencoder)s mf://%(syml)s%(img_pre)s*%(ext)s %(mencoder_opts)s%(yuvv)s %(std)s + yuvcommand = """cd %(source_dir)s ; \\ + %(mencoder)s mf://%(syml)s%(img_pre)s*%(ext)s %(mencoder_opts)s%(yuvv)s %(std)s """ % all_vars - run(yuvcommand) - command = """cd %(source_dir)s ; \\ + run(yuvcommand) + + command = """cd %(source_dir)s ; \\ %(dirac_encoder)s -width %(fx)s -height %(fy)s -fr %(ffps)s %(be_verbose)s %(dirac_opts)s %(yuvv)s %(dyuvv)s.drc %(std)s -""" % all_vars - run(command) + """ % all_vars + run(command) os.remove(yuvv) for tfile in [dyuvv, dyuvv + '.yuv', dyuvv + '.imt']: if os.path.exists(tfile): if verbose: - print('Removing ' + tfile) + print(('Removing ' + tfile)) os.remove(tfile) -# Audio not supported yet. Planned to use Matroska container but
View file
LiVES-2.2.7.tar.bz2/lives-plugins/marcos-encoders/lives_dirac_encoder3 -> LiVES-2.2.8.tar.bz2/lives-plugins/marcos-encoders/lives_dirac_encoder3
Changed
@@ -6,7 +6,7 @@ """ -dirac_encoder.py +lives_dirac_encoder3 Front-end to various programs needed to create Dirac movies with some image-enhancing capabilities through the use of @@ -34,19 +34,29 @@ Updated by G. Finch (salsaman) 2010 """ - version = '0.1' -convert = 'convert' -mencoder = 'mencoder' -dirac_encoder = 'dirac_encoder' -identify = 'identify' +import os +if os.name == 'nt': + convert = 'convert.exe' + mencoder = 'mencoder.exe' + oggenc = 'oggenc.exe' + mkvmerge = 'mkvmerge.exe' + dirac_encoder = 'dirac_encoder.exe' + identify = 'identify.exe' +else: + convert = 'convert' + mencoder = 'mencoder' + oggenc = 'oggenc' + mkvmerge = 'mkvmerge' + dirac_encoder = 'dirac_encoder' + identify = 'identify' usage = \ """ -dirac_encoder.py -h -dirac_encoder.py -V -dirac_encoder.py -C -dirac_encoder.py [-o out] [-p pre] [-d dir] [-a aspect] [-D delay*] +lives_dirac_encoder3 -h +lives_dirac_encoder3 -V +lives_dirac_encoder3 -C +lives_dirac_encoder3 [-o out] [-p pre] [-d dir] [-a aspect] [-D delay*] [-q|-v] [-t type] [-k] [-e [[-w dir] [-c geom] [-r geom]]] [-s sndfile*] [-b sndrate*] [-f fpscode] [-L lv1file] [firstframe lastframe] @@ -77,13 +87,13 @@ -p pre the encoder assumes that sound and images are named using LiVES' conventions i.e. "audio" and "00000001.ext", "00000002.ext"... where "ext" is either "jpg" or "png". - However, dirac_encoder.py will create temporary files + However, lives_dirac_encoder3 will create temporary files which can be saved for later use (for example, after enhancing the images with "-e" , which may take a long time). These temporary files will be named "pre_00000001.ext", etc... where "pre" is either "eimg" or "rimg" and will be kept if the "-k" option is used. - dirac_encoder.py can then be run over the enhanced images + lives_dirac_encoder3 can then be run over the enhanced images only by selecting the appropriate prefix ("eimg" or "rimg") here. See "-e" to see what each prefix means. Default: "" (an empty string). @@ -112,6 +122,9 @@ -t type type of video created. The options here are: + "ll": lossless DIRAC file, suitable + for archiving images of any size + "hi": a very high quality MPEG-4 file, suitable for archiving images of 720x480. @@ -229,7 +242,7 @@ In this example the movie is assumed to be 16:9. Then, in order to create an drc file you can simply do the following: - dirac_encoder.py -d /tmp/livestmp/991319584 -o /movies/default.drc -a 3 + lives_dirac_encoder3 -d /tmp/livestmp/991319584 -o /movies/default.drc -a 3 and the clip "default.drc" will be created in "/movies/" with the correct aspect ratio. @@ -243,7 +256,7 @@ images somewhat, so be careful about cropping/resizing, and remember to use dimensions which are multiples of 16): - dirac_encoder.py -v -d /tmp/livestmp/991319584 -w /tmp/tmpdrc \\ + lives_dirac_encoder3 -v -d /tmp/livestmp/991319584 -w /tmp/tmpdrc \\ -o /movies/download.drc -a 3 -k -e -c "704x464+5+6" -r "352x240" Since we use the "-k" flag the enhanced images are kept (both full-size @@ -253,17 +266,17 @@ to re-use the enhanced images. So, for example, creating a high-quality clip at full size can be accomplished now as follows: - dirac_encoder.py -d /tmp/tmpdrc -t hi -o /movies/archive.drc \\ + lives_dirac_encoder3 -d /tmp/tmpdrc -t hi -o /movies/archive.drc \\ -s /tmp/livestmp/991319584/audio -a 3 -k -p eimg If, for example, we only want to encode frames 100 to 150 we can run the following: - dirac_encoder.py -v -d /tmp/tmpdrc -o /movies/selection.drc \\ + lives_dirac_encoder3 -v -d /tmp/tmpdrc -o /movies/selection.drc \\ -a 3 -k -p eimg 100 150 Note that no audio has been selected ("-s"). This is because -dirac_encoder.py cannot trim the audio to the appropriate length. +lives_dirac_encoder3 cannot trim the audio to the appropriate length. You would need to use LiVES to do this. To delete all the enhanced images you can just remove "/tmp/tmpdrc". @@ -272,7 +285,7 @@ near the end of the movie the video trails the audio by, say, 0.2s, you can use the "-D" option as follows: - dirac_encoder.py -d /tmp/livestmp/991319584 -o test.drc -D 200 + lives_dirac_encoder3 -d /tmp/livestmp/991319584 -o test.drc -D 200 Note that negative time values are also allowed. @@ -282,7 +295,7 @@ for i in movie?.lv1 do mkdir /tmp/$i:r - dirac_encoder.py -d /tmp/$i:r -o /tmp/$i:r.drc -L $i + lives_dirac_encoder3 -d /tmp/$i:r -o /tmp/$i:r.drc -L $i rm -rf /tmp/$i:r done @@ -377,7 +390,10 @@ mencoder_opts = '-mf type=%s:fps=%s ' % (ext[1:], ffps) + \ '-nosound -vf hqdn3d=2:1:3,pp=va:128:8/ha:128:8/dr,' + \ 'dsize=%s,format=i420 -ovc raw -of rawvideo -o ' % aspect - dirac_opts = '-HD1080' + dirac_opts = '' + if vtype == 'll': + dirac_opts = ' '.join([dirac_opts, '-lossless']) + oggenc_opts = '-q 10' if vtype == 'hi': dirac_opts = ' '.join([dirac_opts, '-qf 10']) oggenc_opts = '-q 9' @@ -430,17 +446,31 @@ all_vars.update(globals()) all_vars.update(locals()) + if vtype != 'll': + if fx == 1920 and fy == 1080: + if ffps == 50.: + dirac_opts = ' '.join([dirac_opts, '-HD1080P50']) + elif ffps == 60.: + dirac_opts = ' '.join([dirac_opts, '-HD1080P60']) + if fx == 1024 and fy == 720: + if ffps == 50.: + dirac_opts = ' '.join([dirac_opts, '-HD720P50']) + elif ffps == 60.: + dirac_opts = ' '.join([dirac_opts, '-HD720P60']) + if not quiet: print(('Creating "%s"-quality Dirac file' % vtype)) - + yuvcommand = """cd %(source_dir)s ; \\ -%(mencoder)s mf://%(syml)s%(img_pre)s*%(ext)s %(mencoder_opts)s%(yuvv)s %(std)s + %(mencoder)s mf://%(syml)s%(img_pre)s*%(ext)s %(mencoder_opts)s%(yuvv)s %(std)s """ % all_vars run(yuvcommand) + command = """cd %(source_dir)s ; \\ -%(dirac_encoder)s -width %(fx)s -height %(fy)s -fr %(ffps)s %(be_verbose)s %(dirac_opts)s %(yuvv)s %(dyuvv)s.drc %(std)s -""" % all_vars + %(dirac_encoder)s -width %(fx)s -height %(fy)s -fr %(ffps)s %(be_verbose)s %(dirac_opts)s %(yuvv)s %(dyuvv)s.drc %(std)s + """ % all_vars run(command) + os.remove(yuvv) for tfile in [dyuvv, dyuvv + '.yuv', dyuvv + '.imt']: @@ -449,9 +479,6 @@ print(('Removing ' + tfile)) os.remove(tfile) -# Audio not supported yet. Planned to use Matroska container but -# Dirac developers are thinking of MXF. - audio = False if audio: if not quiet: print(('Creating "%s"-quality ogg vorbis file' % vtype)) @@ -480,26 +507,16 @@ if not quiet: print('Multiplexing...') command = """ -%(mkvplex)s --aspect-ratio '1:%(aspect)s' -o "%(vidname)s" %(vidv)s -y '0:0%(delaysh)s' %(ogg)s %(std)s""" % all_vars +%(mkvmerge)s --aspect-ratio '1:%(aspect)s' -o "%(vidname)s" %(dyuvv)s.drc -y '0:0%(delaysh)s' %(ogg)s %(std)s""" % all_vars run(command) if rawsndf and os.path.exists(wav): os.remove(wav) if os.path.exists(ogg): os.remove(ogg) if os.path.exists(dyuvv + '.drc'): os.remove(dyuvv + '.drc') else:
View file
LiVES-2.2.7.tar.bz2/lives-plugins/marcos-encoders/lives_gif_encoder -> LiVES-2.2.8.tar.bz2/lives-plugins/marcos-encoders/lives_gif_encoder
Changed
@@ -4,7 +4,7 @@ locale.setlocale(locale.LC_NUMERIC,"") """ -gif_encoder.py +lives_gif_encoder Front-end to various programs needed to create GIF movies with some image-enhancing capabilities through the use of @@ -37,10 +37,10 @@ usage = \ """ -gif_encoder.py -h -gif_encoder.py -V -gif_encoder.py -C -gif_encoder.py [-o out] [-p pre] [-d dir] [-a aspect*] [-D delay*] +lives_gif_encoder -h +lives_gif_encoder -V +lives_gif_encoder -C +lives_gif_encoder [-o out] [-p pre] [-d dir] [-a aspect*] [-D delay*] [-q|-v] [-t type*] [-k] [-e [[-w dir] [-c geom] [-r geom]]] [-s sndfile*] [-b sndrate*] [-f fpscode] [-L lv1file] [firstframe lastframe] @@ -71,13 +71,13 @@ -p pre the encoder assumes that sound and images are named using LiVES' conventions i.e. "audio" and "00000001.ext", "00000002.ext"... where "ext" is either "jpg" or "png". - However, gif_encoder.py will create temporary files + However, lives_gif_encoder will create temporary files which can be saved for later use (for example, after enhancing the images with "-e" , which may take a long time). These temporary files will be named "pre_00000001.ext", etc... where "pre" is either "eimg" or "rimg" and will be kept if the "-k" option is used. - gif_encoder.py can then be run over the enhanced images + lives_gif_encoder can then be run over the enhanced images only by selecting the appropriate prefix ("eimg" or "rimg") here. See "-e" to see what each prefix means. Default: "" (an empty string). @@ -192,7 +192,7 @@ and that the images are stored in the directory "/tmp/livestmp/991319584/". Then, in order to create an gif file you can simply do the following: - gif_encoder.py -d /tmp/livestmp/991319584 -o /movies/default.gif + lives_gif_encoder -d /tmp/livestmp/991319584 -o /movies/default.gif and the clip "default.gif" will be created in "/movies/". @@ -204,7 +204,7 @@ the original pictures which we want to get rid of (this might distort the images somewhat, so be careful about cropping/resizing): - gif_encoder.py -v -d /tmp/livestmp/991319584 -w /tmp/tmpgif \\ + lives_gif_encoder -v -d /tmp/livestmp/991319584 -w /tmp/tmpgif \\ -o /movies/download.gif -k -e -c "704x464+5+6" -r "352x240" Since we use the "-k" flag the enhanced images are kept (both full-size @@ -214,13 +214,13 @@ to re-use the enhanced images. So, for example, creating a clip at full size can be accomplished now as follows: - gif_encoder.py -d /tmp/tmpgif -o /movies/archive.gif \\ + lives_gif_encoder -d /tmp/tmpgif -o /movies/archive.gif \\ -s /tmp/livestmp/991319584/audio -k -p eimg If, for example, we only want to encode frames 100 to 150 we can run the following: - gif_encoder.py -v -d /tmp/tmpgif -o /movies/selection.gif \\ + lives_gif_encoder -v -d /tmp/tmpgif -o /movies/selection.gif \\ -k -p eimg 100 150 To delete all the enhanced images you can just remove "/tmp/tmpgif". @@ -231,7 +231,7 @@ for i in movie?.lv1 do mkdir /tmp/$i:r - gif_encoder.py -d /tmp/$i:r -o /tmp/$i:r.gif -L $i + lives_gif_encoder -d /tmp/$i:r -o /tmp/$i:r.gif -L $i rm -rf /tmp/$i:r done @@ -465,7 +465,7 @@ raise SystemExit if '-V' in opts: - print 'gif_encoder.py version ' + version + print 'lives_gif_encoder version ' + version raise SystemExit if ('-v' in opts) or ('-C' in opts):
View file
LiVES-2.2.7.tar.bz2/lives-plugins/marcos-encoders/lives_gif_encoder3 -> LiVES-2.2.8.tar.bz2/lives-plugins/marcos-encoders/lives_gif_encoder3
Changed
@@ -4,7 +4,7 @@ locale.setlocale(locale.LC_NUMERIC,"") """ -gif_encoder.py +lives_gif_encoder3 Front-end to various programs needed to create GIF movies with some image-enhancing capabilities through the use of @@ -33,10 +33,10 @@ usage = \ """ -gif_encoder.py -h -gif_encoder.py -V -gif_encoder.py -C -gif_encoder.py [-o out] [-p pre] [-d dir] [-a aspect*] [-D delay*] +lives_gif_encoder3 -h +lives_gif_encoder3 -V +lives_gif_encoder3 -C +lives_gif_encoder3 [-o out] [-p pre] [-d dir] [-a aspect*] [-D delay*] [-q|-v] [-t type*] [-k] [-e [[-w dir] [-c geom] [-r geom]]] [-s sndfile*] [-b sndrate*] [-f fpscode] [-L lv1file] [firstframe lastframe] @@ -67,13 +67,13 @@ -p pre the encoder assumes that sound and images are named using LiVES' conventions i.e. "audio" and "00000001.ext", "00000002.ext"... where "ext" is either "jpg" or "png". - However, gif_encoder.py will create temporary files + However, lives_gif_encoder3 will create temporary files which can be saved for later use (for example, after enhancing the images with "-e" , which may take a long time). These temporary files will be named "pre_00000001.ext", etc... where "pre" is either "eimg" or "rimg" and will be kept if the "-k" option is used. - gif_encoder.py can then be run over the enhanced images + lives_gif_encoder3 can then be run over the enhanced images only by selecting the appropriate prefix ("eimg" or "rimg") here. See "-e" to see what each prefix means. Default: "" (an empty string). @@ -188,7 +188,7 @@ and that the images are stored in the directory "/tmp/livestmp/991319584/". Then, in order to create an gif file you can simply do the following: - gif_encoder.py -d /tmp/livestmp/991319584 -o /movies/default.gif + lives_gif_encoder3 -d /tmp/livestmp/991319584 -o /movies/default.gif and the clip "default.gif" will be created in "/movies/". @@ -200,7 +200,7 @@ the original pictures which we want to get rid of (this might distort the images somewhat, so be careful about cropping/resizing): - gif_encoder.py -v -d /tmp/livestmp/991319584 -w /tmp/tmpgif \\ + lives_gif_encoder3 -v -d /tmp/livestmp/991319584 -w /tmp/tmpgif \\ -o /movies/download.gif -k -e -c "704x464+5+6" -r "352x240" Since we use the "-k" flag the enhanced images are kept (both full-size @@ -210,13 +210,13 @@ to re-use the enhanced images. So, for example, creating a clip at full size can be accomplished now as follows: - gif_encoder.py -d /tmp/tmpgif -o /movies/archive.gif \\ + lives_gif_encoder3 -d /tmp/tmpgif -o /movies/archive.gif \\ -s /tmp/livestmp/991319584/audio -k -p eimg If, for example, we only want to encode frames 100 to 150 we can run the following: - gif_encoder.py -v -d /tmp/tmpgif -o /movies/selection.gif \\ + lives_gif_encoder3 -v -d /tmp/tmpgif -o /movies/selection.gif \\ -k -p eimg 100 150 To delete all the enhanced images you can just remove "/tmp/tmpgif". @@ -227,7 +227,7 @@ for i in movie?.lv1 do mkdir /tmp/$i:r - gif_encoder.py -d /tmp/$i:r -o /tmp/$i:r.gif -L $i + lives_gif_encoder3 -d /tmp/$i:r -o /tmp/$i:r.gif -L $i rm -rf /tmp/$i:r done @@ -450,7 +450,7 @@ raise SystemExit if '-V' in opts: - print('gif_encoder.py version ' + version) + print('lives_gif_encoder3 version ' + version) raise SystemExit if ('-v' in opts) or ('-C' in opts):
View file
LiVES-2.2.7.tar.bz2/lives-plugins/marcos-encoders/lives_mkv_encoder -> LiVES-2.2.8.tar.bz2/lives-plugins/marcos-encoders/lives_mkv_encoder
Changed
@@ -1,10 +1,12 @@ #!/usr/bin/env python +import time + import locale locale.setlocale(locale.LC_NUMERIC,"") """ -mkv_encoder.py +lives_mkv_encoder Front-end to various programs needed to create MKV (Matroska) movies with some image-enhancing capabilities through the use of @@ -44,10 +46,10 @@ usage = \ """ -mkv_encoder.py -h -mkv_encoder.py -V -mkv_encoder.py -C -mkv_encoder.py [-o out] [-p pre] [-d dir] [-a aspect] [-D delay] +lives_mkv_encoder -h +lives_mkv_encoder -V +lives_mkv_encoder -C +lives_mkv_encoder [-o out] [-p pre] [-d dir] [-a aspect] [-D delay] [-q|-v] [-t type] [-k] [-e [[-w dir] [-c geom] [-r geom]]] [-s sndfile] [-b sndrate] [-f fpscode] [-L lv1file] [firstframe lastframe] @@ -78,13 +80,13 @@ -p pre the encoder assumes that sound and images are named using LiVES' conventions i.e. "audio" and "00000001.ext", "00000002.ext"... where "ext" is either "jpg" or "png". - However, mkv_encoder.py will create temporary files + However, lives_mkv_encoder will create temporary files which can be saved for later use (for example, after enhancing the images with "-e" , which may take a long time). These temporary files will be named "pre_00000001.ext", etc... where "pre" is either "eimg" or "rimg" and will be kept if the "-k" option is used. - mkv_encoder.py can then be run over the enhanced images + lives_mkv_encoder can then be run over the enhanced images only by selecting the appropriate prefix ("eimg" or "rimg") here. See "-e" to see what each prefix means. Default: "" (an empty string). @@ -239,7 +241,7 @@ In this example the movie is assumed to be 16:9. Then, in order to create an MKV file you can simply do the following: - mkv_encoder.py -d /tmp/livestmp/991319584 -o /movies/default.mkv -a 3 + lives_mkv_encoder -d /tmp/livestmp/991319584 -o /movies/default.mkv -a 3 and the clip "default.mkv" will be created in "/movies/" with the correct aspect ratio. @@ -253,7 +255,7 @@ images somewhat, so be careful about cropping/resizing, and remember to use dimensions which are multiples of 16): - mkv_encoder.py -v -d /tmp/livestmp/991319584 -w /tmp/tmpmkv \\ + lives_mkv_encoder -v -d /tmp/livestmp/991319584 -w /tmp/tmpmkv \\ -o /movies/download.mkv -a 3 -k -e -c "704x464+5+6" -r "352x240" Since we use the "-k" flag the enhanced images are kept (both full-size @@ -263,17 +265,17 @@ to re-use the enhanced images. So, for example, creating a high-quality clip at full size can be accomplished now as follows: - mkv_encoder.py -d /tmp/tmpmkv -t hi -o /movies/archive.mkv \\ + lives_mkv_encoder -d /tmp/tmpmkv -t hi -o /movies/archive.mkv \\ -s /tmp/livestmp/991319584/audio -a 3 -k -p eimg If, for example, we only want to encode frames 100 to 150 we can run the following: - mkv_encoder.py -v -d /tmp/tmpmkv -o /movies/selection.mkv \\ + lives_mkv_encoder -v -d /tmp/tmpmkv -o /movies/selection.mkv \\ -a 3 -k -p eimg 100 150 Note that no audio has been selected ("-s"). This is because -mkv_encoder.py cannot trim the audio to the appropriate length. +lives_mkv_encoder cannot trim the audio to the appropriate length. You would need to use LiVES to do this. To delete all the enhanced images you can just remove "/tmp/tmpmkv". @@ -282,7 +284,7 @@ near the end of the movie the video trails the audio by, say, 0.2s, you can use the "-D" option as follows: - mkv_encoder.py -d /tmp/livestmp/991319584 -o test.mkv -D 200 + lives_mkv_encoder -d /tmp/livestmp/991319584 -o test.mkv -D 200 Note that negative time values are also allowed. @@ -292,7 +294,7 @@ for i in movie?.lv1 do mkdir /tmp/$i:r - mkv_encoder.py -d /tmp/$i:r -o /tmp/$i:r.mkv -L $i + lives_mkv_encoder -d /tmp/$i:r -o /tmp/$i:r.mkv -L $i rm -rf /tmp/$i:r done @@ -479,8 +481,6 @@ all_vars.update(globals()) all_vars.update(locals()) - - if os.name == 'nt': if vtype[-1] == 'h': @@ -489,14 +489,18 @@ %(mencoder.exe)s mf://%(syml)s%(img_pre)s*%(ext)s %(mencoder_opts)s%(yuvv)s %(std)s & """ % all_vars run(yuvcommand) - command = """cd %(source_dir)s ; \\ -%(x264.exe)s --stats "%(x264log)s" %(cpass1opts)s %(x264_opts)s1 -o /dev/null %(yuvv)s %(fx)sx%(fy)s %(std)s + + command = """cd %(source_dir)s ; \\ +%(x264.exe)s --stats "%(x264log)s" %(cpass1opts)s %(x264_opts)s1 --input-res %(fx)sx%(fy)s -o /dev/null %(yuvv)s %(fx)sx%(fy)s %(std)s """ % all_vars run(command) os.remove(yuvv) run(yuvcommand) + + + command = """cd %(source_dir)s ; \\ -%(x264.exe)s --stats "%(x264log)s" %(cpass2opts)s %(x264_opts)s2 -o "%(vidv)s" %(yuvv)s %(fx)sx%(fy)s %(std)s +%(x264.exe)s --stats "%(x264log)s" %(cpass2opts)s %(x264_opts)s2 --input-res %(fx)sx%(fy)s -o "%(vidv)s" %(yuvv)s %(fx)sx%(fy)s %(std)s """ % all_vars run(command) os.remove(yuvv) @@ -516,18 +520,21 @@ %(mencoder)s mf://%(syml)s%(img_pre)s*%(ext)s %(mencoder_opts)s%(yuvv)s %(std)s & """ % all_vars run(yuvcommand) + command = """cd %(source_dir)s ; \\ -%(x264)s --stats "%(x264log)s" %(cpass1opts)s %(x264_opts)s1 -o /dev/null %(yuvv)s %(fx)sx%(fy)s %(std)s +%(x264)s --stats "%(x264log)s" %(cpass1opts)s %(x264_opts)s1 --input-res %(fx)sx%(fy)s -o /dev/null %(yuvv)s %(fx)sx%(fy)s %(std)s """ % all_vars run(command) os.remove(yuvv) run(yuvcommand) + command = """cd %(source_dir)s ; \\ -%(x264)s --stats "%(x264log)s" %(cpass2opts)s %(x264_opts)s2 -o "%(vidv)s" %(yuvv)s %(fx)sx%(fy)s %(std)s +%(x264)s --stats "%(x264log)s" %(cpass2opts)s %(x264_opts)s2 --input-res %(fx)sx%(fy)s -o "%(vidv)s" %(yuvv)s %(fx)sx%(fy)s %(std)s """ % all_vars run(command) os.remove(yuvv) os.remove(x264log) + else: command = """cd %(source_dir)s ; \\ %(mencoder)s "mf://%(syml)s%(img_pre)s*%(ext)s" %(mencoder_opts)s1 -o /dev/null %(std)s ; \\ @@ -535,7 +542,6 @@ """ % all_vars run(command) - if os.path.exists(os.path.join(source_dir, 'divx2pass.log')): os.remove(os.path.join(source_dir, 'divx2pass.log')) if os.path.exists(os.path.join(source_dir, 'xvid-twopass.stats')): @@ -679,7 +685,7 @@ raise SystemExit if '-V' in opts: - print 'mkv_encoder.py version ' + version + print 'lives_mkv_encoder version ' + version raise SystemExit if ('-v' in opts) or ('-C' in opts):
View file
LiVES-2.2.7.tar.bz2/lives-plugins/marcos-encoders/lives_mkv_encoder3 -> LiVES-2.2.8.tar.bz2/lives-plugins/marcos-encoders/lives_mkv_encoder3
Changed
@@ -4,7 +4,7 @@ locale.setlocale(locale.LC_NUMERIC,"") """ -mkv_encoder.py +lives_mkv_encoder3 Front-end to various programs needed to create MKV (Matroska) movies with some image-enhancing capabilities through the use of @@ -33,10 +33,10 @@ usage = \ """ -mkv_encoder.py -h -mkv_encoder.py -V -mkv_encoder.py -C -mkv_encoder.py [-o out] [-p pre] [-d dir] [-a aspect] [-D delay] +lives_mkv_encoder3 -h +lives_mkv_encoder3 -V +lives_mkv_encoder3 -C +lives_mkv_encoder3 [-o out] [-p pre] [-d dir] [-a aspect] [-D delay] [-q|-v] [-t type] [-k] [-e [[-w dir] [-c geom] [-r geom]]] [-s sndfile] [-b sndrate] [-f fpscode] [-L lv1file] [firstframe lastframe] @@ -67,13 +67,13 @@ -p pre the encoder assumes that sound and images are named using LiVES' conventions i.e. "audio" and "00000001.ext", "00000002.ext"... where "ext" is either "jpg" or "png". - However, mkv_encoder.py will create temporary files + However, lives_mkv_encoder3 will create temporary files which can be saved for later use (for example, after enhancing the images with "-e" , which may take a long time). These temporary files will be named "pre_00000001.ext", etc... where "pre" is either "eimg" or "rimg" and will be kept if the "-k" option is used. - mkv_encoder.py can then be run over the enhanced images + lives_mkv_encoder3 can then be run over the enhanced images only by selecting the appropriate prefix ("eimg" or "rimg") here. See "-e" to see what each prefix means. Default: "" (an empty string). @@ -228,7 +228,7 @@ In this example the movie is assumed to be 16:9. Then, in order to create an MKV file you can simply do the following: - mkv_encoder.py -d /tmp/livestmp/991319584 -o /movies/default.mkv -a 3 + lives_mkv_encoder3 -d /tmp/livestmp/991319584 -o /movies/default.mkv -a 3 and the clip "default.mkv" will be created in "/movies/" with the correct aspect ratio. @@ -242,7 +242,7 @@ images somewhat, so be careful about cropping/resizing, and remember to use dimensions which are multiples of 16): - mkv_encoder.py -v -d /tmp/livestmp/991319584 -w /tmp/tmpmkv \\ + lives_mkv_encoder3 -v -d /tmp/livestmp/991319584 -w /tmp/tmpmkv \\ -o /movies/download.mkv -a 3 -k -e -c "704x464+5+6" -r "352x240" Since we use the "-k" flag the enhanced images are kept (both full-size @@ -252,17 +252,17 @@ to re-use the enhanced images. So, for example, creating a high-quality clip at full size can be accomplished now as follows: - mkv_encoder.py -d /tmp/tmpmkv -t hi -o /movies/archive.mkv \\ + lives_mkv_encoder3 -d /tmp/tmpmkv -t hi -o /movies/archive.mkv \\ -s /tmp/livestmp/991319584/audio -a 3 -k -p eimg If, for example, we only want to encode frames 100 to 150 we can run the following: - mkv_encoder.py -v -d /tmp/tmpmkv -o /movies/selection.mkv \\ + lives_mkv_encoder3 -v -d /tmp/tmpmkv -o /movies/selection.mkv \\ -a 3 -k -p eimg 100 150 Note that no audio has been selected ("-s"). This is because -mkv_encoder.py cannot trim the audio to the appropriate length. +lives_mkv_encoder3 cannot trim the audio to the appropriate length. You would need to use LiVES to do this. To delete all the enhanced images you can just remove "/tmp/tmpmkv". @@ -271,7 +271,7 @@ near the end of the movie the video trails the audio by, say, 0.2s, you can use the "-D" option as follows: - mkv_encoder.py -d /tmp/livestmp/991319584 -o test.mkv -D 200 + lives_mkv_encoder3 -d /tmp/livestmp/991319584 -o test.mkv -D 200 Note that negative time values are also allowed. @@ -281,7 +281,7 @@ for i in movie?.lv1 do mkdir /tmp/$i:r - mkv_encoder.py -d /tmp/$i:r -o /tmp/$i:r.mkv -L $i + lives_mkv_encoder3 -d /tmp/$i:r -o /tmp/$i:r.mkv -L $i rm -rf /tmp/$i:r done @@ -476,13 +476,13 @@ """ % all_vars run(yuvcommand) command = """cd %(source_dir)s ; \\ -%(x264)s --stats "%(x264log)s" %(cpass1opts)s %(x264_opts)s1 -o /dev/null %(yuvv)s %(fx)sx%(fy)s %(std)s +%(x264)s --stats "%(x264log)s" %(cpass1opts)s %(x264_opts)s1 --input-res %(fx)sx%(fy)s -o /dev/null %(yuvv)s %(fx)sx%(fy)s %(std)s """ % all_vars run(command) os.remove(yuvv) run(yuvcommand) command = """cd %(source_dir)s ; \\ -%(x264)s --stats "%(x264log)s" %(cpass2opts)s %(x264_opts)s2 -o "%(vidv)s" %(yuvv)s %(fx)sx%(fy)s %(std)s +%(x264)s --stats "%(x264log)s" %(cpass2opts)s %(x264_opts)s2 --input-res %(fx)sx%(fy)s -o "%(vidv)s" %(yuvv)s %(fx)sx%(fy)s %(std)s """ % all_vars run(command) os.remove(yuvv) @@ -637,7 +637,7 @@ raise SystemExit if '-V' in opts: - print('mkv_encoder.py version ' + version) + print('lives_mkv_encoder3 version ' + version) raise SystemExit if ('-v' in opts) or ('-C' in opts):
View file
LiVES-2.2.7.tar.bz2/lives-plugins/marcos-encoders/lives_mng_encoder -> LiVES-2.2.8.tar.bz2/lives-plugins/marcos-encoders/lives_mng_encoder
Changed
@@ -4,7 +4,7 @@ locale.setlocale(locale.LC_NUMERIC,"") """ -mng_encoder.py +lives_mng_encoder Front-end to various programs needed to create MNG movies with some image-enhancing capabilities through the use of @@ -37,10 +37,10 @@ usage = \ """ -mng_encoder.py -h -mng_encoder.py -V -mng_encoder.py -C -mng_encoder.py [-o out] [-p pre] [-d dir] [-a aspect*] [-D delay*] +lives_mng_encoder -h +lives_mng_encoder -V +lives_mng_encoder -C +lives_mng_encoder [-o out] [-p pre] [-d dir] [-a aspect*] [-D delay*] [-q|-v] [-t type*] [-k] [-e [[-w dir] [-c geom] [-r geom]]] [-s sndfile*] [-b sndrate*] [-f fpscode] [-L lv1file] [firstframe lastframe] @@ -71,13 +71,13 @@ -p pre the encoder assumes that sound and images are named using LiVES' conventions i.e. "audio" and "00000001.ext", "00000002.ext"... where "ext" is either "jpg" or "png". - However, mng_encoder.py will create temporary files + However, lives_mng_encoder will create temporary files which can be saved for later use (for example, after enhancing the images with "-e" , which may take a long time). These temporary files will be named "pre_00000001.ext", etc... where "pre" is either "eimg" or "rimg" and will be kept if the "-k" option is used. - mng_encoder.py can then be run over the enhanced images + lives_mng_encoder can then be run over the enhanced images only by selecting the appropriate prefix ("eimg" or "rimg") here. See "-e" to see what each prefix means. Default: "" (an empty string). @@ -192,7 +192,7 @@ and that the images are stored in the directory "/tmp/livestmp/991319584/". Then, in order to create an mng file you can simply do the following: - mng_encoder.py -d /tmp/livestmp/991319584 -o /movies/default.mng + lives_mng_encoder -d /tmp/livestmp/991319584 -o /movies/default.mng and the clip "default.mng" will be created in "/movies/". @@ -204,7 +204,7 @@ the original pictures which we want to get rid of (this might distort the images somewhat, so be careful about cropping/resizing): - mng_encoder.py -v -d /tmp/livestmp/991319584 -w /tmp/tmpmng \\ + lives_mng_encoder -v -d /tmp/livestmp/991319584 -w /tmp/tmpmng \\ -o /movies/download.mng -k -e -c "704x464+5+6" -r "352x240" Since we use the "-k" flag the enhanced images are kept (both full-size @@ -214,13 +214,13 @@ to re-use the enhanced images. So, for example, creating a clip at full size can be accomplished now as follows: - mng_encoder.py -d /tmp/tmpmng -o /movies/archive.mng \\ + lives_mng_encoder -d /tmp/tmpmng -o /movies/archive.mng \\ -s /tmp/livestmp/991319584/audio -k -p eimg If, for example, we only want to encode frames 100 to 150 we can run the following: - mng_encoder.py -v -d /tmp/tmpmng -o /movies/selection.mng \\ + lives_mng_encoder -v -d /tmp/tmpmng -o /movies/selection.mng \\ -k -p eimg 100 150 To delete all the enhanced images you can just remove "/tmp/tmpmng". @@ -231,7 +231,7 @@ for i in movie?.lv1 do mkdir /tmp/$i:r - mng_encoder.py -d /tmp/$i:r -o /tmp/$i:r.mng -L $i + lives_mng_encoder -d /tmp/$i:r -o /tmp/$i:r.mng -L $i rm -rf /tmp/$i:r done @@ -463,7 +463,7 @@ raise SystemExit if '-V' in opts: - print 'mng_encoder.py version ' + version + print 'lives_mng_encoder version ' + version raise SystemExit if ('-v' in opts) or ('-C' in opts):
View file
LiVES-2.2.7.tar.bz2/lives-plugins/marcos-encoders/lives_mng_encoder3 -> LiVES-2.2.8.tar.bz2/lives-plugins/marcos-encoders/lives_mng_encoder3
Changed
@@ -4,7 +4,7 @@ locale.setlocale(locale.LC_NUMERIC,"") """ -mng_encoder.py +lives_mng_encoder3 Front-end to various programs needed to create MNG movies with some image-enhancing capabilities through the use of @@ -33,10 +33,10 @@ usage = \ """ -mng_encoder.py -h -mng_encoder.py -V -mng_encoder.py -C -mng_encoder.py [-o out] [-p pre] [-d dir] [-a aspect*] [-D delay*] +lives_mng_encoder3 -h +lives_mng_encoder3 -V +lives_mng_encoder3 -C +lives_mng_encoder3 [-o out] [-p pre] [-d dir] [-a aspect*] [-D delay*] [-q|-v] [-t type*] [-k] [-e [[-w dir] [-c geom] [-r geom]]] [-s sndfile*] [-b sndrate*] [-f fpscode] [-L lv1file] [firstframe lastframe] @@ -67,13 +67,13 @@ -p pre the encoder assumes that sound and images are named using LiVES' conventions i.e. "audio" and "00000001.ext", "00000002.ext"... where "ext" is either "jpg" or "png". - However, mng_encoder.py will create temporary files + However, lives_mng_encoder3 will create temporary files which can be saved for later use (for example, after enhancing the images with "-e" , which may take a long time). These temporary files will be named "pre_00000001.ext", etc... where "pre" is either "eimg" or "rimg" and will be kept if the "-k" option is used. - mng_encoder.py can then be run over the enhanced images + lives_mng_encoder3 can then be run over the enhanced images only by selecting the appropriate prefix ("eimg" or "rimg") here. See "-e" to see what each prefix means. Default: "" (an empty string). @@ -188,7 +188,7 @@ and that the images are stored in the directory "/tmp/livestmp/991319584/". Then, in order to create an mng file you can simply do the following: - mng_encoder.py -d /tmp/livestmp/991319584 -o /movies/default.mng + lives_mng_encoder3 -d /tmp/livestmp/991319584 -o /movies/default.mng and the clip "default.mng" will be created in "/movies/". @@ -200,7 +200,7 @@ the original pictures which we want to get rid of (this might distort the images somewhat, so be careful about cropping/resizing): - mng_encoder.py -v -d /tmp/livestmp/991319584 -w /tmp/tmpmng \\ + lives_mng_encoder3 -v -d /tmp/livestmp/991319584 -w /tmp/tmpmng \\ -o /movies/download.mng -k -e -c "704x464+5+6" -r "352x240" Since we use the "-k" flag the enhanced images are kept (both full-size @@ -210,13 +210,13 @@ to re-use the enhanced images. So, for example, creating a clip at full size can be accomplished now as follows: - mng_encoder.py -d /tmp/tmpmng -o /movies/archive.mng \\ + lives_mng_encoder3 -d /tmp/tmpmng -o /movies/archive.mng \\ -s /tmp/livestmp/991319584/audio -k -p eimg If, for example, we only want to encode frames 100 to 150 we can run the following: - mng_encoder.py -v -d /tmp/tmpmng -o /movies/selection.mng \\ + lives_mng_encoder3 -v -d /tmp/tmpmng -o /movies/selection.mng \\ -k -p eimg 100 150 To delete all the enhanced images you can just remove "/tmp/tmpmng". @@ -227,7 +227,7 @@ for i in movie?.lv1 do mkdir /tmp/$i:r - mng_encoder.py -d /tmp/$i:r -o /tmp/$i:r.mng -L $i + lives_mng_encoder3 -d /tmp/$i:r -o /tmp/$i:r.mng -L $i rm -rf /tmp/$i:r done @@ -450,7 +450,7 @@ raise SystemExit if '-V' in opts: - print('mng_encoder.py version ' + version) + print('lives_mng_encoder3 version ' + version) raise SystemExit if ('-v' in opts) or ('-C' in opts):
View file
LiVES-2.2.7.tar.bz2/lives-plugins/marcos-encoders/lives_mpeg_encoder -> LiVES-2.2.8.tar.bz2/lives-plugins/marcos-encoders/lives_mpeg_encoder
Changed
@@ -4,7 +4,7 @@ locale.setlocale(locale.LC_NUMERIC,"") """ -mpeg_encoder.py +lives_mpeg_encoder Simple front-end to MJPEGtools with some image-enhancing capabilities through the use of ImageMagick. Meant as a @@ -47,10 +47,10 @@ usage = \ """ -mpeg_encoder.py -h -mpeg_encoder.py -V -mpeg_encoder.py -C -mpeg_encoder.py [-o out] [-p pre] [-d dir] [-a aspect] [-D delay] +lives_mpeg_encoder -h +lives_mpeg_encoder -V +lives_mpeg_encoder -C +lives_mpeg_encoder [-o out] [-p pre] [-d dir] [-a aspect] [-D delay] [-q|-v] [-t type] [-k] [-e [[-w dir] [-c geom] [-r geom]]] [-s sndfile] [-b sndrate] [-f fpscode] [-L lv1file] [firstframe lastframe] @@ -84,13 +84,13 @@ -p pre the encoder assumes that sound and images are named using LiVES' conventions i.e. "audio" and "00000001.ext", "00000002.ext"... where "ext" is either "jpg" or "png". - However, mpeg_encoder.py will create temporary files + However, lives_mpeg_encoder will create temporary files which can be saved for later use (for example, after enhancing the images with "-e" , which may take a long time). These temporary files will be named "pre_00000001.ext", etc... where "pre" is either "eimg" or "rimg" and will be kept if the "-k" option is used. - mpeg_encoder.py can then be run over the enhanced images + lives_mpeg_encoder can then be run over the enhanced images only by selecting the appropriate prefix ("eimg" or "rimg") here. See "-e" to see what each prefix means. Default: "" (an empty string). @@ -259,7 +259,7 @@ BE PROGRESSIVE (NON-INTERLACED) FOR THIS TO WORK. Then, in order to create an MPEG-1 file you can simply do the following: - mpeg_encoder.py -d /tmp/livestmp/991319584 -o /movies/default.mpg -a 3 + lives_mpeg_encoder -d /tmp/livestmp/991319584 -o /movies/default.mpg -a 3 and the clip "default.mpg" will be created in "/movies/" with the correct aspect ratio. @@ -273,7 +273,7 @@ images somewhat, so be careful about cropping/resizing, and remember to use dimensions which are multiples of 16): - mpeg_encoder.py -v -d /tmp/livestmp/991319584 -w /tmp/tmpmpg \\ + lives_mpeg_encoder -v -d /tmp/livestmp/991319584 -w /tmp/tmpmpg \\ -o /movies/download.mpg -a 3 -k -e -c "704x464+5+6" -r "352x240" Since we use the "-k" flag the enhanced images are kept (both full-size @@ -283,28 +283,28 @@ to re-use the enhanced images. So, for example, creating a high-quality clip at full size can be accomplished now as follows: - mpeg_encoder.py -d /tmp/tmpmpg -t hi -o /movies/archive.mpg \\ + lives_mpeg_encoder -d /tmp/tmpmpg -t hi -o /movies/archive.mpg \\ -s /tmp/livestmp/991319584/audio -a 3 -k -p eimg Creating VCD/SVCD/DVD-compatible clips is also readily done: - mpeg_encoder.py -d /tmp/tmpmpg -t vcd -o /movies/vcd.mpg \\ + lives_mpeg_encoder -d /tmp/tmpmpg -t vcd -o /movies/vcd.mpg \\ -s /tmp/livestmp/991319584/audio -a 3 -k -p eimg - mpeg_encoder.py -q -d /tmp/tmpmpg -t svcd -o /movies/svcd.mpg \\ + lives_mpeg_encoder -q -d /tmp/tmpmpg -t svcd -o /movies/svcd.mpg \\ -s /tmp/livestmp/991319584/audio -a 3 -k -p eimg - mpeg_encoder.py -v -d /tmp/tmpmpg -t dvd -o /movies/dvd.mpg \\ + lives_mpeg_encoder -v -d /tmp/tmpmpg -t dvd -o /movies/dvd.mpg \\ -s /tmp/livestmp/991319584/audio -a 3 -k -p eimg If, for example, we only want to encode frames 100 to 150 we can run the following: - mpeg_encoder.py -v -d /tmp/tmpmpg -o /movies/selection.mpg \\ + lives_mpeg_encoder -v -d /tmp/tmpmpg -o /movies/selection.mpg \\ -a 3 -k -p eimg 100 150 Note that no audio has been selected ("-s"). This is because -mpeg_encoder.py cannot trim the audio to the appropriate length. +lives_mpeg_encoder cannot trim the audio to the appropriate length. You would need to use LiVES to do this. To delete all the enhanced images you can just remove "/tmp/tmpmpg". @@ -313,7 +313,7 @@ near the end of the movie the video trails the audio by, say, 0.2s, you can use the "-D" option as follows: - mpeg_encoder.py -d /tmp/livestmp/991319584 -o test.mpg -D 200 + lives_mpeg_encoder -d /tmp/livestmp/991319584 -o test.mpg -D 200 Note that negative time values are also allowed. @@ -323,7 +323,7 @@ for i in movie?.lv1 do mkdir /tmp/$i:r - mpeg_encoder.py -d /tmp/$i:r -o /tmp/$i:r.mpg -L $i + lives_mpeg_encoder -d /tmp/$i:r -o /tmp/$i:r.mpg -L $i rm -rf /tmp/$i:r done @@ -655,7 +655,7 @@ raise SystemExit if '-V' in opts: - print 'mpeg_encoder.py version ' + version + print 'lives_mpeg_encoder version ' + version raise SystemExit if ('-v' in opts) or ('-C' in opts):
View file
LiVES-2.2.7.tar.bz2/lives-plugins/marcos-encoders/lives_mpeg_encoder3 -> LiVES-2.2.8.tar.bz2/lives-plugins/marcos-encoders/lives_mpeg_encoder3
Changed
@@ -4,7 +4,7 @@ locale.setlocale(locale.LC_NUMERIC,"") """ -mpeg_encoder.py +lives_mpeg_encoder3 Simple front-end to MJPEGtools with some image-enhancing capabilities through the use of ImageMagick. Meant as a @@ -35,10 +35,10 @@ usage = \ """ -mpeg_encoder.py -h -mpeg_encoder.py -V -mpeg_encoder.py -C -mpeg_encoder.py [-o out] [-p pre] [-d dir] [-a aspect] [-D delay] +lives_mpeg_encoder3 -h +lives_mpeg_encoder3 -V +lives_mpeg_encoder3 -C +lives_mpeg_encoder3 [-o out] [-p pre] [-d dir] [-a aspect] [-D delay] [-q|-v] [-t type] [-k] [-e [[-w dir] [-c geom] [-r geom]]] [-s sndfile] [-b sndrate] [-f fpscode] [-L lv1file] [firstframe lastframe] @@ -72,13 +72,13 @@ -p pre the encoder assumes that sound and images are named using LiVES' conventions i.e. "audio" and "00000001.ext", "00000002.ext"... where "ext" is either "jpg" or "png". - However, mpeg_encoder.py will create temporary files + However, lives_mpeg_encoder3 will create temporary files which can be saved for later use (for example, after enhancing the images with "-e" , which may take a long time). These temporary files will be named "pre_00000001.ext", etc... where "pre" is either "eimg" or "rimg" and will be kept if the "-k" option is used. - mpeg_encoder.py can then be run over the enhanced images + lives_mpeg_encoder3 can then be run over the enhanced images only by selecting the appropriate prefix ("eimg" or "rimg") here. See "-e" to see what each prefix means. Default: "" (an empty string). @@ -247,7 +247,7 @@ BE PROGRESSIVE (NON-INTERLACED) FOR THIS TO WORK. Then, in order to create an MPEG-1 file you can simply do the following: - mpeg_encoder.py -d /tmp/livestmp/991319584 -o /movies/default.mpg -a 3 + lives_mpeg_encoder3 -d /tmp/livestmp/991319584 -o /movies/default.mpg -a 3 and the clip "default.mpg" will be created in "/movies/" with the correct aspect ratio. @@ -261,7 +261,7 @@ images somewhat, so be careful about cropping/resizing, and remember to use dimensions which are multiples of 16): - mpeg_encoder.py -v -d /tmp/livestmp/991319584 -w /tmp/tmpmpg \\ + lives_mpeg_encoder3 -v -d /tmp/livestmp/991319584 -w /tmp/tmpmpg \\ -o /movies/download.mpg -a 3 -k -e -c "704x464+5+6" -r "352x240" Since we use the "-k" flag the enhanced images are kept (both full-size @@ -271,28 +271,28 @@ to re-use the enhanced images. So, for example, creating a high-quality clip at full size can be accomplished now as follows: - mpeg_encoder.py -d /tmp/tmpmpg -t hi -o /movies/archive.mpg \\ + lives_mpeg_encoder3 -d /tmp/tmpmpg -t hi -o /movies/archive.mpg \\ -s /tmp/livestmp/991319584/audio -a 3 -k -p eimg Creating VCD/SVCD/DVD-compatible clips is also readily done: - mpeg_encoder.py -d /tmp/tmpmpg -t vcd -o /movies/vcd.mpg \\ + lives_mpeg_encoder3 -d /tmp/tmpmpg -t vcd -o /movies/vcd.mpg \\ -s /tmp/livestmp/991319584/audio -a 3 -k -p eimg - mpeg_encoder.py -q -d /tmp/tmpmpg -t svcd -o /movies/svcd.mpg \\ + lives_mpeg_encoder3 -q -d /tmp/tmpmpg -t svcd -o /movies/svcd.mpg \\ -s /tmp/livestmp/991319584/audio -a 3 -k -p eimg - mpeg_encoder.py -v -d /tmp/tmpmpg -t dvd -o /movies/dvd.mpg \\ + lives_mpeg_encoder3 -v -d /tmp/tmpmpg -t dvd -o /movies/dvd.mpg \\ -s /tmp/livestmp/991319584/audio -a 3 -k -p eimg If, for example, we only want to encode frames 100 to 150 we can run the following: - mpeg_encoder.py -v -d /tmp/tmpmpg -o /movies/selection.mpg \\ + lives_mpeg_encoder3 -v -d /tmp/tmpmpg -o /movies/selection.mpg \\ -a 3 -k -p eimg 100 150 Note that no audio has been selected ("-s"). This is because -mpeg_encoder.py cannot trim the audio to the appropriate length. +lives_mpeg_encoder3 cannot trim the audio to the appropriate length. You would need to use LiVES to do this. To delete all the enhanced images you can just remove "/tmp/tmpmpg". @@ -301,7 +301,7 @@ near the end of the movie the video trails the audio by, say, 0.2s, you can use the "-D" option as follows: - mpeg_encoder.py -d /tmp/livestmp/991319584 -o test.mpg -D 200 + lives_mpeg_encoder3 -d /tmp/livestmp/991319584 -o test.mpg -D 200 Note that negative time values are also allowed. @@ -311,7 +311,7 @@ for i in movie?.lv1 do mkdir /tmp/$i:r - mpeg_encoder.py -d /tmp/$i:r -o /tmp/$i:r.mpg -L $i + lives_mpeg_encoder3 -d /tmp/$i:r -o /tmp/$i:r.mpg -L $i rm -rf /tmp/$i:r done @@ -643,7 +643,7 @@ raise SystemExit if '-V' in opts: - print('mpeg_encoder.py version ' + version) + print('lives_mpeg_encoder3 version ' + version) raise SystemExit if ('-v' in opts) or ('-C' in opts):
View file
LiVES-2.2.7.tar.bz2/lives-plugins/marcos-encoders/lives_ogm_encoder -> LiVES-2.2.8.tar.bz2/lives-plugins/marcos-encoders/lives_ogm_encoder
Changed
@@ -4,7 +4,7 @@ locale.setlocale(locale.LC_NUMERIC,"") """ -ogm_encoder.py +lives_ogm_encoder Front-end to various programs needed to create OGM movies with some image-enhancing capabilities through the use of @@ -39,10 +39,10 @@ usage = \ """ -ogm_encoder.py -h -ogm_encoder.py -V -ogm_encoder.py -C -ogm_encoder.py [-o out] [-p pre] [-d dir] [-a aspect] [-D delay] +lives_ogm_encoder -h +lives_ogm_encoder -V +lives_ogm_encoder -C +lives_ogm_encoder [-o out] [-p pre] [-d dir] [-a aspect] [-D delay] [-q|-v] [-t type] [-k] [-e [[-w dir] [-c geom] [-r geom]]] [-s sndfile] [-b sndrate] [-f fpscode] [-L lv1file] [firstframe lastframe] @@ -73,13 +73,13 @@ -p pre the encoder assumes that sound and images are named using LiVES' conventions i.e. "audio" and "00000001.ext", "00000002.ext"... where "ext" is either "jpg" or "png". - However, ogm_encoder.py will create temporary files + However, lives_ogm_encoder will create temporary files which can be saved for later use (for example, after enhancing the images with "-e" , which may take a long time). These temporary files will be named "pre_00000001.ext", etc... where "pre" is either "eimg" or "rimg" and will be kept if the "-k" option is used. - ogm_encoder.py can then be run over the enhanced images + lives_ogm_encoder can then be run over the enhanced images only by selecting the appropriate prefix ("eimg" or "rimg") here. See "-e" to see what each prefix means. Default: "" (an empty string). @@ -231,7 +231,7 @@ In this example the movie is assumed to be 16:9. Then, in order to create an OGM file you can simply do the following: - ogm_encoder.py -d /tmp/livestmp/991319584 -o /movies/default.ogm -a 3 + lives_ogm_encoder -d /tmp/livestmp/991319584 -o /movies/default.ogm -a 3 and the clip "default.ogm" will be created in "/movies/" with the correct aspect ratio. @@ -245,7 +245,7 @@ images somewhat, so be careful about cropping/resizing, and remember to use dimensions which are multiples of 16): - ogm_encoder.py -v -d /tmp/livestmp/991319584 -w /tmp/tmpogm \\ + lives_ogm_encoder -v -d /tmp/livestmp/991319584 -w /tmp/tmpogm \\ -o /movies/download.ogm -a 3 -k -e -c "704x464+5+6" -r "352x240" Since we use the "-k" flag the enhanced images are kept (both full-size @@ -255,17 +255,17 @@ to re-use the enhanced images. So, for example, creating a high-quality clip at full size can be accomplished now as follows: - ogm_encoder.py -d /tmp/tmpogm -t hi -o /movies/archive.ogm \\ + lives_ogm_encoder -d /tmp/tmpogm -t hi -o /movies/archive.ogm \\ -s /tmp/livestmp/991319584/audio -a 3 -k -p eimg If, for example, we only want to encode frames 100 to 150 we can run the following: - ogm_encoder.py -v -d /tmp/tmpogm -o /movies/selection.ogm \\ + lives_ogm_encoder -v -d /tmp/tmpogm -o /movies/selection.ogm \\ -a 3 -k -p eimg 100 150 Note that no audio has been selected ("-s"). This is because -ogm_encoder.py cannot trim the audio to the appropriate length. +lives_ogm_encoder cannot trim the audio to the appropriate length. You would need to use LiVES to do this. To delete all the enhanced images you can just remove "/tmp/tmpogm". @@ -274,7 +274,7 @@ near the end of the movie the video trails the audio by, say, 0.2s, you can use the "-D" option as follows: - ogm_encoder.py -d /tmp/livestmp/991319584 -o test.ogm -D 200 + lives_ogm_encoder -d /tmp/livestmp/991319584 -o test.ogm -D 200 Note that negative time values are also allowed. @@ -284,7 +284,7 @@ for i in movie?.lv1 do mkdir /tmp/$i:r - ogm_encoder.py -d /tmp/$i:r -o /tmp/$i:r.ogm -L $i + lives_ogm_encoder -d /tmp/$i:r -o /tmp/$i:r.ogm -L $i rm -rf /tmp/$i:r done @@ -584,7 +584,7 @@ raise SystemExit if '-V' in opts: - print 'ogm_encoder.py version ' + version + print 'lives_ogm_encoder version ' + version raise SystemExit if ('-v' in opts) or ('-C' in opts):
View file
LiVES-2.2.7.tar.bz2/lives-plugins/marcos-encoders/lives_ogm_encoder3 -> LiVES-2.2.8.tar.bz2/lives-plugins/marcos-encoders/lives_ogm_encoder3
Changed
@@ -4,7 +4,7 @@ locale.setlocale(locale.LC_NUMERIC,"") """ -ogm_encoder.py +lives_ogm_encoder3 Front-end to various programs needed to create OGM movies with some image-enhancing capabilities through the use of @@ -31,10 +31,10 @@ usage = \ """ -ogm_encoder.py -h -ogm_encoder.py -V -ogm_encoder.py -C -ogm_encoder.py [-o out] [-p pre] [-d dir] [-a aspect] [-D delay] +lives_ogm_encoder3 -h +lives_ogm_encoder3 -V +lives_ogm_encoder3 -C +lives_ogm_encoder3 [-o out] [-p pre] [-d dir] [-a aspect] [-D delay] [-q|-v] [-t type] [-k] [-e [[-w dir] [-c geom] [-r geom]]] [-s sndfile] [-b sndrate] [-f fpscode] [-L lv1file] [firstframe lastframe] @@ -65,13 +65,13 @@ -p pre the encoder assumes that sound and images are named using LiVES' conventions i.e. "audio" and "00000001.ext", "00000002.ext"... where "ext" is either "jpg" or "png". - However, ogm_encoder.py will create temporary files + However, lives_ogm_encoder3 will create temporary files which can be saved for later use (for example, after enhancing the images with "-e" , which may take a long time). These temporary files will be named "pre_00000001.ext", etc... where "pre" is either "eimg" or "rimg" and will be kept if the "-k" option is used. - ogm_encoder.py can then be run over the enhanced images + lives_ogm_encoder3 can then be run over the enhanced images only by selecting the appropriate prefix ("eimg" or "rimg") here. See "-e" to see what each prefix means. Default: "" (an empty string). @@ -223,7 +223,7 @@ In this example the movie is assumed to be 16:9. Then, in order to create an OGM file you can simply do the following: - ogm_encoder.py -d /tmp/livestmp/991319584 -o /movies/default.ogm -a 3 + lives_ogm_encoder3 -d /tmp/livestmp/991319584 -o /movies/default.ogm -a 3 and the clip "default.ogm" will be created in "/movies/" with the correct aspect ratio. @@ -237,7 +237,7 @@ images somewhat, so be careful about cropping/resizing, and remember to use dimensions which are multiples of 16): - ogm_encoder.py -v -d /tmp/livestmp/991319584 -w /tmp/tmpogm \\ + lives_ogm_encoder3 -v -d /tmp/livestmp/991319584 -w /tmp/tmpogm \\ -o /movies/download.ogm -a 3 -k -e -c "704x464+5+6" -r "352x240" Since we use the "-k" flag the enhanced images are kept (both full-size @@ -247,17 +247,17 @@ to re-use the enhanced images. So, for example, creating a high-quality clip at full size can be accomplished now as follows: - ogm_encoder.py -d /tmp/tmpogm -t hi -o /movies/archive.ogm \\ + lives_ogm_encoder3 -d /tmp/tmpogm -t hi -o /movies/archive.ogm \\ -s /tmp/livestmp/991319584/audio -a 3 -k -p eimg If, for example, we only want to encode frames 100 to 150 we can run the following: - ogm_encoder.py -v -d /tmp/tmpogm -o /movies/selection.ogm \\ + lives_ogm_encoder3 -v -d /tmp/tmpogm -o /movies/selection.ogm \\ -a 3 -k -p eimg 100 150 Note that no audio has been selected ("-s"). This is because -ogm_encoder.py cannot trim the audio to the appropriate length. +lives_ogm_encoder3 cannot trim the audio to the appropriate length. You would need to use LiVES to do this. To delete all the enhanced images you can just remove "/tmp/tmpogm". @@ -266,7 +266,7 @@ near the end of the movie the video trails the audio by, say, 0.2s, you can use the "-D" option as follows: - ogm_encoder.py -d /tmp/livestmp/991319584 -o test.ogm -D 200 + lives_ogm_encoder3 -d /tmp/livestmp/991319584 -o test.ogm -D 200 Note that negative time values are also allowed. @@ -276,7 +276,7 @@ for i in movie?.lv1 do mkdir /tmp/$i:r - ogm_encoder.py -d /tmp/$i:r -o /tmp/$i:r.ogm -L $i + lives_ogm_encoder3 -d /tmp/$i:r -o /tmp/$i:r.ogm -L $i rm -rf /tmp/$i:r done @@ -569,7 +569,7 @@ raise SystemExit if '-V' in opts: - print('ogm_encoder.py version ' + version) + print('lives_ogm_encoder3 version ' + version) raise SystemExit if ('-v' in opts) or ('-C' in opts):
View file
LiVES-2.2.7.tar.bz2/lives-plugins/marcos-encoders/lives_theora_encoder -> LiVES-2.2.8.tar.bz2/lives-plugins/marcos-encoders/lives_theora_encoder
Changed
@@ -4,7 +4,7 @@ locale.setlocale(locale.LC_NUMERIC,"") """ -theora_encoder.py +lives_theora_encoder Front-end to various programs needed to create Ogg Theora movies with some image-enhancing capabilities through the use of @@ -46,10 +46,10 @@ usage = \ """ -theora_encoder.py -h -theora_encoder.py -V -theora_encoder.py -C -theora_encoder.py [-o out] [-p pre] [-d dir] [-a aspect] [-D delay*] +lives_theora_encoder -h +lives_theora_encoder -V +lives_theora_encoder -C +lives_theora_encoder [-o out] [-p pre] [-d dir] [-a aspect] [-D delay*] [-q|-v] [-t type] [-k] [-e [[-w dir] [-c geom] [-r geom]]] [-s sndfile] [-b sndrate] [-f fpscode] [-L lv1file] [firstframe lastframe] @@ -80,13 +80,13 @@ -p pre the encoder assumes that sound and images are named using LiVES' conventions i.e. "audio" and "00000001.ext", "00000002.ext"... where "ext" is either "jpg" or "png". - However, theora_encoder.py will create temporary files + However, lives_theora_encoder will create temporary files which can be saved for later use (for example, after enhancing the images with "-e" , which may take a long time). These temporary files will be named "pre_00000001.ext", etc... where "pre" is either "eimg" or "rimg" and will be kept if the "-k" option is used. - theora_encoder.py can then be run over the enhanced images + lives_theora_encoder can then be run over the enhanced images only by selecting the appropriate prefix ("eimg" or "rimg") here. See "-e" to see what each prefix means. Default: "" (an empty string). @@ -234,7 +234,7 @@ In this example the movie is assumed to be 16:9. Then, in order to create an ogg file you can simply do the following: - theora_encoder.py -d /tmp/livestmp/991319584 -o /movies/default.ogg -a 3 + lives_theora_encoder -d /tmp/livestmp/991319584 -o /movies/default.ogg -a 3 and the clip "default.ogg" will be created in "/movies/" with the correct aspect ratio. @@ -248,7 +248,7 @@ images somewhat, so be careful about cropping/resizing, and remember to use dimensions which are multiples of 16): - theora_encoder.py -v -d /tmp/livestmp/991319584 -w /tmp/tmpogg \\ + lives_theora_encoder -v -d /tmp/livestmp/991319584 -w /tmp/tmpogg \\ -o /movies/download.ogg -a 3 -k -e -c "704x464+5+6" -r "352x240" Since we use the "-k" flag the enhanced images are kept (both full-size @@ -258,17 +258,17 @@ to re-use the enhanced images. So, for example, creating a high-quality clip at full size can be accomplished now as follows: - theora_encoder.py -d /tmp/tmpogg -t hi -o /movies/archive.ogg \\ + lives_theora_encoder -d /tmp/tmpogg -t hi -o /movies/archive.ogg \\ -s /tmp/livestmp/991319584/audio -a 3 -k -p eimg If, for example, we only want to encode frames 100 to 150 we can run the following: - theora_encoder.py -v -d /tmp/tmpogg -o /movies/selection.ogg \\ + lives_theora_encoder -v -d /tmp/tmpogg -o /movies/selection.ogg \\ -a 3 -k -p eimg 100 150 Note that no audio has been selected ("-s"). This is because -theora_encoder.py cannot trim the audio to the appropriate length. +lives_theora_encoder cannot trim the audio to the appropriate length. You would need to use LiVES to do this. To delete all the enhanced images you can just remove "/tmp/tmpogg". @@ -277,7 +277,7 @@ near the end of the movie the video trails the audio by, say, 0.2s, you can use the "-D" option as follows: - theora_encoder.py -d /tmp/livestmp/991319584 -o test.ogg -D 200 + lives_theora_encoder -d /tmp/livestmp/991319584 -o test.ogg -D 200 Note that negative time values are also allowed ("-D" NOT IMPLEMENTED YET). @@ -287,7 +287,7 @@ for i in movie?.lv1 do mkdir /tmp/$i:r - theora_encoder.py -d /tmp/$i:r -o /tmp/$i:r.ogg -L $i + lives_theora_encoder -d /tmp/$i:r -o /tmp/$i:r.ogg -L $i rm -rf /tmp/$i:r done @@ -473,22 +473,17 @@ %(mplayer)s mf://%(syml)s%(img_pre)s*%(ext)s %(mplayer_opts)s %(std)s & """ % all_vars run(command) - command = """cd %(source_dir)s ; \\ -%(theora_encoder)s %(theora_opts)s -o "%(vidname)s" %(wav)s stream.yuv %(std)s -""" % all_vars - run(command) else: command = """cd %(source_dir)s ; \\ mkfifo -m 0600 stream.yuv ; \\ %(mplayer)s mf://%(syml)s%(img_pre)s*%(ext)s %(mplayer_opts)s %(std)s & """ % all_vars run(command) - command = """cd %(source_dir)s ; \\ -%(theora_encoder)s %(theora_opts)s -o "%(vidname)s" %(wav)s stream.yuv %(std)s -""" % all_vars - run(command) - + command = """cd %(source_dir)s ; \\ + %(theora_encoder)s %(theora_opts)s -o "%(vidname)s" %(wav)s stream.yuv %(std)s + """ % all_vars + run(command) if os.path.exists(os.path.join(source_dir, 'stream.yuv')): os.remove(os.path.join(source_dir, 'stream.yuv')) @@ -608,7 +603,7 @@ raise SystemExit if '-V' in opts: - print 'theora_encoder.py version ' + version + print 'lives_theora_encoder version ' + version raise SystemExit if ('-v' in opts) or ('-C' in opts):
View file
LiVES-2.2.7.tar.bz2/lives-plugins/marcos-encoders/lives_theora_encoder3 -> LiVES-2.2.8.tar.bz2/lives-plugins/marcos-encoders/lives_theora_encoder3
Changed
@@ -4,7 +4,7 @@ locale.setlocale(locale.LC_NUMERIC,"") """ -theora_encoder.py +lives_theora_encoder3 Front-end to various programs needed to create Ogg Theora movies with some image-enhancing capabilities through the use of @@ -46,10 +46,10 @@ usage = \ """ -theora_encoder.py -h -theora_encoder.py -V -theora_encoder.py -C -theora_encoder.py [-o out] [-p pre] [-d dir] [-a aspect] [-D delay*] +lives_theora_encoder3 -h +lives_theora_encoder3 -V +lives_theora_encoder3 -C +lives_theora_encoder3 [-o out] [-p pre] [-d dir] [-a aspect] [-D delay*] [-q|-v] [-t type] [-k] [-e [[-w dir] [-c geom] [-r geom]]] [-s sndfile] [-b sndrate] [-f fpscode] [-L lv1file] [firstframe lastframe] @@ -80,13 +80,13 @@ -p pre the encoder assumes that sound and images are named using LiVES' conventions i.e. "audio" and "00000001.ext", "00000002.ext"... where "ext" is either "jpg" or "png". - However, theora_encoder.py will create temporary files + However, lives_theora_encoder3 will create temporary files which can be saved for later use (for example, after enhancing the images with "-e" , which may take a long time). These temporary files will be named "pre_00000001.ext", etc... where "pre" is either "eimg" or "rimg" and will be kept if the "-k" option is used. - theora_encoder.py can then be run over the enhanced images + lives_theora_encoder3 can then be run over the enhanced images only by selecting the appropriate prefix ("eimg" or "rimg") here. See "-e" to see what each prefix means. Default: "" (an empty string). @@ -234,7 +234,7 @@ In this example the movie is assumed to be 16:9. Then, in order to create an ogg file you can simply do the following: - theora_encoder.py -d /tmp/livestmp/991319584 -o /movies/default.ogg -a 3 + lives_theora_encoder3 -d /tmp/livestmp/991319584 -o /movies/default.ogg -a 3 and the clip "default.ogg" will be created in "/movies/" with the correct aspect ratio. @@ -248,7 +248,7 @@ images somewhat, so be careful about cropping/resizing, and remember to use dimensions which are multiples of 16): - theora_encoder.py -v -d /tmp/livestmp/991319584 -w /tmp/tmpogg \\ + lives_theora_encoder3 -v -d /tmp/livestmp/991319584 -w /tmp/tmpogg \\ -o /movies/download.ogg -a 3 -k -e -c "704x464+5+6" -r "352x240" Since we use the "-k" flag the enhanced images are kept (both full-size @@ -258,17 +258,17 @@ to re-use the enhanced images. So, for example, creating a high-quality clip at full size can be accomplished now as follows: - theora_encoder.py -d /tmp/tmpogg -t hi -o /movies/archive.ogg \\ + lives_theora_encoder3 -d /tmp/tmpogg -t hi -o /movies/archive.ogg \\ -s /tmp/livestmp/991319584/audio -a 3 -k -p eimg If, for example, we only want to encode frames 100 to 150 we can run the following: - theora_encoder.py -v -d /tmp/tmpogg -o /movies/selection.ogg \\ + lives_theora_encoder3 -v -d /tmp/tmpogg -o /movies/selection.ogg \\ -a 3 -k -p eimg 100 150 Note that no audio has been selected ("-s"). This is because -theora_encoder.py cannot trim the audio to the appropriate length. +lives_theora_encoder3 cannot trim the audio to the appropriate length. You would need to use LiVES to do this. To delete all the enhanced images you can just remove "/tmp/tmpogg". @@ -277,7 +277,7 @@ near the end of the movie the video trails the audio by, say, 0.2s, you can use the "-D" option as follows: - theora_encoder.py -d /tmp/livestmp/991319584 -o test.ogg -D 200 + lives_theora_encoder3 -d /tmp/livestmp/991319584 -o test.ogg -D 200 Note that negative time values are also allowed ("-D" NOT IMPLEMENTED YET). @@ -287,7 +287,7 @@ for i in movie?.lv1 do mkdir /tmp/$i:r - theora_encoder.py -d /tmp/$i:r -o /tmp/$i:r.ogg -L $i + lives_theora_encoder3 -d /tmp/$i:r -o /tmp/$i:r.ogg -L $i rm -rf /tmp/$i:r done @@ -392,7 +392,7 @@ be_verbose = '' if which(theora_encoder2) != '': - theora_encoder = theora_encoder2 + theora_encoder = lives_theora_encoder2 if which(theora_encoder3) != '': theora_encoder = theora_encoder3 @@ -473,20 +473,18 @@ %(mplayer)s mf://%(syml)s%(img_pre)s*%(ext)s %(mplayer_opts)s %(std)s & """ % all_vars run(command) - command = """cd %(source_dir)s ; \\ -%(theora_encoder)s %(theora_opts)s -o "%(vidname)s" %(wav)s stream.yuv %(std)s -""" % all_vars - run(command) else: command = """cd %(source_dir)s ; \\ mkfifo -m 0600 stream.yuv ; \\ %(mplayer)s mf://%(syml)s%(img_pre)s*%(ext)s %(mplayer_opts)s %(std)s & """ % all_vars run(command) - command = """cd %(source_dir)s ; \\ + + + command = """cd %(source_dir)s ; \\ %(theora_encoder)s %(theora_opts)s -o "%(vidname)s" %(wav)s stream.yuv %(std)s """ % all_vars - run(command) + run(command) if os.path.exists(os.path.join(source_dir, 'stream.yuv')): os.remove(os.path.join(source_dir, 'stream.yuv')) @@ -606,7 +604,7 @@ raise SystemExit if '-V' in opts: - print('theora_encoder.py version ' + version) + print('lives_theora_encoder3 version ' + version) raise SystemExit if ('-v' in opts) or ('-C' in opts):
View file
LiVES-2.2.7.tar.bz2/lives-plugins/plugins/Makefile.in -> LiVES-2.2.8.tar.bz2/lives-plugins/plugins/Makefile.in
Changed
@@ -345,8 +345,6 @@ PNG_LIBS = @PNG_LIBS@ POSUB = @POSUB@ PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@ -PROJECTM_CFLAGS = @PROJECTM_CFLAGS@ -PROJECTM_LIBS = @PROJECTM_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ PTHREAD_LIBS = @PTHREAD_LIBS@
View file
LiVES-2.2.7.tar.bz2/lives-plugins/plugins/decoders/Makefile.am -> LiVES-2.2.8.tar.bz2/lives-plugins/plugins/decoders/Makefile.am
Changed
@@ -88,6 +88,10 @@ libav_cflags += -DHAVE_AVFORMAT_FIND_STREAM_INFO=1 endif +if HAVE_AVFORMAT_CLOSE_INPUT +libav_cflags += -DHAVE_AVFORMAT_CLOSE_INPUT=1 +endif + if HAVE_AVFORMAT_INTERNAL_H libav_cflags += -DHAVE_AVFORMAT_INTERNAL_H=1 endif
View file
LiVES-2.2.7.tar.bz2/lives-plugins/plugins/decoders/Makefile.in -> LiVES-2.2.8.tar.bz2/lives-plugins/plugins/decoders/Makefile.in
Changed
@@ -89,8 +89,9 @@ @HAVE_AVCODEC_ALLOC_CONTEXT3_TRUE@@HAVE_AVCODEC_TRUE@@HAVE_AVFORMAT_TRUE@@HAVE_AVUTIL_TRUE@am__append_8 = -DHAVE_AVCODEC_ALLOC_CONTEXT3=1 @HAVE_AVCODEC_TRUE@@HAVE_AVFORMAT_NEW_STREAM_TRUE@@HAVE_AVFORMAT_TRUE@@HAVE_AVUTIL_TRUE@am__append_9 = -DHAVE_AVFORMAT_NEW_STREAM=1 @HAVE_AVCODEC_TRUE@@HAVE_AVFORMAT_FIND_STREAM_INFO_TRUE@@HAVE_AVFORMAT_TRUE@@HAVE_AVUTIL_TRUE@am__append_10 = -DHAVE_AVFORMAT_FIND_STREAM_INFO=1 -@HAVE_AVCODEC_TRUE@@HAVE_AVFORMAT_INTERNAL_H_TRUE@@HAVE_AVFORMAT_TRUE@@HAVE_AVUTIL_TRUE@am__append_11 = -DHAVE_AVFORMAT_INTERNAL_H=1 -@HAVE_AVCODEC_TRUE@@HAVE_AVFORMAT_TRUE@@HAVE_AVUTIL_TRUE@@HAVE_AV_SET_PTS_INFO_TRUE@am__append_12 = -DHAVE_AV_SET_PTS_INFO=1 +@HAVE_AVCODEC_TRUE@@HAVE_AVFORMAT_CLOSE_INPUT_TRUE@@HAVE_AVFORMAT_TRUE@@HAVE_AVUTIL_TRUE@am__append_11 = -DHAVE_AVFORMAT_CLOSE_INPUT=1 +@HAVE_AVCODEC_TRUE@@HAVE_AVFORMAT_INTERNAL_H_TRUE@@HAVE_AVFORMAT_TRUE@@HAVE_AVUTIL_TRUE@am__append_12 = -DHAVE_AVFORMAT_INTERNAL_H=1 +@HAVE_AVCODEC_TRUE@@HAVE_AVFORMAT_TRUE@@HAVE_AVUTIL_TRUE@@HAVE_AV_SET_PTS_INFO_TRUE@am__append_13 = -DHAVE_AV_SET_PTS_INFO=1 subdir = lives-plugins/plugins/decoders DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ $(top_srcdir)/mkinstalldirs $(top_srcdir)/depcomp @@ -452,8 +453,6 @@ PNG_LIBS = @PNG_LIBS@ POSUB = @POSUB@ PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@ -PROJECTM_CFLAGS = @PROJECTM_CFLAGS@ -PROJECTM_LIBS = @PROJECTM_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ PTHREAD_LIBS = @PTHREAD_LIBS@ @@ -588,7 +587,8 @@ @HAVE_AVCODEC_TRUE@@HAVE_AVFORMAT_TRUE@@HAVE_AVUTIL_TRUE@ $(am__append_9) \ @HAVE_AVCODEC_TRUE@@HAVE_AVFORMAT_TRUE@@HAVE_AVUTIL_TRUE@ $(am__append_10) \ @HAVE_AVCODEC_TRUE@@HAVE_AVFORMAT_TRUE@@HAVE_AVUTIL_TRUE@ $(am__append_11) \ -@HAVE_AVCODEC_TRUE@@HAVE_AVFORMAT_TRUE@@HAVE_AVUTIL_TRUE@ $(am__append_12) +@HAVE_AVCODEC_TRUE@@HAVE_AVFORMAT_TRUE@@HAVE_AVUTIL_TRUE@ $(am__append_12) \ +@HAVE_AVCODEC_TRUE@@HAVE_AVFORMAT_TRUE@@HAVE_AVUTIL_TRUE@ $(am__append_13) @HAVE_AVCODEC_TRUE@@HAVE_AVFORMAT_TRUE@@HAVE_AVUTIL_TRUE@flv_libs = flv_decoder.la @HAVE_AVCODEC_TRUE@@HAVE_AVFORMAT_TRUE@@HAVE_AVUTIL_TRUE@FLVDEC_LIBS = @LIBAVCODEC_LIBS@ @LIBAVFORMAT_LIBS@ @HAVE_AVCODEC_TRUE@@HAVE_AVFORMAT_TRUE@@HAVE_AVUTIL_TRUE@FLVDEC_CFLAGS = @LIBAVFORMAT_CFLAGS@ @LIBAVCODEC_CFLAGS@ -Wno-deprecated-declarations
View file
LiVES-2.2.7.tar.bz2/lives-plugins/plugins/decoders/asf_decoder.c -> LiVES-2.2.8.tar.bz2/lives-plugins/plugins/decoders/asf_decoder.c
Changed
@@ -32,11 +32,9 @@ #include <unistd.h> #include <stdlib.h> #include <ctype.h> -#ifndef IS_MINGW -#ifndef IS_SOLARIS +#if !defined (IS_MINGW) && !defined (IS_SOLARIS) && !defined (__FreeBSD__) #include <endian.h> #endif -#endif #include <sys/stat.h> #include <pthread.h> @@ -1464,7 +1462,7 @@ if (priv->st->codec->extradata_size && (priv->st->codec->bits_per_coded_sample <= 8)) { -#ifndef IS_MINGW +#if !defined (IS_MINGW) && !defined (IS_SOLARIS) && !defined (__FreeBSD__) # if __BYTE_ORDER == __BIG_ENDIAN int i; for (i = 0; i < FFMIN(priv->st->codec->extradata_size, AVPALETTE_SIZE)/4; i++)
View file
LiVES-2.2.7.tar.bz2/lives-plugins/plugins/decoders/decplugin.h -> LiVES-2.2.8.tar.bz2/lives-plugins/plugins/decoders/decplugin.h
Changed
@@ -22,7 +22,7 @@ #include "../../../libweed/weed-palettes.h" #endif -#ifdef IS_DARWIN +#if defined (IS_DARWIN) || defined (__FreeBSD__) #ifndef lseek64 #define lseek64 lseek #endif
View file
LiVES-2.2.7.tar.bz2/lives-plugins/plugins/decoders/libav_helper.h -> LiVES-2.2.8.tar.bz2/lives-plugins/plugins/decoders/libav_helper.h
Changed
@@ -190,6 +190,11 @@ #define av_new_stream(a, b) avformat_new_stream(a, NULL) #endif +#if HAVE_AVFORMAT_CLOSE_INPUT +#define av_close_input_file(a) avformat_close_input(&a) +#endif + + #if !HAVE_AV_SET_PTS_INFO #if HAVE_AVFORMAT_INTERNAL_H
View file
LiVES-2.2.7.tar.bz2/lives-plugins/plugins/decoders/mpegts_decoder.c -> LiVES-2.2.8.tar.bz2/lives-plugins/plugins/decoders/mpegts_decoder.c
Changed
@@ -30,7 +30,7 @@ #include <ctype.h> #include <sys/stat.h> -#ifndef IS_MINGW +#if !defined (IS_MINGW) && !defined (IS_SOLARIS) && !defined (__FreeBSD__) #include <endian.h> #endif @@ -3814,7 +3814,8 @@ return TRUE; } -#ifndef IS_MINGW + +#if !defined (IS_MINGW) && !defined (IS_SOLARIS) && !defined (__FreeBSD__) # if __BYTE_ORDER == __BIG_ENDIAN @@ -3830,7 +3831,7 @@ #endif static ssize_t lives_write_le(int fd, const void *buf, size_t count) { -#ifndef IS_MINGW +#if !defined (IS_MINGW) && !defined (IS_SOLARIS) && !defined (__FreeBSD__) # if __BYTE_ORDER == __BIG_ENDIAN uint8_t xbuf[count]; reverse_bytes(xbuf,(const uint8_t *)buf,count); @@ -3846,7 +3847,7 @@ ssize_t lives_read_le(int fd, void *buf, size_t count) { -#ifndef IS_MINGW +#if !defined (IS_MINGW) && !defined (IS_SOLARIS) && !defined (__FreeBSD__) # if __BYTE_ORDER == __BIG_ENDIAN uint8_t xbuf[count]; ssize_t retval=read(fd,buf,count);
View file
LiVES-2.2.7.tar.bz2/lives-plugins/plugins/effects/Makefile.in -> LiVES-2.2.8.tar.bz2/lives-plugins/plugins/effects/Makefile.in
Changed
@@ -345,8 +345,6 @@ PNG_LIBS = @PNG_LIBS@ POSUB = @POSUB@ PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@ -PROJECTM_CFLAGS = @PROJECTM_CFLAGS@ -PROJECTM_LIBS = @PROJECTM_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ PTHREAD_LIBS = @PTHREAD_LIBS@
View file
LiVES-2.2.7.tar.bz2/lives-plugins/plugins/effects/RFXscripts/Makefile.in -> LiVES-2.2.8.tar.bz2/lives-plugins/plugins/effects/RFXscripts/Makefile.in
Changed
@@ -318,8 +318,6 @@ PNG_LIBS = @PNG_LIBS@ POSUB = @POSUB@ PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@ -PROJECTM_CFLAGS = @PROJECTM_CFLAGS@ -PROJECTM_LIBS = @PROJECTM_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ PTHREAD_LIBS = @PTHREAD_LIBS@
View file
LiVES-2.2.7.tar.bz2/lives-plugins/plugins/effects/compound/Makefile.in -> LiVES-2.2.8.tar.bz2/lives-plugins/plugins/effects/compound/Makefile.in
Changed
@@ -317,8 +317,6 @@ PNG_LIBS = @PNG_LIBS@ POSUB = @POSUB@ PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@ -PROJECTM_CFLAGS = @PROJECTM_CFLAGS@ -PROJECTM_LIBS = @PROJECTM_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ PTHREAD_LIBS = @PTHREAD_LIBS@
View file
LiVES-2.2.7.tar.bz2/lives-plugins/plugins/encoders/Makefile.in -> LiVES-2.2.8.tar.bz2/lives-plugins/plugins/encoders/Makefile.in
Changed
@@ -318,8 +318,6 @@ PNG_LIBS = @PNG_LIBS@ POSUB = @POSUB@ PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@ -PROJECTM_CFLAGS = @PROJECTM_CFLAGS@ -PROJECTM_LIBS = @PROJECTM_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ PTHREAD_LIBS = @PTHREAD_LIBS@
View file
LiVES-2.2.7.tar.bz2/lives-plugins/plugins/encoders/ffmpeg_encoder -> LiVES-2.2.8.tar.bz2/lives-plugins/plugins/encoders/ffmpeg_encoder
Changed
@@ -50,8 +50,8 @@ # On error, print error message and exit 1 # otherwise exit 0 - if (&location("ffmpeg") eq "") { - print "The ffmpeg binary was not found, please install it and try again !"; + if (&location("ffmpeg") eq "" && &location("avconv") eq "") { + print "The ffmpeg or avconv binary was not found, please install it and try again !"; exit 1; }
View file
LiVES-2.2.7.tar.bz2/lives-plugins/plugins/encoders/mencoder_encoder -> LiVES-2.2.8.tar.bz2/lives-plugins/plugins/encoders/mencoder_encoder
Changed
@@ -6,12 +6,13 @@ # see file COPYING or www.gnu.org for details ####################################################################### -# LiVES mencoder plugin v1.9 +# LiVES mencoder plugin v1.10 # 1.7 add kvcd back in # 1.8 use mjpeg with -ovc copy (thanks to Rich Felker for the suggestion) # 1.9 add ffv1 and png support (thanks to anonymous) # 1.91 add ffv1 image formats +# 1.93 get audio codec for encoding ####################################################################### @@ -37,7 +38,7 @@ if ($command eq "version") { - print "mencoder encoder plugin v1.92\n"; + print "mencoder encoder plugin v1.93\n"; exit 0; } @@ -145,6 +146,9 @@ &rc_set("output_type",$otype); } + # get audio codec + $aq=&rc_get("encoder_acodec"); + # set the codec $vcodec="mjpeg"; @@ -217,13 +221,13 @@ $audio_com.="-audiofile ".$audiofile." -oac lavc -lavcopts acodec=mp3"; } } - elsif ($aq==2) { + elsif ($aq==1) { $audio_com="-audiofile ".$audiofile." -oac copy"; } - elsif ($aq==4) { + elsif ($aq==2) { $audio_com="-audiofile ".$audiofile." -oac lavc -lavcopts acodec=mp2"; } - elsif ($aq==128) { + elsif ($aq==8) { $audio_com="-audiofile ".$audiofile." -oac lavc -lavcopts acodec=wmav2"; } }
View file
LiVES-2.2.7.tar.bz2/lives-plugins/plugins/encoders/multi_encoder -> LiVES-2.2.8.tar.bz2/lives-plugins/plugins/encoders/multi_encoder
Changed
@@ -82,7 +82,7 @@ XVID/MP3/AVI (various aspect ratios/frame rates) SNOW/MP3/AVI (various aspect ratios/frame rates) H.264/MP3/AVI (various aspect ratios/frame rates) -DIRAC/---/DRC (various aspect ratios/frame rates, no sound) +DIRAC/VORBIS/MKV (various aspect ratios/frame rates) VCD/SVCD/DVD (NTSC and PAL video) MNG (no sound) Animated GIF (no sound) @@ -180,11 +180,11 @@ if found: if hassubproc: - p = subprocess.Popen(['python', prog, '-C'],stdout=subprocess.PIPE) + p = subprocess.Popen(['python', wprog, '-C'],stdout=subprocess.PIPE) std_out_err=p.stdout else: - (std_in, std_out_err) = os.popen4('python ' + prog + ' -C') + (std_in, std_out_err) = os.popen4('python ' + wprog + ' -C') std_in.close() @@ -406,13 +406,14 @@ print 'mh-theora|Medium-High Quality OGG (THEORA/VORBIS)' + specs print 'hi-theora|High Quality OGG (THEORA/VORBIS)' + specs - # EXPERIMENTAL. Also, drc doesn't support sound yet (needs wrapper). + # EXPERIMENTAL. if is_installed(drc): - specs = '|0|%s,%s,%s,%s|drc|' % (ar, hb, vb, sr) - print 'lo-dirac|EXP Low Quality DRC (DIRAC/NONE)' + specs - print 'ml-dirac|EXP Medium-Low Quality DRC (DIRAC/NONE)' + specs - print 'mh-dirac|EXP Medium-High Quality DRC (DIRAC/NONE)' + specs - print 'hi-dirac|EXP High Quality DRC (DIRAC/NONE)' + specs + specs = '|8|%s,%s,%s,%s|mkv|' % (ar, hb, vb, sr) + print 'lo-dirac|EXP Low Quality Dirac (DIRAC/VORBIS/MKV)' + specs + print 'ml-dirac|EXP Medium-Low Quality Dirac (DIRAC/VORBIS/MKV)' + specs + print 'mh-dirac|EXP Medium-High Quality Dirac (DIRAC/VORBIS/MKV)' + specs + print 'hi-dirac|EXP High Quality Dirac (DIRAC/VORBIS/MKV)' + specs + print 'll-dirac|EXP Lossless Dirac (DIRAC/VORBIS/MKV)' + specs if is_installed(mng): specs = '|0|none|mng|'
View file
LiVES-2.2.7.tar.bz2/lives-plugins/plugins/encoders/multi_encoder3 -> LiVES-2.2.8.tar.bz2/lives-plugins/plugins/encoders/multi_encoder3
Changed
@@ -181,11 +181,11 @@ if found: if hassubproc: - p = subprocess.Popen(['python', prog, '-C'],stdout=subprocess.PIPE) + p = subprocess.Popen(['python', wprog, '-C'],stdout=subprocess.PIPE) std_out_err=p.stdout else: - (std_in, std_out_err) = os.popen4('python ' + prog + ' -C') + (std_in, std_out_err) = os.popen4('python ' + wprog + ' -C') std_in.close() @@ -407,13 +407,13 @@ print('mh-theora|Medium-High Quality OGG (THEORA/VORBIS)' + specs) print('hi-theora|High Quality OGG (THEORA/VORBIS)' + specs) - # EXPERIMENTAL. Also, drc doesn't support sound yet (needs wrapper). + # EXPERIMENTAL. if is_installed(drc): - specs = '|0|%s,%s,%s,%s|drc|' % (ar, hb, vb, sr) - print('lo-dirac|EXP Low Quality DRC (DIRAC/NONE)' + specs) - print('ml-dirac|EXP Medium-Low Quality DRC (DIRAC/NONE)' + specs) - print('mh-dirac|EXP Medium-High Quality DRC (DIRAC/NONE)' + specs) - print('hi-dirac|EXP High Quality DRC (DIRAC/NONE)' + specs) + specs = '|8|%s,%s,%s,%s|mkv|' % (ar, hb, vb, sr) + print 'lo-dirac|EXP Low Quality Dirac (DIRAC/VORBIS/MKV)' + specs + print 'ml-dirac|EXP Medium-Low Quality Dirac (DIRAC/VORBIS/MKV)' + specs + print 'mh-dirac|EXP Medium-High Quality Dirac (DIRAC/VORBIS/MKV)' + specs + print 'hi-dirac|EXP High Quality Dirac (DIRAC/VORBIS/MKV)' + specs if is_installed(mng): specs = '|0|none|mng|'
View file
LiVES-2.2.7.tar.bz2/lives-plugins/plugins/encoders/x264_encoder -> LiVES-2.2.8.tar.bz2/lives-plugins/plugins/encoders/x264_encoder
Changed
@@ -58,6 +58,7 @@ if (&location("mplayer2") eq "") { print "mplayer or mplayer2 was not found. Please install it and try again."; exit 1; + } } # end init code
View file
LiVES-2.2.7.tar.bz2/lives-plugins/plugins/playback/Makefile.in -> LiVES-2.2.8.tar.bz2/lives-plugins/plugins/playback/Makefile.in
Changed
@@ -345,8 +345,6 @@ PNG_LIBS = @PNG_LIBS@ POSUB = @POSUB@ PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@ -PROJECTM_CFLAGS = @PROJECTM_CFLAGS@ -PROJECTM_LIBS = @PROJECTM_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ PTHREAD_LIBS = @PTHREAD_LIBS@
View file
LiVES-2.2.7.tar.bz2/lives-plugins/plugins/playback/audiostream/Makefile.in -> LiVES-2.2.8.tar.bz2/lives-plugins/plugins/playback/audiostream/Makefile.in
Changed
@@ -318,8 +318,6 @@ PNG_LIBS = @PNG_LIBS@ POSUB = @POSUB@ PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@ -PROJECTM_CFLAGS = @PROJECTM_CFLAGS@ -PROJECTM_LIBS = @PROJECTM_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ PTHREAD_LIBS = @PTHREAD_LIBS@
View file
LiVES-2.2.7.tar.bz2/lives-plugins/plugins/playback/video/Makefile.in -> LiVES-2.2.8.tar.bz2/lives-plugins/plugins/playback/video/Makefile.in
Changed
@@ -469,8 +469,6 @@ PNG_LIBS = @PNG_LIBS@ POSUB = @POSUB@ PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@ -PROJECTM_CFLAGS = @PROJECTM_CFLAGS@ -PROJECTM_LIBS = @PROJECTM_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ PTHREAD_LIBS = @PTHREAD_LIBS@
View file
LiVES-2.2.7.tar.bz2/lives-plugins/plugins/playback/video/lives2lives_stream.c -> LiVES-2.2.8.tar.bz2/lives-plugins/plugins/playback/video/lives2lives_stream.c
Changed
@@ -9,6 +9,10 @@ #include <sys/types.h> #include <sys/socket.h> +#ifndef IS_MINGW +#include <netinet/in.h> +#endif + ////////////////////////////////////// static int palette_list[3];
View file
LiVES-2.2.7.tar.bz2/lives-plugins/themes/Makefile.in -> LiVES-2.2.8.tar.bz2/lives-plugins/themes/Makefile.in
Changed
@@ -375,8 +375,6 @@ PNG_LIBS = @PNG_LIBS@ POSUB = @POSUB@ PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@ -PROJECTM_CFLAGS = @PROJECTM_CFLAGS@ -PROJECTM_LIBS = @PROJECTM_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ PTHREAD_LIBS = @PTHREAD_LIBS@
View file
LiVES-2.2.7.tar.bz2/lives-plugins/themes/camera/Makefile.in -> LiVES-2.2.8.tar.bz2/lives-plugins/themes/camera/Makefile.in
Changed
@@ -315,8 +315,6 @@ PNG_LIBS = @PNG_LIBS@ POSUB = @POSUB@ PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@ -PROJECTM_CFLAGS = @PROJECTM_CFLAGS@ -PROJECTM_LIBS = @PROJECTM_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ PTHREAD_LIBS = @PTHREAD_LIBS@
View file
LiVES-2.2.7.tar.bz2/lives-plugins/themes/crayons-bright/Makefile.in -> LiVES-2.2.8.tar.bz2/lives-plugins/themes/crayons-bright/Makefile.in
Changed
@@ -315,8 +315,6 @@ PNG_LIBS = @PNG_LIBS@ POSUB = @POSUB@ PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@ -PROJECTM_CFLAGS = @PROJECTM_CFLAGS@ -PROJECTM_LIBS = @PROJECTM_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ PTHREAD_LIBS = @PTHREAD_LIBS@
View file
LiVES-2.2.7.tar.bz2/lives-plugins/themes/crayons/Makefile.in -> LiVES-2.2.8.tar.bz2/lives-plugins/themes/crayons/Makefile.in
Changed
@@ -315,8 +315,6 @@ PNG_LIBS = @PNG_LIBS@ POSUB = @POSUB@ PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@ -PROJECTM_CFLAGS = @PROJECTM_CFLAGS@ -PROJECTM_LIBS = @PROJECTM_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ PTHREAD_LIBS = @PTHREAD_LIBS@
View file
LiVES-2.2.7.tar.bz2/lives-plugins/themes/cutting_room/Makefile.in -> LiVES-2.2.8.tar.bz2/lives-plugins/themes/cutting_room/Makefile.in
Changed
@@ -315,8 +315,6 @@ PNG_LIBS = @PNG_LIBS@ POSUB = @POSUB@ PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@ -PROJECTM_CFLAGS = @PROJECTM_CFLAGS@ -PROJECTM_LIBS = @PROJECTM_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ PTHREAD_LIBS = @PTHREAD_LIBS@
View file
LiVES-2.2.7.tar.bz2/lives-plugins/themes/editor/Makefile.in -> LiVES-2.2.8.tar.bz2/lives-plugins/themes/editor/Makefile.in
Changed
@@ -315,8 +315,6 @@ PNG_LIBS = @PNG_LIBS@ POSUB = @POSUB@ PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@ -PROJECTM_CFLAGS = @PROJECTM_CFLAGS@ -PROJECTM_LIBS = @PROJECTM_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ PTHREAD_LIBS = @PTHREAD_LIBS@
View file
LiVES-2.2.7.tar.bz2/lives-plugins/themes/pinks/Makefile.in -> LiVES-2.2.8.tar.bz2/lives-plugins/themes/pinks/Makefile.in
Changed
@@ -315,8 +315,6 @@ PNG_LIBS = @PNG_LIBS@ POSUB = @POSUB@ PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@ -PROJECTM_CFLAGS = @PROJECTM_CFLAGS@ -PROJECTM_LIBS = @PROJECTM_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ PTHREAD_LIBS = @PTHREAD_LIBS@
View file
LiVES-2.2.7.tar.bz2/lives-plugins/weed-plugins/Makefile.in -> LiVES-2.2.8.tar.bz2/lives-plugins/weed-plugins/Makefile.in
Changed
@@ -674,8 +674,6 @@ PNG_LIBS = @PNG_LIBS@ POSUB = @POSUB@ PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@ -PROJECTM_CFLAGS = @PROJECTM_CFLAGS@ -PROJECTM_LIBS = @PROJECTM_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ PTHREAD_LIBS = @PTHREAD_LIBS@
View file
LiVES-2.2.7.tar.bz2/lives-plugins/weed-plugins/cairo/Makefile.in -> LiVES-2.2.8.tar.bz2/lives-plugins/weed-plugins/cairo/Makefile.in
Changed
@@ -365,8 +365,6 @@ PNG_LIBS = @PNG_LIBS@ POSUB = @POSUB@ PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@ -PROJECTM_CFLAGS = @PROJECTM_CFLAGS@ -PROJECTM_LIBS = @PROJECTM_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ PTHREAD_LIBS = @PTHREAD_LIBS@
View file
LiVES-2.2.7.tar.bz2/lives-plugins/weed-plugins/gdk/Makefile.in -> LiVES-2.2.8.tar.bz2/lives-plugins/weed-plugins/gdk/Makefile.in
Changed
@@ -411,8 +411,6 @@ PNG_LIBS = @PNG_LIBS@ POSUB = @POSUB@ PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@ -PROJECTM_CFLAGS = @PROJECTM_CFLAGS@ -PROJECTM_LIBS = @PROJECTM_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ PTHREAD_LIBS = @PTHREAD_LIBS@
View file
LiVES-2.2.7.tar.bz2/lives-plugins/weed-plugins/simple_blend.c -> LiVES-2.2.8.tar.bz2/lives-plugins/weed-plugins/simple_blend.c
Changed
@@ -91,7 +91,7 @@ register int i,j; for (i=0;i<256;i++) { - for (j=0;j<=256;j++) { + for (j=0;j<256;j++) { sdata->blend[i][j]=(unsigned char)((bf*i+bfn*j)>>8); } }
View file
LiVES-2.2.7.tar.bz2/m4/Makefile.in -> LiVES-2.2.8.tar.bz2/m4/Makefile.in
Changed
@@ -285,8 +285,6 @@ PNG_LIBS = @PNG_LIBS@ POSUB = @POSUB@ PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@ -PROJECTM_CFLAGS = @PROJECTM_CFLAGS@ -PROJECTM_LIBS = @PROJECTM_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ PTHREAD_LIBS = @PTHREAD_LIBS@
View file
LiVES-2.2.7.tar.bz2/menu-entries/LiVES.desktop -> LiVES-2.2.8.tar.bz2/menu-entries/LiVES.desktop
Changed
@@ -1,8 +1,9 @@ [Desktop Entry] -Name=LiVES -Comment=Video Editor/VJ tool +Name=LiVES +GenericName=Video Editor/VJ tool +Comment=A video editor and VJ program Categories=AudioVideo;AudioVideoEditing; Exec=lives -Icon=lives.xpm +Icon=lives Type=Application Terminal=false
View file
LiVES-2.2.7.tar.bz2/po/ar.po -> LiVES-2.2.8.tar.bz2/po/ar.po
Changed
@@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: lives\n" "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n" -"POT-Creation-Date: 2014-12-21 11:07-0300\n" +"POT-Creation-Date: 2015-02-08 17:18-0300\n" "PO-Revision-Date: 2013-03-14 12:31+0000\n" "Last-Translator: Launchpad Translations Administrators <Unknown>\n" "Language-Team: Arabic <ar@li.org>\n" @@ -19,7 +19,7 @@ "X-Generator: Launchpad (build 16546)\n" #. TRANSLATORS: do not translate this message -#: src/main.c:120 +#: src/main.c:118 msgid "" "Attention Translators !\n" "This message is intended for you, so please do not translate it.\n" @@ -28,22 +28,22 @@ "http://lives.sourceforge.net/TRANS-README.txt" msgstr "" -#: src/main.c:136 +#: src/main.c:134 #, c-format msgid "%s Warning: %s\n" msgstr "" -#: src/main.c:140 +#: src/main.c:138 #, c-format msgid "%s Critical error: %s\n" msgstr "" -#: src/main.c:141 +#: src/main.c:139 #, c-format msgid "%s Fatal error: %s\n" msgstr "" -#: src/main.c:178 +#: src/main.c:176 msgid "" "\n" "Unfortunately LiVES crashed.\n" @@ -57,7 +57,7 @@ "group_id=64341&atid=507139\n" "سيتم إنعاش البرنامج بعد إعادة تشغيله. وشكرا\n" -#: src/main.c:179 +#: src/main.c:177 msgid "" "\n" "\n" @@ -69,7 +69,7 @@ "عند الإبلاغ عن العثرات ، يرجى ذِكر نظام التشغيل الخاص بك ، والتوزيعة ، " "وإصدارة البرنامج." -#: src/main.c:182 +#: src/main.c:180 msgid "" "and any information shown below:\n" "\n" @@ -77,7 +77,7 @@ "وأية معلومات موضحة أدناه.\n" "\n" -#: src/main.c:186 +#: src/main.c:184 msgid "" "Please install gdb and then run LiVES with the -debug option to collect more " "information.\n" @@ -87,84 +87,84 @@ "المعلومات.\n" "\n" -#: src/main.c:194 +#: src/main.c:192 msgid "Preserving set.\n" msgstr "الحفاظ على ضبط\n" -#: src/main.c:638 +#: src/main.c:636 msgid "Resizing" msgstr "غيّر حجم" -#: src/main.c:645 +#: src/main.c:643 msgid "_Resize All Frames" msgstr "غيّر حجم جميع الإطارات" #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter") -#: src/main.c:897 +#: src/main.c:895 msgid "Any" msgstr "أيّ" #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified") -#: src/main.c:899 +#: src/main.c:897 msgid "None" msgstr "بدون" #. TRANSLATORS: text saying "recommended", for plugin names, etc. -#: src/main.c:901 +#: src/main.c:899 msgid "recommended" msgstr "مستحسن" #. TRANSLATORS: text saying "disabled", (as in "not enabled") -#: src/main.c:903 +#: src/main.c:901 msgid "disabled !" msgstr "معطّل !" #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected -#: src/main.c:905 +#: src/main.c:903 msgid "**The current layout**" msgstr "**التخطيط الحالي**" #. TRANSLATORS: adjective for "Built in" type effects -#: src/main.c:907 +#: src/main.c:905 msgid "Builtin" msgstr "مُضمَّن" #. TRANSLATORS: adjective for "Custom" type effects -#: src/main.c:909 +#: src/main.c:907 msgid "Custom" msgstr "مخصص" #. TRANSLATORS: adjective for "Test" type effects -#: src/main.c:911 +#: src/main.c:909 msgid "Test" msgstr "اختبار" -#: src/main.c:1056 +#: src/main.c:1054 msgid "Foreground" msgstr "" -#: src/main.c:1057 +#: src/main.c:1055 #, fuzzy msgid "Background" msgstr "_خلفية بيضاء" -#: src/main.c:1568 +#: src/main.c:1566 msgid "Loading realtime effect plugins..." msgstr "تحميل إضافات مؤثرات الوقت الحقيقي..." -#: src/main.c:1633 +#: src/main.c:1631 msgid "Starting jack audio server..." msgstr "بدء خادوم جاك الصوت..." -#: src/main.c:1635 +#: src/main.c:1633 msgid "Starting jack transport server..." msgstr "بدء خادوم نقل جاك" -#: src/main.c:1636 +#: src/main.c:1634 msgid "Connecting to jack transport server..." msgstr "يتصل بخادوم نقل جاك" -#: src/main.c:1665 +#: src/main.c:1663 #, c-format msgid "" "\n" @@ -176,114 +176,114 @@ "Alternatively, try to start lives with either \"lives -jackopts 16\", or " msgstr "" -#: src/main.c:1699 +#: src/main.c:1697 msgid "Starting pulse audio server..." msgstr "بدء خادوم بالص-اوديو..." -#: src/main.c:1767 +#: src/main.c:1765 msgid "Checking optional dependencies:" msgstr "التحقق من إكتشاف التبعيات" -#: src/main.c:1768 +#: src/main.c:1766 msgid "mplayer...detected..." msgstr "تم العثور علي mplayer" -#: src/main.c:1769 +#: src/main.c:1767 msgid "mplayer...NOT DETECTED..." msgstr "لم يتم العثور علي mplayer" -#: src/main.c:1770
View file
LiVES-2.2.7.tar.bz2/po/ca.po -> LiVES-2.2.8.tar.bz2/po/ca.po
Changed
@@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: lives\n" "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n" -"POT-Creation-Date: 2014-12-21 11:07-0300\n" +"POT-Creation-Date: 2015-02-08 17:18-0300\n" "PO-Revision-Date: 2013-03-14 12:31+0000\n" "Last-Translator: Launchpad Translations Administrators <Unknown>\n" "Language-Team: Catalan <ca@li.org>\n" @@ -19,7 +19,7 @@ "X-Generator: Launchpad (build 16546)\n" #. TRANSLATORS: do not translate this message -#: src/main.c:120 +#: src/main.c:118 msgid "" "Attention Translators !\n" "This message is intended for you, so please do not translate it.\n" @@ -28,22 +28,22 @@ "http://lives.sourceforge.net/TRANS-README.txt" msgstr "" -#: src/main.c:136 +#: src/main.c:134 #, c-format msgid "%s Warning: %s\n" msgstr "" -#: src/main.c:140 +#: src/main.c:138 #, c-format msgid "%s Critical error: %s\n" msgstr "" -#: src/main.c:141 +#: src/main.c:139 #, c-format msgid "%s Fatal error: %s\n" msgstr "" -#: src/main.c:178 +#: src/main.c:176 msgid "" "\n" "Unfortunately LiVES crashed.\n" @@ -57,7 +57,7 @@ "group_id=64341&atid=507139\n" "Gràcies. La recuperació ha de ser possible si es reinicia LiVES.\n" -#: src/main.c:179 +#: src/main.c:177 msgid "" "\n" "\n" @@ -69,7 +69,7 @@ "Quan es notifiqui una falla, si us plau poseu les dades del vostre sistema " "operatiu, distribució i la versió de LIVES (" -#: src/main.c:182 +#: src/main.c:180 msgid "" "and any information shown below:\n" "\n" @@ -77,7 +77,7 @@ "Tot seguit hi haurà alguna informació:\n" "\n" -#: src/main.c:186 +#: src/main.c:184 msgid "" "Please install gdb and then run LiVES with the -debug option to collect more " "information.\n" @@ -87,84 +87,84 @@ "informació.\n" "\n" -#: src/main.c:194 +#: src/main.c:192 msgid "Preserving set.\n" msgstr "Grup de seguretat.\n" -#: src/main.c:638 +#: src/main.c:636 msgid "Resizing" msgstr "Redimensionat" -#: src/main.c:645 +#: src/main.c:643 msgid "_Resize All Frames" msgstr "reconfigureu totes les finestres" #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter") -#: src/main.c:897 +#: src/main.c:895 msgid "Any" msgstr "qualsevol" #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified") -#: src/main.c:899 +#: src/main.c:897 msgid "None" msgstr "Cap" #. TRANSLATORS: text saying "recommended", for plugin names, etc. -#: src/main.c:901 +#: src/main.c:899 msgid "recommended" msgstr "Recomanat" #. TRANSLATORS: text saying "disabled", (as in "not enabled") -#: src/main.c:903 +#: src/main.c:901 msgid "disabled !" msgstr "Espatllat" #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected -#: src/main.c:905 +#: src/main.c:903 msgid "**The current layout**" msgstr "**El disseny actual**" #. TRANSLATORS: adjective for "Built in" type effects -#: src/main.c:907 +#: src/main.c:905 msgid "Builtin" msgstr "Incorporat" #. TRANSLATORS: adjective for "Custom" type effects -#: src/main.c:909 +#: src/main.c:907 msgid "Custom" msgstr "Personalitzat" #. TRANSLATORS: adjective for "Test" type effects -#: src/main.c:911 +#: src/main.c:909 msgid "Test" msgstr "Comprova" -#: src/main.c:1056 +#: src/main.c:1054 msgid "Foreground" msgstr "" -#: src/main.c:1057 +#: src/main.c:1055 #, fuzzy msgid "Background" msgstr "_Inici" -#: src/main.c:1568 +#: src/main.c:1566 msgid "Loading realtime effect plugins..." msgstr "Carregant connexió d'efectes reals" -#: src/main.c:1633 +#: src/main.c:1631 msgid "Starting jack audio server..." msgstr "Començant connexió de servidor d'audio jack..." -#: src/main.c:1635 +#: src/main.c:1633 msgid "Starting jack transport server..." msgstr "" -#: src/main.c:1636 +#: src/main.c:1634 msgid "Connecting to jack transport server..." msgstr "" -#: src/main.c:1665 +#: src/main.c:1663 #, c-format msgid "" "\n" @@ -176,114 +176,114 @@ "Alternatively, try to start lives with either \"lives -jackopts 16\", or " msgstr "" -#: src/main.c:1699 +#: src/main.c:1697 msgid "Starting pulse audio server..." msgstr "Començant servidor d'audio pulsant..." -#: src/main.c:1767 +#: src/main.c:1765 msgid "Checking optional dependencies:" msgstr "Comprovant dependències opcionals:" -#: src/main.c:1768 +#: src/main.c:1766 msgid "mplayer...detected..." msgstr "mplayer...detectat..." -#: src/main.c:1769 +#: src/main.c:1767 msgid "mplayer...NOT DETECTED..." msgstr "mplayer...NO S'HA DETECTAT..." -#: src/main.c:1770
View file
LiVES-2.2.7.tar.bz2/po/cs.po -> LiVES-2.2.8.tar.bz2/po/cs.po
Changed
@@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: LiVEScz\n" "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n" -"POT-Creation-Date: 2014-12-21 11:07-0300\n" +"POT-Creation-Date: 2015-02-08 17:18-0300\n" "PO-Revision-Date: 2013-03-14 12:31+0000\n" "Last-Translator: Launchpad Translations Administrators <Unknown>\n" "Language-Team: <martin@svobodicz.com, ales@mur.at>\n" @@ -21,7 +21,7 @@ "X-Poedit-Language: Czech\n" #. TRANSLATORS: do not translate this message -#: src/main.c:120 +#: src/main.c:118 msgid "" "Attention Translators !\n" "This message is intended for you, so please do not translate it.\n" @@ -30,22 +30,22 @@ "http://lives.sourceforge.net/TRANS-README.txt" msgstr "" -#: src/main.c:136 +#: src/main.c:134 #, c-format msgid "%s Warning: %s\n" msgstr "" -#: src/main.c:140 +#: src/main.c:138 #, c-format msgid "%s Critical error: %s\n" msgstr "" -#: src/main.c:141 +#: src/main.c:139 #, c-format msgid "%s Fatal error: %s\n" msgstr "" -#: src/main.c:178 +#: src/main.c:176 msgid "" "\n" "Unfortunately LiVES crashed.\n" @@ -59,7 +59,7 @@ "group_id=64341&atid=507139\n" "Dzięki. Odzyskiwanie powinno być możliwe po uruchomieniu LiVES.\n" -#: src/main.c:179 +#: src/main.c:177 msgid "" "\n" "\n" @@ -71,7 +71,7 @@ "Przy zgłaszaniu awarii, należy podać szczegółowe informacje na temat systemu " "operacyjnego, dystrybucję i wersję LiVES (" -#: src/main.c:182 +#: src/main.c:180 msgid "" "and any information shown below:\n" "\n" @@ -79,91 +79,91 @@ "oraz wszelkie informacje przedstawione poniżej:\n" "\n" -#: src/main.c:186 +#: src/main.c:184 msgid "" "Please install gdb and then run LiVES with the -debug option to collect more " "information.\n" "\n" msgstr "" -#: src/main.c:194 +#: src/main.c:192 msgid "Preserving set.\n" msgstr "Zachování nastavení.\n" -#: src/main.c:638 +#: src/main.c:636 msgid "Resizing" msgstr "Měním velikost" -#: src/main.c:645 +#: src/main.c:643 msgid "_Resize All Frames" msgstr "Změnit velikost všech _snímků" #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter") -#: src/main.c:897 +#: src/main.c:895 msgid "Any" msgstr "Libovolný" #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified") -#: src/main.c:899 +#: src/main.c:897 msgid "None" msgstr "Žádný" #. TRANSLATORS: text saying "recommended", for plugin names, etc. -#: src/main.c:901 +#: src/main.c:899 msgid "recommended" msgstr "doporučeno" #. TRANSLATORS: text saying "disabled", (as in "not enabled") -#: src/main.c:903 +#: src/main.c:901 msgid "disabled !" msgstr "zakázáno!" #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected -#: src/main.c:905 +#: src/main.c:903 msgid "**The current layout**" msgstr "**Bieżący układ**" #. TRANSLATORS: adjective for "Built in" type effects -#: src/main.c:907 +#: src/main.c:905 msgid "Builtin" msgstr "Vestavěno" #. TRANSLATORS: adjective for "Custom" type effects -#: src/main.c:909 +#: src/main.c:907 msgid "Custom" msgstr "Vlastní" #. TRANSLATORS: adjective for "Test" type effects -#: src/main.c:911 +#: src/main.c:909 msgid "Test" msgstr "Test" -#: src/main.c:1056 +#: src/main.c:1054 msgid "Foreground" msgstr "" -#: src/main.c:1057 +#: src/main.c:1055 #, fuzzy msgid "Background" msgstr "_Prázdné pozadí" -#: src/main.c:1568 +#: src/main.c:1566 msgid "Loading realtime effect plugins..." msgstr "Načítám pluginy pro efekty v reálném času..." -#: src/main.c:1633 +#: src/main.c:1631 msgid "Starting jack audio server..." msgstr "Spouštím zvukový server JACK..." -#: src/main.c:1635 +#: src/main.c:1633 msgid "Starting jack transport server..." msgstr "" -#: src/main.c:1636 +#: src/main.c:1634 msgid "Connecting to jack transport server..." msgstr "" -#: src/main.c:1665 +#: src/main.c:1663 #, c-format msgid "" "\n" @@ -175,114 +175,114 @@ "Alternatively, try to start lives with either \"lives -jackopts 16\", or " msgstr "" -#: src/main.c:1699 +#: src/main.c:1697 msgid "Starting pulse audio server..." msgstr "" -#: src/main.c:1767 +#: src/main.c:1765 msgid "Checking optional dependencies:" msgstr "Kontrola dodatečných závislostí:" -#: src/main.c:1768 +#: src/main.c:1766 msgid "mplayer...detected..." msgstr "mplayer... nalezen..." -#: src/main.c:1769 +#: src/main.c:1767 msgid "mplayer...NOT DETECTED..." msgstr "mplayer... NENALEZEN..." -#: src/main.c:1770 +#: src/main.c:1768
View file
LiVES-2.2.7.tar.bz2/po/da.po -> LiVES-2.2.8.tar.bz2/po/da.po
Changed
@@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: lives\n" "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n" -"POT-Creation-Date: 2014-12-21 11:07-0300\n" +"POT-Creation-Date: 2015-02-08 17:18-0300\n" "PO-Revision-Date: 2013-03-14 12:31+0000\n" "Last-Translator: Launchpad Translations Administrators <Unknown>\n" "Language-Team: Danish <da@li.org>\n" @@ -19,7 +19,7 @@ "X-Generator: Launchpad (build 16546)\n" #. TRANSLATORS: do not translate this message -#: src/main.c:120 +#: src/main.c:118 msgid "" "Attention Translators !\n" "This message is intended for you, so please do not translate it.\n" @@ -28,22 +28,22 @@ "http://lives.sourceforge.net/TRANS-README.txt" msgstr "" -#: src/main.c:136 +#: src/main.c:134 #, c-format msgid "%s Warning: %s\n" msgstr "" -#: src/main.c:140 +#: src/main.c:138 #, c-format msgid "%s Critical error: %s\n" msgstr "" -#: src/main.c:141 +#: src/main.c:139 #, c-format msgid "%s Fatal error: %s\n" msgstr "" -#: src/main.c:178 +#: src/main.c:176 msgid "" "\n" "Unfortunately LiVES crashed.\n" @@ -52,7 +52,7 @@ "Thanks. Recovery should be possible if you restart LiVES.\n" msgstr "" -#: src/main.c:179 +#: src/main.c:177 msgid "" "\n" "\n" @@ -60,97 +60,97 @@ "distribution, and the LiVES version (" msgstr "" -#: src/main.c:182 +#: src/main.c:180 msgid "" "and any information shown below:\n" "\n" msgstr "" -#: src/main.c:186 +#: src/main.c:184 msgid "" "Please install gdb and then run LiVES with the -debug option to collect more " "information.\n" "\n" msgstr "" -#: src/main.c:194 +#: src/main.c:192 msgid "Preserving set.\n" msgstr "" -#: src/main.c:638 +#: src/main.c:636 msgid "Resizing" msgstr "Ændrer størrelse" -#: src/main.c:645 +#: src/main.c:643 msgid "_Resize All Frames" msgstr "" #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter") -#: src/main.c:897 +#: src/main.c:895 msgid "Any" msgstr "Enhver" #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified") -#: src/main.c:899 +#: src/main.c:897 msgid "None" msgstr "Ingen" #. TRANSLATORS: text saying "recommended", for plugin names, etc. -#: src/main.c:901 +#: src/main.c:899 msgid "recommended" msgstr "anbefalet" #. TRANSLATORS: text saying "disabled", (as in "not enabled") -#: src/main.c:903 +#: src/main.c:901 msgid "disabled !" msgstr "" #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected -#: src/main.c:905 +#: src/main.c:903 msgid "**The current layout**" msgstr "" #. TRANSLATORS: adjective for "Built in" type effects -#: src/main.c:907 +#: src/main.c:905 msgid "Builtin" msgstr "Indbygget" #. TRANSLATORS: adjective for "Custom" type effects -#: src/main.c:909 +#: src/main.c:907 msgid "Custom" msgstr "Brugerdefineret" #. TRANSLATORS: adjective for "Test" type effects -#: src/main.c:911 +#: src/main.c:909 msgid "Test" msgstr "Test" -#: src/main.c:1056 +#: src/main.c:1054 msgid "Foreground" msgstr "" -#: src/main.c:1057 +#: src/main.c:1055 #, fuzzy msgid "Background" msgstr "_Start farve" -#: src/main.c:1568 +#: src/main.c:1566 msgid "Loading realtime effect plugins..." msgstr "" -#: src/main.c:1633 +#: src/main.c:1631 msgid "Starting jack audio server..." msgstr "" -#: src/main.c:1635 +#: src/main.c:1633 msgid "Starting jack transport server..." msgstr "" -#: src/main.c:1636 +#: src/main.c:1634 msgid "Connecting to jack transport server..." msgstr "" -#: src/main.c:1665 +#: src/main.c:1663 #, c-format msgid "" "\n" @@ -162,112 +162,112 @@ "Alternatively, try to start lives with either \"lives -jackopts 16\", or " msgstr "" -#: src/main.c:1699 +#: src/main.c:1697 msgid "Starting pulse audio server..." msgstr "" -#: src/main.c:1767 +#: src/main.c:1765 msgid "Checking optional dependencies:" msgstr "" -#: src/main.c:1768 +#: src/main.c:1766 msgid "mplayer...detected..." msgstr "" -#: src/main.c:1769 +#: src/main.c:1767 msgid "mplayer...NOT DETECTED..." msgstr "" -#: src/main.c:1770 +#: src/main.c:1768 msgid "mplayer2...detected..." msgstr ""
View file
LiVES-2.2.7.tar.bz2/po/de_DE.po -> LiVES-2.2.8.tar.bz2/po/de_DE.po
Changed
@@ -2,7 +2,7 @@ msgstr "" "Project-Id-Version: Lives 0.9.5\n" "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n" -"POT-Creation-Date: 2014-12-21 11:07-0300\n" +"POT-Creation-Date: 2015-02-08 17:18-0300\n" "PO-Revision-Date: 2013-11-30 14:32+0000\n" "Last-Translator: h3ndrik <Unknown>\n" "Language-Team: Herbert U. Hübner <herbert.u.huebner@friendglow.net>\n" @@ -16,7 +16,7 @@ "X-Poedit-Language: German\n" #. TRANSLATORS: do not translate this message -#: src/main.c:120 +#: src/main.c:118 msgid "" "Attention Translators !\n" "This message is intended for you, so please do not translate it.\n" @@ -25,22 +25,22 @@ "http://lives.sourceforge.net/TRANS-README.txt" msgstr "" -#: src/main.c:136 +#: src/main.c:134 #, c-format msgid "%s Warning: %s\n" msgstr "%s Warnung: %s\n" -#: src/main.c:140 +#: src/main.c:138 #, c-format msgid "%s Critical error: %s\n" msgstr "%s Kritischer Fehler: %s\n" -#: src/main.c:141 +#: src/main.c:139 #, c-format msgid "%s Fatal error: %s\n" msgstr "%s Fataler Fehler: %s\n" -#: src/main.c:178 +#: src/main.c:176 msgid "" "\n" "Unfortunately LiVES crashed.\n" @@ -55,7 +55,7 @@ "Danke. Projektwiederherstellung sollte beim nächsten Start von LiVES möglich " "sein.\n" -#: src/main.c:179 +#: src/main.c:177 msgid "" "\n" "\n" @@ -67,7 +67,7 @@ "Absturzberichte bitte mit Details über das Betriebssystem, Distribution und " "die LiVES-Version versehen (" -#: src/main.c:182 +#: src/main.c:180 msgid "" "and any information shown below:\n" "\n" @@ -75,7 +75,7 @@ "und die Informationen, die unten angezeigt werden:\n" "\n" -#: src/main.c:186 +#: src/main.c:184 msgid "" "Please install gdb and then run LiVES with the -debug option to collect more " "information.\n" @@ -85,83 +85,83 @@ "um weitere Informationen zu sammeln\n" "\n" -#: src/main.c:194 +#: src/main.c:192 msgid "Preserving set.\n" msgstr "Set wird erhalten.\n" -#: src/main.c:638 +#: src/main.c:636 msgid "Resizing" msgstr "Skalieren" -#: src/main.c:645 +#: src/main.c:643 msgid "_Resize All Frames" msgstr "Alle Frames _skalieren" #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter") -#: src/main.c:897 +#: src/main.c:895 msgid "Any" msgstr "Beliebig" #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified") -#: src/main.c:899 +#: src/main.c:897 msgid "None" msgstr "Kein(e)" #. TRANSLATORS: text saying "recommended", for plugin names, etc. -#: src/main.c:901 +#: src/main.c:899 msgid "recommended" msgstr "empfohlen" #. TRANSLATORS: text saying "disabled", (as in "not enabled") -#: src/main.c:903 +#: src/main.c:901 msgid "disabled !" msgstr "deaktiviert!" #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected -#: src/main.c:905 +#: src/main.c:903 msgid "**The current layout**" msgstr "**Momentanes Layout**" #. TRANSLATORS: adjective for "Built in" type effects -#: src/main.c:907 +#: src/main.c:905 msgid "Builtin" msgstr "Eingebaut" #. TRANSLATORS: adjective for "Custom" type effects -#: src/main.c:909 +#: src/main.c:907 msgid "Custom" msgstr "Benutzerdefiniert" #. TRANSLATORS: adjective for "Test" type effects -#: src/main.c:911 +#: src/main.c:909 msgid "Test" msgstr "Test" -#: src/main.c:1056 +#: src/main.c:1054 msgid "Foreground" msgstr "" -#: src/main.c:1057 +#: src/main.c:1055 msgid "Background" msgstr "" -#: src/main.c:1568 +#: src/main.c:1566 msgid "Loading realtime effect plugins..." msgstr "Lade Echtzeit-Effekt Plugins..." -#: src/main.c:1633 +#: src/main.c:1631 msgid "Starting jack audio server..." msgstr "Jack Audio Server wird gestartet..." -#: src/main.c:1635 +#: src/main.c:1633 msgid "Starting jack transport server..." msgstr "Jack Transport Server wird gestartet..." -#: src/main.c:1636 +#: src/main.c:1634 msgid "Connecting to jack transport server..." msgstr "Verbindung zum Jack Transport Server wird hergestellt..." -#: src/main.c:1665 +#: src/main.c:1663 #, c-format msgid "" "\n" @@ -182,114 +182,114 @@ "Alternativ, Versuchen Sie LiVES entweder mit der Option \"-jackopts 16\" zu " "starten, oder " -#: src/main.c:1699 +#: src/main.c:1697 msgid "Starting pulse audio server..." msgstr "PulseAudio Server wird gestartet..." -#: src/main.c:1767 +#: src/main.c:1765 msgid "Checking optional dependencies:" msgstr "Optionale Abhängigkeiten werden überprüft:" -#: src/main.c:1768 +#: src/main.c:1766 msgid "mplayer...detected..." msgstr "" -#: src/main.c:1769 +#: src/main.c:1767 msgid "mplayer...NOT DETECTED..." msgstr "" -#: src/main.c:1770 +#: src/main.c:1768
View file
LiVES-2.2.7.tar.bz2/po/en_GB.po -> LiVES-2.2.8.tar.bz2/po/en_GB.po
Changed
@@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: lives\n" "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n" -"POT-Creation-Date: 2014-12-21 11:07-0300\n" +"POT-Creation-Date: 2015-02-08 17:18-0300\n" "PO-Revision-Date: 2013-11-23 20:55+0000\n" "Last-Translator: Andi Chandler <Unknown>\n" "Language-Team: English (United Kingdom) <en_GB@li.org>\n" @@ -19,7 +19,7 @@ "X-Generator: Launchpad (build 16976)\n" #. TRANSLATORS: do not translate this message -#: src/main.c:120 +#: src/main.c:118 msgid "" "Attention Translators !\n" "This message is intended for you, so please do not translate it.\n" @@ -33,22 +33,22 @@ "All translators should read the LiVES translation notes at\n" "http://lives.sourceforge.net/TRANS-README.txt" -#: src/main.c:136 +#: src/main.c:134 #, c-format msgid "%s Warning: %s\n" msgstr "%s Warning: %s\n" -#: src/main.c:140 +#: src/main.c:138 #, c-format msgid "%s Critical error: %s\n" msgstr "%s Critical error: %s\n" -#: src/main.c:141 +#: src/main.c:139 #, c-format msgid "%s Fatal error: %s\n" msgstr "%s Fatal error: %s\n" -#: src/main.c:178 +#: src/main.c:176 msgid "" "\n" "Unfortunately LiVES crashed.\n" @@ -62,7 +62,7 @@ "group_id=64341&atid=507139\n" "Thanks. Recovery should be possible if you restart LiVES.\n" -#: src/main.c:179 +#: src/main.c:177 msgid "" "\n" "\n" @@ -74,7 +74,7 @@ "When reporting crashes, please include details of your operating system, " "distribution, and the LiVES version (" -#: src/main.c:182 +#: src/main.c:180 msgid "" "and any information shown below:\n" "\n" @@ -82,7 +82,7 @@ "and any information shown below:\n" "\n" -#: src/main.c:186 +#: src/main.c:184 msgid "" "Please install gdb and then run LiVES with the -debug option to collect more " "information.\n" @@ -92,83 +92,83 @@ "information.\n" "\n" -#: src/main.c:194 +#: src/main.c:192 msgid "Preserving set.\n" msgstr "Preserving set.\n" -#: src/main.c:638 +#: src/main.c:636 msgid "Resizing" msgstr "Resizing" -#: src/main.c:645 +#: src/main.c:643 msgid "_Resize All Frames" msgstr "_Resize All Frames" #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter") -#: src/main.c:897 +#: src/main.c:895 msgid "Any" msgstr "Any" #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified") -#: src/main.c:899 +#: src/main.c:897 msgid "None" msgstr "None" #. TRANSLATORS: text saying "recommended", for plugin names, etc. -#: src/main.c:901 +#: src/main.c:899 msgid "recommended" msgstr "recommended" #. TRANSLATORS: text saying "disabled", (as in "not enabled") -#: src/main.c:903 +#: src/main.c:901 msgid "disabled !" msgstr "disabled !" #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected -#: src/main.c:905 +#: src/main.c:903 msgid "**The current layout**" msgstr "**The current layout**" #. TRANSLATORS: adjective for "Built in" type effects -#: src/main.c:907 +#: src/main.c:905 msgid "Builtin" msgstr "Builtin" #. TRANSLATORS: adjective for "Custom" type effects -#: src/main.c:909 +#: src/main.c:907 msgid "Custom" msgstr "Custom" #. TRANSLATORS: adjective for "Test" type effects -#: src/main.c:911 +#: src/main.c:909 msgid "Test" msgstr "Test" -#: src/main.c:1056 +#: src/main.c:1054 msgid "Foreground" msgstr "Foreground" -#: src/main.c:1057 +#: src/main.c:1055 msgid "Background" msgstr "Background" -#: src/main.c:1568 +#: src/main.c:1566 msgid "Loading realtime effect plugins..." msgstr "Loading realtime effect plugins..." -#: src/main.c:1633 +#: src/main.c:1631 msgid "Starting jack audio server..." msgstr "Starting jack audio server..." -#: src/main.c:1635 +#: src/main.c:1633 msgid "Starting jack transport server..." msgstr "Starting jack transport server..." -#: src/main.c:1636 +#: src/main.c:1634 msgid "Connecting to jack transport server..." msgstr "Connecting to jack transport server..." -#: src/main.c:1665 +#: src/main.c:1663 #, c-format msgid "" "\n" @@ -187,114 +187,114 @@ "\n" "Alternatively, try to start lives with either \"lives -jackopts 16\", or " -#: src/main.c:1699 +#: src/main.c:1697 msgid "Starting pulse audio server..." msgstr "Starting pulse audio server..." -#: src/main.c:1767 +#: src/main.c:1765 msgid "Checking optional dependencies:" msgstr "Checking optional dependencies:" -#: src/main.c:1768 +#: src/main.c:1766 msgid "mplayer...detected..." msgstr "mplayer...detected..." -#: src/main.c:1769 +#: src/main.c:1767 msgid "mplayer...NOT DETECTED..." msgstr "mplayer...NOT DETECTED..." -#: src/main.c:1770 +#: src/main.c:1768
View file
LiVES-2.2.7.tar.bz2/po/es.po -> LiVES-2.2.8.tar.bz2/po/es.po
Changed
@@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: lives\n" "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n" -"POT-Creation-Date: 2014-12-21 11:07-0300\n" +"POT-Creation-Date: 2015-02-08 17:18-0300\n" "PO-Revision-Date: 2014-01-01 22:33+0000\n" "Last-Translator: Adolfo Jayme <fitoschido@gmail.com>\n" "Language-Team: Spanish <es@li.org>\n" @@ -19,7 +19,7 @@ "X-Generator: Launchpad (build 16976)\n" #. TRANSLATORS: do not translate this message -#: src/main.c:120 +#: src/main.c:118 msgid "" "Attention Translators !\n" "This message is intended for you, so please do not translate it.\n" @@ -33,22 +33,22 @@ "All translators should read the LiVES translation notes at\n" "http://lives.sourceforge.net/TRANS-README.txt" -#: src/main.c:136 +#: src/main.c:134 #, c-format msgid "%s Warning: %s\n" msgstr "%s Aviso: %s\n" -#: src/main.c:140 +#: src/main.c:138 #, c-format msgid "%s Critical error: %s\n" msgstr "%s Error crítico: %s\n" -#: src/main.c:141 +#: src/main.c:139 #, c-format msgid "%s Fatal error: %s\n" msgstr "%s Error grave: %s\n" -#: src/main.c:178 +#: src/main.c:176 msgid "" "\n" "Unfortunately LiVES crashed.\n" @@ -62,7 +62,7 @@ "group_id=64341&atid=507139\n" "Gracias. Debería poder recuperar su sesión reiniciando LiVES.\n" -#: src/main.c:179 +#: src/main.c:177 msgid "" "\n" "\n" @@ -74,7 +74,7 @@ "Cuando informe del problema, incluya detalles de su sistema operativo, " "distribución, y la versión de LiVES (" -#: src/main.c:182 +#: src/main.c:180 msgid "" "and any information shown below:\n" "\n" @@ -82,7 +82,7 @@ "y la información mostrada debajo:\n" "\n" -#: src/main.c:186 +#: src/main.c:184 msgid "" "Please install gdb and then run LiVES with the -debug option to collect more " "information.\n" @@ -92,83 +92,83 @@ "información.\n" "\n" -#: src/main.c:194 +#: src/main.c:192 msgid "Preserving set.\n" msgstr "Preservando el conjunto.\n" -#: src/main.c:638 +#: src/main.c:636 msgid "Resizing" msgstr "Redimensionando" -#: src/main.c:645 +#: src/main.c:643 msgid "_Resize All Frames" msgstr "_Redimensionar todos los cuadros" #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter") -#: src/main.c:897 +#: src/main.c:895 msgid "Any" msgstr "Cualquiera" #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified") -#: src/main.c:899 +#: src/main.c:897 msgid "None" msgstr "Ninguno" #. TRANSLATORS: text saying "recommended", for plugin names, etc. -#: src/main.c:901 +#: src/main.c:899 msgid "recommended" msgstr "recomendado" #. TRANSLATORS: text saying "disabled", (as in "not enabled") -#: src/main.c:903 +#: src/main.c:901 msgid "disabled !" msgstr "desactivado" #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected -#: src/main.c:905 +#: src/main.c:903 msgid "**The current layout**" msgstr "**La disposición actual**" #. TRANSLATORS: adjective for "Built in" type effects -#: src/main.c:907 +#: src/main.c:905 msgid "Builtin" msgstr "Integrado" #. TRANSLATORS: adjective for "Custom" type effects -#: src/main.c:909 +#: src/main.c:907 msgid "Custom" msgstr "Personalizado" #. TRANSLATORS: adjective for "Test" type effects -#: src/main.c:911 +#: src/main.c:909 msgid "Test" msgstr "Prueba" -#: src/main.c:1056 +#: src/main.c:1054 msgid "Foreground" msgstr "Frente" -#: src/main.c:1057 +#: src/main.c:1055 msgid "Background" msgstr "Fondo" -#: src/main.c:1568 +#: src/main.c:1566 msgid "Loading realtime effect plugins..." msgstr "Cargando complementos de efectos en tiempo real..." -#: src/main.c:1633 +#: src/main.c:1631 msgid "Starting jack audio server..." msgstr "Iniciando el servidor de audio jack..." -#: src/main.c:1635 +#: src/main.c:1633 msgid "Starting jack transport server..." msgstr "" -#: src/main.c:1636 +#: src/main.c:1634 msgid "Connecting to jack transport server..." msgstr "" -#: src/main.c:1665 +#: src/main.c:1663 #, c-format msgid "" "\n" @@ -180,114 +180,114 @@ "Alternatively, try to start lives with either \"lives -jackopts 16\", or " msgstr "" -#: src/main.c:1699 +#: src/main.c:1697 msgid "Starting pulse audio server..." msgstr "Iniciando servidor PulseAudio..." -#: src/main.c:1767 +#: src/main.c:1765 msgid "Checking optional dependencies:" msgstr "Comprobando dependencias opcionales:" -#: src/main.c:1768 +#: src/main.c:1766 msgid "mplayer...detected..." msgstr "mplayer... detectado..." -#: src/main.c:1769 +#: src/main.c:1767 msgid "mplayer...NOT DETECTED..." msgstr "mplayer... NO DETECTADO..." -#: src/main.c:1770 +#: src/main.c:1768
View file
LiVES-2.2.7.tar.bz2/po/et.po -> LiVES-2.2.8.tar.bz2/po/et.po
Changed
@@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: lives\n" "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n" -"POT-Creation-Date: 2014-12-21 11:07-0300\n" +"POT-Creation-Date: 2015-02-08 17:18-0300\n" "PO-Revision-Date: 2013-03-14 12:31+0000\n" "Last-Translator: Launchpad Translations Administrators <Unknown>\n" "Language-Team: Estonian <et@li.org>\n" @@ -19,7 +19,7 @@ "X-Generator: Launchpad (build 16546)\n" #. TRANSLATORS: do not translate this message -#: src/main.c:120 +#: src/main.c:118 msgid "" "Attention Translators !\n" "This message is intended for you, so please do not translate it.\n" @@ -28,22 +28,22 @@ "http://lives.sourceforge.net/TRANS-README.txt" msgstr "" -#: src/main.c:136 +#: src/main.c:134 #, c-format msgid "%s Warning: %s\n" msgstr "" -#: src/main.c:140 +#: src/main.c:138 #, c-format msgid "%s Critical error: %s\n" msgstr "" -#: src/main.c:141 +#: src/main.c:139 #, c-format msgid "%s Fatal error: %s\n" msgstr "" -#: src/main.c:178 +#: src/main.c:176 msgid "" "\n" "Unfortunately LiVES crashed.\n" @@ -57,7 +57,7 @@ "group_id=64341&atid=507139\n" "Aitäh. Peaks olema võimalik progress taastada LiVES-i taaskäivitusel.\n" -#: src/main.c:179 +#: src/main.c:177 msgid "" "\n" "\n" @@ -69,7 +69,7 @@ "Vigadest teatades, palun lisage infot oma operatsioonisüsteemist, jaotusest " "ja LiVES-i versioonist (" -#: src/main.c:182 +#: src/main.c:180 msgid "" "and any information shown below:\n" "\n" @@ -77,7 +77,7 @@ "ja mis tahes allpool esitatud teave:\n" "\n" -#: src/main.c:186 +#: src/main.c:184 msgid "" "Please install gdb and then run LiVES with the -debug option to collect more " "information.\n" @@ -87,84 +87,84 @@ "infot.\n" "\n" -#: src/main.c:194 +#: src/main.c:192 msgid "Preserving set.\n" msgstr "Valiku säilitamine.\n" -#: src/main.c:638 +#: src/main.c:636 msgid "Resizing" msgstr "Mõõtmete muutmine" -#: src/main.c:645 +#: src/main.c:643 msgid "_Resize All Frames" msgstr "_kõikide kaadrite suuruse muutmine" #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter") -#: src/main.c:897 +#: src/main.c:895 msgid "Any" msgstr "Kõik" #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified") -#: src/main.c:899 +#: src/main.c:897 msgid "None" msgstr "Pole" #. TRANSLATORS: text saying "recommended", for plugin names, etc. -#: src/main.c:901 +#: src/main.c:899 msgid "recommended" msgstr "soovitatav" #. TRANSLATORS: text saying "disabled", (as in "not enabled") -#: src/main.c:903 +#: src/main.c:901 msgid "disabled !" msgstr "keelatud !" #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected -#: src/main.c:905 +#: src/main.c:903 msgid "**The current layout**" msgstr "**Praegune skeem**" #. TRANSLATORS: adjective for "Built in" type effects -#: src/main.c:907 +#: src/main.c:905 msgid "Builtin" msgstr "Sisseehitatud" #. TRANSLATORS: adjective for "Custom" type effects -#: src/main.c:909 +#: src/main.c:907 msgid "Custom" msgstr "Kohandatud" #. TRANSLATORS: adjective for "Test" type effects -#: src/main.c:911 +#: src/main.c:909 msgid "Test" msgstr "Testi" -#: src/main.c:1056 +#: src/main.c:1054 msgid "Foreground" msgstr "" -#: src/main.c:1057 +#: src/main.c:1055 #, fuzzy msgid "Background" msgstr "_Alusta" -#: src/main.c:1568 +#: src/main.c:1566 msgid "Loading realtime effect plugins..." msgstr "Laen reaalaja efektide pluginaid..." -#: src/main.c:1633 +#: src/main.c:1631 msgid "Starting jack audio server..." msgstr "Heli serveri jack käivitamine..." -#: src/main.c:1635 +#: src/main.c:1633 msgid "Starting jack transport server..." msgstr "" -#: src/main.c:1636 +#: src/main.c:1634 msgid "Connecting to jack transport server..." msgstr "" -#: src/main.c:1665 +#: src/main.c:1663 #, c-format msgid "" "\n" @@ -176,114 +176,114 @@ "Alternatively, try to start lives with either \"lives -jackopts 16\", or " msgstr "" -#: src/main.c:1699 +#: src/main.c:1697 msgid "Starting pulse audio server..." msgstr "Heli serveri pulse käivitamine..." -#: src/main.c:1767 +#: src/main.c:1765 msgid "Checking optional dependencies:" msgstr "" -#: src/main.c:1768 +#: src/main.c:1766 msgid "mplayer...detected..." msgstr "mplayer...tuvastatud..." -#: src/main.c:1769 +#: src/main.c:1767 msgid "mplayer...NOT DETECTED..." msgstr "mplayer...ei tuvastatud..." -#: src/main.c:1770
View file
LiVES-2.2.7.tar.bz2/po/fi.po -> LiVES-2.2.8.tar.bz2/po/fi.po
Changed
@@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: lives\n" "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n" -"POT-Creation-Date: 2014-12-21 11:07-0300\n" +"POT-Creation-Date: 2015-02-08 17:18-0300\n" "PO-Revision-Date: 2013-03-14 12:31+0000\n" "Last-Translator: Launchpad Translations Administrators <Unknown>\n" "Language-Team: Finnish <fi@li.org>\n" @@ -19,7 +19,7 @@ "X-Generator: Launchpad (build 16546)\n" #. TRANSLATORS: do not translate this message -#: src/main.c:120 +#: src/main.c:118 msgid "" "Attention Translators !\n" "This message is intended for you, so please do not translate it.\n" @@ -33,22 +33,22 @@ "All translators should read the LiVES translation notes at\n" "http://lives.sourceforge.net/TRANS-README.txt" -#: src/main.c:136 +#: src/main.c:134 #, c-format msgid "%s Warning: %s\n" msgstr "" -#: src/main.c:140 +#: src/main.c:138 #, c-format msgid "%s Critical error: %s\n" msgstr "" -#: src/main.c:141 +#: src/main.c:139 #, c-format msgid "%s Fatal error: %s\n" msgstr "" -#: src/main.c:178 +#: src/main.c:176 msgid "" "\n" "Unfortunately LiVES crashed.\n" @@ -63,7 +63,7 @@ "Kiitos. Palautumisen tulisi olla mahdollista uudelleen käynnistäessäsi " "ohjelman.\n" -#: src/main.c:179 +#: src/main.c:177 msgid "" "\n" "\n" @@ -75,7 +75,7 @@ "Raportoidessasi kaatumisista, sisällytä käyttöjärjestelmän tiedot, " "jakeluversio ja LiVESin versiotiedot (" -#: src/main.c:182 +#: src/main.c:180 msgid "" "and any information shown below:\n" "\n" @@ -83,7 +83,7 @@ "ja alla olevat tiedot:\n" "\n" -#: src/main.c:186 +#: src/main.c:184 msgid "" "Please install gdb and then run LiVES with the -debug option to collect more " "information.\n" @@ -93,84 +93,84 @@ "lisätietoja.\n" "\n" -#: src/main.c:194 +#: src/main.c:192 msgid "Preserving set.\n" msgstr "Säilytetään leikesarja.\n" -#: src/main.c:638 +#: src/main.c:636 msgid "Resizing" msgstr "Koon muutos" -#: src/main.c:645 +#: src/main.c:643 msgid "_Resize All Frames" msgstr "Muuta kaikkien kuvien k_okoa" #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter") -#: src/main.c:897 +#: src/main.c:895 msgid "Any" msgstr "Mikä tahansa" #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified") -#: src/main.c:899 +#: src/main.c:897 msgid "None" msgstr "Ei mitään" #. TRANSLATORS: text saying "recommended", for plugin names, etc. -#: src/main.c:901 +#: src/main.c:899 msgid "recommended" msgstr "suositeltu" #. TRANSLATORS: text saying "disabled", (as in "not enabled") -#: src/main.c:903 +#: src/main.c:901 msgid "disabled !" msgstr "kytketty pois päältä!" #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected -#: src/main.c:905 +#: src/main.c:903 msgid "**The current layout**" msgstr "**Nykyinen asettelu**" #. TRANSLATORS: adjective for "Built in" type effects -#: src/main.c:907 +#: src/main.c:905 msgid "Builtin" msgstr "" #. TRANSLATORS: adjective for "Custom" type effects -#: src/main.c:909 +#: src/main.c:907 msgid "Custom" msgstr "Mukauta" #. TRANSLATORS: adjective for "Test" type effects -#: src/main.c:911 +#: src/main.c:909 msgid "Test" msgstr "Kokeile" -#: src/main.c:1056 +#: src/main.c:1054 msgid "Foreground" msgstr "" -#: src/main.c:1057 +#: src/main.c:1055 #, fuzzy msgid "Background" msgstr "P_imennä tausta" -#: src/main.c:1568 +#: src/main.c:1566 msgid "Loading realtime effect plugins..." msgstr "Ladataan reaaliaikaiset tehosteliitännäiset..." -#: src/main.c:1633 +#: src/main.c:1631 msgid "Starting jack audio server..." msgstr "Käynnistetään jack-äänipalvelin..." -#: src/main.c:1635 +#: src/main.c:1633 msgid "Starting jack transport server..." msgstr "Käynnistetään jack-välityspalvelin..." -#: src/main.c:1636 +#: src/main.c:1634 msgid "Connecting to jack transport server..." msgstr "Yhdistetään jack-välityspalvelimeen..." -#: src/main.c:1665 +#: src/main.c:1663 #, c-format msgid "" "\n" @@ -182,114 +182,114 @@ "Alternatively, try to start lives with either \"lives -jackopts 16\", or " msgstr "" -#: src/main.c:1699 +#: src/main.c:1697 msgid "Starting pulse audio server..." msgstr "Käynnistetään pulse audio -palvelin..." -#: src/main.c:1767 +#: src/main.c:1765 msgid "Checking optional dependencies:" msgstr "Tarkistetaan valinnaiset riippuvuudet:" -#: src/main.c:1768 +#: src/main.c:1766 msgid "mplayer...detected..." msgstr "mplayer...havaittu..." -#: src/main.c:1769 +#: src/main.c:1767 msgid "mplayer...NOT DETECTED..." msgstr "mplayer...EI HAVAITTU..." -#: src/main.c:1770
View file
LiVES-2.2.7.tar.bz2/po/fr.po -> LiVES-2.2.8.tar.bz2/po/fr.po
Changed
@@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: fr\n" "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n" -"POT-Creation-Date: 2014-12-21 11:07-0300\n" +"POT-Creation-Date: 2015-02-08 17:18-0300\n" "PO-Revision-Date: 2013-03-14 12:31+0000\n" "Last-Translator: Launchpad Translations Administrators <Unknown>\n" "Language-Team: Français <kwizart@gmail.com>\n" @@ -23,7 +23,7 @@ "X-Poedit-Language: French\n" #. TRANSLATORS: do not translate this message -#: src/main.c:120 +#: src/main.c:118 msgid "" "Attention Translators !\n" "This message is intended for you, so please do not translate it.\n" @@ -32,22 +32,22 @@ "http://lives.sourceforge.net/TRANS-README.txt" msgstr "" -#: src/main.c:136 +#: src/main.c:134 #, c-format msgid "%s Warning: %s\n" msgstr "" -#: src/main.c:140 +#: src/main.c:138 #, c-format msgid "%s Critical error: %s\n" msgstr "" -#: src/main.c:141 +#: src/main.c:139 #, c-format msgid "%s Fatal error: %s\n" msgstr "" -#: src/main.c:178 +#: src/main.c:176 msgid "" "\n" "Unfortunately LiVES crashed.\n" @@ -61,7 +61,7 @@ "tracker/?group_id=64341&atid=507139\n" "Merci. Une récupération devrait être possible si vous redémarrez LiVES.\n" -#: src/main.c:179 +#: src/main.c:177 msgid "" "\n" "\n" @@ -74,7 +74,7 @@ "détails de votre système d'exploitation, la distribution, et la version de " "LiVES (" -#: src/main.c:182 +#: src/main.c:180 msgid "" "and any information shown below:\n" "\n" @@ -82,7 +82,7 @@ "et toute autre information indiquée ci-dessous :\n" "\n" -#: src/main.c:186 +#: src/main.c:184 msgid "" "Please install gdb and then run LiVES with the -debug option to collect more " "information.\n" @@ -92,84 +92,84 @@ "recueillir plus d'informations.\n" "\n" -#: src/main.c:194 +#: src/main.c:192 msgid "Preserving set.\n" msgstr "Marque positionnée.\n" -#: src/main.c:638 +#: src/main.c:636 msgid "Resizing" msgstr "Recadrage" -#: src/main.c:645 +#: src/main.c:643 msgid "_Resize All Frames" msgstr "_Recadre Toutes Les Images" #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter") -#: src/main.c:897 +#: src/main.c:895 msgid "Any" msgstr "Tous" #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified") -#: src/main.c:899 +#: src/main.c:897 msgid "None" msgstr "Aucun" #. TRANSLATORS: text saying "recommended", for plugin names, etc. -#: src/main.c:901 +#: src/main.c:899 msgid "recommended" msgstr "recommandé" #. TRANSLATORS: text saying "disabled", (as in "not enabled") -#: src/main.c:903 +#: src/main.c:901 msgid "disabled !" msgstr "désactivé !" #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected -#: src/main.c:905 +#: src/main.c:903 msgid "**The current layout**" msgstr "**La configuration actuelle**" #. TRANSLATORS: adjective for "Built in" type effects -#: src/main.c:907 +#: src/main.c:905 msgid "Builtin" msgstr "Intégré" #. TRANSLATORS: adjective for "Custom" type effects -#: src/main.c:909 +#: src/main.c:907 msgid "Custom" msgstr "Personnalisé" #. TRANSLATORS: adjective for "Test" type effects -#: src/main.c:911 +#: src/main.c:909 msgid "Test" msgstr "Essai" -#: src/main.c:1056 +#: src/main.c:1054 msgid "Foreground" msgstr "" -#: src/main.c:1057 +#: src/main.c:1055 #, fuzzy msgid "Background" msgstr "_Cacher Arrière Plan" -#: src/main.c:1568 +#: src/main.c:1566 msgid "Loading realtime effect plugins..." msgstr "Chargement des plugins d'effets en temps réel" -#: src/main.c:1633 +#: src/main.c:1631 msgid "Starting jack audio server..." msgstr "Démarrage du serveur audio jack..." -#: src/main.c:1635 +#: src/main.c:1633 msgid "Starting jack transport server..." msgstr "Lancement du serveur de transport Jack..." -#: src/main.c:1636 +#: src/main.c:1634 msgid "Connecting to jack transport server..." msgstr "Connexion au serveur de transport Jack..." -#: src/main.c:1665 +#: src/main.c:1663 #, c-format msgid "" "\n" @@ -181,114 +181,114 @@ "Alternatively, try to start lives with either \"lives -jackopts 16\", or " msgstr "" -#: src/main.c:1699 +#: src/main.c:1697 msgid "Starting pulse audio server..." msgstr "Initialisation du serveur audio pulse..." -#: src/main.c:1767 +#: src/main.c:1765 msgid "Checking optional dependencies:" msgstr "Verification des dépendances optionnelles:" -#: src/main.c:1768 +#: src/main.c:1766 msgid "mplayer...detected..." msgstr "mplayer....détecté..." -#: src/main.c:1769 +#: src/main.c:1767 msgid "mplayer...NOT DETECTED..." msgstr "mplayer...NON DÉTECTÉ..." -#: src/main.c:1770
View file
LiVES-2.2.7.tar.bz2/po/gl.po -> LiVES-2.2.8.tar.bz2/po/gl.po
Changed
@@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: lives\n" "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n" -"POT-Creation-Date: 2014-12-21 11:07-0300\n" +"POT-Creation-Date: 2015-02-08 17:18-0300\n" "PO-Revision-Date: 2013-03-14 12:31+0000\n" "Last-Translator: Launchpad Translations Administrators <Unknown>\n" "Language-Team: Galician <gl@li.org>\n" @@ -19,7 +19,7 @@ "X-Generator: Launchpad (build 16546)\n" #. TRANSLATORS: do not translate this message -#: src/main.c:120 +#: src/main.c:118 msgid "" "Attention Translators !\n" "This message is intended for you, so please do not translate it.\n" @@ -28,22 +28,22 @@ "http://lives.sourceforge.net/TRANS-README.txt" msgstr "" -#: src/main.c:136 +#: src/main.c:134 #, c-format msgid "%s Warning: %s\n" msgstr "" -#: src/main.c:140 +#: src/main.c:138 #, c-format msgid "%s Critical error: %s\n" msgstr "" -#: src/main.c:141 +#: src/main.c:139 #, c-format msgid "%s Fatal error: %s\n" msgstr "" -#: src/main.c:178 +#: src/main.c:176 msgid "" "\n" "Unfortunately LiVES crashed.\n" @@ -57,7 +57,7 @@ "group_id=64341&atid=507139\n" "Grazas. A recuperación debe ser posible se reinicia LiVES.\n" -#: src/main.c:179 +#: src/main.c:177 msgid "" "\n" "\n" @@ -69,7 +69,7 @@ "Cando falla de información, por favor inclúa os detalles do seu sistema " "operativo, distribución, ea versión LiVES (" -#: src/main.c:182 +#: src/main.c:180 msgid "" "and any information shown below:\n" "\n" @@ -77,7 +77,7 @@ "e todas as informacións que aparecen a continuación:\n" "\n" -#: src/main.c:186 +#: src/main.c:184 msgid "" "Please install gdb and then run LiVES with the -debug option to collect more " "information.\n" @@ -87,84 +87,84 @@ "máis información.\n" "\n" -#: src/main.c:194 +#: src/main.c:192 msgid "Preserving set.\n" msgstr "Preservar set.\n" -#: src/main.c:638 +#: src/main.c:636 msgid "Resizing" msgstr "Redimensionando" -#: src/main.c:645 +#: src/main.c:643 msgid "_Resize All Frames" msgstr "_Redimensionar todos os cadros" #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter") -#: src/main.c:897 +#: src/main.c:895 msgid "Any" msgstr "Calquer" #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified") -#: src/main.c:899 +#: src/main.c:897 msgid "None" msgstr "Ningún" #. TRANSLATORS: text saying "recommended", for plugin names, etc. -#: src/main.c:901 +#: src/main.c:899 msgid "recommended" msgstr "recomendado" #. TRANSLATORS: text saying "disabled", (as in "not enabled") -#: src/main.c:903 +#: src/main.c:901 msgid "disabled !" msgstr "minusválidos !" #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected -#: src/main.c:905 +#: src/main.c:903 msgid "**The current layout**" msgstr "** O esquema actual **" #. TRANSLATORS: adjective for "Built in" type effects -#: src/main.c:907 +#: src/main.c:905 msgid "Builtin" msgstr "Incorporado" #. TRANSLATORS: adjective for "Custom" type effects -#: src/main.c:909 +#: src/main.c:907 msgid "Custom" msgstr "Personalizado" #. TRANSLATORS: adjective for "Test" type effects -#: src/main.c:911 +#: src/main.c:909 msgid "Test" msgstr "Proba" -#: src/main.c:1056 +#: src/main.c:1054 msgid "Foreground" msgstr "" -#: src/main.c:1057 +#: src/main.c:1055 #, fuzzy msgid "Background" msgstr "_Inicio" -#: src/main.c:1568 +#: src/main.c:1566 msgid "Loading realtime effect plugins..." msgstr "" -#: src/main.c:1633 +#: src/main.c:1631 msgid "Starting jack audio server..." msgstr "" -#: src/main.c:1635 +#: src/main.c:1633 msgid "Starting jack transport server..." msgstr "" -#: src/main.c:1636 +#: src/main.c:1634 msgid "Connecting to jack transport server..." msgstr "" -#: src/main.c:1665 +#: src/main.c:1663 #, c-format msgid "" "\n" @@ -176,114 +176,114 @@ "Alternatively, try to start lives with either \"lives -jackopts 16\", or " msgstr "" -#: src/main.c:1699 +#: src/main.c:1697 msgid "Starting pulse audio server..." msgstr "" -#: src/main.c:1767 +#: src/main.c:1765 msgid "Checking optional dependencies:" msgstr "Comprobar dependencias opcionais:" -#: src/main.c:1768 +#: src/main.c:1766 msgid "mplayer...detected..." msgstr "mplayer...detectados..." -#: src/main.c:1769 +#: src/main.c:1767 msgid "mplayer...NOT DETECTED..." msgstr "mplayer...NON DETECTA..." -#: src/main.c:1770
View file
LiVES-2.2.7.tar.bz2/po/he.po -> LiVES-2.2.8.tar.bz2/po/he.po
Changed
@@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: lives\n" "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n" -"POT-Creation-Date: 2014-12-21 11:07-0300\n" +"POT-Creation-Date: 2015-02-08 17:18-0300\n" "PO-Revision-Date: 2013-03-14 12:31+0000\n" "Last-Translator: Launchpad Translations Administrators <Unknown>\n" "Language-Team: Hebrew <he@li.org>\n" @@ -19,7 +19,7 @@ "X-Generator: Launchpad (build 16546)\n" #. TRANSLATORS: do not translate this message -#: src/main.c:120 +#: src/main.c:118 msgid "" "Attention Translators !\n" "This message is intended for you, so please do not translate it.\n" @@ -33,22 +33,22 @@ "All translators should read the LiVES translation notes at\n" "http://lives.sourceforge.net/TRANS-README.txt" -#: src/main.c:136 +#: src/main.c:134 #, c-format msgid "%s Warning: %s\n" msgstr "" -#: src/main.c:140 +#: src/main.c:138 #, c-format msgid "%s Critical error: %s\n" msgstr "" -#: src/main.c:141 +#: src/main.c:139 #, c-format msgid "%s Fatal error: %s\n" msgstr "" -#: src/main.c:178 +#: src/main.c:176 msgid "" "\n" "Unfortunately LiVES crashed.\n" @@ -62,7 +62,7 @@ "group_id=64341&atid=507139\n" "תודה. ניתן לשחזר את הנתונים שאבדו בהפעלה מחדש של LiVES.\n" -#: src/main.c:179 +#: src/main.c:177 msgid "" "\n" "\n" @@ -74,7 +74,7 @@ "בעת דיווח על קריסות, נא לכלול פרטים על מערכת ההפעלה שלך, ההפצה וגרסת ה־LiVES " "שבשימוש (" -#: src/main.c:182 +#: src/main.c:180 msgid "" "and any information shown below:\n" "\n" @@ -82,7 +82,7 @@ "וכל מידע זמין מוצג כאן:\n" "\n" -#: src/main.c:186 +#: src/main.c:184 msgid "" "Please install gdb and then run LiVES with the -debug option to collect more " "information.\n" @@ -92,84 +92,84 @@ "מידע.\n" "\n" -#: src/main.c:194 +#: src/main.c:192 msgid "Preserving set.\n" msgstr "מתבצע שימור האוסף.\n" -#: src/main.c:638 +#: src/main.c:636 msgid "Resizing" msgstr "שינוי גודל" -#: src/main.c:645 +#: src/main.c:643 msgid "_Resize All Frames" msgstr "_שינוי גודל כל השקופיות" #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter") -#: src/main.c:897 +#: src/main.c:895 msgid "Any" msgstr "הכל" #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified") -#: src/main.c:899 +#: src/main.c:897 msgid "None" msgstr "ללא" #. TRANSLATORS: text saying "recommended", for plugin names, etc. -#: src/main.c:901 +#: src/main.c:899 msgid "recommended" msgstr "מומלץ" #. TRANSLATORS: text saying "disabled", (as in "not enabled") -#: src/main.c:903 +#: src/main.c:901 msgid "disabled !" msgstr "נוטרל !" #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected -#: src/main.c:905 +#: src/main.c:903 msgid "**The current layout**" msgstr "**הפריסה הנוכחית**" #. TRANSLATORS: adjective for "Built in" type effects -#: src/main.c:907 +#: src/main.c:905 msgid "Builtin" msgstr "מובנה" #. TRANSLATORS: adjective for "Custom" type effects -#: src/main.c:909 +#: src/main.c:907 msgid "Custom" msgstr "מותאם אישית" #. TRANSLATORS: adjective for "Test" type effects -#: src/main.c:911 +#: src/main.c:909 msgid "Test" msgstr "בדיקה" -#: src/main.c:1056 +#: src/main.c:1054 msgid "Foreground" msgstr "" -#: src/main.c:1057 +#: src/main.c:1055 #, fuzzy msgid "Background" msgstr "רקע _שחור" -#: src/main.c:1568 +#: src/main.c:1566 msgid "Loading realtime effect plugins..." msgstr "מתבצעת טעינת תוספים לאפקטים בזמן אמת..." -#: src/main.c:1633 +#: src/main.c:1631 msgid "Starting jack audio server..." msgstr "מתבצעת הפעלת שרת השמע jack..." -#: src/main.c:1635 +#: src/main.c:1633 msgid "Starting jack transport server..." msgstr "מפעיל את שרת התעבורה של jack..." -#: src/main.c:1636 +#: src/main.c:1634 msgid "Connecting to jack transport server..." msgstr "מתחבר לשרת התעבורה של jack..." -#: src/main.c:1665 +#: src/main.c:1663 #, c-format msgid "" "\n" @@ -181,114 +181,114 @@ "Alternatively, try to start lives with either \"lives -jackopts 16\", or " msgstr "" -#: src/main.c:1699 +#: src/main.c:1697 msgid "Starting pulse audio server..." msgstr "מפעיל את שרת השמע Pulse..." -#: src/main.c:1767 +#: src/main.c:1765 msgid "Checking optional dependencies:" msgstr "מתבצעת בדיקת חבילות תלות אפשריות:" -#: src/main.c:1768 +#: src/main.c:1766 msgid "mplayer...detected..." msgstr "mplayer...זוהה..." -#: src/main.c:1769 +#: src/main.c:1767 msgid "mplayer...NOT DETECTED..." msgstr "mplayer...לא זוהה..." -#: src/main.c:1770
View file
LiVES-2.2.7.tar.bz2/po/hr.po -> LiVES-2.2.8.tar.bz2/po/hr.po
Changed
@@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: lives\n" "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n" -"POT-Creation-Date: 2014-12-21 11:07-0300\n" +"POT-Creation-Date: 2015-02-08 17:18-0300\n" "PO-Revision-Date: 2013-03-14 12:31+0000\n" "Last-Translator: Launchpad Translations Administrators <Unknown>\n" "Language-Team: Croatian <hr@li.org>\n" @@ -19,7 +19,7 @@ "X-Generator: Launchpad (build 16546)\n" #. TRANSLATORS: do not translate this message -#: src/main.c:120 +#: src/main.c:118 msgid "" "Attention Translators !\n" "This message is intended for you, so please do not translate it.\n" @@ -28,22 +28,22 @@ "http://lives.sourceforge.net/TRANS-README.txt" msgstr "" -#: src/main.c:136 +#: src/main.c:134 #, c-format msgid "%s Warning: %s\n" msgstr "" -#: src/main.c:140 +#: src/main.c:138 #, c-format msgid "%s Critical error: %s\n" msgstr "" -#: src/main.c:141 +#: src/main.c:139 #, c-format msgid "%s Fatal error: %s\n" msgstr "" -#: src/main.c:178 +#: src/main.c:176 msgid "" "\n" "Unfortunately LiVES crashed.\n" @@ -57,7 +57,7 @@ "group_id=64341&atid=507139\n" "Hvala. Oporavak bi trebao biti moguće ako se ponovno LiVES.\n" -#: src/main.c:179 +#: src/main.c:177 msgid "" "\n" "\n" @@ -69,7 +69,7 @@ "Kada izvještavanje crashes, molimo uključite detalje vašeg operacijskog " "sustava, distribucije, a LiVES verzija (" -#: src/main.c:182 +#: src/main.c:180 msgid "" "and any information shown below:\n" "\n" @@ -77,7 +77,7 @@ "i sve podatke prikazane u nastavku:\n" "\n" -#: src/main.c:186 +#: src/main.c:184 msgid "" "Please install gdb and then run LiVES with the -debug option to collect more " "information.\n" @@ -87,84 +87,84 @@ "prikupljanja više infomacija.\n" "\n" -#: src/main.c:194 +#: src/main.c:192 msgid "Preserving set.\n" msgstr "Očuvanje set.\n" -#: src/main.c:638 +#: src/main.c:636 msgid "Resizing" msgstr "Promjena veličine" -#: src/main.c:645 +#: src/main.c:643 msgid "_Resize All Frames" msgstr "" #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter") -#: src/main.c:897 +#: src/main.c:895 msgid "Any" msgstr "Bilo koji" #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified") -#: src/main.c:899 +#: src/main.c:897 msgid "None" msgstr "Nijedan" #. TRANSLATORS: text saying "recommended", for plugin names, etc. -#: src/main.c:901 +#: src/main.c:899 msgid "recommended" msgstr "preporučeno" #. TRANSLATORS: text saying "disabled", (as in "not enabled") -#: src/main.c:903 +#: src/main.c:901 msgid "disabled !" msgstr "isključeno !" #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected -#: src/main.c:905 +#: src/main.c:903 msgid "**The current layout**" msgstr "**Trenutni izgled**" #. TRANSLATORS: adjective for "Built in" type effects -#: src/main.c:907 +#: src/main.c:905 msgid "Builtin" msgstr "" #. TRANSLATORS: adjective for "Custom" type effects -#: src/main.c:909 +#: src/main.c:907 msgid "Custom" msgstr "" #. TRANSLATORS: adjective for "Test" type effects -#: src/main.c:911 +#: src/main.c:909 msgid "Test" msgstr "" -#: src/main.c:1056 +#: src/main.c:1054 msgid "Foreground" msgstr "" -#: src/main.c:1057 +#: src/main.c:1055 #, fuzzy msgid "Background" msgstr "_Zanemari promjene" -#: src/main.c:1568 +#: src/main.c:1566 msgid "Loading realtime effect plugins..." msgstr "Učitavanje stvarnom efekt čep..." -#: src/main.c:1633 +#: src/main.c:1631 msgid "Starting jack audio server..." msgstr "Pokrećem jack audio poslužitelj..." -#: src/main.c:1635 +#: src/main.c:1633 msgid "Starting jack transport server..." msgstr "Pokrećem jack transport server..." -#: src/main.c:1636 +#: src/main.c:1634 msgid "Connecting to jack transport server..." msgstr "Spajanje na jack transport server..." -#: src/main.c:1665 +#: src/main.c:1663 #, c-format msgid "" "\n" @@ -176,114 +176,114 @@ "Alternatively, try to start lives with either \"lives -jackopts 16\", or " msgstr "" -#: src/main.c:1699 +#: src/main.c:1697 msgid "Starting pulse audio server..." msgstr "Pokrećem pulse audio poslužitelj..." -#: src/main.c:1767 +#: src/main.c:1765 msgid "Checking optional dependencies:" msgstr "Provjera izborno ovisnosti:" -#: src/main.c:1768 +#: src/main.c:1766 msgid "mplayer...detected..." msgstr "mplayer...pronađen..." -#: src/main.c:1769 +#: src/main.c:1767 msgid "mplayer...NOT DETECTED..." msgstr "mplayer...NIJE PRONAĐEN..." -#: src/main.c:1770
View file
LiVES-2.2.7.tar.bz2/po/hu.po -> LiVES-2.2.8.tar.bz2/po/hu.po
Changed
@@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: hu\n" "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n" -"POT-Creation-Date: 2014-12-21 11:07-0300\n" +"POT-Creation-Date: 2015-02-08 17:18-0300\n" "PO-Revision-Date: 2012-08-08 08:49+0000\n" "Last-Translator: Krasznecz Zoltán <zoltan.krasznecz@gmail.com>\n" "Language-Team: Magyar <lisovszki@gmail.com>\n" @@ -19,7 +19,7 @@ "X-Generator: Launchpad (build 15801)\n" #. TRANSLATORS: do not translate this message -#: src/main.c:120 +#: src/main.c:118 msgid "" "Attention Translators !\n" "This message is intended for you, so please do not translate it.\n" @@ -28,22 +28,22 @@ "http://lives.sourceforge.net/TRANS-README.txt" msgstr "" -#: src/main.c:136 +#: src/main.c:134 #, c-format msgid "%s Warning: %s\n" msgstr "" -#: src/main.c:140 +#: src/main.c:138 #, c-format msgid "%s Critical error: %s\n" msgstr "" -#: src/main.c:141 +#: src/main.c:139 #, c-format msgid "%s Fatal error: %s\n" msgstr "" -#: src/main.c:178 +#: src/main.c:176 msgid "" "\n" "Unfortunately LiVES crashed.\n" @@ -57,7 +57,7 @@ "group_id=64341&atid=507139\n" "Köszönjük. A LiVES újraindításával helyreállítható a program.\n" -#: src/main.c:179 +#: src/main.c:177 msgid "" "\n" "\n" @@ -69,7 +69,7 @@ "Összeomlások bejelentésénél kérjük add meg a rendszered adatait és a LiVES " "verziószámát. (" -#: src/main.c:182 +#: src/main.c:180 msgid "" "and any information shown below:\n" "\n" @@ -77,7 +77,7 @@ "és minden lent szereplő információt:\n" "\n" -#: src/main.c:186 +#: src/main.c:184 msgid "" "Please install gdb and then run LiVES with the -debug option to collect more " "information.\n" @@ -87,84 +87,84 @@ "beiktatásával, hogy további információkat tudhass meg.\n" "\n" -#: src/main.c:194 +#: src/main.c:192 msgid "Preserving set.\n" msgstr "Tartós beállítás.\n" -#: src/main.c:638 +#: src/main.c:636 msgid "Resizing" msgstr "Átméretezés" -#: src/main.c:645 +#: src/main.c:643 msgid "_Resize All Frames" msgstr "_Minden képkocka átméretezése" #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter") -#: src/main.c:897 +#: src/main.c:895 msgid "Any" msgstr "Bármely" #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified") -#: src/main.c:899 +#: src/main.c:897 msgid "None" msgstr "Nincs" #. TRANSLATORS: text saying "recommended", for plugin names, etc. -#: src/main.c:901 +#: src/main.c:899 msgid "recommended" msgstr "ajánlott" #. TRANSLATORS: text saying "disabled", (as in "not enabled") -#: src/main.c:903 +#: src/main.c:901 msgid "disabled !" msgstr "tíltva!" #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected -#: src/main.c:905 +#: src/main.c:903 msgid "**The current layout**" msgstr "**A jelenlegi kimenet**" #. TRANSLATORS: adjective for "Built in" type effects -#: src/main.c:907 +#: src/main.c:905 msgid "Builtin" msgstr "Beépített" #. TRANSLATORS: adjective for "Custom" type effects -#: src/main.c:909 +#: src/main.c:907 msgid "Custom" msgstr "Egyéni" #. TRANSLATORS: adjective for "Test" type effects -#: src/main.c:911 +#: src/main.c:909 msgid "Test" msgstr "Teszt" -#: src/main.c:1056 +#: src/main.c:1054 msgid "Foreground" msgstr "" -#: src/main.c:1057 +#: src/main.c:1055 #, fuzzy msgid "Background" msgstr "_Üres háttér" -#: src/main.c:1568 +#: src/main.c:1566 msgid "Loading realtime effect plugins..." msgstr "Az azonnali effektek betöltése..." -#: src/main.c:1633 +#: src/main.c:1631 msgid "Starting jack audio server..." msgstr "Jack audió szerver indítása" -#: src/main.c:1635 +#: src/main.c:1633 msgid "Starting jack transport server..." msgstr "" -#: src/main.c:1636 +#: src/main.c:1634 msgid "Connecting to jack transport server..." msgstr "" -#: src/main.c:1665 +#: src/main.c:1663 #, c-format msgid "" "\n" @@ -176,114 +176,114 @@ "Alternatively, try to start lives with either \"lives -jackopts 16\", or " msgstr "" -#: src/main.c:1699 +#: src/main.c:1697 msgid "Starting pulse audio server..." msgstr "Pulse audio szerver indítása..." -#: src/main.c:1767 +#: src/main.c:1765 msgid "Checking optional dependencies:" msgstr "Ajánlott függőségek ellenőrzése" -#: src/main.c:1768 +#: src/main.c:1766 msgid "mplayer...detected..." msgstr "mplayer...megtalálva" -#: src/main.c:1769 +#: src/main.c:1767 msgid "mplayer...NOT DETECTED..." msgstr "mplayer...NEM TALÁLOM.." -#: src/main.c:1770
View file
LiVES-2.2.7.tar.bz2/po/it.po -> LiVES-2.2.8.tar.bz2/po/it.po
Changed
@@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: lives\n" "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n" -"POT-Creation-Date: 2014-12-21 11:07-0300\n" +"POT-Creation-Date: 2015-02-08 17:18-0300\n" "PO-Revision-Date: 2013-03-14 12:31+0000\n" "Last-Translator: Launchpad Translations Administrators <Unknown>\n" "Language-Team: Italian <it@li.org>\n" @@ -19,7 +19,7 @@ "X-Generator: Launchpad (build 16546)\n" #. TRANSLATORS: do not translate this message -#: src/main.c:120 +#: src/main.c:118 msgid "" "Attention Translators !\n" "This message is intended for you, so please do not translate it.\n" @@ -28,22 +28,22 @@ "http://lives.sourceforge.net/TRANS-README.txt" msgstr "" -#: src/main.c:136 +#: src/main.c:134 #, c-format msgid "%s Warning: %s\n" msgstr "" -#: src/main.c:140 +#: src/main.c:138 #, c-format msgid "%s Critical error: %s\n" msgstr "" -#: src/main.c:141 +#: src/main.c:139 #, c-format msgid "%s Fatal error: %s\n" msgstr "" -#: src/main.c:178 +#: src/main.c:176 msgid "" "\n" "Unfortunately LiVES crashed.\n" @@ -57,7 +57,7 @@ "group_id=64341&atid=507139\n" "Grazie. Dovrebbe essere possibile un recupero se riavvii LiVES.\n" -#: src/main.c:179 +#: src/main.c:177 msgid "" "\n" "\n" @@ -69,7 +69,7 @@ "Durante la segnalazione di crash, fornisci informazioni sul tuo sistema " "operativo, la distribuzione e la versione di LiVES (" -#: src/main.c:182 +#: src/main.c:180 msgid "" "and any information shown below:\n" "\n" @@ -77,7 +77,7 @@ "e qualsiasi altra informazione mostrata qua sotto:\n" "\n" -#: src/main.c:186 +#: src/main.c:184 msgid "" "Please install gdb and then run LiVES with the -debug option to collect more " "information.\n" @@ -87,84 +87,84 @@ "informazioni.\n" "\n" -#: src/main.c:194 +#: src/main.c:192 msgid "Preserving set.\n" msgstr "Preservazione del set in corso.\n" -#: src/main.c:638 +#: src/main.c:636 msgid "Resizing" msgstr "Ridimensionamento" -#: src/main.c:645 +#: src/main.c:643 msgid "_Resize All Frames" msgstr "_Ridimensiona tutti i fotogrammi" #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter") -#: src/main.c:897 +#: src/main.c:895 msgid "Any" msgstr "Qualsiasi" #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified") -#: src/main.c:899 +#: src/main.c:897 msgid "None" msgstr "Nessuno" #. TRANSLATORS: text saying "recommended", for plugin names, etc. -#: src/main.c:901 +#: src/main.c:899 msgid "recommended" msgstr "consigliato" #. TRANSLATORS: text saying "disabled", (as in "not enabled") -#: src/main.c:903 +#: src/main.c:901 msgid "disabled !" msgstr "disabilitato !" #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected -#: src/main.c:905 +#: src/main.c:903 msgid "**The current layout**" msgstr "**Il layout corrente**" #. TRANSLATORS: adjective for "Built in" type effects -#: src/main.c:907 +#: src/main.c:905 msgid "Builtin" msgstr "Integrato" #. TRANSLATORS: adjective for "Custom" type effects -#: src/main.c:909 +#: src/main.c:907 msgid "Custom" msgstr "Personalizzato" #. TRANSLATORS: adjective for "Test" type effects -#: src/main.c:911 +#: src/main.c:909 msgid "Test" msgstr "Test" -#: src/main.c:1056 +#: src/main.c:1054 msgid "Foreground" msgstr "" -#: src/main.c:1057 +#: src/main.c:1055 #, fuzzy msgid "Background" msgstr "Sfondo _Vuoto" -#: src/main.c:1568 +#: src/main.c:1566 msgid "Loading realtime effect plugins..." msgstr "Caricamento dei plugin degli effetti in tempo reale in corso..." -#: src/main.c:1633 +#: src/main.c:1631 msgid "Starting jack audio server..." msgstr "Avvio del server audio jack in corso..." -#: src/main.c:1635 +#: src/main.c:1633 msgid "Starting jack transport server..." msgstr "" -#: src/main.c:1636 +#: src/main.c:1634 msgid "Connecting to jack transport server..." msgstr "" -#: src/main.c:1665 +#: src/main.c:1663 #, c-format msgid "" "\n" @@ -176,114 +176,114 @@ "Alternatively, try to start lives with either \"lives -jackopts 16\", or " msgstr "" -#: src/main.c:1699 +#: src/main.c:1697 msgid "Starting pulse audio server..." msgstr "Avviando il server audio pulse..." -#: src/main.c:1767 +#: src/main.c:1765 msgid "Checking optional dependencies:" msgstr "Controllo delle dipendenze opzionali in corso:" -#: src/main.c:1768 +#: src/main.c:1766 msgid "mplayer...detected..." msgstr "mplayer...rilevato..." -#: src/main.c:1769 +#: src/main.c:1767 msgid "mplayer...NOT DETECTED..." msgstr "mplayer...NON RILEVATO..." -#: src/main.c:1770
View file
LiVES-2.2.7.tar.bz2/po/ja.po -> LiVES-2.2.8.tar.bz2/po/ja.po
Changed
@@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: ja\n" "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n" -"POT-Creation-Date: 2014-12-21 11:07-0300\n" +"POT-Creation-Date: 2015-02-08 17:18-0300\n" "PO-Revision-Date: 2013-03-14 12:31+0000\n" "Last-Translator: Launchpad Translations Administrators <Unknown>\n" "Language-Team: Japanese <ja@li.org>\n" @@ -19,7 +19,7 @@ "X-Generator: Launchpad (build 16546)\n" #. TRANSLATORS: do not translate this message -#: src/main.c:120 +#: src/main.c:118 msgid "" "Attention Translators !\n" "This message is intended for you, so please do not translate it.\n" @@ -28,22 +28,22 @@ "http://lives.sourceforge.net/TRANS-README.txt" msgstr "" -#: src/main.c:136 +#: src/main.c:134 #, c-format msgid "%s Warning: %s\n" msgstr "" -#: src/main.c:140 +#: src/main.c:138 #, c-format msgid "%s Critical error: %s\n" msgstr "" -#: src/main.c:141 +#: src/main.c:139 #, c-format msgid "%s Fatal error: %s\n" msgstr "" -#: src/main.c:178 +#: src/main.c:176 msgid "" "\n" "Unfortunately LiVES crashed.\n" @@ -57,7 +57,7 @@ "してください。\n" "ご協力ありがとうございます。LiVESを再起動すれば復元が行われるでしょう。\n" -#: src/main.c:179 +#: src/main.c:177 msgid "" "\n" "\n" @@ -69,7 +69,7 @@ "クラッシュ報告する際は、使用しているOS・ディストリビューションやLiVESのバー" "ジョンなどの詳細も含めてください (" -#: src/main.c:182 +#: src/main.c:180 msgid "" "and any information shown below:\n" "\n" @@ -77,7 +77,7 @@ "また、以下の情報もお願いします:\n" "\n" -#: src/main.c:186 +#: src/main.c:184 msgid "" "Please install gdb and then run LiVES with the -debug option to collect more " "information.\n" @@ -87,84 +87,84 @@ "と共に実行してください。\n" "\n" -#: src/main.c:194 +#: src/main.c:192 msgid "Preserving set.\n" msgstr "セットの保護\n" -#: src/main.c:638 +#: src/main.c:636 msgid "Resizing" msgstr "リサイズ" -#: src/main.c:645 +#: src/main.c:643 msgid "_Resize All Frames" msgstr "全フレームのリサイズ(_R)" #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter") -#: src/main.c:897 +#: src/main.c:895 msgid "Any" msgstr "任意" #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified") -#: src/main.c:899 +#: src/main.c:897 msgid "None" msgstr "なし" #. TRANSLATORS: text saying "recommended", for plugin names, etc. -#: src/main.c:901 +#: src/main.c:899 msgid "recommended" msgstr "推奨" #. TRANSLATORS: text saying "disabled", (as in "not enabled") -#: src/main.c:903 +#: src/main.c:901 msgid "disabled !" msgstr "使用不能！" #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected -#: src/main.c:905 +#: src/main.c:903 msgid "**The current layout**" msgstr "**現在のレイアウト**" #. TRANSLATORS: adjective for "Built in" type effects -#: src/main.c:907 +#: src/main.c:905 msgid "Builtin" msgstr "ビルトイン" #. TRANSLATORS: adjective for "Custom" type effects -#: src/main.c:909 +#: src/main.c:907 msgid "Custom" msgstr "カスタム" #. TRANSLATORS: adjective for "Test" type effects -#: src/main.c:911 +#: src/main.c:909 msgid "Test" msgstr "テスト" -#: src/main.c:1056 +#: src/main.c:1054 msgid "Foreground" msgstr "" -#: src/main.c:1057 +#: src/main.c:1055 #, fuzzy msgid "Background" msgstr "空白のバックグラウンド(_B)" -#: src/main.c:1568 +#: src/main.c:1566 msgid "Loading realtime effect plugins..." msgstr "リアルタイムエフェクトプラグインを読み込み中..." -#: src/main.c:1633 +#: src/main.c:1631 msgid "Starting jack audio server..." msgstr "JACKサーバーの音声機能を開始しています..." -#: src/main.c:1635 +#: src/main.c:1633 msgid "Starting jack transport server..." msgstr "JACKサーバーのトランスポート機能を開始しています..." -#: src/main.c:1636 +#: src/main.c:1634 msgid "Connecting to jack transport server..." msgstr "JACKサーバーのトランスポート機能に接続しています..." -#: src/main.c:1665 +#: src/main.c:1663 #, c-format msgid "" "\n" @@ -176,114 +176,114 @@ "Alternatively, try to start lives with either \"lives -jackopts 16\", or " msgstr "" -#: src/main.c:1699 +#: src/main.c:1697 msgid "Starting pulse audio server..." msgstr "PulseAudioサーバーを開始しています..." -#: src/main.c:1767 +#: src/main.c:1765 msgid "Checking optional dependencies:" msgstr "必ずしも必要ではない依存関係を確認しています:" -#: src/main.c:1768 +#: src/main.c:1766 msgid "mplayer...detected..." msgstr "mplayerが見つかりました..." -#: src/main.c:1769 +#: src/main.c:1767 msgid "mplayer...NOT DETECTED..." msgstr "mplayerは見つかりませんでした..." -#: src/main.c:1770
View file
LiVES-2.2.7.tar.bz2/po/lives.pot -> LiVES-2.2.8.tar.bz2/po/lives.pot
Changed
@@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: lives 2.2.7\n" +"Project-Id-Version: lives 2.2.8\n" "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n" -"POT-Creation-Date: 2014-12-21 11:07-0300\n" +"POT-Creation-Date: 2015-02-08 17:18-0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -18,7 +18,7 @@ "Content-Transfer-Encoding: 8bit\n" #. TRANSLATORS: do not translate this message -#: src/main.c:120 +#: src/main.c:118 msgid "" "Attention Translators !\n" "This message is intended for you, so please do not translate it.\n" @@ -27,22 +27,22 @@ "http://lives.sourceforge.net/TRANS-README.txt" msgstr "" -#: src/main.c:136 +#: src/main.c:134 #, c-format msgid "%s Warning: %s\n" msgstr "" -#: src/main.c:140 +#: src/main.c:138 #, c-format msgid "%s Critical error: %s\n" msgstr "" -#: src/main.c:141 +#: src/main.c:139 #, c-format msgid "%s Fatal error: %s\n" msgstr "" -#: src/main.c:178 +#: src/main.c:176 msgid "" "\n" "Unfortunately LiVES crashed.\n" @@ -51,7 +51,7 @@ "Thanks. Recovery should be possible if you restart LiVES.\n" msgstr "" -#: src/main.c:179 +#: src/main.c:177 msgid "" "\n" "\n" @@ -59,96 +59,96 @@ "distribution, and the LiVES version (" msgstr "" -#: src/main.c:182 +#: src/main.c:180 msgid "" "and any information shown below:\n" "\n" msgstr "" -#: src/main.c:186 +#: src/main.c:184 msgid "" "Please install gdb and then run LiVES with the -debug option to collect more " "information.\n" "\n" msgstr "" -#: src/main.c:194 +#: src/main.c:192 msgid "Preserving set.\n" msgstr "" -#: src/main.c:638 +#: src/main.c:636 msgid "Resizing" msgstr "" -#: src/main.c:645 +#: src/main.c:643 msgid "_Resize All Frames" msgstr "" #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter") -#: src/main.c:897 +#: src/main.c:895 msgid "Any" msgstr "" #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified") -#: src/main.c:899 +#: src/main.c:897 msgid "None" msgstr "" #. TRANSLATORS: text saying "recommended", for plugin names, etc. -#: src/main.c:901 +#: src/main.c:899 msgid "recommended" msgstr "" #. TRANSLATORS: text saying "disabled", (as in "not enabled") -#: src/main.c:903 +#: src/main.c:901 msgid "disabled !" msgstr "" #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected -#: src/main.c:905 +#: src/main.c:903 msgid "**The current layout**" msgstr "" #. TRANSLATORS: adjective for "Built in" type effects -#: src/main.c:907 +#: src/main.c:905 msgid "Builtin" msgstr "" #. TRANSLATORS: adjective for "Custom" type effects -#: src/main.c:909 +#: src/main.c:907 msgid "Custom" msgstr "" #. TRANSLATORS: adjective for "Test" type effects -#: src/main.c:911 +#: src/main.c:909 msgid "Test" msgstr "" -#: src/main.c:1056 +#: src/main.c:1054 msgid "Foreground" msgstr "" -#: src/main.c:1057 +#: src/main.c:1055 msgid "Background" msgstr "" -#: src/main.c:1568 +#: src/main.c:1566 msgid "Loading realtime effect plugins..." msgstr "" -#: src/main.c:1633 +#: src/main.c:1631 msgid "Starting jack audio server..." msgstr "" -#: src/main.c:1635 +#: src/main.c:1633 msgid "Starting jack transport server..." msgstr "" -#: src/main.c:1636 +#: src/main.c:1634 msgid "Connecting to jack transport server..." msgstr "" -#: src/main.c:1665 +#: src/main.c:1663 #, c-format msgid "" "\n" @@ -160,112 +160,112 @@ "Alternatively, try to start lives with either \"lives -jackopts 16\", or " msgstr "" -#: src/main.c:1699 +#: src/main.c:1697 msgid "Starting pulse audio server..." msgstr "" -#: src/main.c:1767 +#: src/main.c:1765 msgid "Checking optional dependencies:" msgstr "" -#: src/main.c:1768 +#: src/main.c:1766 msgid "mplayer...detected..." msgstr "" -#: src/main.c:1769 +#: src/main.c:1767 msgid "mplayer...NOT DETECTED..." msgstr "" -#: src/main.c:1770 +#: src/main.c:1768
View file
LiVES-2.2.7.tar.bz2/po/nl_NL.po -> LiVES-2.2.8.tar.bz2/po/nl_NL.po
Changed
@@ -2,7 +2,7 @@ msgstr "" "Project-Id-Version: LiVES 0.9.5cvs\n" "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n" -"POT-Creation-Date: 2014-12-21 11:07-0300\n" +"POT-Creation-Date: 2015-02-08 17:18-0300\n" "PO-Revision-Date: 2013-03-14 12:31+0000\n" "Last-Translator: Launchpad Translations Administrators <Unknown>\n" "Language-Team: \n" @@ -16,7 +16,7 @@ "X-Poedit-Language: Dutch\n" #. TRANSLATORS: do not translate this message -#: src/main.c:120 +#: src/main.c:118 msgid "" "Attention Translators !\n" "This message is intended for you, so please do not translate it.\n" @@ -25,22 +25,22 @@ "http://lives.sourceforge.net/TRANS-README.txt" msgstr "" -#: src/main.c:136 +#: src/main.c:134 #, c-format msgid "%s Warning: %s\n" msgstr "" -#: src/main.c:140 +#: src/main.c:138 #, c-format msgid "%s Critical error: %s\n" msgstr "" -#: src/main.c:141 +#: src/main.c:139 #, c-format msgid "%s Fatal error: %s\n" msgstr "" -#: src/main.c:178 +#: src/main.c:176 msgid "" "\n" "Unfortunately LiVES crashed.\n" @@ -49,7 +49,7 @@ "Thanks. Recovery should be possible if you restart LiVES.\n" msgstr "" -#: src/main.c:179 +#: src/main.c:177 msgid "" "\n" "\n" @@ -57,97 +57,97 @@ "distribution, and the LiVES version (" msgstr "" -#: src/main.c:182 +#: src/main.c:180 msgid "" "and any information shown below:\n" "\n" msgstr "" -#: src/main.c:186 +#: src/main.c:184 msgid "" "Please install gdb and then run LiVES with the -debug option to collect more " "information.\n" "\n" msgstr "" -#: src/main.c:194 +#: src/main.c:192 msgid "Preserving set.\n" msgstr "" -#: src/main.c:638 +#: src/main.c:636 msgid "Resizing" msgstr "Grootte aanpassen" -#: src/main.c:645 +#: src/main.c:643 msgid "_Resize All Frames" msgstr "" #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter") -#: src/main.c:897 +#: src/main.c:895 msgid "Any" msgstr "" #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified") -#: src/main.c:899 +#: src/main.c:897 msgid "None" msgstr "" #. TRANSLATORS: text saying "recommended", for plugin names, etc. -#: src/main.c:901 +#: src/main.c:899 msgid "recommended" msgstr "" #. TRANSLATORS: text saying "disabled", (as in "not enabled") -#: src/main.c:903 +#: src/main.c:901 msgid "disabled !" msgstr "" #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected -#: src/main.c:905 +#: src/main.c:903 msgid "**The current layout**" msgstr "" #. TRANSLATORS: adjective for "Built in" type effects -#: src/main.c:907 +#: src/main.c:905 msgid "Builtin" msgstr "" #. TRANSLATORS: adjective for "Custom" type effects -#: src/main.c:909 +#: src/main.c:907 msgid "Custom" msgstr "" #. TRANSLATORS: adjective for "Test" type effects -#: src/main.c:911 +#: src/main.c:909 msgid "Test" msgstr "" -#: src/main.c:1056 +#: src/main.c:1054 msgid "Foreground" msgstr "" -#: src/main.c:1057 +#: src/main.c:1055 #, fuzzy msgid "Background" msgstr "Vervagen" -#: src/main.c:1568 +#: src/main.c:1566 msgid "Loading realtime effect plugins..." msgstr "" -#: src/main.c:1633 +#: src/main.c:1631 msgid "Starting jack audio server..." msgstr "" -#: src/main.c:1635 +#: src/main.c:1633 msgid "Starting jack transport server..." msgstr "" -#: src/main.c:1636 +#: src/main.c:1634 msgid "Connecting to jack transport server..." msgstr "" -#: src/main.c:1665 +#: src/main.c:1663 #, c-format msgid "" "\n" @@ -159,112 +159,112 @@ "Alternatively, try to start lives with either \"lives -jackopts 16\", or " msgstr "" -#: src/main.c:1699 +#: src/main.c:1697 msgid "Starting pulse audio server..." msgstr "" -#: src/main.c:1767 +#: src/main.c:1765 msgid "Checking optional dependencies:" msgstr "" -#: src/main.c:1768 +#: src/main.c:1766 msgid "mplayer...detected..." msgstr "" -#: src/main.c:1769 +#: src/main.c:1767 msgid "mplayer...NOT DETECTED..." msgstr "" -#: src/main.c:1770 +#: src/main.c:1768 msgid "mplayer2...detected..." msgstr ""
View file
LiVES-2.2.7.tar.bz2/po/oc.po -> LiVES-2.2.8.tar.bz2/po/oc.po
Changed
@@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: lives\n" "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n" -"POT-Creation-Date: 2014-12-21 11:07-0300\n" +"POT-Creation-Date: 2015-02-08 17:18-0300\n" "PO-Revision-Date: 2013-03-14 12:31+0000\n" "Last-Translator: Launchpad Translations Administrators <Unknown>\n" "Language-Team: Occitan (post 1500) <oc@li.org>\n" @@ -19,7 +19,7 @@ "X-Generator: Launchpad (build 16546)\n" #. TRANSLATORS: do not translate this message -#: src/main.c:120 +#: src/main.c:118 msgid "" "Attention Translators !\n" "This message is intended for you, so please do not translate it.\n" @@ -28,22 +28,22 @@ "http://lives.sourceforge.net/TRANS-README.txt" msgstr "" -#: src/main.c:136 +#: src/main.c:134 #, c-format msgid "%s Warning: %s\n" msgstr "" -#: src/main.c:140 +#: src/main.c:138 #, c-format msgid "%s Critical error: %s\n" msgstr "" -#: src/main.c:141 +#: src/main.c:139 #, c-format msgid "%s Fatal error: %s\n" msgstr "" -#: src/main.c:178 +#: src/main.c:176 msgid "" "\n" "Unfortunately LiVES crashed.\n" @@ -52,7 +52,7 @@ "Thanks. Recovery should be possible if you restart LiVES.\n" msgstr "" -#: src/main.c:179 +#: src/main.c:177 msgid "" "\n" "\n" @@ -60,7 +60,7 @@ "distribution, and the LiVES version (" msgstr "" -#: src/main.c:182 +#: src/main.c:180 msgid "" "and any information shown below:\n" "\n" @@ -68,91 +68,91 @@ "e tota autra informacion indicada çaijós :\n" "\n" -#: src/main.c:186 +#: src/main.c:184 msgid "" "Please install gdb and then run LiVES with the -debug option to collect more " "information.\n" "\n" msgstr "" -#: src/main.c:194 +#: src/main.c:192 msgid "Preserving set.\n" msgstr "Marca posicionada.\n" -#: src/main.c:638 +#: src/main.c:636 msgid "Resizing" msgstr "Requadratge" -#: src/main.c:645 +#: src/main.c:643 msgid "_Resize All Frames" msgstr "_Requadra Totes Los Imatges" #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter") -#: src/main.c:897 +#: src/main.c:895 msgid "Any" msgstr "Quin que siá" #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified") -#: src/main.c:899 +#: src/main.c:897 msgid "None" msgstr "Pas cap" #. TRANSLATORS: text saying "recommended", for plugin names, etc. -#: src/main.c:901 +#: src/main.c:899 msgid "recommended" msgstr "recomandat" #. TRANSLATORS: text saying "disabled", (as in "not enabled") -#: src/main.c:903 +#: src/main.c:901 msgid "disabled !" msgstr "desactivat !" #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected -#: src/main.c:905 +#: src/main.c:903 msgid "**The current layout**" msgstr "**La configuracion actuala**" #. TRANSLATORS: adjective for "Built in" type effects -#: src/main.c:907 +#: src/main.c:905 msgid "Builtin" msgstr "Integrat" #. TRANSLATORS: adjective for "Custom" type effects -#: src/main.c:909 +#: src/main.c:907 msgid "Custom" msgstr "Personalizat" #. TRANSLATORS: adjective for "Test" type effects -#: src/main.c:911 +#: src/main.c:909 msgid "Test" msgstr "Testar" -#: src/main.c:1056 +#: src/main.c:1054 msgid "Foreground" msgstr "" -#: src/main.c:1057 +#: src/main.c:1055 #, fuzzy msgid "Background" msgstr "_Aviar" -#: src/main.c:1568 +#: src/main.c:1566 msgid "Loading realtime effect plugins..." msgstr "Cargament dels plugins d'efièches en temps real" -#: src/main.c:1633 +#: src/main.c:1631 msgid "Starting jack audio server..." msgstr "Aviada del servidor àudio jack..." -#: src/main.c:1635 +#: src/main.c:1633 msgid "Starting jack transport server..." msgstr "" -#: src/main.c:1636 +#: src/main.c:1634 msgid "Connecting to jack transport server..." msgstr "" -#: src/main.c:1665 +#: src/main.c:1663 #, c-format msgid "" "\n" @@ -164,114 +164,114 @@ "Alternatively, try to start lives with either \"lives -jackopts 16\", or " msgstr "" -#: src/main.c:1699 +#: src/main.c:1697 msgid "Starting pulse audio server..." msgstr "Inicializacion del servidor àudio pulse..." -#: src/main.c:1767 +#: src/main.c:1765 msgid "Checking optional dependencies:" msgstr "Verificacion de las dependéncias opcionalas :" -#: src/main.c:1768 +#: src/main.c:1766 msgid "mplayer...detected..." msgstr "mplayer....detectat..." -#: src/main.c:1769 +#: src/main.c:1767 msgid "mplayer...NOT DETECTED..." msgstr "mplayer...PAS DETECTAT..." -#: src/main.c:1770 +#: src/main.c:1768
View file
LiVES-2.2.7.tar.bz2/po/pl.po -> LiVES-2.2.8.tar.bz2/po/pl.po
Changed
@@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: lives\n" "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n" -"POT-Creation-Date: 2014-12-21 11:07-0300\n" +"POT-Creation-Date: 2015-02-08 17:18-0300\n" "PO-Revision-Date: 2013-03-14 12:31+0000\n" "Last-Translator: Launchpad Translations Administrators <Unknown>\n" "Language-Team: Polish <pl@li.org>\n" @@ -19,7 +19,7 @@ "X-Generator: Launchpad (build 16546)\n" #. TRANSLATORS: do not translate this message -#: src/main.c:120 +#: src/main.c:118 msgid "" "Attention Translators !\n" "This message is intended for you, so please do not translate it.\n" @@ -28,22 +28,22 @@ "http://lives.sourceforge.net/TRANS-README.txt" msgstr "" -#: src/main.c:136 +#: src/main.c:134 #, c-format msgid "%s Warning: %s\n" msgstr "%s Ostrzeżenie: %s\n" -#: src/main.c:140 +#: src/main.c:138 #, c-format msgid "%s Critical error: %s\n" msgstr "%s Błąd krytyczny: %s\n" -#: src/main.c:141 +#: src/main.c:139 #, c-format msgid "%s Fatal error: %s\n" msgstr "" -#: src/main.c:178 +#: src/main.c:176 msgid "" "\n" "Unfortunately LiVES crashed.\n" @@ -57,7 +57,7 @@ "group_id=64341&atid=507139\n" "Dzięki. Odzyskiwanie powinno być możliwe po uruchomieniu życia.\n" -#: src/main.c:179 +#: src/main.c:177 msgid "" "\n" "\n" @@ -69,7 +69,7 @@ "Przy zgłaszaniu awarii, należy podać szczegółowe informacje na temat systemu " "operacyjnego, dystrybucję i wersję LiVES (" -#: src/main.c:182 +#: src/main.c:180 msgid "" "and any information shown below:\n" "\n" @@ -77,7 +77,7 @@ "oraz wszelkie informacje poniżej:\n" "\n" -#: src/main.c:186 +#: src/main.c:184 msgid "" "Please install gdb and then run LiVES with the -debug option to collect more " "information.\n" @@ -87,84 +87,84 @@ "więcej informacji.\n" "\n" -#: src/main.c:194 +#: src/main.c:192 msgid "Preserving set.\n" msgstr "" -#: src/main.c:638 +#: src/main.c:636 msgid "Resizing" msgstr "Skalowanie" -#: src/main.c:645 +#: src/main.c:643 msgid "_Resize All Frames" msgstr "_Skaluj Wszystkie Klatki" #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter") -#: src/main.c:897 +#: src/main.c:895 msgid "Any" msgstr "Dowolny" #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified") -#: src/main.c:899 +#: src/main.c:897 msgid "None" msgstr "Brak" #. TRANSLATORS: text saying "recommended", for plugin names, etc. -#: src/main.c:901 +#: src/main.c:899 msgid "recommended" msgstr "zalecane" #. TRANSLATORS: text saying "disabled", (as in "not enabled") -#: src/main.c:903 +#: src/main.c:901 msgid "disabled !" msgstr "niepełnosprawnych !" #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected -#: src/main.c:905 +#: src/main.c:903 msgid "**The current layout**" msgstr "**Obecny układ**" #. TRANSLATORS: adjective for "Built in" type effects -#: src/main.c:907 +#: src/main.c:905 msgid "Builtin" msgstr "Wbudowane" #. TRANSLATORS: adjective for "Custom" type effects -#: src/main.c:909 +#: src/main.c:907 msgid "Custom" msgstr "Własne" #. TRANSLATORS: adjective for "Test" type effects -#: src/main.c:911 +#: src/main.c:909 msgid "Test" msgstr "Przetestuj" -#: src/main.c:1056 +#: src/main.c:1054 msgid "Foreground" msgstr "" -#: src/main.c:1057 +#: src/main.c:1055 #, fuzzy msgid "Background" msgstr "_Uruchom" -#: src/main.c:1568 +#: src/main.c:1566 msgid "Loading realtime effect plugins..." msgstr "" -#: src/main.c:1633 +#: src/main.c:1631 msgid "Starting jack audio server..." msgstr "" -#: src/main.c:1635 +#: src/main.c:1633 msgid "Starting jack transport server..." msgstr "" -#: src/main.c:1636 +#: src/main.c:1634 msgid "Connecting to jack transport server..." msgstr "" -#: src/main.c:1665 +#: src/main.c:1663 #, c-format msgid "" "\n" @@ -176,114 +176,114 @@ "Alternatively, try to start lives with either \"lives -jackopts 16\", or " msgstr "" -#: src/main.c:1699 +#: src/main.c:1697 msgid "Starting pulse audio server..." msgstr "Uruchamianie serwera pulse audio" -#: src/main.c:1767 +#: src/main.c:1765 msgid "Checking optional dependencies:" msgstr "Sprawdzanie zależności opcjonalne:" -#: src/main.c:1768 +#: src/main.c:1766 msgid "mplayer...detected..." msgstr "mplayer... wykryto..." -#: src/main.c:1769 +#: src/main.c:1767 msgid "mplayer...NOT DETECTED..." msgstr "mplayer...NIE WYKRYTO..." -#: src/main.c:1770
View file
LiVES-2.2.7.tar.bz2/po/pms.po -> LiVES-2.2.8.tar.bz2/po/pms.po
Changed
@@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: lives\n" "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n" -"POT-Creation-Date: 2014-12-21 11:07-0300\n" +"POT-Creation-Date: 2015-02-08 17:18-0300\n" "PO-Revision-Date: 2013-11-09 23:22+0000\n" "Last-Translator: Simon Uslengh <simoneislanda@libero.it>\n" "Language-Team: Piemontese <pms@li.org>\n" @@ -19,7 +19,7 @@ "X-Generator: Launchpad (build 16976)\n" #. TRANSLATORS: do not translate this message -#: src/main.c:120 +#: src/main.c:118 msgid "" "Attention Translators !\n" "This message is intended for you, so please do not translate it.\n" @@ -28,22 +28,22 @@ "http://lives.sourceforge.net/TRANS-README.txt" msgstr "" -#: src/main.c:136 +#: src/main.c:134 #, c-format msgid "%s Warning: %s\n" msgstr "%s Avis: %s\n" -#: src/main.c:140 +#: src/main.c:138 #, c-format msgid "%s Critical error: %s\n" msgstr "%s Eror grav: %s\n" -#: src/main.c:141 +#: src/main.c:139 #, c-format msgid "%s Fatal error: %s\n" msgstr "%s Eror vastant: %s\n" -#: src/main.c:178 +#: src/main.c:176 msgid "" "\n" "Unfortunately LiVES crashed.\n" @@ -57,7 +57,7 @@ "group_id=64341&atid=507139\n" "Mersì. A dovrìa podej arpijè sò travaj andiand torna LiVES.\n" -#: src/main.c:179 +#: src/main.c:177 msgid "" "\n" "\n" @@ -69,7 +69,7 @@ "Cand a arpòrta d'vast, ch'a includa fabilman ij detaj ëd sò sistem operativ, " "la distribussion e la version ëd LiVES." -#: src/main.c:182 +#: src/main.c:180 msgid "" "and any information shown below:\n" "\n" @@ -77,7 +77,7 @@ "e tute j'informassion smonùe sì dapress\n" "\n" -#: src/main.c:186 +#: src/main.c:184 msgid "" "Please install gdb and then run LiVES with the -debug option to collect more " "information.\n" @@ -87,83 +87,83 @@ "fale (debug) për cheuje pì d'informassion.\n" "\n" -#: src/main.c:194 +#: src/main.c:192 msgid "Preserving set.\n" msgstr "Preservassion j'anpostassion\n" -#: src/main.c:638 +#: src/main.c:636 msgid "Resizing" msgstr "Ardimensionament" -#: src/main.c:645 +#: src/main.c:643 msgid "_Resize All Frames" msgstr "_Ardimension-a tute le curnis" #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter") -#: src/main.c:897 +#: src/main.c:895 msgid "Any" msgstr "qualsëssìa" #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified") -#: src/main.c:899 +#: src/main.c:897 msgid "None" msgstr "Gnun" #. TRANSLATORS: text saying "recommended", for plugin names, etc. -#: src/main.c:901 +#: src/main.c:899 msgid "recommended" msgstr "consejà" #. TRANSLATORS: text saying "disabled", (as in "not enabled") -#: src/main.c:903 +#: src/main.c:901 msgid "disabled !" msgstr "dësativà" #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected -#: src/main.c:905 +#: src/main.c:903 msgid "**The current layout**" msgstr "**L'atual formà**" #. TRANSLATORS: adjective for "Built in" type effects -#: src/main.c:907 +#: src/main.c:905 msgid "Builtin" msgstr "Antregà" #. TRANSLATORS: adjective for "Custom" type effects -#: src/main.c:909 +#: src/main.c:907 msgid "Custom" msgstr "Personaj" #. TRANSLATORS: adjective for "Test" type effects -#: src/main.c:911 +#: src/main.c:909 msgid "Test" msgstr "Test" -#: src/main.c:1056 +#: src/main.c:1054 msgid "Foreground" msgstr "Prim pian" -#: src/main.c:1057 +#: src/main.c:1055 msgid "Background" msgstr "Drefond" -#: src/main.c:1568 +#: src/main.c:1566 msgid "Loading realtime effect plugins..." msgstr "Caria dle gionte për j'efet an temp-real..." -#: src/main.c:1633 +#: src/main.c:1631 msgid "Starting jack audio server..." msgstr "Andi dël jack audio server..." -#: src/main.c:1635 +#: src/main.c:1633 msgid "Starting jack transport server..." msgstr "Andi dël jack transport server..." -#: src/main.c:1636 +#: src/main.c:1634 msgid "Connecting to jack transport server..." msgstr "Conession al jack transport server..." -#: src/main.c:1665 +#: src/main.c:1663 #, c-format msgid "" "\n" @@ -182,114 +182,114 @@ "\n" "Dësnò, ch'a preuva a nandiè lives con tute le doe \"lives - jackopts 16\", o " -#: src/main.c:1699 +#: src/main.c:1697 msgid "Starting pulse audio server..." msgstr "Andi dël pulse audio server..." -#: src/main.c:1767 +#: src/main.c:1765 msgid "Checking optional dependencies:" msgstr "Contròl dependense opsionaj:" -#: src/main.c:1768 +#: src/main.c:1766 msgid "mplayer...detected..." msgstr "mplayer...trovà..." -#: src/main.c:1769 +#: src/main.c:1767 msgid "mplayer...NOT DETECTED..." msgstr "mplayer...NEN TROVÀ" -#: src/main.c:1770 +#: src/main.c:1768
View file
LiVES-2.2.7.tar.bz2/po/pt.po -> LiVES-2.2.8.tar.bz2/po/pt.po
Changed
@@ -2,7 +2,7 @@ msgstr "" "Project-Id-Version: LiVES\n" "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n" -"POT-Creation-Date: 2014-12-21 11:07-0300\n" +"POT-Creation-Date: 2015-02-08 17:18-0300\n" "PO-Revision-Date: 2013-03-14 12:31+0000\n" "Last-Translator: Launchpad Translations Administrators <Unknown>\n" "Language-Team: pixel <vjpixel@gmail.com>\n" @@ -16,7 +16,7 @@ "X-Poedit-SourceCharset: utf-8\n" #. TRANSLATORS: do not translate this message -#: src/main.c:120 +#: src/main.c:118 msgid "" "Attention Translators !\n" "This message is intended for you, so please do not translate it.\n" @@ -25,22 +25,22 @@ "http://lives.sourceforge.net/TRANS-README.txt" msgstr "" -#: src/main.c:136 +#: src/main.c:134 #, c-format msgid "%s Warning: %s\n" msgstr "" -#: src/main.c:140 +#: src/main.c:138 #, c-format msgid "%s Critical error: %s\n" msgstr "" -#: src/main.c:141 +#: src/main.c:139 #, c-format msgid "%s Fatal error: %s\n" msgstr "" -#: src/main.c:178 +#: src/main.c:176 msgid "" "\n" "Unfortunately LiVES crashed.\n" @@ -54,7 +54,7 @@ "group_id=64341&atid=5071 39\n" "Obrigado. A recuperação deve ser possível se você reiniciar LiVES.\n" -#: src/main.c:179 +#: src/main.c:177 msgid "" "\n" "\n" @@ -66,7 +66,7 @@ "Quando falha de informação, por favor inclua detalhes de seu sistema " "operacional, a distribuição ea versão do LiVES (" -#: src/main.c:182 +#: src/main.c:180 msgid "" "and any information shown below:\n" "\n" @@ -74,91 +74,91 @@ "e todas as informações mostradas abaixo:\n" "\n" -#: src/main.c:186 +#: src/main.c:184 msgid "" "Please install gdb and then run LiVES with the -debug option to collect more " "information.\n" "\n" msgstr "" -#: src/main.c:194 +#: src/main.c:192 msgid "Preserving set.\n" msgstr "Preservando set.\n" -#: src/main.c:638 +#: src/main.c:636 msgid "Resizing" msgstr "A redimensionar" -#: src/main.c:645 +#: src/main.c:643 msgid "_Resize All Frames" msgstr "_Redimensionar Todos Frames" #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter") -#: src/main.c:897 +#: src/main.c:895 msgid "Any" msgstr "Qualquer" #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified") -#: src/main.c:899 +#: src/main.c:897 msgid "None" msgstr "Nenhum" #. TRANSLATORS: text saying "recommended", for plugin names, etc. -#: src/main.c:901 +#: src/main.c:899 msgid "recommended" msgstr "recomendado" #. TRANSLATORS: text saying "disabled", (as in "not enabled") -#: src/main.c:903 +#: src/main.c:901 msgid "disabled !" msgstr "desactivado!" #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected -#: src/main.c:905 +#: src/main.c:903 msgid "**The current layout**" msgstr "**O layout atual**" #. TRANSLATORS: adjective for "Built in" type effects -#: src/main.c:907 +#: src/main.c:905 msgid "Builtin" msgstr "Builtin" #. TRANSLATORS: adjective for "Custom" type effects -#: src/main.c:909 +#: src/main.c:907 msgid "Custom" msgstr "Customizado" #. TRANSLATORS: adjective for "Test" type effects -#: src/main.c:911 +#: src/main.c:909 msgid "Test" msgstr "Teste" -#: src/main.c:1056 +#: src/main.c:1054 msgid "Foreground" msgstr "" -#: src/main.c:1057 +#: src/main.c:1055 #, fuzzy msgid "Background" msgstr "Fundo _Branco" -#: src/main.c:1568 +#: src/main.c:1566 msgid "Loading realtime effect plugins..." msgstr "A carregar plugins de efeito em tempo real..." -#: src/main.c:1633 +#: src/main.c:1631 msgid "Starting jack audio server..." msgstr "A iniciar servidor de jack audio..." -#: src/main.c:1635 +#: src/main.c:1633 msgid "Starting jack transport server..." msgstr "" -#: src/main.c:1636 +#: src/main.c:1634 msgid "Connecting to jack transport server..." msgstr "" -#: src/main.c:1665 +#: src/main.c:1663 #, c-format msgid "" "\n" @@ -170,114 +170,114 @@ "Alternatively, try to start lives with either \"lives -jackopts 16\", or " msgstr "" -#: src/main.c:1699 +#: src/main.c:1697 msgid "Starting pulse audio server..." msgstr "" -#: src/main.c:1767 +#: src/main.c:1765 msgid "Checking optional dependencies:" msgstr "A verificar as dependências opcionais:" -#: src/main.c:1768 +#: src/main.c:1766 msgid "mplayer...detected..." msgstr "mplayer...detectado..." -#: src/main.c:1769 +#: src/main.c:1767 msgid "mplayer...NOT DETECTED..." msgstr "mplayer...NÃO DETECTADO..." -#: src/main.c:1770 +#: src/main.c:1768
View file
LiVES-2.2.7.tar.bz2/po/pt_BR.po -> LiVES-2.2.8.tar.bz2/po/pt_BR.po
Changed
@@ -2,7 +2,7 @@ msgstr "" "Project-Id-Version: LiVES\n" "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n" -"POT-Creation-Date: 2014-12-21 11:07-0300\n" +"POT-Creation-Date: 2015-02-08 17:18-0300\n" "PO-Revision-Date: 2013-03-14 12:31+0000\n" "Last-Translator: Launchpad Translations Administrators <Unknown>\n" "Language-Team: pixel <vjpixel@gmail.com>\n" @@ -16,7 +16,7 @@ "X-Poedit-SourceCharset: utf-8\n" #. TRANSLATORS: do not translate this message -#: src/main.c:120 +#: src/main.c:118 msgid "" "Attention Translators !\n" "This message is intended for you, so please do not translate it.\n" @@ -25,22 +25,22 @@ "http://lives.sourceforge.net/TRANS-README.txt" msgstr "" -#: src/main.c:136 +#: src/main.c:134 #, c-format msgid "%s Warning: %s\n" msgstr "" -#: src/main.c:140 +#: src/main.c:138 #, c-format msgid "%s Critical error: %s\n" msgstr "" -#: src/main.c:141 +#: src/main.c:139 #, c-format msgid "%s Fatal error: %s\n" msgstr "" -#: src/main.c:178 +#: src/main.c:176 msgid "" "\n" "Unfortunately LiVES crashed.\n" @@ -54,7 +54,7 @@ "group_id=64341&atid=507139\n" "Obrigado. Os dados podem ser recuperados se você reiniciar o LiVes.\n" -#: src/main.c:179 +#: src/main.c:177 msgid "" "\n" "\n" @@ -66,7 +66,7 @@ "Ao reportar travamentos, por favor informe qual o seu sistema operacional, " "distribuição e a versão do LiVES (" -#: src/main.c:182 +#: src/main.c:180 msgid "" "and any information shown below:\n" "\n" @@ -74,7 +74,7 @@ "e toda informação mostrada abaixo:\n" "\n" -#: src/main.c:186 +#: src/main.c:184 msgid "" "Please install gdb and then run LiVES with the -debug option to collect more " "information.\n" @@ -84,84 +84,84 @@ "seja coletada mais informações.\n" "\n" -#: src/main.c:194 +#: src/main.c:192 msgid "Preserving set.\n" msgstr "Preservando set.\n" -#: src/main.c:638 +#: src/main.c:636 msgid "Resizing" msgstr "Redimensionando" -#: src/main.c:645 +#: src/main.c:643 msgid "_Resize All Frames" msgstr "_Redimensionar Todos Frames" #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter") -#: src/main.c:897 +#: src/main.c:895 msgid "Any" msgstr "Qualquer" #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified") -#: src/main.c:899 +#: src/main.c:897 msgid "None" msgstr "Nenhum" #. TRANSLATORS: text saying "recommended", for plugin names, etc. -#: src/main.c:901 +#: src/main.c:899 msgid "recommended" msgstr "recomendado" #. TRANSLATORS: text saying "disabled", (as in "not enabled") -#: src/main.c:903 +#: src/main.c:901 msgid "disabled !" msgstr "desativado!" #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected -#: src/main.c:905 +#: src/main.c:903 msgid "**The current layout**" msgstr "**Layout atual**" #. TRANSLATORS: adjective for "Built in" type effects -#: src/main.c:907 +#: src/main.c:905 msgid "Builtin" msgstr "Builtin" #. TRANSLATORS: adjective for "Custom" type effects -#: src/main.c:909 +#: src/main.c:907 msgid "Custom" msgstr "Customizado" #. TRANSLATORS: adjective for "Test" type effects -#: src/main.c:911 +#: src/main.c:909 msgid "Test" msgstr "Teste" -#: src/main.c:1056 +#: src/main.c:1054 msgid "Foreground" msgstr "" -#: src/main.c:1057 +#: src/main.c:1055 #, fuzzy msgid "Background" msgstr "Fundo _Branco" -#: src/main.c:1568 +#: src/main.c:1566 msgid "Loading realtime effect plugins..." msgstr "Carregando plugins de efeitos em tempo real..." -#: src/main.c:1633 +#: src/main.c:1631 msgid "Starting jack audio server..." msgstr "Iniciando servidor de áudio jack..." -#: src/main.c:1635 +#: src/main.c:1633 msgid "Starting jack transport server..." msgstr "Iniciando o servidor jack de transporte..." -#: src/main.c:1636 +#: src/main.c:1634 msgid "Connecting to jack transport server..." msgstr "Conectando ao servidor jack de transporte..." -#: src/main.c:1665 +#: src/main.c:1663 #, c-format msgid "" "\n" @@ -173,114 +173,114 @@ "Alternatively, try to start lives with either \"lives -jackopts 16\", or " msgstr "" -#: src/main.c:1699 +#: src/main.c:1697 msgid "Starting pulse audio server..." msgstr "Iniciando o servidor pulse audio..." -#: src/main.c:1767 +#: src/main.c:1765 msgid "Checking optional dependencies:" msgstr "Checando dependências opcionais:" -#: src/main.c:1768 +#: src/main.c:1766 msgid "mplayer...detected..." msgstr "mplayer...detectado..." -#: src/main.c:1769 +#: src/main.c:1767 msgid "mplayer...NOT DETECTED..." msgstr "mplayer...NÃO DETECTADO..." -#: src/main.c:1770
View file
LiVES-2.2.7.tar.bz2/po/ro.po -> LiVES-2.2.8.tar.bz2/po/ro.po
Changed
@@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: lives\n" "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n" -"POT-Creation-Date: 2014-12-21 11:07-0300\n" +"POT-Creation-Date: 2015-02-08 17:18-0300\n" "PO-Revision-Date: 2013-03-14 12:31+0000\n" "Last-Translator: Launchpad Translations Administrators <Unknown>\n" "Language-Team: Romanian <ro@li.org>\n" @@ -19,7 +19,7 @@ "X-Generator: Launchpad (build 16546)\n" #. TRANSLATORS: do not translate this message -#: src/main.c:120 +#: src/main.c:118 msgid "" "Attention Translators !\n" "This message is intended for you, so please do not translate it.\n" @@ -28,22 +28,22 @@ "http://lives.sourceforge.net/TRANS-README.txt" msgstr "" -#: src/main.c:136 +#: src/main.c:134 #, c-format msgid "%s Warning: %s\n" msgstr "" -#: src/main.c:140 +#: src/main.c:138 #, c-format msgid "%s Critical error: %s\n" msgstr "" -#: src/main.c:141 +#: src/main.c:139 #, c-format msgid "%s Fatal error: %s\n" msgstr "" -#: src/main.c:178 +#: src/main.c:176 msgid "" "\n" "Unfortunately LiVES crashed.\n" @@ -58,7 +58,7 @@ "Mulţumesc. De recuperare ar trebui să fie posibilă în cazul în care " "reporniţi LiVES.\n" -#: src/main.c:179 +#: src/main.c:177 msgid "" "\n" "\n" @@ -70,7 +70,7 @@ "Atunci când se blochează de raportare, vă rugăm să includă detalii cu " "privire la sistemul de operare, de distribuţie, precum şi LiVES versiunea (" -#: src/main.c:182 +#: src/main.c:180 msgid "" "and any information shown below:\n" "\n" @@ -78,7 +78,7 @@ "şi orice alte informaţii prezentate mai jos:\n" "\n" -#: src/main.c:186 +#: src/main.c:184 msgid "" "Please install gdb and then run LiVES with the -debug option to collect more " "information.\n" @@ -88,84 +88,84 @@ "multe informații.\n" "\n" -#: src/main.c:194 +#: src/main.c:192 msgid "Preserving set.\n" msgstr "Păstrarea set.\n" -#: src/main.c:638 +#: src/main.c:636 msgid "Resizing" msgstr "Redimensionare" -#: src/main.c:645 +#: src/main.c:643 msgid "_Resize All Frames" msgstr "_Redimensionarea tuturor cadrelor" #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter") -#: src/main.c:897 +#: src/main.c:895 msgid "Any" msgstr "Orice" #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified") -#: src/main.c:899 +#: src/main.c:897 msgid "None" msgstr "Nimic" #. TRANSLATORS: text saying "recommended", for plugin names, etc. -#: src/main.c:901 +#: src/main.c:899 msgid "recommended" msgstr "recomandat" #. TRANSLATORS: text saying "disabled", (as in "not enabled") -#: src/main.c:903 +#: src/main.c:901 msgid "disabled !" msgstr "dezactivat !" #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected -#: src/main.c:905 +#: src/main.c:903 msgid "**The current layout**" msgstr "** Structura actuală **" #. TRANSLATORS: adjective for "Built in" type effects -#: src/main.c:907 +#: src/main.c:905 msgid "Builtin" msgstr "" #. TRANSLATORS: adjective for "Custom" type effects -#: src/main.c:909 +#: src/main.c:907 msgid "Custom" msgstr "" #. TRANSLATORS: adjective for "Test" type effects -#: src/main.c:911 +#: src/main.c:909 msgid "Test" msgstr "" -#: src/main.c:1056 +#: src/main.c:1054 msgid "Foreground" msgstr "" -#: src/main.c:1057 +#: src/main.c:1055 #, fuzzy msgid "Background" msgstr "_Ignoră schimbările" -#: src/main.c:1568 +#: src/main.c:1566 msgid "Loading realtime effect plugins..." msgstr "Se incarcă modulele de efecte in timp real..." -#: src/main.c:1633 +#: src/main.c:1631 msgid "Starting jack audio server..." msgstr "Pornirea serverului audio jack..." -#: src/main.c:1635 +#: src/main.c:1633 msgid "Starting jack transport server..." msgstr "" -#: src/main.c:1636 +#: src/main.c:1634 msgid "Connecting to jack transport server..." msgstr "" -#: src/main.c:1665 +#: src/main.c:1663 #, c-format msgid "" "\n" @@ -177,114 +177,114 @@ "Alternatively, try to start lives with either \"lives -jackopts 16\", or " msgstr "" -#: src/main.c:1699 +#: src/main.c:1697 msgid "Starting pulse audio server..." msgstr "Pornirea serverului audio pulse..." -#: src/main.c:1767 +#: src/main.c:1765 msgid "Checking optional dependencies:" msgstr "Verificarea dependenţelor opţionale:" -#: src/main.c:1768 +#: src/main.c:1766 msgid "mplayer...detected..." msgstr "mplayer...a fost detectat..." -#: src/main.c:1769 +#: src/main.c:1767 msgid "mplayer...NOT DETECTED..." msgstr "mplayer... nu a fost detectat..." -#: src/main.c:1770
View file
LiVES-2.2.7.tar.bz2/po/ru.po -> LiVES-2.2.8.tar.bz2/po/ru.po
Changed
@@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: lives\n" "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n" -"POT-Creation-Date: 2014-12-21 11:07-0300\n" +"POT-Creation-Date: 2015-02-08 17:18-0300\n" "PO-Revision-Date: 2013-12-08 07:42+0000\n" "Last-Translator: Alexander Litvinov <aleclitvinov1980@gmail.com>\n" "Language-Team: Russian <ru@li.org>\n" @@ -19,7 +19,7 @@ "X-Generator: Launchpad (build 16976)\n" #. TRANSLATORS: do not translate this message -#: src/main.c:120 +#: src/main.c:118 msgid "" "Attention Translators !\n" "This message is intended for you, so please do not translate it.\n" @@ -33,22 +33,22 @@ "Все переводчики должны прочитать заметки по переводу LiVES на\n" "http://lives.sourceforge.net/TRANS-README.txt" -#: src/main.c:136 +#: src/main.c:134 #, c-format msgid "%s Warning: %s\n" msgstr "%s Внимание: %s\n" -#: src/main.c:140 +#: src/main.c:138 #, c-format msgid "%s Critical error: %s\n" msgstr "%s Критическая ошибка: %s\n" -#: src/main.c:141 +#: src/main.c:139 #, c-format msgid "%s Fatal error: %s\n" msgstr "%s Неисправимая ошибка: %s\n" -#: src/main.c:178 +#: src/main.c:176 msgid "" "\n" "Unfortunately LiVES crashed.\n" @@ -62,7 +62,7 @@ "tracker/?group_id=64341&atid=507139\n" "Спасибо. Для восстановления перезапустите LiVES.\n" -#: src/main.c:179 +#: src/main.c:177 msgid "" "\n" "\n" @@ -74,7 +74,7 @@ "В отчете об ошибке, пожалуйста, сообщите о вашей операционной системе, " "дистрибутиве, а также версию LiVES (" -#: src/main.c:182 +#: src/main.c:180 msgid "" "and any information shown below:\n" "\n" @@ -82,7 +82,7 @@ "и другую информацию, как указано ниже:\n" "\n" -#: src/main.c:186 +#: src/main.c:184 msgid "" "Please install gdb and then run LiVES with the -debug option to collect more " "information.\n" @@ -92,83 +92,83 @@ "чтобы собрать больше информации.\n" "\n" -#: src/main.c:194 +#: src/main.c:192 msgid "Preserving set.\n" msgstr "Сохранение сборки.\n" -#: src/main.c:638 +#: src/main.c:636 msgid "Resizing" msgstr "Масштабирование" -#: src/main.c:645 +#: src/main.c:643 msgid "_Resize All Frames" msgstr "_Масштабировать все кадры" #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter") -#: src/main.c:897 +#: src/main.c:895 msgid "Any" msgstr "Любой" #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified") -#: src/main.c:899 +#: src/main.c:897 msgid "None" msgstr "Нет" #. TRANSLATORS: text saying "recommended", for plugin names, etc. -#: src/main.c:901 +#: src/main.c:899 msgid "recommended" msgstr "рекомендуемые" #. TRANSLATORS: text saying "disabled", (as in "not enabled") -#: src/main.c:903 +#: src/main.c:901 msgid "disabled !" msgstr "отключено!" #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected -#: src/main.c:905 +#: src/main.c:903 msgid "**The current layout**" msgstr "Текущее размещение" #. TRANSLATORS: adjective for "Built in" type effects -#: src/main.c:907 +#: src/main.c:905 msgid "Builtin" msgstr "Встроенный" #. TRANSLATORS: adjective for "Custom" type effects -#: src/main.c:909 +#: src/main.c:907 msgid "Custom" msgstr "Настраиваемый" #. TRANSLATORS: adjective for "Test" type effects -#: src/main.c:911 +#: src/main.c:909 msgid "Test" msgstr "Тест" -#: src/main.c:1056 +#: src/main.c:1054 msgid "Foreground" msgstr "Передний план" -#: src/main.c:1057 +#: src/main.c:1055 msgid "Background" msgstr "Фон" -#: src/main.c:1568 +#: src/main.c:1566 msgid "Loading realtime effect plugins..." msgstr "Загрузка плагина эффектов реального времени..." -#: src/main.c:1633 +#: src/main.c:1631 msgid "Starting jack audio server..." msgstr "Запуск звукового сервера jack..." -#: src/main.c:1635 +#: src/main.c:1633 msgid "Starting jack transport server..." msgstr "Запуск передающего сервера jack..." -#: src/main.c:1636 +#: src/main.c:1634 msgid "Connecting to jack transport server..." msgstr "Подключение к передающему jack-серверу..." -#: src/main.c:1665 +#: src/main.c:1663 #, c-format msgid "" "\n" @@ -189,114 +189,114 @@ "Также, вы можете попробовать запустить программу таким образом \"lives -" "jackopts 16\" или " -#: src/main.c:1699 +#: src/main.c:1697 msgid "Starting pulse audio server..." msgstr "Запуск сервера pulse audio..." -#: src/main.c:1767 +#: src/main.c:1765 msgid "Checking optional dependencies:" msgstr "Проверка опциональных зависимостей:" -#: src/main.c:1768 +#: src/main.c:1766 msgid "mplayer...detected..." msgstr "mplayer...обнаружен..." -#: src/main.c:1769 +#: src/main.c:1767 msgid "mplayer...NOT DETECTED..." msgstr "mplayer...НЕ ОБНАРУЖЕН..." -#: src/main.c:1770 +#: src/main.c:1768
View file
LiVES-2.2.7.tar.bz2/po/sk.po -> LiVES-2.2.8.tar.bz2/po/sk.po
Changed
@@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: lives\n" "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n" -"POT-Creation-Date: 2014-12-21 11:07-0300\n" +"POT-Creation-Date: 2015-02-08 17:18-0300\n" "PO-Revision-Date: 2013-03-14 12:31+0000\n" "Last-Translator: Launchpad Translations Administrators <Unknown>\n" "Language-Team: Slovak <sk@li.org>\n" @@ -19,7 +19,7 @@ "X-Generator: Launchpad (build 16546)\n" #. TRANSLATORS: do not translate this message -#: src/main.c:120 +#: src/main.c:118 msgid "" "Attention Translators !\n" "This message is intended for you, so please do not translate it.\n" @@ -33,22 +33,22 @@ "All translators should read the LiVES translation notes at\n" "http://lives.sourceforge.net/TRANS-README.txt" -#: src/main.c:136 +#: src/main.c:134 #, c-format msgid "%s Warning: %s\n" msgstr "" -#: src/main.c:140 +#: src/main.c:138 #, c-format msgid "%s Critical error: %s\n" msgstr "" -#: src/main.c:141 +#: src/main.c:139 #, c-format msgid "%s Fatal error: %s\n" msgstr "" -#: src/main.c:178 +#: src/main.c:176 msgid "" "\n" "Unfortunately LiVES crashed.\n" @@ -62,7 +62,7 @@ "group_id=64341&atid=507139\n" "Ďakujeme. Obnovenie by malo byť možné po reštartovaní LiVES.\n" -#: src/main.c:179 +#: src/main.c:177 msgid "" "\n" "\n" @@ -74,7 +74,7 @@ "Pri nahlasovaní neočakávaných skončení, prosím uveďte podrobnosti o " "operačnom systéme, distribúcii a verzii LiVES (" -#: src/main.c:182 +#: src/main.c:180 msgid "" "and any information shown below:\n" "\n" @@ -82,7 +82,7 @@ "a všetky informácie uvedené nižšie:\n" "\n" -#: src/main.c:186 +#: src/main.c:184 msgid "" "Please install gdb and then run LiVES with the -debug option to collect more " "information.\n" @@ -92,84 +92,84 @@ "zhromaždenie viac informácií.\n" "\n" -#: src/main.c:194 +#: src/main.c:192 msgid "Preserving set.\n" msgstr "Nastavenie zachovania.\n" -#: src/main.c:638 +#: src/main.c:636 msgid "Resizing" msgstr "Zmena veľkosti" -#: src/main.c:645 +#: src/main.c:643 msgid "_Resize All Frames" msgstr "_Zmeniť veľkosť všetkých snímkov" #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter") -#: src/main.c:897 +#: src/main.c:895 msgid "Any" msgstr "Ktorýkoľvek" #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified") -#: src/main.c:899 +#: src/main.c:897 msgid "None" msgstr "Žiaden" #. TRANSLATORS: text saying "recommended", for plugin names, etc. -#: src/main.c:901 +#: src/main.c:899 msgid "recommended" msgstr "doporučené" #. TRANSLATORS: text saying "disabled", (as in "not enabled") -#: src/main.c:903 +#: src/main.c:901 msgid "disabled !" msgstr "zakázané !" #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected -#: src/main.c:905 +#: src/main.c:903 msgid "**The current layout**" msgstr "**Súčasné rozloženie**" #. TRANSLATORS: adjective for "Built in" type effects -#: src/main.c:907 +#: src/main.c:905 msgid "Builtin" msgstr "Vstavané" #. TRANSLATORS: adjective for "Custom" type effects -#: src/main.c:909 +#: src/main.c:907 msgid "Custom" msgstr "Vlastné" #. TRANSLATORS: adjective for "Test" type effects -#: src/main.c:911 +#: src/main.c:909 msgid "Test" msgstr "Otestovať" -#: src/main.c:1056 +#: src/main.c:1054 msgid "Foreground" msgstr "" -#: src/main.c:1057 +#: src/main.c:1055 #, fuzzy msgid "Background" msgstr "_Prázdne pozadie" -#: src/main.c:1568 +#: src/main.c:1566 msgid "Loading realtime effect plugins..." msgstr "Načítavam efekt rozšírenia v réálnom čase..." -#: src/main.c:1633 +#: src/main.c:1631 msgid "Starting jack audio server..." msgstr "Spúšťam zvukový server jack..." -#: src/main.c:1635 +#: src/main.c:1633 msgid "Starting jack transport server..." msgstr "" -#: src/main.c:1636 +#: src/main.c:1634 msgid "Connecting to jack transport server..." msgstr "" -#: src/main.c:1665 +#: src/main.c:1663 #, c-format msgid "" "\n" @@ -181,114 +181,114 @@ "Alternatively, try to start lives with either \"lives -jackopts 16\", or " msgstr "" -#: src/main.c:1699 +#: src/main.c:1697 msgid "Starting pulse audio server..." msgstr "Spúšťam pulse audio server..." -#: src/main.c:1767 +#: src/main.c:1765 msgid "Checking optional dependencies:" msgstr "Kontrola dodatočných záavislostí:" -#: src/main.c:1768 +#: src/main.c:1766 msgid "mplayer...detected..." msgstr "mplayer...nájdený..." -#: src/main.c:1769 +#: src/main.c:1767 msgid "mplayer...NOT DETECTED..." msgstr "mplayer...NENÁJDENÝ..." -#: src/main.c:1770
View file
LiVES-2.2.7.tar.bz2/po/te.po -> LiVES-2.2.8.tar.bz2/po/te.po
Changed
@@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: lives\n" "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n" -"POT-Creation-Date: 2014-12-21 11:07-0300\n" +"POT-Creation-Date: 2015-02-08 17:18-0300\n" "PO-Revision-Date: 2013-03-14 12:31+0000\n" "Last-Translator: Launchpad Translations Administrators <Unknown>\n" "Language-Team: Telugu <indlinux-telugu@lists.sourceforge.net>\n" @@ -20,7 +20,7 @@ "X-Generator: Launchpad (build 16546)\n" #. TRANSLATORS: do not translate this message -#: src/main.c:120 +#: src/main.c:118 msgid "" "Attention Translators !\n" "This message is intended for you, so please do not translate it.\n" @@ -29,22 +29,22 @@ "http://lives.sourceforge.net/TRANS-README.txt" msgstr "" -#: src/main.c:136 +#: src/main.c:134 #, c-format msgid "%s Warning: %s\n" msgstr "" -#: src/main.c:140 +#: src/main.c:138 #, c-format msgid "%s Critical error: %s\n" msgstr "" -#: src/main.c:141 +#: src/main.c:139 #, c-format msgid "%s Fatal error: %s\n" msgstr "" -#: src/main.c:178 +#: src/main.c:176 msgid "" "\n" "Unfortunately LiVES crashed.\n" @@ -53,7 +53,7 @@ "Thanks. Recovery should be possible if you restart LiVES.\n" msgstr "" -#: src/main.c:179 +#: src/main.c:177 msgid "" "\n" "\n" @@ -61,97 +61,97 @@ "distribution, and the LiVES version (" msgstr "" -#: src/main.c:182 +#: src/main.c:180 msgid "" "and any information shown below:\n" "\n" msgstr "" -#: src/main.c:186 +#: src/main.c:184 msgid "" "Please install gdb and then run LiVES with the -debug option to collect more " "information.\n" "\n" msgstr "" -#: src/main.c:194 +#: src/main.c:192 msgid "Preserving set.\n" msgstr "" -#: src/main.c:638 +#: src/main.c:636 msgid "Resizing" msgstr "పరిమాణం మార్చుట" -#: src/main.c:645 +#: src/main.c:643 msgid "_Resize All Frames" msgstr "అన్ని చట్రాల పరిమాణం మార్చు (_R)" #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter") -#: src/main.c:897 +#: src/main.c:895 msgid "Any" msgstr "ఏదైనా" #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified") -#: src/main.c:899 +#: src/main.c:897 msgid "None" msgstr "ఏదీ వద్దు" #. TRANSLATORS: text saying "recommended", for plugin names, etc. -#: src/main.c:901 +#: src/main.c:899 msgid "recommended" msgstr "సిఫారసుచేయబడింది" #. TRANSLATORS: text saying "disabled", (as in "not enabled") -#: src/main.c:903 +#: src/main.c:901 msgid "disabled !" msgstr "" #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected -#: src/main.c:905 +#: src/main.c:903 msgid "**The current layout**" msgstr "" #. TRANSLATORS: adjective for "Built in" type effects -#: src/main.c:907 +#: src/main.c:905 msgid "Builtin" msgstr "నిర్మితమైన" #. TRANSLATORS: adjective for "Custom" type effects -#: src/main.c:909 +#: src/main.c:907 msgid "Custom" msgstr "మలచిన" #. TRANSLATORS: adjective for "Test" type effects -#: src/main.c:911 +#: src/main.c:909 msgid "Test" msgstr "పరిశీలన" -#: src/main.c:1056 +#: src/main.c:1054 msgid "Foreground" msgstr "" -#: src/main.c:1057 +#: src/main.c:1055 #, fuzzy msgid "Background" msgstr "_ప్రారంభం" -#: src/main.c:1568 +#: src/main.c:1566 msgid "Loading realtime effect plugins..." msgstr "" -#: src/main.c:1633 +#: src/main.c:1631 msgid "Starting jack audio server..." msgstr "" -#: src/main.c:1635 +#: src/main.c:1633 msgid "Starting jack transport server..." msgstr "" -#: src/main.c:1636 +#: src/main.c:1634 msgid "Connecting to jack transport server..." msgstr "" -#: src/main.c:1665 +#: src/main.c:1663 #, c-format msgid "" "\n" @@ -163,112 +163,112 @@ "Alternatively, try to start lives with either \"lives -jackopts 16\", or " msgstr "" -#: src/main.c:1699 +#: src/main.c:1697 msgid "Starting pulse audio server..." msgstr "" -#: src/main.c:1767 +#: src/main.c:1765 msgid "Checking optional dependencies:" msgstr "" -#: src/main.c:1768 +#: src/main.c:1766 msgid "mplayer...detected..." msgstr "" -#: src/main.c:1769 +#: src/main.c:1767 msgid "mplayer...NOT DETECTED..." msgstr "" -#: src/main.c:1770 +#: src/main.c:1768 msgid "mplayer2...detected..." msgstr ""
View file
LiVES-2.2.7.tar.bz2/po/tr.po -> LiVES-2.2.8.tar.bz2/po/tr.po
Changed
@@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: lives\n" "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n" -"POT-Creation-Date: 2014-12-21 11:07-0300\n" +"POT-Creation-Date: 2015-02-08 17:18-0300\n" "PO-Revision-Date: 2013-03-14 12:31+0000\n" "Last-Translator: Launchpad Translations Administrators <Unknown>\n" "Language-Team: Turkish <tr@li.org>\n" @@ -19,7 +19,7 @@ "X-Generator: Launchpad (build 16546)\n" #. TRANSLATORS: do not translate this message -#: src/main.c:120 +#: src/main.c:118 msgid "" "Attention Translators !\n" "This message is intended for you, so please do not translate it.\n" @@ -28,22 +28,22 @@ "http://lives.sourceforge.net/TRANS-README.txt" msgstr "" -#: src/main.c:136 +#: src/main.c:134 #, c-format msgid "%s Warning: %s\n" msgstr "" -#: src/main.c:140 +#: src/main.c:138 #, c-format msgid "%s Critical error: %s\n" msgstr "" -#: src/main.c:141 +#: src/main.c:139 #, c-format msgid "%s Fatal error: %s\n" msgstr "" -#: src/main.c:178 +#: src/main.c:176 msgid "" "\n" "Unfortunately LiVES crashed.\n" @@ -58,7 +58,7 @@ "Teşekkür ederiz. Eğer LiVES yeniden başlatırsanız çalışmanızı kurtarmanız " "mümkündür.\n" -#: src/main.c:179 +#: src/main.c:177 msgid "" "\n" "\n" @@ -70,7 +70,7 @@ "Lütfen hata raporuna İşletim sistemi, dağıtım ve LiVES sürüm bilgilerini " "ekleyiniz (" -#: src/main.c:182 +#: src/main.c:180 msgid "" "and any information shown below:\n" "\n" @@ -78,7 +78,7 @@ "ve daha fazla bilgi aşağıda gösterilmiştir:\n" "\n" -#: src/main.c:186 +#: src/main.c:184 msgid "" "Please install gdb and then run LiVES with the -debug option to collect more " "information.\n" @@ -88,84 +88,84 @@ "birlikte çalıştırın.\n" "\n" -#: src/main.c:194 +#: src/main.c:192 msgid "Preserving set.\n" msgstr "Koruma ayarları.\n" -#: src/main.c:638 +#: src/main.c:636 msgid "Resizing" msgstr "Yeniden boyutlandırma" -#: src/main.c:645 +#: src/main.c:643 msgid "_Resize All Frames" msgstr "Tüm çerçeveleri yeniden boyutlandır" #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter") -#: src/main.c:897 +#: src/main.c:895 msgid "Any" msgstr "Herhangi" #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified") -#: src/main.c:899 +#: src/main.c:897 msgid "None" msgstr "Boş" #. TRANSLATORS: text saying "recommended", for plugin names, etc. -#: src/main.c:901 +#: src/main.c:899 msgid "recommended" msgstr "tavsiye" #. TRANSLATORS: text saying "disabled", (as in "not enabled") -#: src/main.c:903 +#: src/main.c:901 msgid "disabled !" msgstr "Engelli!" #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected -#: src/main.c:905 +#: src/main.c:903 msgid "**The current layout**" msgstr "**Mevcut yerleşim düzeni**" #. TRANSLATORS: adjective for "Built in" type effects -#: src/main.c:907 +#: src/main.c:905 msgid "Builtin" msgstr "Yapısal" #. TRANSLATORS: adjective for "Custom" type effects -#: src/main.c:909 +#: src/main.c:907 msgid "Custom" msgstr "Özel" #. TRANSLATORS: adjective for "Test" type effects -#: src/main.c:911 +#: src/main.c:909 msgid "Test" msgstr "Sınama" -#: src/main.c:1056 +#: src/main.c:1054 msgid "Foreground" msgstr "" -#: src/main.c:1057 +#: src/main.c:1055 #, fuzzy msgid "Background" msgstr "_Boş arkaplan" -#: src/main.c:1568 +#: src/main.c:1566 msgid "Loading realtime effect plugins..." msgstr "Gerçek zaman efekt eklentileri yükleniyor" -#: src/main.c:1633 +#: src/main.c:1631 msgid "Starting jack audio server..." msgstr "Jack audio sunucusu başlıyor..." -#: src/main.c:1635 +#: src/main.c:1633 msgid "Starting jack transport server..." msgstr "Jack taşıma sunucusu başlıyor" -#: src/main.c:1636 +#: src/main.c:1634 msgid "Connecting to jack transport server..." msgstr "Jack taşıma sunucusuna bağlanılıyor" -#: src/main.c:1665 +#: src/main.c:1663 #, c-format msgid "" "\n" @@ -177,114 +177,114 @@ "Alternatively, try to start lives with either \"lives -jackopts 16\", or " msgstr "" -#: src/main.c:1699 +#: src/main.c:1697 msgid "Starting pulse audio server..." msgstr "Pulse audio sunucusu başlıyor" -#: src/main.c:1767 +#: src/main.c:1765 msgid "Checking optional dependencies:" msgstr "Isteğe bağlı bağımlılıkları denetleme:" -#: src/main.c:1768 +#: src/main.c:1766 msgid "mplayer...detected..." msgstr "mplayer ... bulundu ..." -#: src/main.c:1769 +#: src/main.c:1767 msgid "mplayer...NOT DETECTED..." msgstr "mplayer ... BULUNAMADI ..." -#: src/main.c:1770
View file
LiVES-2.2.7.tar.bz2/po/ug.po -> LiVES-2.2.8.tar.bz2/po/ug.po
Changed
@@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: lives\n" "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n" -"POT-Creation-Date: 2014-12-21 11:07-0300\n" +"POT-Creation-Date: 2015-02-08 17:18-0300\n" "PO-Revision-Date: 2013-03-14 12:31+0000\n" "Last-Translator: Launchpad Translations Administrators <Unknown>\n" "Language-Team: Uyghur <ug@li.org>\n" @@ -19,7 +19,7 @@ "X-Generator: Launchpad (build 16546)\n" #. TRANSLATORS: do not translate this message -#: src/main.c:120 +#: src/main.c:118 msgid "" "Attention Translators !\n" "This message is intended for you, so please do not translate it.\n" @@ -28,22 +28,22 @@ "http://lives.sourceforge.net/TRANS-README.txt" msgstr "" -#: src/main.c:136 +#: src/main.c:134 #, c-format msgid "%s Warning: %s\n" msgstr "" -#: src/main.c:140 +#: src/main.c:138 #, c-format msgid "%s Critical error: %s\n" msgstr "" -#: src/main.c:141 +#: src/main.c:139 #, c-format msgid "%s Fatal error: %s\n" msgstr "" -#: src/main.c:178 +#: src/main.c:176 msgid "" "\n" "Unfortunately LiVES crashed.\n" @@ -52,7 +52,7 @@ "Thanks. Recovery should be possible if you restart LiVES.\n" msgstr "" -#: src/main.c:179 +#: src/main.c:177 msgid "" "\n" "\n" @@ -60,97 +60,97 @@ "distribution, and the LiVES version (" msgstr "" -#: src/main.c:182 +#: src/main.c:180 msgid "" "and any information shown below:\n" "\n" msgstr "" -#: src/main.c:186 +#: src/main.c:184 msgid "" "Please install gdb and then run LiVES with the -debug option to collect more " "information.\n" "\n" msgstr "" -#: src/main.c:194 +#: src/main.c:192 msgid "Preserving set.\n" msgstr "" -#: src/main.c:638 +#: src/main.c:636 msgid "Resizing" msgstr "" -#: src/main.c:645 +#: src/main.c:643 msgid "_Resize All Frames" msgstr "" #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter") -#: src/main.c:897 +#: src/main.c:895 msgid "Any" msgstr "خالىغان" #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified") -#: src/main.c:899 +#: src/main.c:897 msgid "None" msgstr "يوق" #. TRANSLATORS: text saying "recommended", for plugin names, etc. -#: src/main.c:901 +#: src/main.c:899 msgid "recommended" msgstr "تەۋسىيە قىلغان" #. TRANSLATORS: text saying "disabled", (as in "not enabled") -#: src/main.c:903 +#: src/main.c:901 msgid "disabled !" msgstr "چەكلەنگەن!" #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected -#: src/main.c:905 +#: src/main.c:903 msgid "**The current layout**" msgstr "" #. TRANSLATORS: adjective for "Built in" type effects -#: src/main.c:907 +#: src/main.c:905 msgid "Builtin" msgstr "ئىچكى" #. TRANSLATORS: adjective for "Custom" type effects -#: src/main.c:909 +#: src/main.c:907 msgid "Custom" msgstr "ئىختىيارى" #. TRANSLATORS: adjective for "Test" type effects -#: src/main.c:911 +#: src/main.c:909 msgid "Test" msgstr "سىناق" -#: src/main.c:1056 +#: src/main.c:1054 msgid "Foreground" msgstr "" -#: src/main.c:1057 +#: src/main.c:1055 #, fuzzy msgid "Background" msgstr "باشلا(_S)" -#: src/main.c:1568 +#: src/main.c:1566 msgid "Loading realtime effect plugins..." msgstr "" -#: src/main.c:1633 +#: src/main.c:1631 msgid "Starting jack audio server..." msgstr "" -#: src/main.c:1635 +#: src/main.c:1633 msgid "Starting jack transport server..." msgstr "" -#: src/main.c:1636 +#: src/main.c:1634 msgid "Connecting to jack transport server..." msgstr "" -#: src/main.c:1665 +#: src/main.c:1663 #, c-format msgid "" "\n" @@ -162,112 +162,112 @@ "Alternatively, try to start lives with either \"lives -jackopts 16\", or " msgstr "" -#: src/main.c:1699 +#: src/main.c:1697 msgid "Starting pulse audio server..." msgstr "" -#: src/main.c:1767 +#: src/main.c:1765 msgid "Checking optional dependencies:" msgstr "" -#: src/main.c:1768 +#: src/main.c:1766 msgid "mplayer...detected..." msgstr "" -#: src/main.c:1769 +#: src/main.c:1767 msgid "mplayer...NOT DETECTED..." msgstr "" -#: src/main.c:1770 +#: src/main.c:1768 msgid "mplayer2...detected..." msgstr ""
View file
LiVES-2.2.7.tar.bz2/po/uk.po -> LiVES-2.2.8.tar.bz2/po/uk.po
Changed
@@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: lives\n" "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n" -"POT-Creation-Date: 2014-12-21 11:07-0300\n" +"POT-Creation-Date: 2015-02-08 17:18-0300\n" "PO-Revision-Date: 2013-12-13 17:20+0000\n" "Last-Translator: Yuri Chornoivan <yurchor@gmail.com>\n" "Language-Team: Ukrainian <translation@linux.org.ua>\n" @@ -20,7 +20,7 @@ "X-Generator: Launchpad (build 16976)\n" #. TRANSLATORS: do not translate this message -#: src/main.c:120 +#: src/main.c:118 msgid "" "Attention Translators !\n" "This message is intended for you, so please do not translate it.\n" @@ -34,22 +34,22 @@ "All translators should read the LiVES translation notes at\n" "http://lives.sourceforge.net/TRANS-README.txt" -#: src/main.c:136 +#: src/main.c:134 #, c-format msgid "%s Warning: %s\n" msgstr "%s, попередження: %s\n" -#: src/main.c:140 +#: src/main.c:138 #, c-format msgid "%s Critical error: %s\n" msgstr "%s, критична помилка: %s\n" -#: src/main.c:141 +#: src/main.c:139 #, c-format msgid "%s Fatal error: %s\n" msgstr "%s, аварія: %s\n" -#: src/main.c:178 +#: src/main.c:176 msgid "" "\n" "Unfortunately LiVES crashed.\n" @@ -63,7 +63,7 @@ "group_id=64341&atid=507139\n" "Дякуємо. Відновити дані можна буде після перезапуску LiVES.\n" -#: src/main.c:179 +#: src/main.c:177 msgid "" "\n" "\n" @@ -75,7 +75,7 @@ "Будь ласка, у повідомленнях про помилки у програмі вказуйте назву вашої " "операційної системи, дистрибутива та номер версії LiVES (" -#: src/main.c:182 +#: src/main.c:180 msgid "" "and any information shown below:\n" "\n" @@ -83,7 +83,7 @@ "а також дані, наведені нижче:\n" "\n" -#: src/main.c:186 +#: src/main.c:184 msgid "" "Please install gdb and then run LiVES with the -debug option to collect more " "information.\n" @@ -93,83 +93,83 @@ "зібрати більше даних.\n" "\n" -#: src/main.c:194 +#: src/main.c:192 msgid "Preserving set.\n" msgstr "Збереження набору.\n" -#: src/main.c:638 +#: src/main.c:636 msgid "Resizing" msgstr "Зміна розміру" -#: src/main.c:645 +#: src/main.c:643 msgid "_Resize All Frames" msgstr "_Змінити розміри всіх кадрів" #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter") -#: src/main.c:897 +#: src/main.c:895 msgid "Any" msgstr "Будь-який" #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified") -#: src/main.c:899 +#: src/main.c:897 msgid "None" msgstr "Жодного" #. TRANSLATORS: text saying "recommended", for plugin names, etc. -#: src/main.c:901 +#: src/main.c:899 msgid "recommended" msgstr "найліпший" #. TRANSLATORS: text saying "disabled", (as in "not enabled") -#: src/main.c:903 +#: src/main.c:901 msgid "disabled !" msgstr "вимкнено!" #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected -#: src/main.c:905 +#: src/main.c:903 msgid "**The current layout**" msgstr "**Поточне компонування**" #. TRANSLATORS: adjective for "Built in" type effects -#: src/main.c:907 +#: src/main.c:905 msgid "Builtin" msgstr "Вбудований" #. TRANSLATORS: adjective for "Custom" type effects -#: src/main.c:909 +#: src/main.c:907 msgid "Custom" msgstr "Нетиповий" #. TRANSLATORS: adjective for "Test" type effects -#: src/main.c:911 +#: src/main.c:909 msgid "Test" msgstr "Перевірити" -#: src/main.c:1056 +#: src/main.c:1054 msgid "Foreground" msgstr "Передній план" -#: src/main.c:1057 +#: src/main.c:1055 msgid "Background" msgstr "Тло" -#: src/main.c:1568 +#: src/main.c:1566 msgid "Loading realtime effect plugins..." msgstr "Завантаження додатків ефектів реального часу…" -#: src/main.c:1633 +#: src/main.c:1631 msgid "Starting jack audio server..." msgstr "Запуск звукового сервера jack…" -#: src/main.c:1635 +#: src/main.c:1633 msgid "Starting jack transport server..." msgstr "Запуск сервера передавання даних jack…" -#: src/main.c:1636 +#: src/main.c:1634 msgid "Connecting to jack transport server..." msgstr "Встановлення з’єднання з сервером передавання даних jack…" -#: src/main.c:1665 +#: src/main.c:1663 #, c-format msgid "" "\n" @@ -188,114 +188,114 @@ "\n" "Alternatively, try to start lives with either \"lives -jackopts 16\", or " -#: src/main.c:1699 +#: src/main.c:1697 msgid "Starting pulse audio server..." msgstr "Запуск звукового сервера PulseAudio…" -#: src/main.c:1767 +#: src/main.c:1765 msgid "Checking optional dependencies:" msgstr "Пошук додаткових залежностей:" -#: src/main.c:1768 +#: src/main.c:1766 msgid "mplayer...detected..." msgstr "mplayer… виявлено…" -#: src/main.c:1769 +#: src/main.c:1767 msgid "mplayer...NOT DETECTED..." msgstr "mplayer…НЕ ВИЯВЛЕНО…" -#: src/main.c:1770 +#: src/main.c:1768
View file
LiVES-2.2.7.tar.bz2/po/uz.po -> LiVES-2.2.8.tar.bz2/po/uz.po
Changed
@@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: lives\n" "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n" -"POT-Creation-Date: 2014-12-21 11:07-0300\n" +"POT-Creation-Date: 2015-02-08 17:18-0300\n" "PO-Revision-Date: 2013-03-14 12:31+0000\n" "Last-Translator: Launchpad Translations Administrators <Unknown>\n" "Language-Team: Uzbek <uz@li.org>\n" @@ -19,7 +19,7 @@ "X-Generator: Launchpad (build 16546)\n" #. TRANSLATORS: do not translate this message -#: src/main.c:120 +#: src/main.c:118 msgid "" "Attention Translators !\n" "This message is intended for you, so please do not translate it.\n" @@ -33,22 +33,22 @@ "Барча таржимонлар LiVES таржима эслатмасаларини \n" "http://lives.sourceforge.net/TRANS-README.txt файлидан ўқишлари керак." -#: src/main.c:136 +#: src/main.c:134 #, c-format msgid "%s Warning: %s\n" msgstr "" -#: src/main.c:140 +#: src/main.c:138 #, c-format msgid "%s Critical error: %s\n" msgstr "" -#: src/main.c:141 +#: src/main.c:139 #, c-format msgid "%s Fatal error: %s\n" msgstr "" -#: src/main.c:178 +#: src/main.c:176 msgid "" "\n" "Unfortunately LiVES crashed.\n" @@ -63,7 +63,7 @@ "Раҳмат. Тиклаш жараёни LiVES. дастурини қайтадан ишга туширсангиз мавжуд " "бўлиши керак.\n" -#: src/main.c:179 +#: src/main.c:177 msgid "" "\n" "\n" @@ -75,7 +75,7 @@ "Носозлик ҳақида хабар берганингизда, илтимос, операцион тизимингиз, " "дистрибутивингиз ва LiVES дастури версияси маълумотларини ҳам қўшинг (" -#: src/main.c:182 +#: src/main.c:180 msgid "" "and any information shown below:\n" "\n" @@ -83,7 +83,7 @@ "ва бошқа маълумот қуйида кўрсатилади:\n" "\n" -#: src/main.c:186 +#: src/main.c:184 msgid "" "Please install gdb and then run LiVES with the -debug option to collect more " "information.\n" @@ -93,84 +93,84 @@ "debug мосламаси билан ишга туширинг.\n" "\n" -#: src/main.c:194 +#: src/main.c:192 msgid "Preserving set.\n" msgstr "Йиғилганларни сақлаш\n" -#: src/main.c:638 +#: src/main.c:636 msgid "Resizing" msgstr "Ҳажми ўзгартирилмоқда" -#: src/main.c:645 +#: src/main.c:643 msgid "_Resize All Frames" msgstr "Барча кадрларнинг _ҳажмини ўзгартириш" #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter") -#: src/main.c:897 +#: src/main.c:895 msgid "Any" msgstr "Исталган" #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified") -#: src/main.c:899 +#: src/main.c:897 msgid "None" msgstr "Йўқ" #. TRANSLATORS: text saying "recommended", for plugin names, etc. -#: src/main.c:901 +#: src/main.c:899 msgid "recommended" msgstr "тавсия қилинди" #. TRANSLATORS: text saying "disabled", (as in "not enabled") -#: src/main.c:903 +#: src/main.c:901 msgid "disabled !" msgstr "ўчирилди !" #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected -#: src/main.c:905 +#: src/main.c:903 msgid "**The current layout**" msgstr "**Жорий қатлам**" #. TRANSLATORS: adjective for "Built in" type effects -#: src/main.c:907 +#: src/main.c:905 msgid "Builtin" msgstr "" #. TRANSLATORS: adjective for "Custom" type effects -#: src/main.c:909 +#: src/main.c:907 msgid "Custom" msgstr "Бошқа" #. TRANSLATORS: adjective for "Test" type effects -#: src/main.c:911 +#: src/main.c:909 msgid "Test" msgstr "Синаш" -#: src/main.c:1056 +#: src/main.c:1054 msgid "Foreground" msgstr "" -#: src/main.c:1057 +#: src/main.c:1055 #, fuzzy msgid "Background" msgstr "Сўниш" -#: src/main.c:1568 +#: src/main.c:1566 msgid "Loading realtime effect plugins..." msgstr "Реал вақт эффект плагинлари юкланмоқда..." -#: src/main.c:1633 +#: src/main.c:1631 msgid "Starting jack audio server..." msgstr "Jack аудио сервер ишга туширилмоқда..." -#: src/main.c:1635 +#: src/main.c:1633 msgid "Starting jack transport server..." msgstr "Jack транспорт сервери ишга туширилмоқда..." -#: src/main.c:1636 +#: src/main.c:1634 msgid "Connecting to jack transport server..." msgstr "Jack транспорт серверига уланмоқда..." -#: src/main.c:1665 +#: src/main.c:1663 #, c-format msgid "" "\n" @@ -182,114 +182,114 @@ "Alternatively, try to start lives with either \"lives -jackopts 16\", or " msgstr "" -#: src/main.c:1699 +#: src/main.c:1697 msgid "Starting pulse audio server..." msgstr "Аудио сервер пульси ишга туширилмоқда..." -#: src/main.c:1767 +#: src/main.c:1765 msgid "Checking optional dependencies:" msgstr "" -#: src/main.c:1768 +#: src/main.c:1766 msgid "mplayer...detected..." msgstr "mplayer...аниқланди..." -#: src/main.c:1769 +#: src/main.c:1767 msgid "mplayer...NOT DETECTED..." msgstr "mplayer...АНИҚЛАНМАДИ..." -#: src/main.c:1770
View file
LiVES-2.2.7.tar.bz2/po/zh_CN.po -> LiVES-2.2.8.tar.bz2/po/zh_CN.po
Changed
@@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: lives\n" "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n" -"POT-Creation-Date: 2014-12-21 11:07-0300\n" +"POT-Creation-Date: 2015-02-08 17:18-0300\n" "PO-Revision-Date: 2013-03-14 12:31+0000\n" "Last-Translator: Launchpad Translations Administrators <Unknown>\n" "Language-Team: Simplified Chinese <zh_CN@li.org>\n" @@ -19,7 +19,7 @@ "X-Generator: Launchpad (build 16546)\n" #. TRANSLATORS: do not translate this message -#: src/main.c:120 +#: src/main.c:118 msgid "" "Attention Translators !\n" "This message is intended for you, so please do not translate it.\n" @@ -28,22 +28,22 @@ "http://lives.sourceforge.net/TRANS-README.txt" msgstr "" -#: src/main.c:136 +#: src/main.c:134 #, c-format msgid "%s Warning: %s\n" msgstr "" -#: src/main.c:140 +#: src/main.c:138 #, c-format msgid "%s Critical error: %s\n" msgstr "" -#: src/main.c:141 +#: src/main.c:139 #, c-format msgid "%s Fatal error: %s\n" msgstr "" -#: src/main.c:178 +#: src/main.c:176 msgid "" "\n" "Unfortunately LiVES crashed.\n" @@ -57,7 +57,7 @@ "谢。\n" "重启 LiVES 之后应该可以恢复。\n" -#: src/main.c:179 +#: src/main.c:177 msgid "" "\n" "\n" @@ -68,7 +68,7 @@ "\n" "报告崩溃时请包括操作系统、发行版及 LiVES 版本信息 (" -#: src/main.c:182 +#: src/main.c:180 msgid "" "and any information shown below:\n" "\n" @@ -76,7 +76,7 @@ "以及下面的信息：\n" "\n" -#: src/main.c:186 +#: src/main.c:184 msgid "" "Please install gdb and then run LiVES with the -debug option to collect more " "information.\n" @@ -85,84 +85,84 @@ "请安装 gdb 然后添加 -debug 选项运行 LiVES 以便收集更多信息。\n" "\n" -#: src/main.c:194 +#: src/main.c:192 msgid "Preserving set.\n" msgstr "正在保存场景。\n" -#: src/main.c:638 +#: src/main.c:636 msgid "Resizing" msgstr "正在调整尺寸" -#: src/main.c:645 +#: src/main.c:643 msgid "_Resize All Frames" msgstr "调整所有帧的尺寸(_R)" #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter") -#: src/main.c:897 +#: src/main.c:895 msgid "Any" msgstr "任意" #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified") -#: src/main.c:899 +#: src/main.c:897 msgid "None" msgstr "无" #. TRANSLATORS: text saying "recommended", for plugin names, etc. -#: src/main.c:901 +#: src/main.c:899 msgid "recommended" msgstr "推荐" #. TRANSLATORS: text saying "disabled", (as in "not enabled") -#: src/main.c:903 +#: src/main.c:901 msgid "disabled !" msgstr "已禁用 ！" #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected -#: src/main.c:905 +#: src/main.c:903 msgid "**The current layout**" msgstr "**当前的布局**" #. TRANSLATORS: adjective for "Built in" type effects -#: src/main.c:907 +#: src/main.c:905 msgid "Builtin" msgstr "内置" #. TRANSLATORS: adjective for "Custom" type effects -#: src/main.c:909 +#: src/main.c:907 msgid "Custom" msgstr "自定义" #. TRANSLATORS: adjective for "Test" type effects -#: src/main.c:911 +#: src/main.c:909 msgid "Test" msgstr "测试" -#: src/main.c:1056 +#: src/main.c:1054 msgid "Foreground" msgstr "" -#: src/main.c:1057 +#: src/main.c:1055 #, fuzzy msgid "Background" msgstr "空白背景(_B)" -#: src/main.c:1568 +#: src/main.c:1566 msgid "Loading realtime effect plugins..." msgstr "正在加载实时效果插件..." -#: src/main.c:1633 +#: src/main.c:1631 msgid "Starting jack audio server..." msgstr "正在启动 jack 音频服务器..." -#: src/main.c:1635 +#: src/main.c:1633 msgid "Starting jack transport server..." msgstr "正在启动 jack 传输服务器..." -#: src/main.c:1636 +#: src/main.c:1634 msgid "Connecting to jack transport server..." msgstr "正在连接 jack 传输服务器..." -#: src/main.c:1665 +#: src/main.c:1663 #, c-format msgid "" "\n" @@ -174,114 +174,114 @@ "Alternatively, try to start lives with either \"lives -jackopts 16\", or " msgstr "" -#: src/main.c:1699 +#: src/main.c:1697 msgid "Starting pulse audio server..." msgstr "正在开启 pulse 音频服务..." -#: src/main.c:1767 +#: src/main.c:1765 msgid "Checking optional dependencies:" msgstr "检查可选的依赖：" -#: src/main.c:1768 +#: src/main.c:1766 msgid "mplayer...detected..." msgstr "mplayer...发现..." -#: src/main.c:1769 +#: src/main.c:1767 msgid "mplayer...NOT DETECTED..." msgstr "mplayer...未发现..." -#: src/main.c:1770
View file
LiVES-2.2.7.tar.bz2/resources/Makefile.in -> LiVES-2.2.8.tar.bz2/resources/Makefile.in
Changed
@@ -317,8 +317,6 @@ PNG_LIBS = @PNG_LIBS@ POSUB = @POSUB@ PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@ -PROJECTM_CFLAGS = @PROJECTM_CFLAGS@ -PROJECTM_LIBS = @PROJECTM_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ PTHREAD_LIBS = @PTHREAD_LIBS@
View file
LiVES-2.2.7.tar.bz2/smogrify -> LiVES-2.2.8.tar.bz2/smogrify
Changed
@@ -22,7 +22,7 @@ # Do not change these except for testing ! $background=1; -$version="2.2.7"; +$version="2.2.8"; #$dyneversion="LIVES-20091209"; ################################################################### @@ -1398,7 +1398,7 @@ } $sox_version=&get_sox_version; - if ($sox_version<13) { + if ($sox_version<13000000) { if ($asamps==1) { $stype="b"; } @@ -2070,6 +2070,10 @@ smog_system ("/bin/chmod -R 777 \"$linksdir\""); + if ($^O ne "MSWin32") { + $fstype=&get_fs_type($curtmpdir); + } + # need to make hard links, as some encoders complain about symbolic links @@ -2077,22 +2081,62 @@ $name=&mkname($i); $from=&mkname($i+$start-1); if (-f "$curtmpdir$from$img_ext") { - $smerr=smog_system ("/bin/ln \"$curtmpdir/$from$img_ext\" \"$linksdir$name$img_ext\""); - if ($smerr) { - sig_system_error("Symlinking \"$curtmpdir/$from$img_ext\" from \"$linksdir$name$img_ext\"",$smerr); - unlink "$pidfile"; - exit 1; + if ($^O eq "MSWin32") { + $smerr=smog_system ("cp.exe \"$curtmpdir/$from$img_ext\" \"$linksdir$name$img_ext\""); + if ($smerr) { + sig_system_error("Copying \"$curtmpdir/$from$img_ext\" to \"$linksdir$name$img_ext\"",$smerr); + unlink "$pidfile"; + exit 1; + } + } + else { + if ($fstype eq "vfat" || $fstype eq "fat32" || $fstype eq "msdos") { + $smerr=smog_system ("/bin/cp -f \"$curtmpdir/$from$img_ext\" \"$linksdir$name$img_ext\""); + if ($smerr) { + sig_system_error("Copying \"$curtmpdir/$from$img_ext\" from \"$linksdir$name$img_ext\"",$smerr); + unlink "$pidfile"; + exit 1; + } + } + else { + $smerr=smog_system ("/bin/ln \"$curtmpdir/$from$img_ext\" \"$linksdir$name$img_ext\""); + if ($smerr) { + sig_system_error("Symlinking \"$curtmpdir/$from$img_ext\" from \"$linksdir$name$img_ext\"",$smerr); + unlink "$pidfile"; + exit 1; + } + } } } } if (-f $audiofile) { my $xaudiofile=(split(/\//,$audiofile))[-1]; if (! -f "$linksdir$xaudiofile") { - $smerr=smog_system("/bin/ln \"$curtmpdir/$audiofile\" \"$linksdir$xaudiofile\""); - if ($smerr) { - sig_system_error("Symlinking \"$curtmpdir/$audiofile\" from \"$linksdir$xaudiofile\"",$smerr); - unlink "$pidfile"; - exit 1; + if ($^O eq "MSWin32") { + $smerr=smog_system ("cp.exe \"$curtmpdir/$audiofile\" \"$linksdir$xaudiofile\""); + if ($smerr) { + sig_system_error("Copying \"$curtmpdir/$audiofile\" to \"$linksdir$xaudiofile\"",$smerr); + unlink "$pidfile"; + exit 1; + } + } + else { + if ($fstype eq "vfat" || $fstype eq "fat32" || $fstype eq "msdos") { + $smerr=smog_system("/bin/cp -f \"$curtmpdir/$audiofile\" \"$linksdir$xaudiofile\""); + if ($smerr) { + sig_system_error("Copying \"$curtmpdir/$audiofile\" from \"$linksdir$xaudiofile\"",$smerr); + unlink "$pidfile"; + exit 1; + } + } + else { + $smerr=smog_system("/bin/ln \"$curtmpdir/$audiofile\" \"$linksdir$xaudiofile\""); + if ($smerr) { + sig_system_error("Symlinking \"$curtmpdir/$audiofile\" from \"$linksdir$xaudiofile\"",$smerr); + unlink "$pidfile"; + exit 1; + } + } } } } @@ -2270,6 +2314,10 @@ $img_ext=&get_img_ext($curtmpdir,$start); + if ($^O ne "MSWin32") { + $fstype=&get_fs_type($curtmpdir); + } + for ($i=1;$i<=($end-$start+1);$i++) { $name=&mkname($i); $from=&mkname($i+$start-1); @@ -2283,11 +2331,21 @@ } } else { - $smerr=smog_system ("/bin/ln \"$curtmpdir/$from$img_ext\" \"$linksdir/$name$img_ext\""); - if ($smerr) { - sig_system_error("Linking \"$curtmpdir/$from$img_ext\" to \"$linksdir/$name$img_ext\"",$smerr); - unlink "$pidfile"; - exit 1; + if ($fstype eq "vfat" || $fstype eq "fat32" || $fstype eq "msdos") { + $smerr=smog_system ("/bin/cp -f \"$curtmpdir/$from$img_ext\" \"$linksdir/$name$img_ext\""); + if ($smerr) { + sig_system_error("Copying \"$curtmpdir/$from$img_ext\" to \"$linksdir/$name$img_ext\"",$smerr); + unlink "$pidfile"; + exit 1; + } + } + else { + $smerr=smog_system ("/bin/ln \"$curtmpdir/$from$img_ext\" \"$linksdir/$name$img_ext\""); + if ($smerr) { + sig_system_error("Linking \"$curtmpdir/$from$img_ext\" to \"$linksdir/$name$img_ext\"",$smerr); + unlink "$pidfile"; + exit 1; + } } } @@ -4929,14 +4987,29 @@ sub get_formats { + + if (!defined($sox_version)) { + $sox_version=&get_sox_version; + } + if ($asamps==8){ $format=16; $signed=0; - $xsigned="-u"; + if ($sox_version < 14004001) { + $xsigned="-u"; + } + else { + $xsigned="-e unsigned-integer"; + } } else { $signed=1; - $xsigned="-s"; + if ($sox_version < 14004001) { + $xsigned="-s"; + } + else { + $xsigned="-e signed-integer"; + } if ($endian==1) { # little $format=128; @@ -5313,6 +5386,7 @@ #convert .wav to raw pcm using sox or mplayer my $smcom; + &get_formats; my $ap=&rc_get("audio_player"); @@ -5355,7 +5429,7 @@ $sox_version=&get_sox_version; } - if ($sox_version<13) { + if ($sox_version<13000000) { $nodither=""; if ($asamps==8) { $sasamps="b"; @@ -5369,7 +5443,6 @@ $sasamps=$aasamps; } - if (!defined($nrate)) { $nrate=$arate; } @@ -5383,22 +5456,38 @@ }
View file
LiVES-2.2.7.tar.bz2/src/Makefile.am -> LiVES-2.2.8.tar.bz2/src/Makefile.am
Changed
@@ -156,6 +156,7 @@ lives_exe_SOURCES = \ widget-helper.c widget-helper.h \ + widget-helper-gtk.h widget-helper-qt.h \ main.c\ support.c support.h \ effects.c\
View file
LiVES-2.2.7.tar.bz2/src/Makefile.in -> LiVES-2.2.8.tar.bz2/src/Makefile.in
Changed
@@ -115,10 +115,11 @@ CONFIG_CLEAN_VPATH_FILES = am__installdirs = "$(DESTDIR)$(bindir)" PROGRAMS = $(bin_PROGRAMS) -am__lives_exe_SOURCES_DIST = widget-helper.c widget-helper.h main.c \ - support.c support.h effects.c plugins.c plugins.h \ - effects-weed.c effects-weed.h effects-data.c effects-data.h \ - framedraw.c framedraw.h interface.c interface.h paramspecial.c \ +am__lives_exe_SOURCES_DIST = widget-helper.c widget-helper.h \ + widget-helper-gtk.h widget-helper-qt.h main.c support.c \ + support.h effects.c plugins.c plugins.h effects-weed.c \ + effects-weed.h effects-data.c effects-data.h framedraw.c \ + framedraw.h interface.c interface.h paramspecial.c \ paramspecial.h paramwindow.c paramwindow.h rfx-builder.c \ rfx-builder.h lives-yuv4mpeg.c lives-yuv4mpeg.h preferences.c \ preferences.h rte_window.c rte_window.h gui.c ce_thumbs.c \ @@ -395,8 +396,6 @@ PNG_LIBS = @PNG_LIBS@ POSUB = @POSUB@ PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@ -PROJECTM_CFLAGS = @PROJECTM_CFLAGS@ -PROJECTM_LIBS = @PROJECTM_LIBS@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ PTHREAD_LIBS = @PTHREAD_LIBS@ @@ -560,6 +559,7 @@ @ENABLE_GIW_TRUE@giw_CFLAGS = -DENABLE_GIW=1 lives_exe_SOURCES = \ widget-helper.c widget-helper.h \ + widget-helper-gtk.h widget-helper-qt.h \ main.c\ support.c support.h \ effects.c\
View file
LiVES-2.2.7.tar.bz2/src/audio.c -> LiVES-2.2.8.tar.bz2/src/audio.c
Changed
@@ -75,14 +75,14 @@ channum++; if (channum>abuf->out_achans) { register int i; - abuf->bufferf=g_realloc(abuf->bufferf,channum*sizeof(float *)); + abuf->bufferf=(float **)g_realloc(abuf->bufferf,channum*sizeof(float *)); for (i=abuf->out_achans;i<channum;i++) { abuf->bufferf[i]=NULL; } abuf->out_achans=channum; } channum--; - abuf->bufferf[channum]=g_realloc(abuf->bufferf[channum],nsampsize); + abuf->bufferf[channum]=(float *)g_realloc(abuf->bufferf[channum],nsampsize); lives_memcpy(&abuf->bufferf[channum][abuf->samples_filled],src,nsamples*sizeof(float)); } @@ -100,14 +100,14 @@ channum++; if (abuf->buffer16==NULL||channum>abuf->out_achans) { register int i; - abuf->buffer16=g_realloc(abuf->buffer16,channum*sizeof(int16_t *)); + abuf->buffer16=(int16_t **)g_realloc(abuf->buffer16,channum*sizeof(int16_t *)); for (i=abuf->out_achans;i<channum;i++) { abuf->buffer16[i]=NULL; } abuf->out_achans=channum; } channum--; - abuf->buffer16[channum]=g_realloc(abuf->buffer16[channum],nsampsize); + abuf->buffer16[channum]=(int16_t *)g_realloc(abuf->buffer16[channum],nsampsize); lives_memcpy(&abuf->buffer16[channum][abuf->samples_filled],src,nsamples*2); #ifdef DEBUG_AFB g_print("append16 to afb\n"); @@ -3004,9 +3004,9 @@ int swap=0; if (!abuf->s8_signed) swap=SWAP_U_TO_S; abuf->s16_signed=TRUE; - abuf->buffer16=g_malloc(abuf->out_achans*sizeof(int16_t *)); + abuf->buffer16=(int16_t **)g_malloc(abuf->out_achans*sizeof(int16_t *)); for (i=0;i<abuf->out_achans;i++) { - abuf->bufferf[i]=g_malloc(abuf->samples_filled*2); + abuf->bufferf[i]=(float *)g_malloc(abuf->samples_filled*2); sample_move_d8_d16 (abuf->buffer16[i],abuf->buffer8[i], abuf->samples_filled, abuf->samples_filled*2, 1.0, abuf->out_achans, abuf->out_achans, swap); @@ -3016,9 +3016,9 @@ // try convert S16 -> float if (abuf->buffer16!=NULL) { - abuf->bufferf=g_malloc(abuf->out_achans*sizeof(float *)); + abuf->bufferf=(float **)g_malloc(abuf->out_achans*sizeof(float *)); for (i=0;i<abuf->out_achans;i++) { - abuf->bufferf[i]=g_malloc(abuf->samples_filled*sizeof(float)); + abuf->bufferf[i]=(float *)g_malloc(abuf->samples_filled*sizeof(float)); if (!abuf->in_interleaf) { sample_move_d16_float(abuf->bufferf[i],abuf->buffer16[i],abuf->samples_filled,1, (abuf->s16_signed?AFORM_SIGNED:AFORM_UNSIGNED),abuf->swap_endian,1.0); @@ -3065,14 +3065,14 @@ } else { // needs resample - sample_move_float_float(dst,src,alen,scale,1); + sample_move_float_float((float *)dst,(float *)src,alen,scale,1); } dst+=alen*sizeof(float); } else { // interleaved for (i=0;i<tchans;i++) { - sample_move_float_float(dst,src,alen,scale,tchans); + sample_move_float_float((float *)dst,(float *)src,alen,scale,tchans); dst+=sizeof(float); } }
View file
LiVES-2.2.7.tar.bz2/src/callbacks.c -> LiVES-2.2.8.tar.bz2/src/callbacks.c
Changed
@@ -1,6 +1,6 @@ // callbacks.c // LiVES -// (c) G. Finch 2003 - 2014 <salsaman@gmail.com> +// (c) G. Finch 2003 - 2015 <salsaman@gmail.com> // released under the GNU GPL 3 or later // see file ../COPYING for licensing details @@ -533,13 +533,19 @@ void on_filesel_button_clicked (LiVESButton *button, gpointer user_data) { LiVESWidget *tentry=LIVES_WIDGET(user_data); + + boolean is_dir=TRUE; + gchar *dirname; gchar *fname; gchar *tmp; - gchar *def_dir=(gchar *)g_object_get_data(G_OBJECT(button),"def_dir"); + gchar *def_dir=NULL; - boolean is_dir=LIVES_POINTER_TO_INT(g_object_get_data(G_OBJECT(button),"is_dir")); + if (button!=NULL) { + def_dir=(gchar *)g_object_get_data(G_OBJECT(button),"def_dir"); + is_dir=LIVES_POINTER_TO_INT(g_object_get_data(G_OBJECT(button),"is_dir")); + } if (LIVES_IS_TEXT_VIEW(tentry)) fname=lives_text_view_get_text(LIVES_TEXT_VIEW(tentry)); else fname=g_strdup(lives_entry_get_text(LIVES_ENTRY(tentry))); @@ -604,7 +610,7 @@ -void on_open_sel_activate (GtkMenuItem *menuitem, gpointer user_data) { +void on_open_sel_activate (LiVESMenuItem *menuitem, gpointer user_data) { // OPEN A FILE if (mainw->multitrack!=NULL) { @@ -622,7 +628,7 @@ -void on_ok_filesel_open_clicked (GtkFileChooser *chooser, gpointer user_data) { +void on_ok_filesel_open_clicked (LiVESFileChooser *chooser, gpointer user_data) { gchar *fname=lives_file_chooser_get_filename (chooser); gchar *tmp; @@ -655,7 +661,7 @@ -void on_open_vcd_activate (GtkMenuItem *menuitem, gpointer user_data) { +void on_open_vcd_activate (LiVESMenuItem *menuitem, gpointer user_data) { LiVESWidget *vcdtrack_dialog; if (mainw->multitrack!=NULL) { @@ -676,7 +682,7 @@ } -void on_open_loc_activate (GtkMenuItem *menuitem, gpointer user_data) { +void on_open_loc_activate (LiVESMenuItem *menuitem, gpointer user_data) { if (mainw->multitrack!=NULL) { if (mainw->multitrack->idlefunc>0) { g_source_remove(mainw->multitrack->idlefunc); @@ -693,7 +699,7 @@ } -void on_open_utube_activate (GtkMenuItem *menuitem, gpointer user_data) { +void on_open_utube_activate (LiVESMenuItem *menuitem, gpointer user_data) { if (mainw->multitrack!=NULL) { if (mainw->multitrack->idlefunc>0) { g_source_remove(mainw->multitrack->idlefunc); @@ -711,7 +717,7 @@ -void on_autoreload_toggled (GtkToggleButton *togglebutton, gpointer user_data) { +void on_autoreload_toggled (LiVESToggleButton *togglebutton, gpointer user_data) { // type==1, autoreload clipset // type==2, autoreload layout @@ -734,7 +740,7 @@ } -void on_recent_activate (GtkMenuItem *menuitem, gpointer user_data) { +void on_recent_activate (LiVESMenuItem *menuitem, gpointer user_data) { char file[PATH_MAX]; double start=0.; int end=0,pno; @@ -982,7 +988,7 @@ -void on_stop_clicked (GtkMenuItem *menuitem, gpointer user_data) { +void on_stop_clicked (LiVESMenuItem *menuitem, gpointer user_data) { // 'enough' button for open, open location, and record audio gchar *com; @@ -1063,7 +1069,7 @@ -void on_save_as_activate (GtkMenuItem *menuitem, gpointer user_data) { +void on_save_as_activate (LiVESMenuItem *menuitem, gpointer user_data) { if (cfile->frames==0) { on_export_audio_activate (NULL,NULL); @@ -1074,13 +1080,12 @@ } -void -on_save_selection_activate (GtkMenuItem *menuitem, gpointer user_data) { +void on_save_selection_activate (LiVESMenuItem *menuitem, gpointer user_data) { save_file(mainw->current_file,cfile->start,cfile->end,NULL); } -void on_close_activate (GtkMenuItem *menuitem, gpointer user_data) { +void on_close_activate (LiVESMenuItem *menuitem, gpointer user_data) { gchar *warn,*extra; gchar title[256]; boolean lmap_errors=FALSE,acurrent=FALSE,only_current=FALSE; @@ -1297,7 +1302,7 @@ void -on_import_proj_activate (GtkMenuItem *menuitem, +on_import_proj_activate (LiVESMenuItem *menuitem, gpointer user_data) { gchar *com; @@ -1405,7 +1410,7 @@ void -on_export_proj_activate (GtkMenuItem *menuitem, +on_export_proj_activate (LiVESMenuItem *menuitem, gpointer user_data) { gchar *filt[]={"*.lv2",NULL}; @@ -1422,7 +1427,7 @@ renamew=create_rename_dialog(5); lives_widget_show(renamew->dialog); response=lives_dialog_run(LIVES_DIALOG(renamew->dialog)); - if (response==GTK_RESPONSE_CANCEL) { + if (response==LIVES_RESPONSE_CANCEL) { lives_widget_destroy(renamew->dialog); g_free(renamew); mainw->cancelled=CANCEL_USER; @@ -1495,7 +1500,7 @@ -void on_backup_activate (GtkMenuItem *menuitem, gpointer user_data) { +void on_backup_activate (LiVESMenuItem *menuitem, gpointer user_data) { gchar *filt[]={"*.lv1",NULL}; gchar *file_name = choose_file (strlen(mainw->proj_save_dir)?mainw->proj_save_dir:NULL,NULL,filt, LIVES_FILE_CHOOSER_ACTION_SAVE,_ ("Backup as .lv1 file"),NULL); @@ -1511,7 +1516,7 @@ -void on_restore_activate (GtkMenuItem *menuitem, gpointer user_data) { +void on_restore_activate (LiVESMenuItem *menuitem, gpointer user_data) { gchar *filt[]={"*.lv1",NULL}; gchar *file_name = choose_file (strlen(mainw->proj_load_dir)?mainw->proj_load_dir:NULL,NULL,filt, LIVES_FILE_CHOOSER_ACTION_OPEN,_ ("Restore .lv1 file"),NULL); @@ -1564,15 +1569,14 @@ -void -on_quit_activate (GtkMenuItem *menuitem, - gpointer user_data) -{ - int i; - boolean has_layout_map=FALSE; +void on_quit_activate (LiVESMenuItem *menuitem, gpointer user_data) { gchar *com,*esave_dir,*msg; + + boolean has_layout_map=FALSE; boolean had_clips=FALSE,legal_set_name; + register int i; + if (user_data!=NULL&&GPOINTER_TO_INT(user_data)==1) mainw->only_close=TRUE; else mainw->only_close=FALSE; @@ -1744,7 +1748,7 @@ // TODO - split into undo.c -void on_undo_activate (GtkMenuItem *menuitem, gpointer user_data) { +void on_undo_activate (LiVESMenuItem *menuitem, gpointer user_data) { gchar *com;
View file
LiVES-2.2.7.tar.bz2/src/callbacks.h -> LiVES-2.2.8.tar.bz2/src/callbacks.h
Changed
@@ -1,6 +1,6 @@ // callbacks.h // LiVES -// (c) G. Finch <salsaman@gmail.com> 2003 - 2013 +// (c) G. Finch <salsaman@gmail.com> 2003 - 2015 // Released under the GPL 3 or later // see file ../COPYING for licensing details @@ -9,333 +9,328 @@ boolean on_LiVES_delete_event (LiVESWidget *widget, - GdkEvent *event, + LiVESXEvent *event, gpointer user_data); void -on_open_activate (GtkMenuItem *menuitem, +on_open_activate (LiVESMenuItem *menuitem, gpointer user_data); void -on_open_sel_activate (GtkMenuItem *menuitem, +on_open_sel_activate (LiVESMenuItem *menuitem, gpointer user_data); void -on_open_loc_activate (GtkMenuItem *menuitem, +on_open_loc_activate (LiVESMenuItem *menuitem, gpointer user_data); void -on_open_utube_activate (GtkMenuItem *menuitem, +on_open_utube_activate (LiVESMenuItem *menuitem, gpointer user_data); void -on_stop_clicked (GtkMenuItem *menuitem, +on_stop_clicked (LiVESMenuItem *menuitem, gpointer user_data); void -on_save_selection_activate (GtkMenuItem *menuitem, +on_save_selection_activate (LiVESMenuItem *menuitem, gpointer user_data); void -on_save_as_activate (GtkMenuItem *menuitem, +on_save_as_activate (LiVESMenuItem *menuitem, gpointer user_data); void -on_show_clipboard_info_activate (GtkMenuItem *menuitem, +on_show_clipboard_info_activate (LiVESMenuItem *menuitem, gpointer user_data); void -on_close_activate (GtkMenuItem *menuitem, +on_close_activate (LiVESMenuItem *menuitem, gpointer user_data); void -on_import_proj_activate (GtkMenuItem *menuitem, +on_import_proj_activate (LiVESMenuItem *menuitem, gpointer user_data); void -on_export_proj_activate (GtkMenuItem *menuitem, +on_export_proj_activate (LiVESMenuItem *menuitem, gpointer user_data); void -on_quit_activate (GtkMenuItem *menuitem, +on_quit_activate (LiVESMenuItem *menuitem, gpointer user_data); void -on_undo_activate (GtkMenuItem *menuitem, +on_undo_activate (LiVESMenuItem *menuitem, gpointer user_data); void -on_redo_activate (GtkMenuItem *menuitem, +on_redo_activate (LiVESMenuItem *menuitem, gpointer user_data); void -on_paste_as_new_activate (GtkMenuItem *menuitem, +on_paste_as_new_activate (LiVESMenuItem *menuitem, gpointer user_data); void -on_copy_activate (GtkMenuItem *menuitem, +on_copy_activate (LiVESMenuItem *menuitem, gpointer user_data); void -on_cut_activate (GtkMenuItem *menuitem, +on_cut_activate (LiVESMenuItem *menuitem, gpointer user_data); void -on_insert_pre_activate (GtkMenuItem *menuitem, +on_insert_pre_activate (LiVESMenuItem *menuitem, gpointer user_data); void -on_insert_activate (GtkButton *button, +on_insert_activate (LiVESButton *button, gpointer user_data); void -on_merge_activate (GtkMenuItem *menuitem, +on_merge_activate (LiVESMenuItem *menuitem, gpointer user_data); void -on_delete_activate (GtkMenuItem *menuitem, +on_delete_activate (LiVESMenuItem *menuitem, gpointer user_data); void -on_select_all_activate (GtkMenuItem *menuitem, +on_select_all_activate (LiVESMenuItem *menuitem, gpointer user_data); void -on_select_new_activate (GtkMenuItem *menuitem, +on_select_new_activate (LiVESMenuItem *menuitem, gpointer user_data); void -on_select_last_activate (GtkMenuItem *menuitem, +on_select_last_activate (LiVESMenuItem *menuitem, gpointer user_data); void -on_select_to_end_activate (GtkMenuItem *menuitem, +on_select_to_end_activate (LiVESMenuItem *menuitem, gpointer user_data); void -on_select_from_start_activate (GtkMenuItem *menuitem, +on_select_from_start_activate (LiVESMenuItem *menuitem, gpointer user_data); void -on_lock_selwidth_activate (GtkMenuItem *menuitem, +on_lock_selwidth_activate (LiVESMenuItem *menuitem, gpointer user_data); void -on_playall_activate (GtkMenuItem *menuitem, +on_playall_activate (LiVESMenuItem *menuitem, gpointer user_data); void -on_playsel_activate (GtkMenuItem *menuitem, +on_playsel_activate (LiVESMenuItem *menuitem, gpointer user_data); void -on_playclip_activate (GtkMenuItem *menuitem, +on_playclip_activate (LiVESMenuItem *menuitem, gpointer user_data); void -on_stop_activate (GtkMenuItem *menuitem, +on_stop_activate (LiVESMenuItem *menuitem, gpointer user_data); void -on_rev_clipboard_activate (GtkMenuItem *menuitem, +on_rev_clipboard_activate (LiVESMenuItem *menuitem, gpointer user_data); -void -on_encoder_entry_changed(GtkComboBox *, gpointer ptr); +void on_encoder_entry_changed (LiVESCombo *, gpointer ptr); -void on_vid_playback_plugin_changed (GtkEntry *vpp_entry, gpointer user_data); +void on_vid_playback_plugin_changed (LiVESEntry *vpp_entry, gpointer user_data); void -on_prefs_apply_clicked (GtkButton *button, +on_prefs_apply_clicked (LiVESButton *button, gpointer user_data); void -on_show_file_info_activate (GtkMenuItem *menuitem, +on_show_file_info_activate (LiVESMenuItem *menuitem, gpointer user_data); void -switch_clip_activate (GtkMenuItem *menuitem, +switch_clip_activate (LiVESMenuItem *menuitem, gpointer user_data); void
View file
LiVES-2.2.7.tar.bz2/src/ce_thumbs.c -> LiVES-2.2.8.tar.bz2/src/ce_thumbs.c
Changed
@@ -52,7 +52,7 @@ return FALSE; } -static void ce_thumbs_fx_changed (GtkComboBox *combo, gpointer user_data) { +static void ce_thumbs_fx_changed (LiVESCombo *combo, gpointer user_data) { // callback after user switches fx via combo int key=LIVES_POINTER_TO_INT(user_data); int mode,cmode; @@ -73,10 +73,10 @@ // set (delayed) keycheck state register int i; for (i=0;i<prefs->rte_keys_virtual;i++) { - g_signal_handler_block(key_checks[i],ch_fns[i]); + lives_signal_handler_block(key_checks[i],ch_fns[i]); lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(key_checks[i]),GPOINTER_TO_INT(g_object_get_data(G_OBJECT(key_checks[i]),"active"))); if (!lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(key_checks[i]))&&pscrolls[i]!=NULL) ce_thumbs_remove_param_box(i); - g_signal_handler_unblock(key_checks[i],ch_fns[i]); + lives_signal_handler_unblock(key_checks[i],ch_fns[i]); } } @@ -84,13 +84,13 @@ void ce_thumbs_set_keych (int key, boolean on) { // set key check from other source if (key>=rte_keys_virtual) return; - g_signal_handler_block(key_checks[key],ch_fns[key]); + lives_signal_handler_block(key_checks[key],ch_fns[key]); if (!pthread_mutex_trylock(&mainw->gtk_mutex)) { lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON(key_checks[key]),on); if (!on&&pscrolls[key]!=NULL) ce_thumbs_remove_param_box(key); pthread_mutex_unlock(&mainw->gtk_mutex); } - g_signal_handler_unblock(key_checks[key],ch_fns[key]); + lives_signal_handler_unblock(key_checks[key],ch_fns[key]); g_object_set_data(G_OBJECT(key_checks[key]),"active",GINT_TO_POINTER(on)); } @@ -99,10 +99,10 @@ // set combo from other source : need to add params after if (key>=rte_keys_virtual) return; if (mode<0) return; - g_signal_handler_block(fxcombos[key],combo_fns[key]); + lives_signal_handler_block(fxcombos[key],combo_fns[key]); lives_combo_set_active_index (LIVES_COMBO (fxcombos[key]),mode); ce_thumbs_remove_param_box(key); - g_signal_handler_unblock(fxcombos[key],combo_fns[key]); + lives_signal_handler_unblock(fxcombos[key],combo_fns[key]); } @@ -226,8 +226,8 @@ lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(key_checks[i]),mainw->rte&(GU641<<i)); g_object_set_data(G_OBJECT(key_checks[i]),"active",GINT_TO_POINTER(lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(key_checks[i])))); - ch_fns[i]=g_signal_connect_after (GTK_OBJECT (key_checks[i]), "toggled", - G_CALLBACK (rte_on_off_callback_hook),GINT_TO_POINTER (i+1)); + ch_fns[i]=lives_signal_connect_after (LIVES_GUI_OBJECT (key_checks[i]), LIVES_WIDGET_TOGGLED_EVENT, + LIVES_GUI_CALLBACK (rte_on_off_callback_hook),GINT_TO_POINTER (i+1)); fxcombos[i]=lives_standard_combo_new(NULL,FALSE,fxlist,LIVES_BOX(hbox),NULL); @@ -245,8 +245,8 @@ lives_entry_set_editable (LIVES_ENTRY (combo_entries[i]), FALSE); - combo_fns[i]=g_signal_connect(GTK_OBJECT (fxcombos[i]), "changed", - G_CALLBACK (ce_thumbs_fx_changed),GINT_TO_POINTER(i)); + combo_fns[i]=lives_signal_connect(LIVES_GUI_OBJECT (fxcombos[i]), LIVES_WIDGET_CHANGED_EVENT, + LIVES_GUI_CALLBACK (ce_thumbs_fx_changed),GINT_TO_POINTER(i)); } @@ -317,7 +317,7 @@ rb_clip_areas_group = lives_radio_button_get_group (LIVES_RADIO_BUTTON (rb_clip_areas[i])); g_free(tmp); - rb_clip_fns[i]=g_signal_connect (GTK_OBJECT (rb_clip_areas[i]), "toggled", G_CALLBACK (clip_area_toggled), LIVES_INT_TO_POINTER(i)); + rb_clip_fns[i]=lives_signal_connect (LIVES_GUI_OBJECT (rb_clip_areas[i]), LIVES_WIDGET_TOGGLED_EVENT, LIVES_GUI_CALLBACK (clip_area_toggled), LIVES_INT_TO_POINTER(i)); } @@ -407,8 +407,8 @@ rcount++; - g_signal_connect (GTK_OBJECT (clip_boxes[count]), "button_press_event", - G_CALLBACK (switch_clip_cb), + lives_signal_connect (LIVES_GUI_OBJECT (clip_boxes[count]), "button_press_event", + LIVES_GUI_CALLBACK (switch_clip_cb), GINT_TO_POINTER(i)); cliplist=cliplist->next; @@ -515,8 +515,8 @@ pin_check=lives_standard_check_button_new((tmp=g_strdup(_("_Pin"))),TRUE,LIVES_BOX(hbox),(tmp2=g_strdup(_("Pin the parameter box to the window")))); g_free(tmp); g_free(tmp2); - g_signal_connect_after (GTK_OBJECT (pin_check), "toggled", - G_CALLBACK (pin_toggled),LIVES_INT_TO_POINTER (key)); + lives_signal_connect_after (LIVES_GUI_OBJECT (pin_check), LIVES_WIDGET_TOGGLED_EVENT, + LIVES_GUI_CALLBACK (pin_toggled),LIVES_INT_TO_POINTER (key)); on_fx_pre_activate(rfx,1,vbox); @@ -659,18 +659,18 @@ void ce_thumbs_set_clip_area(void) { register int i; - for (i=0;i<n_screen_areas;i++) g_signal_handler_block(rb_clip_areas[i],rb_clip_fns[i]); + for (i=0;i<n_screen_areas;i++) lives_signal_handler_block(rb_clip_areas[i],rb_clip_fns[i]); lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (rb_clip_areas[mainw->active_sa_clips]), TRUE); - for (i=0;i<n_screen_areas;i++) g_signal_handler_unblock(rb_clip_areas[i],rb_clip_fns[i]); + for (i=0;i<n_screen_areas;i++) lives_signal_handler_unblock(rb_clip_areas[i],rb_clip_fns[i]); ce_thumbs_highlight_current_clip(); } void ce_thumbs_set_fx_area(int area) { //register int i; - //for (i=0;i<n_screen_areas;i++) g_signal_handler_block(rb_fx_areas[i],rb_fx_fns[i]); + //for (i=0;i<n_screen_areas;i++) lives_signal_handler_block(rb_fx_areas[i],rb_fx_fns[i]); lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (rb_fx_areas[area]), TRUE); - //for (i=0;i<n_screen_areas;i++) g_signal_handler_unblock(rb_fx_areas[i],rb_fx_fns[i]); + //for (i=0;i<n_screen_areas;i++) lives_signal_handler_unblock(rb_fx_areas[i],rb_fx_fns[i]); mainw->active_sa_fx=area; }
View file
LiVES-2.2.7.tar.bz2/src/colourspace.c -> LiVES-2.2.8.tar.bz2/src/colourspace.c
Changed
@@ -11054,8 +11054,8 @@ if (surf==NULL) return NULL; - cairo=lives_painter_create(surf); // this copies the pixel_data - lives_painter_surface_destroy(surf); + cairo=lives_painter_create(surf); // surf is refcounted + lives_painter_surface_destroy(surf); // reduce refcount, so it is destroyed with the cairo return cairo; }
View file
LiVES-2.2.7.tar.bz2/src/dialogs.c -> LiVES-2.2.8.tar.bz2/src/dialogs.c
Changed
@@ -1,6 +1,6 @@ // dialogs.c // LiVES (lives-exe) -// (c) G. Finch 2003 - 2012 +// (c) G. Finch 2003 - 2015 // Released under the GPL 3 or later // see file ../COPYING for licensing details @@ -44,7 +44,7 @@ static volatile boolean dlg_thread_ready=FALSE; -void on_warn_mask_toggled (GtkToggleButton *togglebutton, gpointer user_data) { +void on_warn_mask_toggled (LiVESToggleButton *togglebutton, gpointer user_data) { LiVESWidget *tbutton; if (lives_toggle_button_get_active(togglebutton)) prefs->warning_mask|=GPOINTER_TO_INT(user_data); @@ -66,20 +66,20 @@ -static void add_xlays_widget(GtkBox *box) { +static void add_xlays_widget(LiVESBox *box) { // add widget to preview affected layouts - LiVESWidget *expander=gtk_expander_new_with_mnemonic(_("Show affected _layouts")); + LiVESWidget *expander=lives_expander_new_with_mnemonic(_("Show affected _layouts")); LiVESWidget *textview=lives_text_view_new(); LiVESWidget *label; GList *xlist=mainw->xlays; - GtkTextBuffer *textbuffer = lives_text_view_get_buffer (GTK_TEXT_VIEW (textview)); + LiVESTextBuffer *textbuffer = lives_text_view_get_buffer (LIVES_TEXT_VIEW (textview)); lives_text_view_set_editable (LIVES_TEXT_VIEW (textview), FALSE); lives_container_add (LIVES_CONTAINER (expander), textview); if (palette->style&STYLE_1) { - label=gtk_expander_get_label_widget(GTK_EXPANDER(expander)); + label=lives_expander_get_label_widget(LIVES_EXPANDER(expander)); lives_widget_set_fg_color(label, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore); lives_widget_set_fg_color(label, LIVES_WIDGET_STATE_PRELIGHT, &palette->normal_fore); lives_widget_set_fg_color(expander, LIVES_WIDGET_STATE_PRELIGHT, &palette->normal_fore); @@ -106,7 +106,7 @@ -void add_warn_check (GtkBox *box, int warn_mask_number) { +void add_warn_check (LiVESBox *box, int warn_mask_number) { LiVESWidget *checkbutton; LiVESWidget *hbox=lives_hbox_new (FALSE, 0); @@ -116,20 +116,20 @@ lives_widget_show_all(hbox); - g_signal_connect (GTK_OBJECT (checkbutton), "toggled", - G_CALLBACK (on_warn_mask_toggled), + lives_signal_connect (LIVES_GUI_OBJECT (checkbutton), LIVES_WIDGET_TOGGLED_EVENT, + LIVES_GUI_CALLBACK (on_warn_mask_toggled), GINT_TO_POINTER(warn_mask_number)); } -static void add_clear_ds_button(GtkDialog* dialog) { +static void add_clear_ds_button(LiVESDialog* dialog) { LiVESWidget *button = lives_button_new_from_stock (LIVES_STOCK_CLEAR); lives_button_set_label(LIVES_BUTTON(button),_("_Recover disk space")); if (mainw->tried_ds_recover) lives_widget_set_sensitive(button,FALSE); - g_signal_connect (GTK_OBJECT (button), "clicked", - G_CALLBACK (on_cleardisk_activate), + lives_signal_connect (LIVES_GUI_OBJECT (button), LIVES_WIDGET_CLICKED_EVENT, + LIVES_GUI_CALLBACK (on_cleardisk_activate), (gpointer)button); lives_widget_show(button); @@ -138,7 +138,7 @@ } -static void add_clear_ds_adv(GtkBox *box) { +static void add_clear_ds_adv(LiVESBox *box) { // add a button which opens up Recover/Repair widget LiVESWidget *button = lives_button_new_with_mnemonic(_(" _Advanced Settings >>")); LiVESWidget *hbox = lives_hbox_new (FALSE, 0); @@ -148,8 +148,8 @@ lives_widget_show_all(hbox); - g_signal_connect (GTK_OBJECT (button), "clicked", - G_CALLBACK (on_cleardisk_advanced_clicked), + lives_signal_connect (LIVES_GUI_OBJECT (button), LIVES_WIDGET_CLICKED_EVENT, + LIVES_GUI_CALLBACK (on_cleardisk_advanced_clicked), NULL); } @@ -159,7 +159,7 @@ //Warning or yes/no dialog -static LiVESWidget* create_warn_dialog (int warn_mask_number, GtkWindow *transient, const gchar *text, lives_dialog_t diat) { +static LiVESWidget* create_warn_dialog (int warn_mask_number, LiVESWindow *transient, const gchar *text, lives_dialog_t diat) { LiVESWidget *dialog; LiVESWidget *dialog_vbox; LiVESWidget *dialog_action_area; @@ -185,9 +185,9 @@ widget_opts.justify=LIVES_JUSTIFY_CENTER; widget_opts.justify=LIVES_JUSTIFY_DEFAULT; warning_cancelbutton = lives_button_new_from_stock (LIVES_STOCK_LABEL_CANCEL); - lives_dialog_add_action_widget (LIVES_DIALOG (dialog), warning_cancelbutton, GTK_RESPONSE_CANCEL); + lives_dialog_add_action_widget (LIVES_DIALOG (dialog), warning_cancelbutton, LIVES_RESPONSE_CANCEL); warning_okbutton = lives_button_new_from_stock (LIVES_STOCK_LABEL_OK); - lives_dialog_add_action_widget (LIVES_DIALOG (dialog), warning_okbutton, GTK_RESPONSE_OK); + lives_dialog_add_action_widget (LIVES_DIALOG (dialog), warning_okbutton, LIVES_RESPONSE_OK); break; case LIVES_DIALOG_YESNO: dialog = gtk_message_dialog_new (transient,(GtkDialogFlags)0,GTK_MESSAGE_QUESTION,GTK_BUTTONS_NONE,NULL); @@ -259,11 +259,11 @@ lives_widget_set_can_focus_and_default (warning_cancelbutton); - lives_widget_add_accelerator (warning_cancelbutton, "activate", accel_group, - LIVES_KEY_Escape, (GdkModifierType)0, (GtkAccelFlags)0); + lives_widget_add_accelerator (warning_cancelbutton, LIVES_WIDGET_CLICKED_EVENT, accel_group, + LIVES_KEY_Escape, (LiVESXModifierType)0, (LiVESAccelFlags)0); - lives_widget_add_accelerator (warning_okbutton, "activate", accel_group, - LIVES_KEY_Return, (GdkModifierType)0, (GtkAccelFlags)0); + lives_widget_add_accelerator (warning_okbutton, LIVES_WIDGET_CLICKED_EVENT, accel_group, + LIVES_KEY_Return, (LiVESXModifierType)0, (LiVESAccelFlags)0); lives_widget_set_can_focus_and_default (warning_okbutton); lives_widget_grab_default (warning_okbutton); @@ -315,7 +315,7 @@ -boolean do_warning_dialog_with_check_transient(const gchar *text, int warn_mask_number, GtkWindow *transient) { +boolean do_warning_dialog_with_check_transient(const gchar *text, int warn_mask_number, LiVESWindow *transient) { // show OK/CANCEL, returns FALSE if cancelled LiVESWidget *warning; int response=1; @@ -337,12 +337,12 @@ lives_widget_context_update(); if (mytext!=NULL) g_free(mytext); - return (response==GTK_RESPONSE_OK); + return (response==LIVES_RESPONSE_OK); } -boolean do_yesno_dialog_with_check_transient(const gchar *text, int warn_mask_number, GtkWindow *transient) { +boolean do_yesno_dialog_with_check_transient(const gchar *text, int warn_mask_number, LiVESWindow *transient) { // show YES/NO, returns TRUE for YES LiVESWidget *warning; int response=1; @@ -373,7 +373,7 @@ LiVESWidget *warning; int response; gchar *mytext; - GtkWindow *transient=NULL; + LiVESWindow *transient=NULL; if (prefs->show_gui) { if (mainw->multitrack==NULL&&mainw->is_ready) transient=LIVES_WINDOW(mainw->LiVES); @@ -394,7 +394,7 @@ // returns LIVES_CANCEL or LIVES_RETRY -int do_abort_cancel_retry_dialog(const gchar *text, GtkWindow *transient) { +int do_abort_cancel_retry_dialog(const gchar *text, LiVESWindow *transient) { int response; gchar *mytext; LiVESWidget *warning; @@ -459,112 +459,136 @@ -void do_error_dialog(const gchar *text) { +int do_error_dialog(const gchar *text) { + int ret; + // show error box if (!prefs->show_gui) { - do_error_dialog_with_check_transient(text,FALSE,0,NULL); + ret=do_error_dialog_with_check_transient(text,FALSE,0,NULL); } else { - if (prefsw!=NULL&&prefsw->prefs_dialog!=NULL) do_error_dialog_with_check_transient(text,FALSE,0, - LIVES_WINDOW(prefsw->prefs_dialog)); + if (prefsw!=NULL&&prefsw->prefs_dialog!=NULL) ret=do_error_dialog_with_check_transient(text,FALSE,0, + LIVES_WINDOW(prefsw->prefs_dialog)); else { - if (mainw->multitrack==NULL) do_error_dialog_with_check_transient(text,FALSE,0,LIVES_WINDOW(mainw->LiVES)); - else do_error_dialog_with_check_transient(text,FALSE,0,LIVES_WINDOW(mainw->multitrack->window)); + if (mainw->multitrack==NULL) ret=do_error_dialog_with_check_transient(text,FALSE,0,LIVES_WINDOW(mainw->LiVES)); + else ret=do_error_dialog_with_check_transient(text,FALSE,0,LIVES_WINDOW(mainw->multitrack->window)); } }
View file
LiVES-2.2.7.tar.bz2/src/effects-data.c -> LiVES-2.2.8.tar.bz2/src/effects-data.c
Changed
@@ -66,7 +66,7 @@ void override_if_active_input(int hotkey) { // if we have a connection from oparam -1 to iparam -1 for key/mode then set autoscale to TRUE - // this allows user override of "activate" when connected from another filter's "activated" + // this allows user override of LIVES_WIDGET_CLICKED_EVENT when connected from another filter's "activated" lives_pconnect_t *pconx=mainw->pconx; @@ -2593,8 +2593,8 @@ hbox[i]=lives_hbox_new (FALSE, 0); lives_table_attach (LIVES_TABLE (conxwp->tablep), hbox[i], i, i+1, conxwp->trowsp-1, conxwp->trowsp, - (GtkAttachOptions) (LIVES_FILL|LIVES_EXPAND), - (GtkAttachOptions) (0), 0, 0); + (LiVESAttachOptions) (LIVES_FILL|LIVES_EXPAND), + (LiVESAttachOptions) (0), 0, 0); } @@ -2899,8 +2899,8 @@ hbox[i]=lives_hbox_new (FALSE, 0); lives_table_attach (LIVES_TABLE (conxwp->tablec), hbox[i], i, i+1, conxwp->trowsc-1, conxwp->trowsc, - (GtkAttachOptions) (LIVES_FILL|LIVES_EXPAND), - (GtkAttachOptions) (0), 0, 0); + (LiVESAttachOptions) (LIVES_FILL|LIVES_EXPAND), + (LiVESAttachOptions) (0), 0, 0); } @@ -3245,10 +3245,10 @@ if (fidx==-1) { LiVESWidget *acheck=conxwp->acheck[ours]; if (acheck!=NULL) { - g_signal_handler_block(acheck,conxwp->acheck_func[ours]); + lives_signal_handler_block(acheck,conxwp->acheck_func[ours]); lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(acheck),FALSE); lives_widget_set_sensitive(acheck,FALSE); - g_signal_handler_unblock(acheck,conxwp->acheck_func[ours]); + lives_signal_handler_unblock(acheck,conxwp->acheck_func[ours]); } lives_combo_set_active_index (LIVES_COMBO(combo),0); @@ -3531,16 +3531,16 @@ if (acheck!=NULL) { boolean hasrange=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(acheck),"available")); - g_signal_handler_block(acheck,conxwp->acheck_func[ours]); + lives_signal_handler_block(acheck,conxwp->acheck_func[ours]); lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(acheck),FALSE); - g_signal_handler_unblock(acheck,conxwp->acheck_func[ours]); + lives_signal_handler_unblock(acheck,conxwp->acheck_func[ours]); if (hasrange) { lives_widget_set_sensitive(acheck,TRUE); if (lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(conxwp->allcheckc))) { - g_signal_handler_block(acheck,conxwp->acheck_func[ours]); + lives_signal_handler_block(acheck,conxwp->acheck_func[ours]); lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(acheck),TRUE); - g_signal_handler_unblock(acheck,conxwp->acheck_func[ours]); + lives_signal_handler_unblock(acheck,conxwp->acheck_func[ours]); } } } @@ -3548,9 +3548,9 @@ if (iparam==active_dummy) paramname=g_strdup(_("ACTIVATE")); else paramname=weed_get_string_value(iparam,"name",&error); - g_signal_handler_block(combo,conxwp->dpp_func[ours]); + lives_signal_handler_block(combo,conxwp->dpp_func[ours]); lives_combo_set_active_string (LIVES_COMBO(combo),paramname); - g_signal_handler_unblock(combo,conxwp->dpp_func[ours]); + lives_signal_handler_unblock(combo,conxwp->dpp_func[ours]); weed_free(paramname); @@ -3709,10 +3709,10 @@ return; } - g_signal_handler_block(combo,conxwp->dpc_func[ours]); + lives_signal_handler_block(combo,conxwp->dpc_func[ours]); channame=weed_get_string_value(ichan,"name",&error); lives_combo_set_active_string (LIVES_COMBO(combo),channame); - g_signal_handler_unblock(combo,conxwp->dpc_func[ours]); + lives_signal_handler_unblock(combo,conxwp->dpc_func[ours]); weed_free(channame); @@ -3742,7 +3742,7 @@ -static void on_allcheck_toggled(GtkToggleButton *button, gpointer user_data) { +static void on_allcheck_toggled(LiVESToggleButton *button, gpointer user_data) { lives_conx_w *conxwp=(lives_conx_w *)user_data; boolean on=lives_toggle_button_get_active(button); @@ -3757,7 +3757,7 @@ } -static void on_acheck_toggled(GtkToggleButton *acheck, gpointer user_data) { +static void on_acheck_toggled(LiVESToggleButton *acheck, gpointer user_data) { lives_conx_w *conxwp=(lives_conx_w *)user_data; weed_plant_t **iparams; @@ -3922,8 +3922,8 @@ hbox=lives_hbox_new (FALSE, 0); lives_table_attach (LIVES_TABLE (conxwp->tablep), hbox, 0, 1, row, row+1, - (GtkAttachOptions) (LIVES_FILL|LIVES_EXPAND), - (GtkAttachOptions) (0), 0, 0); + (LiVESAttachOptions) (LIVES_FILL|LIVES_EXPAND), + (LiVESAttachOptions) (0), 0, 0); conxwp->pclabel[idx+totchans]=lives_standard_label_new(NULL); lives_box_pack_start (LIVES_BOX (hbox), conxwp->pclabel[idx+totchans], FALSE, FALSE, widget_opts.packing_width); @@ -3937,8 +3937,8 @@ lives_box_pack_start (LIVES_BOX (hbox), conxwp->pfxcombo[idx], FALSE, FALSE, 0); lives_table_attach (LIVES_TABLE (conxwp->tablep), hbox, 2, 3, row, row+1, - (GtkAttachOptions) (LIVES_FILL|LIVES_EXPAND), - (GtkAttachOptions) (0), 0, 0); + (LiVESAttachOptions) (LIVES_FILL|LIVES_EXPAND), + (LiVESAttachOptions) (0), 0, 0); fx_entry = lives_combo_get_entry(LIVES_COMBO(conxwp->pfxcombo[idx])); lives_entry_set_text (LIVES_ENTRY (fx_entry),mainw->string_constants[LIVES_STRING_CONSTANT_NONE]); @@ -3955,16 +3955,16 @@ lives_table_attach (LIVES_TABLE (conxwp->tablep), hbox, 3, 4, row, row+1, - (GtkAttachOptions) (LIVES_FILL|LIVES_EXPAND), - (GtkAttachOptions) (0), 0, 0); + (LiVESAttachOptions) (LIVES_FILL|LIVES_EXPAND), + (LiVESAttachOptions) (0), 0, 0); - g_signal_connect(GTK_OBJECT (conxwp->pfxcombo[idx]), "changed", - G_CALLBACK (dfxp_changed),(gpointer)conxwp); + lives_signal_connect(LIVES_GUI_OBJECT (conxwp->pfxcombo[idx]), LIVES_WIDGET_CHANGED_EVENT, + LIVES_GUI_CALLBACK (dfxp_changed),(gpointer)conxwp); - conxwp->dpp_func[idx]=g_signal_connect(GTK_OBJECT (conxwp->pcombo[idx]), "changed", - G_CALLBACK (dpp_changed),(gpointer)conxwp); + conxwp->dpp_func[idx]=lives_signal_connect(LIVES_GUI_OBJECT (conxwp->pcombo[idx]), LIVES_WIDGET_CHANGED_EVENT, + LIVES_GUI_CALLBACK (dpp_changed),(gpointer)conxwp); g_object_set_data(G_OBJECT(conxwp->pcombo[idx]),"pidx",GINT_TO_POINTER(pidx)); @@ -3989,8 +3989,8 @@ hbox=lives_hbox_new (FALSE, 0); lives_table_attach (LIVES_TABLE (conxwp->tablep), hbox, 4, 5, row, row+1, - (GtkAttachOptions) (LIVES_FILL|LIVES_EXPAND), - (GtkAttachOptions) (0), 0, 0); + (LiVESAttachOptions) (LIVES_FILL|LIVES_EXPAND), + (LiVESAttachOptions) (0), 0, 0); hbox2=lives_hbox_new (FALSE, 0); lives_box_pack_start (LIVES_BOX (hbox), hbox2, FALSE, FALSE, 0); @@ -4000,8 +4000,8 @@ lives_widget_set_sensitive(conxwp->acheck[idx],FALSE); g_object_set_data(G_OBJECT(conxwp->acheck[idx]),"available",GINT_TO_POINTER(hasrange)); - conxwp->acheck_func[idx]=g_signal_connect_after (GTK_OBJECT (conxwp->acheck[idx]), "toggled", - G_CALLBACK (on_acheck_toggled), + conxwp->acheck_func[idx]=lives_signal_connect_after (LIVES_GUI_OBJECT (conxwp->acheck[idx]), LIVES_WIDGET_TOGGLED_EVENT, + LIVES_GUI_CALLBACK (on_acheck_toggled), (gpointer)conxwp); g_object_set_data(G_OBJECT(conxwp->acheck[idx]),"pidx",GINT_TO_POINTER(pidx)); @@ -4018,8 +4018,8 @@ hbox=lives_hbox_new (FALSE, 0); lives_table_attach (LIVES_TABLE (conxwp->tablec), hbox, 0, 1, row, row+1, - (GtkAttachOptions) (LIVES_FILL|LIVES_EXPAND), - (GtkAttachOptions) (0), 0, 0); + (LiVESAttachOptions) (LIVES_FILL|LIVES_EXPAND), + (LiVESAttachOptions) (0), 0, 0); conxwp->pclabel[idx]=lives_standard_label_new(NULL); lives_box_pack_start (LIVES_BOX (hbox), conxwp->pclabel[idx], FALSE, FALSE, widget_opts.packing_width); @@ -4033,8 +4033,8 @@ lives_box_pack_start (LIVES_BOX (hbox), conxwp->cfxcombo[idx], FALSE, FALSE, 0); lives_table_attach (LIVES_TABLE (conxwp->tablec), hbox, 2, 3, row, row+1, - (GtkAttachOptions) (LIVES_FILL|LIVES_EXPAND), - (GtkAttachOptions) (0), 0, 0); + (LiVESAttachOptions) (LIVES_FILL|LIVES_EXPAND), + (LiVESAttachOptions) (0), 0, 0); fx_entry = lives_combo_get_entry(LIVES_COMBO(conxwp->cfxcombo[idx])); lives_entry_set_text (LIVES_ENTRY (fx_entry),mainw->string_constants[LIVES_STRING_CONSTANT_NONE]); @@ -4051,16 +4051,16 @@
View file
LiVES-2.2.7.tar.bz2/src/effects-weed.c -> LiVES-2.2.8.tar.bz2/src/effects-weed.c
Changed
@@ -4847,8 +4847,8 @@ lives_container_add (LIVES_CONTAINER (menu), menuitem); - g_signal_connect (GTK_OBJECT (menuitem), "activate", - G_CALLBACK (rte_set_defs_activate), + lives_signal_connect (LIVES_GUI_OBJECT (menuitem), LIVES_WIDGET_ACTIVATE_EVENT, + LIVES_GUI_CALLBACK (rte_set_defs_activate), GINT_TO_POINTER(i)); weed_free(filter_name);
View file
LiVES-2.2.7.tar.bz2/src/effects.c -> LiVES-2.2.8.tar.bz2/src/effects.c
Changed
@@ -775,7 +775,7 @@ lives_widget_context_update(); lives_xwindow_raise(lives_widget_get_xwindow(resaudw->dialog)); - if (lives_dialog_run(LIVES_DIALOG(resaudw->dialog))!=GTK_RESPONSE_OK) return FALSE; + if (lives_dialog_run(LIVES_DIALOG(resaudw->dialog))!=LIVES_RESPONSE_OK) return FALSE; if (mainw->error) { mainw->error=FALSE; return FALSE; @@ -1039,7 +1039,7 @@ -boolean rte_on_off_callback (GtkAccelGroup *group, GObject *obj, guint keyval, GdkModifierType mod, gpointer user_data) { +boolean rte_on_off_callback (LiVESAccelGroup *group, LiVESObject *obj, uint32_t keyval, LiVESXModifierType mod, gpointer user_data) { // this is the callback which happens when a rte is keyed int key=LIVES_POINTER_TO_INT(user_data); uint64_t new_rte; @@ -1134,12 +1134,12 @@ boolean rte_on_off_callback_hook (LiVESToggleButton *button, gpointer user_data) { - rte_on_off_callback (NULL, NULL, 0, (GdkModifierType)0, user_data); + rte_on_off_callback (NULL, NULL, 0, (LiVESXModifierType)0, user_data); return TRUE; } -boolean grabkeys_callback (GtkAccelGroup *group, GObject *obj, uint32_t keyval, GdkModifierType mod, gpointer user_data) { +boolean grabkeys_callback (LiVESAccelGroup *group, LiVESObject *obj, uint32_t keyval, LiVESXModifierType mod, gpointer user_data) { // assign the keys to the last key-grabable effect mainw->rte_keys=mainw->last_grabable_effect; mainw->osc_block=TRUE; @@ -1153,7 +1153,7 @@ -boolean textparm_callback (GtkAccelGroup *group, GObject *obj, uint32_t keyval, GdkModifierType mod, gpointer user_data) { +boolean textparm_callback (LiVESAccelGroup *group, LiVESObject *obj, uint32_t keyval, LiVESXModifierType mod, gpointer user_data) { // keyboard linked to first string parameter, until TAB is pressed mainw->rte_textparm=get_textparm(); return TRUE; @@ -1164,12 +1164,12 @@ boolean grabkeys_callback_hook (LiVESToggleButton *button, gpointer user_data) { if (!lives_toggle_button_get_active(button)) return TRUE; mainw->last_grabable_effect=GPOINTER_TO_INT(user_data); - grabkeys_callback (NULL, NULL, 0, (GdkModifierType)0, user_data); + grabkeys_callback (NULL, NULL, 0, (LiVESXModifierType)0, user_data); return TRUE; } -boolean rtemode_callback (GtkAccelGroup *group, GObject *obj, uint32_t keyval, GdkModifierType mod, gpointer user_data) { +boolean rtemode_callback (LiVESAccelGroup *group, LiVESObject *obj, uint32_t keyval, LiVESXModifierType mod, gpointer user_data) { // "m" mode key if (mainw->rte_keys==-1) return TRUE; rte_key_setmode(0,-1); @@ -1191,7 +1191,7 @@ } -boolean swap_fg_bg_callback (GtkAccelGroup *group, GObject *obj, uint32_t keyval, GdkModifierType mod, gpointer user_data) { +boolean swap_fg_bg_callback (LiVESAccelGroup *group, LiVESObject *obj, uint32_t keyval, LiVESXModifierType mod, gpointer user_data) { int old_file=mainw->current_file; if (mainw->playing_file<1||mainw->num_tr_applied==0||mainw->noswitch||mainw->blend_file==-1||
View file
LiVES-2.2.7.tar.bz2/src/effects.h -> LiVES-2.2.8.tar.bz2/src/effects.h
Changed
@@ -70,18 +70,18 @@ // key callbacks -boolean textparm_callback (GtkAccelGroup *group, GObject *obj, uint32_t keyval, GdkModifierType mod, gpointer user_data); +boolean textparm_callback (LiVESAccelGroup *group, LiVESObject *obj, uint32_t keyval, LiVESXModifierType mod, gpointer user_data); -boolean grabkeys_callback (GtkAccelGroup *, GObject *, uint32_t, GdkModifierType, gpointer user_data); ///< for accel groups +boolean grabkeys_callback (LiVESAccelGroup *, LiVESObject *, uint32_t, LiVESXModifierType, gpointer user_data); ///< for accel groups boolean grabkeys_callback_hook (LiVESToggleButton *button, gpointer user_data); ///< for widgets -boolean rte_on_off_callback (GtkAccelGroup *, GObject *, uint32_t, GdkModifierType, gpointer user_data); ///< for accel groups +boolean rte_on_off_callback (LiVESAccelGroup *, LiVESObject *, uint32_t, LiVESXModifierType, gpointer user_data); ///< for accel groups boolean rte_on_off_callback_hook (LiVESToggleButton *, gpointer user_data); ///< for widgets -boolean rtemode_callback (GtkAccelGroup *, GObject *, uint32_t, GdkModifierType, gpointer user_data); ///< for accel groups +boolean rtemode_callback (LiVESAccelGroup *, LiVESObject *, uint32_t, LiVESXModifierType, gpointer user_data); ///< for accel groups boolean rtemode_callback_hook (LiVESToggleButton *, gpointer user_data); ///< for widgets -boolean swap_fg_bg_callback (GtkAccelGroup *, GObject *, uint32_t, GdkModifierType, gpointer user_data); +boolean swap_fg_bg_callback (LiVESAccelGroup *, LiVESObject *, uint32_t, LiVESXModifierType, gpointer user_data); weed_plant_t *get_blend_layer(weed_timecode_t tc);
View file
LiVES-2.2.7.tar.bz2/src/events.c -> LiVES-2.2.8.tar.bz2/src/events.c
Changed
@@ -2035,7 +2035,7 @@ ////////////////////////////////////////////////////// // rendering -void set_render_choice (GtkToggleButton *togglebutton, gpointer choice) { +void set_render_choice (LiVESToggleButton *togglebutton, gpointer choice) { if (lives_toggle_button_get_active(togglebutton)) render_choice=GPOINTER_TO_INT (choice); } @@ -2061,7 +2061,7 @@ LiVESWidget *okbutton; LiVESWidget *cancelbutton; GSList *radiobutton_group = NULL; - GtkAccelGroup *accel_group; + LiVESAccelGroup *accel_group; render_choice=RENDER_CHOICE_PREVIEW; @@ -2086,8 +2086,8 @@ lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (radiobutton),TRUE); - g_signal_connect (GTK_OBJECT (radiobutton), "toggled", - G_CALLBACK (set_render_choice), + lives_signal_connect (LIVES_GUI_OBJECT (radiobutton), LIVES_WIDGET_TOGGLED_EVENT, + LIVES_GUI_CALLBACK (set_render_choice), GINT_TO_POINTER (RENDER_CHOICE_PREVIEW)); if (!mainw->clip_switched&&(cfile->clip_type==CLIP_TYPE_DISK||cfile->clip_type==CLIP_TYPE_FILE)) { @@ -2098,8 +2098,8 @@ radiobutton = lives_standard_radio_button_new (_ ("Render events to _same clip"),TRUE,radiobutton_group,LIVES_BOX(hbox),NULL); radiobutton_group = lives_radio_button_get_group (LIVES_RADIO_BUTTON (radiobutton)); - g_signal_connect (GTK_OBJECT (radiobutton), "toggled", - G_CALLBACK (set_render_choice), + lives_signal_connect (LIVES_GUI_OBJECT (radiobutton), LIVES_WIDGET_TOGGLED_EVENT, + LIVES_GUI_CALLBACK (set_render_choice), GINT_TO_POINTER (RENDER_CHOICE_SAME_CLIP)); } @@ -2110,8 +2110,8 @@ radiobutton = lives_standard_radio_button_new (_ ("Render events to _new clip"),TRUE,radiobutton_group,LIVES_BOX(hbox),NULL); radiobutton_group = lives_radio_button_get_group (LIVES_RADIO_BUTTON (radiobutton)); - g_signal_connect (GTK_OBJECT (radiobutton), "toggled", - G_CALLBACK (set_render_choice), + lives_signal_connect (LIVES_GUI_OBJECT (radiobutton), LIVES_WIDGET_TOGGLED_EVENT, + LIVES_GUI_CALLBACK (set_render_choice), GINT_TO_POINTER (RENDER_CHOICE_NEW_CLIP)); @@ -2122,8 +2122,8 @@ radiobutton = lives_standard_radio_button_new (_ ("View/edit events in _multitrack window (test)"),TRUE,radiobutton_group,LIVES_BOX(hbox),NULL); radiobutton_group = lives_radio_button_get_group (LIVES_RADIO_BUTTON (radiobutton)); - g_signal_connect (GTK_OBJECT (radiobutton), "toggled", - G_CALLBACK (set_render_choice), + lives_signal_connect (LIVES_GUI_OBJECT (radiobutton), LIVES_WIDGET_TOGGLED_EVENT, + LIVES_GUI_CALLBACK (set_render_choice), GINT_TO_POINTER (RENDER_CHOICE_MULTITRACK)); if (!allow_mt) lives_widget_set_sensitive(radiobutton,FALSE); @@ -2136,30 +2136,28 @@ radiobutton = lives_standard_radio_button_new (_ ("View/edit events in _event window"),TRUE,radiobutton_group,LIVES_BOX(hbox),NULL); radiobutton_group = lives_radio_button_get_group (LIVES_RADIO_BUTTON (radiobutton)); - if (mainw->stored_event_list!=NULL) lives_widget_set_sensitive(radiobutton,FALSE); - - g_signal_connect (GTK_OBJECT (radiobutton), "toggled", - G_CALLBACK (set_render_choice), + lives_signal_connect (LIVES_GUI_OBJECT (radiobutton), LIVES_WIDGET_TOGGLED_EVENT, + LIVES_GUI_CALLBACK (set_render_choice), GINT_TO_POINTER (RENDER_CHOICE_EVENT_LIST)); cancelbutton = lives_button_new_from_stock (LIVES_STOCK_CANCEL); lives_widget_set_can_focus (cancelbutton,TRUE); - lives_dialog_add_action_widget (LIVES_DIALOG (e_rec_dialog), cancelbutton, GTK_RESPONSE_CANCEL); + lives_dialog_add_action_widget (LIVES_DIALOG (e_rec_dialog), cancelbutton, LIVES_RESPONSE_CANCEL); - g_signal_connect (GTK_OBJECT (cancelbutton), "clicked", - G_CALLBACK (set_render_choice_button), + lives_signal_connect (LIVES_GUI_OBJECT (cancelbutton), LIVES_WIDGET_CLICKED_EVENT, + LIVES_GUI_CALLBACK (set_render_choice_button), GINT_TO_POINTER (RENDER_CHOICE_DISCARD)); accel_group = LIVES_ACCEL_GROUP(lives_accel_group_new ()); - lives_widget_add_accelerator (cancelbutton, "activate", accel_group, - LIVES_KEY_Escape, (GdkModifierType)0, (GtkAccelFlags)0); + lives_widget_add_accelerator (cancelbutton, LIVES_WIDGET_CLICKED_EVENT, accel_group, + LIVES_KEY_Escape, (LiVESXModifierType)0, (LiVESAccelFlags)0); lives_window_add_accel_group (LIVES_WINDOW (e_rec_dialog), accel_group); okbutton = lives_button_new_from_stock (LIVES_STOCK_OK); lives_widget_show (okbutton); - lives_dialog_add_action_widget (LIVES_DIALOG (e_rec_dialog), okbutton, GTK_RESPONSE_OK); + lives_dialog_add_action_widget (LIVES_DIALOG (e_rec_dialog), okbutton, LIVES_RESPONSE_OK); lives_widget_set_can_focus_and_default (okbutton); lives_widget_grab_default (okbutton); lives_widget_show_all (e_rec_dialog); @@ -2906,6 +2904,7 @@ weed_free(in_tracks); } } + weed_free(filter_hash); } weed_free(init_events); @@ -3009,9 +3008,9 @@ // drop frame if it is too far behind if (mainw->playing_file>-1&&!mainw->noframedrop&&next_tc<=curr_tc) break; if (!mainw->fs&&prefs->show_framecount) { - g_signal_handler_block(mainw->spinbutton_pb_fps,mainw->pb_fps_func); + lives_signal_handler_block(mainw->spinbutton_pb_fps,mainw->pb_fps_func); lives_spin_button_set_value(LIVES_SPIN_BUTTON(mainw->spinbutton_pb_fps),cfile->pb_fps); - g_signal_handler_unblock(mainw->spinbutton_pb_fps,mainw->pb_fps_func); + lives_signal_handler_unblock(mainw->spinbutton_pb_fps,mainw->pb_fps_func); } } @@ -4089,7 +4088,7 @@ rdet->enc_changed=FALSE; do { rdet->suggestion_followed=FALSE; - if ((response=lives_dialog_run(LIVES_DIALOG(rdet->dialog)))==GTK_RESPONSE_OK) if (rdet->enc_changed) { + if ((response=lives_dialog_run(LIVES_DIALOG(rdet->dialog)))==LIVES_RESPONSE_OK) if (rdet->enc_changed) { check_encoder_restrictions(FALSE,TRUE,TRUE); } } while (rdet->suggestion_followed); @@ -4111,7 +4110,7 @@ lives_widget_destroy (rdet->dialog); - if (response==GTK_RESPONSE_CANCEL) { + if (response==LIVES_RESPONSE_CANCEL) { g_free(rdet->encoder_name); g_free(rdet); rdet=NULL; @@ -4317,9 +4316,9 @@ mainw->record=FALSE; mainw->record_paused=FALSE; - g_signal_handler_block(mainw->record_perf,mainw->record_perf_func); - lives_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(mainw->record_perf),FALSE); - g_signal_handler_unblock(mainw->record_perf,mainw->record_perf_func); + lives_signal_handler_block(mainw->record_perf,mainw->record_perf_func); + lives_check_menu_item_set_active(LIVES_CHECK_MENU_ITEM(mainw->record_perf),FALSE); + lives_signal_handler_unblock(mainw->record_perf,mainw->record_perf_func); if (count_events(mainw->event_list,FALSE,0,0)==0) { event_list_free(mainw->event_list); @@ -4633,7 +4632,7 @@ // TODO - some event properties should be editable, e.g. parameter values weed_timecode_t tc,tc_secs; - LiVESTreeStore *gtkstore; + LiVESTreeStore *treestore; LiVESTreeIter iter1,iter2,iter3; gchar **string=NULL; @@ -4656,7 +4655,7 @@ LiVESCellRenderer *renderer; LiVESTreeViewColumn *column; - GtkAccelGroup *accel_group; + LiVESAccelGroup *accel_group; char **propnames; @@ -4714,10 +4713,10 @@ lives_table_resize(LIVES_TABLE(table),rows,6); } - gtkstore = lives_tree_store_new (NUM_COLUMNS, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING); + treestore = lives_tree_store_new (NUM_COLUMNS, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING); - lives_tree_store_append (gtkstore, &iter1, NULL); /* Acquire an iterator */ - lives_tree_store_set (gtkstore, &iter1, TITLE_COLUMN, "Properties", -1); + lives_tree_store_append (treestore, &iter1, NULL); /* Acquire an iterator */ + lives_tree_store_set (treestore, &iter1, TITLE_COLUMN, "Properties", -1); propnames=weed_plant_list_leaves (event); @@ -4726,7 +4725,7 @@ weed_free(propnames[i]); continue; } - lives_tree_store_append (gtkstore, &iter2, &iter1); /* Acquire a child iterator */ + lives_tree_store_append (treestore, &iter2, &iter1); /* Acquire a child iterator */ if (oldval!=NULL) { g_free(oldval); @@ -4809,17 +4808,17 @@ } if (j==0) { if (num_elems==1) { - lives_tree_store_set (gtkstore, &iter2, KEY_COLUMN, propnames[i], VALUE_COLUMN, strval, -1); + lives_tree_store_set (treestore, &iter2, KEY_COLUMN, propnames[i], VALUE_COLUMN, strval, -1); }
View file
LiVES-2.2.7.tar.bz2/src/events.h -> LiVES-2.2.8.tar.bz2/src/events.h
Changed
@@ -47,11 +47,11 @@ weed_plant_t *event_copy_and_insert (weed_plant_t *in_event, weed_plant_t *event_list); /// if all_events is FALSE we only count FRAME events -int count_events (weed_plant_t *event_list, gboolean all_events, weed_timecode_t start_tc, weed_timecode_t end_tc); +int count_events (weed_plant_t *event_list, boolean all_events, weed_timecode_t start_tc, weed_timecode_t end_tc); int count_resampled_events (weed_plant_t *event_list, double fps); -gboolean event_list_to_block (weed_plant_t *event_list, int num_events); +boolean event_list_to_block (weed_plant_t *event_list, int num_events); double event_list_get_end_secs (weed_plant_t *event_list); double event_list_get_start_secs (weed_plant_t *event_list); weed_timecode_t event_list_get_end_tc (weed_plant_t *event_list); @@ -63,11 +63,11 @@ weed_plant_t *get_next_frame_event (weed_plant_t *event); weed_plant_t *get_prev_frame_event (weed_plant_t *event); -weed_plant_t *get_frame_event_at (weed_plant_t *event_list, weed_timecode_t tc, weed_plant_t *shortcut, gboolean exact); +weed_plant_t *get_frame_event_at (weed_plant_t *event_list, weed_timecode_t tc, weed_plant_t *shortcut, boolean exact); weed_plant_t *get_frame_event_at_or_before (weed_plant_t *event_list, weed_timecode_t tc, weed_plant_t *shortcut); -gboolean filter_map_after_frame(weed_plant_t *fmap); -gboolean init_event_is_relevant(weed_plant_t *init_event, int ctrack); +boolean filter_map_after_frame(weed_plant_t *fmap); +boolean init_event_is_relevant(weed_plant_t *init_event, int ctrack); // definitions in events.c @@ -88,13 +88,13 @@ weed_timecode_t get_event_timecode (weed_plant_t *); int get_event_hint (weed_plant_t *); -gboolean is_blank_frame (weed_plant_t *, gboolean count_audio); -gboolean has_audio_frame(weed_plant_t *event_list); +boolean is_blank_frame (weed_plant_t *, boolean count_audio); +boolean has_audio_frame(weed_plant_t *event_list); int get_frame_event_clip (weed_plant_t *, int layer); int get_frame_event_frame (weed_plant_t *, int layer); -gboolean frame_event_has_frame_for_track (weed_plant_t *event, int track); +boolean frame_event_has_frame_for_track (weed_plant_t *event, int track); double *get_track_visibility_at_tc(weed_plant_t *event_list, int ntracks, int n_back_tracks, - weed_timecode_t tc, weed_plant_t **shortcut, gboolean bleedthru); + weed_timecode_t tc, weed_plant_t **shortcut, boolean bleedthru); void get_active_track_list(int *clip_index, int num_tracks, weed_plant_t *filter_map); ////////////////////////////////////////////////////////// @@ -104,7 +104,7 @@ int width; int height; double fps; - gboolean ratio_fps; + boolean ratio_fps; LiVESWidget *dialog; LiVESWidget *okbutton; LiVESWidget *encoder_combo; @@ -120,11 +120,11 @@ LiVESWidget *always_hbox; gulong encoder_name_fn; gulong encoder_ofmt_fn; - gboolean enc_changed; + boolean enc_changed; gchar *encoder_name; - gboolean suggestion_followed; + boolean suggestion_followed; - gboolean is_encoding; + boolean is_encoding; int arate; int achans; @@ -140,9 +140,9 @@ //// UI stuff /////// -LiVESWidget *events_rec_dialog (gboolean allow_mt); +LiVESWidget *events_rec_dialog (boolean allow_mt); int get_render_choice (void); -gboolean deal_with_render_choice (gboolean add_deinit); +boolean deal_with_render_choice (boolean add_deinit); #define RENDER_CHOICE_DISCARD 0 #define RENDER_CHOICE_PREVIEW 1
View file
LiVES-2.2.7.tar.bz2/src/framedraw.c -> LiVES-2.2.8.tar.bz2/src/framedraw.c
Changed
@@ -116,8 +116,8 @@ void framedraw_connect_spinbutton(lives_special_framedraw_rect_t *framedraw, lives_rfx_t *rfx) { framedraw->rfx=rfx; - g_signal_connect_after (GTK_OBJECT (mainw->framedraw_spinbutton), "value_changed", - G_CALLBACK (after_framedraw_frame_spinbutton_changed), + lives_signal_connect_after (LIVES_GUI_OBJECT (mainw->framedraw_spinbutton), "value_changed", + LIVES_GUI_CALLBACK (after_framedraw_frame_spinbutton_changed), framedraw); } @@ -128,17 +128,17 @@ // add mouse fn's so we can draw on frames - g_signal_connect (GTK_OBJECT (mainw->framedraw), "motion_notify_event", - G_CALLBACK (on_framedraw_mouse_update), + lives_signal_connect (LIVES_GUI_OBJECT (mainw->framedraw), "motion_notify_event", + LIVES_GUI_CALLBACK (on_framedraw_mouse_update), framedraw); - g_signal_connect (GTK_OBJECT (mainw->framedraw), "button_release_event", - G_CALLBACK (on_framedraw_mouse_reset), + lives_signal_connect (LIVES_GUI_OBJECT (mainw->framedraw), "button_release_event", + LIVES_GUI_CALLBACK (on_framedraw_mouse_reset), framedraw); - g_signal_connect (GTK_OBJECT (mainw->framedraw), "button_press_event", - G_CALLBACK (on_framedraw_mouse_start), + lives_signal_connect (LIVES_GUI_OBJECT (mainw->framedraw), "button_press_event", + LIVES_GUI_CALLBACK (on_framedraw_mouse_start), framedraw); - g_signal_connect (GTK_OBJECT(mainw->framedraw), "enter-notify-event",G_CALLBACK (on_framedraw_enter),framedraw); - g_signal_connect (GTK_OBJECT(mainw->framedraw), "leave-notify-event",G_CALLBACK (on_framedraw_leave),framedraw); + lives_signal_connect (LIVES_GUI_OBJECT(mainw->framedraw), "enter-notify-event",LIVES_GUI_CALLBACK (on_framedraw_enter),framedraw); + lives_signal_connect (LIVES_GUI_OBJECT(mainw->framedraw), "leave-notify-event",LIVES_GUI_CALLBACK (on_framedraw_leave),framedraw); framedraw_connect_spinbutton(framedraw,rfx); @@ -172,7 +172,7 @@ lives_box_pack_start (LIVES_BOX (hbox_rst), mainw->framedraw_reset, TRUE, FALSE, 0); lives_widget_set_sensitive (mainw->framedraw_reset,FALSE); - g_signal_connect (mainw->framedraw_reset, "clicked",G_CALLBACK (on_framedraw_reset_clicked),framedraw); + lives_signal_connect (mainw->framedraw_reset, LIVES_WIDGET_CLICKED_EVENT,LIVES_GUI_CALLBACK (on_framedraw_reset_clicked),framedraw); } @@ -257,8 +257,8 @@ lives_widget_set_fg_color (mainw->framedraw, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore); } - g_signal_connect_after (GTK_OBJECT (mainw->framedraw), LIVES_WIDGET_EVENT_EXPOSE_EVENT, - G_CALLBACK (expose_fd_event), NULL); + lives_signal_connect_after (LIVES_GUI_OBJECT (mainw->framedraw), LIVES_WIDGET_EXPOSE_EVENT, + LIVES_GUI_CALLBACK (expose_fd_event), NULL); hbox = lives_hbox_new (FALSE, 2); @@ -280,7 +280,7 @@ lives_box_pack_start (LIVES_BOX (hbox), mainw->framedraw_preview, TRUE, FALSE, 0); lives_widget_set_sensitive(mainw->framedraw_spinbutton,FALSE); lives_widget_set_sensitive(mainw->framedraw_scale,FALSE); - g_signal_connect (mainw->framedraw_preview, "clicked",G_CALLBACK (start_preview),rfx); + lives_signal_connect (mainw->framedraw_preview, LIVES_WIDGET_CLICKED_EVENT,LIVES_GUI_CALLBACK (start_preview),rfx); lives_widget_show_all (vbox); @@ -804,7 +804,7 @@ // using these 3 functions, the user can draw on frames -boolean on_framedraw_mouse_start (LiVESWidget *widget, GdkEventButton *event, lives_special_framedraw_rect_t *framedraw) { +boolean on_framedraw_mouse_start (LiVESWidget *widget, LiVESXEventButton *event, lives_special_framedraw_rect_t *framedraw) { // user clicked in the framedraw widget (or multitrack playback widget) int fd_height; @@ -924,7 +924,7 @@ return FALSE; } -boolean on_framedraw_mouse_update (LiVESWidget *widget, GdkEventMotion *event, lives_special_framedraw_rect_t *framedraw) { +boolean on_framedraw_mouse_update (LiVESWidget *widget, LiVESXEventMotion *event, lives_special_framedraw_rect_t *framedraw) { // pointer moved in the framedraw widget int xcurrenti,ycurrenti; @@ -1062,7 +1062,7 @@ } -boolean on_framedraw_mouse_reset (LiVESWidget *widget, GdkEventButton *event, lives_special_framedraw_rect_t *framedraw) { +boolean on_framedraw_mouse_reset (LiVESWidget *widget, LiVESXEventButton *event, lives_special_framedraw_rect_t *framedraw) { // user released the mouse button in framedraw widget if (event->button!=1||!b1_held) return FALSE;
View file
LiVES-2.2.7.tar.bz2/src/framedraw.h -> LiVES-2.2.8.tar.bz2/src/framedraw.h
Changed
@@ -13,7 +13,7 @@ #define MAX_PRE_X 320 #define MAX_PRE_Y 240 -// internal padding in pixels for GtkFrame +// internal padding in pixels for LiVESFrame #define FD_HT_ADJ 12 @@ -54,9 +54,9 @@ void on_framedraw_reset_clicked (LiVESButton *, lives_special_framedraw_rect_t *); -boolean on_framedraw_mouse_start (LiVESWidget *, GdkEventButton *, lives_special_framedraw_rect_t *); -boolean on_framedraw_mouse_update (LiVESWidget *, GdkEventMotion *, lives_special_framedraw_rect_t *); -boolean on_framedraw_mouse_reset (LiVESWidget *, GdkEventButton *, lives_special_framedraw_rect_t *); +boolean on_framedraw_mouse_start (LiVESWidget *, LiVESXEventButton *, lives_special_framedraw_rect_t *); +boolean on_framedraw_mouse_update (LiVESWidget *, LiVESXEventMotion *, lives_special_framedraw_rect_t *); +boolean on_framedraw_mouse_reset (LiVESWidget *, LiVESXEventButton *, lives_special_framedraw_rect_t *); boolean on_framedraw_leave (LiVESWidget *, GdkEventCrossing *, lives_special_framedraw_rect_t *);
View file
LiVES-2.2.7.tar.bz2/src/giw/giwknob.c -> LiVES-2.2.8.tar.bz2/src/giw/giwknob.c
Changed
@@ -277,8 +277,8 @@ #if GTK_CHECK_VERSION(3,0,0) G_OBJECT_CLASS (giw_knob_parent_class)->dispose (object); #else - if (GTK_OBJECT_CLASS (parent_class)->destroy) - (* GTK_OBJECT_CLASS (parent_class)->destroy) (object); + if (LIVES_GUI_OBJECT_CLASS (parent_class)->destroy) + (* LIVES_GUI_OBJECT_CLASS (parent_class)->destroy) (object); #endif } @@ -914,18 +914,18 @@ g_signal_handler_disconnect((gpointer)(knob->adjustment),knob->chsig); g_signal_handler_disconnect((gpointer)(knob->adjustment),knob->vchsig); #else - gtk_signal_disconnect_by_data (GTK_OBJECT (knob->adjustment), (gpointer) knob); + gtk_signal_disconnect_by_data (LIVES_GUI_OBJECT (knob->adjustment), (gpointer) knob); #endif - g_object_unref (GTK_OBJECT (knob->adjustment)); + g_object_unref (LIVES_GUI_OBJECT (knob->adjustment)); } knob->adjustment = adjustment; - g_object_ref (GTK_OBJECT (knob->adjustment)); + g_object_ref (LIVES_GUI_OBJECT (knob->adjustment)); - knob->chsig = g_signal_connect (GTK_OBJECT (adjustment), "changed", + knob->chsig = g_signal_connect (LIVES_GUI_OBJECT (adjustment), "changed", (GCallback) giw_knob_adjustment_changed, (gpointer) knob); - knob->vchsig = g_signal_connect (GTK_OBJECT (adjustment), "value_changed", + knob->vchsig = g_signal_connect (LIVES_GUI_OBJECT (adjustment), "value_changed", (GCallback) giw_knob_adjustment_value_changed, (gpointer) knob);
View file
LiVES-2.2.7.tar.bz2/src/giw/giwled.c -> LiVES-2.2.8.tar.bz2/src/giw/giwled.c
Changed
@@ -195,8 +195,8 @@ #if GTK_CHECK_VERSION(3,0,0) G_OBJECT_CLASS (giw_led_parent_class)->dispose (object); #else - if (GTK_OBJECT_CLASS (parent_class)->destroy) - (* GTK_OBJECT_CLASS (parent_class)->destroy) (object); + if (LIVES_GUI_OBJECT_CLASS (parent_class)->destroy) + (* LIVES_GUI_OBJECT_CLASS (parent_class)->destroy) (object); #endif }
View file
LiVES-2.2.7.tar.bz2/src/giw/giwvslider.c -> LiVES-2.2.8.tar.bz2/src/giw/giwvslider.c
Changed
@@ -251,8 +251,8 @@ #if GTK_CHECK_VERSION(3,0,0) G_OBJECT_CLASS (giw_vslider_parent_class)->dispose (object); #else - if (GTK_OBJECT_CLASS (parent_class)->destroy) - (* GTK_OBJECT_CLASS (parent_class)->destroy) (object); + if (LIVES_GUI_OBJECT_CLASS (parent_class)->destroy) + (* LIVES_GUI_OBJECT_CLASS (parent_class)->destroy) (object); #endif } @@ -820,19 +820,19 @@ g_signal_handler_disconnect((gpointer)(vslider->adjustment),vslider->chsig); g_signal_handler_disconnect((gpointer)(vslider->adjustment),vslider->vchsig); #else - gtk_signal_disconnect_by_data (GTK_OBJECT (vslider->adjustment), (gpointer) vslider); + gtk_signal_disconnect_by_data (LIVES_GUI_OBJECT (vslider->adjustment), (gpointer) vslider); #endif g_object_unref (G_OBJECT (vslider->adjustment)); vslider->adjustment=NULL; } vslider->adjustment = adjustment; - g_object_ref (GTK_OBJECT (vslider->adjustment)); + g_object_ref (LIVES_GUI_OBJECT (vslider->adjustment)); - vslider->chsig = g_signal_connect (GTK_OBJECT (adjustment), "changed", + vslider->chsig = g_signal_connect (LIVES_GUI_OBJECT (adjustment), "changed", (GCallback) giw_vslider_adjustment_changed, (gpointer) vslider); - vslider->vchsig = g_signal_connect (GTK_OBJECT (adjustment), "value_changed", + vslider->vchsig = g_signal_connect (LIVES_GUI_OBJECT (adjustment), "value_changed", (GCallback) giw_vslider_adjustment_value_changed, (gpointer) vslider);
View file
LiVES-2.2.7.tar.bz2/src/gui.c -> LiVES-2.2.8.tar.bz2/src/gui.c
Changed
@@ -89,7 +89,7 @@ lives_widget_destroy(mainw->scrolledwindow); } - mainw->scrolledwindow = gtk_scrolled_window_new (NULL, NULL); + mainw->scrolledwindow = lives_scrolled_window_new (NULL, NULL); lives_scrolled_window_set_policy(LIVES_SCROLLED_WINDOW(mainw->scrolledwindow),LIVES_POLICY_AUTOMATIC,LIVES_POLICY_ALWAYS); lives_widget_show (mainw->scrolledwindow); lives_widget_set_vexpand(mainw->scrolledwindow,TRUE); @@ -269,12 +269,12 @@ #if GTK_CHECK_VERSION(3,0,0) - g_signal_connect (GTK_OBJECT (mainw->start_image), LIVES_WIDGET_EVENT_EXPOSE_EVENT, - G_CALLBACK (expose_sim), + lives_signal_connect (LIVES_GUI_OBJECT (mainw->start_image), LIVES_WIDGET_EXPOSE_EVENT, + LIVES_GUI_CALLBACK (expose_sim), NULL); - g_signal_connect (GTK_OBJECT (mainw->end_image), LIVES_WIDGET_EVENT_EXPOSE_EVENT, - G_CALLBACK (expose_eim), + lives_signal_connect (LIVES_GUI_OBJECT (mainw->end_image), LIVES_WIDGET_EXPOSE_EVENT, + LIVES_GUI_CALLBACK (expose_eim), NULL); #else @@ -302,8 +302,8 @@ gtk_drag_dest_set(mainw->LiVES,GTK_DEST_DEFAULT_ALL,mainw->target_table,2, (GdkDragAction)(GDK_ACTION_COPY|GDK_ACTION_MOVE|GDK_ACTION_LINK)); - g_signal_connect (GTK_OBJECT (mainw->LiVES), "drag-data-received", - G_CALLBACK (drag_from_outside), + lives_signal_connect (LIVES_GUI_OBJECT (mainw->LiVES), "drag-data-received", + LIVES_GUI_CALLBACK (drag_from_outside), NULL); @@ -314,7 +314,7 @@ #ifdef GUI_GTK #if !GTK_CHECK_VERSION(3,0,0) if (!mainw->foreign) { - lives_widget_ensure_style(mainw->LiVES); + gtk_widget_ensure_style(mainw->LiVES); } #endif #endif @@ -366,7 +366,7 @@ mainw->open = lives_menu_item_new_with_mnemonic (_("_Open File/Directory")); lives_container_add (LIVES_CONTAINER (menuitem_menu), mainw->open); - lives_widget_add_accelerator (mainw->open, "activate", mainw->accel_group, + lives_widget_add_accelerator (mainw->open, LIVES_WIDGET_ACTIVATE_EVENT, mainw->accel_group, LIVES_KEY_o, LIVES_CONTROL_MASK, LIVES_ACCEL_VISIBLE); @@ -476,8 +476,8 @@ menuitem = lives_menu_item_new_with_mnemonic (_("Add _Unicap Device")); lives_container_add (LIVES_CONTAINER (submenu), menuitem); lives_widget_show (menuitem); - g_signal_connect (GTK_OBJECT (menuitem), "activate", - G_CALLBACK (on_open_vdev_activate), + lives_signal_connect (LIVES_GUI_OBJECT (menuitem), LIVES_WIDGET_ACTIVATE_EVENT, + LIVES_GUI_CALLBACK (on_open_vdev_activate), NULL); #endif @@ -487,8 +487,8 @@ lives_container_add (LIVES_CONTAINER (submenu), menuitem); lives_widget_show (menuitem); - g_signal_connect (GTK_OBJECT (menuitem), "activate", - G_CALLBACK (on_live_fw_activate), + lives_signal_connect (LIVES_GUI_OBJECT (menuitem), LIVES_WIDGET_ACTIVATE_EVENT, + LIVES_GUI_CALLBACK (on_live_fw_activate), NULL); } @@ -496,8 +496,8 @@ lives_container_add (LIVES_CONTAINER (submenu), menuitem); lives_widget_show (menuitem); - g_signal_connect (GTK_OBJECT (menuitem), "activate", - G_CALLBACK (on_live_tvcard_activate), + lives_signal_connect (LIVES_GUI_OBJECT (menuitem), LIVES_WIDGET_ACTIVATE_EVENT, + LIVES_GUI_CALLBACK (on_live_tvcard_activate), NULL); #ifndef HAVE_UNICAP @@ -582,7 +582,7 @@ lives_widget_show (mainw->save_selection); mainw->close = lives_menu_item_new_with_mnemonic (_("_Close This Clip")); - lives_widget_add_accelerator (mainw->close, "activate", mainw->accel_group, + lives_widget_add_accelerator (mainw->close, LIVES_WIDGET_ACTIVATE_EVENT, mainw->accel_group, LIVES_KEY_w, LIVES_CONTROL_MASK, LIVES_ACCEL_VISIBLE); lives_widget_show (mainw->close); @@ -597,7 +597,7 @@ lives_container_add (LIVES_CONTAINER (menuitem_menu), mainw->backup); lives_widget_set_sensitive (mainw->backup, FALSE); - lives_widget_add_accelerator (mainw->backup, "activate", mainw->accel_group, + lives_widget_add_accelerator (mainw->backup, LIVES_WIDGET_ACTIVATE_EVENT, mainw->accel_group, LIVES_KEY_b, LIVES_CONTROL_MASK, LIVES_ACCEL_VISIBLE); @@ -605,7 +605,7 @@ lives_widget_show (mainw->restore); lives_container_add (LIVES_CONTAINER (menuitem_menu), mainw->restore); - lives_widget_add_accelerator (mainw->restore, "activate", mainw->accel_group, + lives_widget_add_accelerator (mainw->restore, LIVES_WIDGET_ACTIVATE_EVENT, mainw->accel_group, LIVES_KEY_r, LIVES_CONTROL_MASK, LIVES_ACCEL_VISIBLE); @@ -652,7 +652,7 @@ lives_widget_set_sensitive (mainw->undo, FALSE); - lives_widget_add_accelerator (mainw->undo, "activate", mainw->accel_group, + lives_widget_add_accelerator (mainw->undo, LIVES_WIDGET_ACTIVATE_EVENT, mainw->accel_group, LIVES_KEY_u, LIVES_CONTROL_MASK, LIVES_ACCEL_VISIBLE); @@ -668,7 +668,7 @@ lives_container_add (LIVES_CONTAINER (menuitem_menu), mainw->redo); lives_widget_set_sensitive (mainw->redo, FALSE); - lives_widget_add_accelerator (mainw->redo, "activate", mainw->accel_group, + lives_widget_add_accelerator (mainw->redo, LIVES_WIDGET_ACTIVATE_EVENT, mainw->accel_group, LIVES_KEY_z, LIVES_CONTROL_MASK, LIVES_ACCEL_VISIBLE); @@ -689,7 +689,7 @@ separatormenuitem=lives_menu_add_separator(LIVES_MENU(menuitem_menu)); lives_widget_show (separatormenuitem); - lives_widget_add_accelerator (mainw->mt_menu, "activate", mainw->accel_group, + lives_widget_add_accelerator (mainw->mt_menu, LIVES_WIDGET_ACTIVATE_EVENT, mainw->accel_group, LIVES_KEY_m, LIVES_CONTROL_MASK, LIVES_ACCEL_VISIBLE); @@ -698,7 +698,7 @@ lives_container_add (LIVES_CONTAINER (menuitem_menu), mainw->copy); lives_widget_set_sensitive (mainw->copy, FALSE); - lives_widget_add_accelerator (mainw->copy, "activate", mainw->accel_group, + lives_widget_add_accelerator (mainw->copy, LIVES_WIDGET_ACTIVATE_EVENT, mainw->accel_group, LIVES_KEY_c, LIVES_CONTROL_MASK, LIVES_ACCEL_VISIBLE); @@ -707,7 +707,7 @@ lives_container_add (LIVES_CONTAINER (menuitem_menu), mainw->cut); lives_widget_set_sensitive (mainw->cut, FALSE); - lives_widget_add_accelerator (mainw->cut, "activate", mainw->accel_group, + lives_widget_add_accelerator (mainw->cut, LIVES_WIDGET_ACTIVATE_EVENT, mainw->accel_group, LIVES_KEY_t, LIVES_CONTROL_MASK, LIVES_ACCEL_VISIBLE); @@ -716,7 +716,7 @@ lives_container_add (LIVES_CONTAINER (menuitem_menu), mainw->insert); lives_widget_set_sensitive (mainw->insert, FALSE); - lives_widget_add_accelerator (mainw->insert, "activate", mainw->accel_group, + lives_widget_add_accelerator (mainw->insert, LIVES_WIDGET_ACTIVATE_EVENT, mainw->accel_group, LIVES_KEY_i, LIVES_CONTROL_MASK, LIVES_ACCEL_VISIBLE); @@ -732,7 +732,7 @@ lives_container_add (LIVES_CONTAINER (menuitem_menu), mainw->paste_as_new); lives_widget_set_sensitive (mainw->paste_as_new, FALSE); - lives_widget_add_accelerator (mainw->paste_as_new, "activate", mainw->accel_group, + lives_widget_add_accelerator (mainw->paste_as_new, LIVES_WIDGET_ACTIVATE_EVENT, mainw->accel_group, LIVES_KEY_n, LIVES_CONTROL_MASK, LIVES_ACCEL_VISIBLE); @@ -754,7 +754,7 @@ lives_image_menu_item_set_image (LIVES_IMAGE_MENU_ITEM (mainw->xdelete), image); #endif - lives_widget_add_accelerator (mainw->xdelete, "activate", mainw->accel_group, + lives_widget_add_accelerator (mainw->xdelete, LIVES_WIDGET_ACTIVATE_EVENT, mainw->accel_group, LIVES_KEY_d, LIVES_CONTROL_MASK, LIVES_ACCEL_VISIBLE); @@ -787,7 +787,7 @@ lives_widget_show (mainw->select_all); lives_container_add (LIVES_CONTAINER (select_submenu_menu), mainw->select_all); - lives_widget_add_accelerator (mainw->select_all, "activate", mainw->accel_group, + lives_widget_add_accelerator (mainw->select_all, LIVES_WIDGET_ACTIVATE_EVENT, mainw->accel_group, LIVES_KEY_a, LIVES_CONTROL_MASK, LIVES_ACCEL_VISIBLE); @@ -795,14 +795,14 @@ lives_widget_show (mainw->select_start_only); lives_container_add (LIVES_CONTAINER (select_submenu_menu), mainw->select_start_only);
View file
LiVES-2.2.7.tar.bz2/src/htmsocket.c -> LiVES-2.2.8.tar.bz2/src/htmsocket.c
Changed
@@ -10,6 +10,7 @@ #include <errno.h> #ifndef IS_MINGW +#include <netinet/in.h> #include <netdb.h> #include <sys/socket.h> #include <sys/ioctl.h>
View file
LiVES-2.2.7.tar.bz2/src/interface.c -> LiVES-2.2.8.tar.bz2/src/interface.c
Changed
@@ -1,6 +1,7 @@ + // interface.c // LiVES -// (c) G. Finch 2003 - 2014 <salsaman@gmail.com> +// (c) G. Finch 2003 - 2015 <salsaman@gmail.com> // Released under the GNU GPL 3 or later // see file ../COPYING for licensing details @@ -26,7 +27,7 @@ extern void mt_change_disp_tracks_ok (LiVESButton *, gpointer user_data); -void add_suffix_check(GtkBox *box, const gchar *ext) { +void add_suffix_check(LiVESBox *box, const gchar *ext) { gchar *ltext; LiVESWidget *checkbutton; @@ -36,15 +37,15 @@ checkbutton=lives_standard_check_button_new(ltext,TRUE,box,NULL); g_free(ltext); lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (checkbutton), mainw->fx1_bool); - g_signal_connect_after (GTK_OBJECT (checkbutton), "toggled", - G_CALLBACK (on_boolean_toggled), + lives_signal_connect_after (LIVES_GUI_OBJECT (checkbutton), LIVES_WIDGET_TOGGLED_EVENT, + LIVES_GUI_CALLBACK (on_boolean_toggled), &mainw->fx1_bool); } -static LiVESWidget *add_deinterlace_checkbox(GtkBox *for_deint) { +static LiVESWidget *add_deinterlace_checkbox(LiVESBox *for_deint) { LiVESWidget *hbox=lives_hbox_new (FALSE, 0); LiVESWidget *checkbutton = lives_standard_check_button_new (_ ("Apply _Deinterlace"),TRUE,LIVES_BOX(hbox),NULL); @@ -59,8 +60,8 @@ lives_widget_set_can_focus_and_default (checkbutton); lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (checkbutton), mainw->open_deint); - g_signal_connect_after (GTK_OBJECT (checkbutton), "toggled", - G_CALLBACK (on_boolean_toggled), + lives_signal_connect_after (LIVES_GUI_OBJECT (checkbutton), LIVES_WIDGET_TOGGLED_EVENT, + LIVES_GUI_CALLBACK (on_boolean_toggled), &mainw->open_deint); lives_widget_set_tooltip_text( checkbutton,_("If this is set, frames will be deinterlaced as they are imported.")); @@ -70,7 +71,7 @@ } -static void pv_sel_changed(GtkFileChooser *chooser, gpointer user_data) { +static void pv_sel_changed(LiVESFileChooser *chooser, gpointer user_data) { GSList *slist=lives_file_chooser_get_filenames (chooser); LiVESWidget *pbutton=(LiVESWidget *)user_data; @@ -147,15 +148,15 @@ } - g_signal_connect (GTK_OBJECT (preview_button), "clicked", - G_CALLBACK (on_fs_preview_clicked), + lives_signal_connect (LIVES_GUI_OBJECT (preview_button), LIVES_WIDGET_CLICKED_EVENT, + LIVES_GUI_CALLBACK (on_fs_preview_clicked), GINT_TO_POINTER (preview_type)); if (GTK_IS_FILE_CHOOSER(widget)) { lives_widget_set_sensitive(preview_button,FALSE); - g_signal_connect (GTK_OBJECT (widget), "selection_changed", - G_CALLBACK (pv_sel_changed), + lives_signal_connect (LIVES_GUI_OBJECT (widget), "selection_changed", + LIVES_GUI_CALLBACK (pv_sel_changed), (gpointer)preview_button); } @@ -282,33 +283,33 @@ } procw->cancel_button = lives_button_new_with_mnemonic (_ ("_Cancel")); - lives_dialog_add_action_widget (LIVES_DIALOG (procw->processing), procw->cancel_button, GTK_RESPONSE_CANCEL); + lives_dialog_add_action_widget (LIVES_DIALOG (procw->processing), procw->cancel_button, LIVES_RESPONSE_CANCEL); lives_widget_set_can_focus_and_default (procw->cancel_button); - lives_widget_add_accelerator (procw->cancel_button, "activate", accel_group, - LIVES_KEY_Escape, (GdkModifierType)0, (GtkAccelFlags)0); + lives_widget_add_accelerator (procw->cancel_button, LIVES_WIDGET_CLICKED_EVENT, accel_group, + LIVES_KEY_Escape, (LiVESXModifierType)0, (LiVESAccelFlags)0); - g_signal_connect (GTK_OBJECT (procw->stop_button), "clicked", - G_CALLBACK (on_stop_clicked), + lives_signal_connect (LIVES_GUI_OBJECT (procw->stop_button), LIVES_WIDGET_CLICKED_EVENT, + LIVES_GUI_CALLBACK (on_stop_clicked), NULL); - g_signal_connect (GTK_OBJECT (procw->pause_button), "clicked", - G_CALLBACK (on_effects_paused), + lives_signal_connect (LIVES_GUI_OBJECT (procw->pause_button), LIVES_WIDGET_CLICKED_EVENT, + LIVES_GUI_CALLBACK (on_effects_paused), NULL); if (mainw->multitrack!=NULL&&mainw->multitrack->is_rendering) { - g_signal_connect (GTK_OBJECT (procw->preview_button), "clicked", - G_CALLBACK (multitrack_preview_clicked), + lives_signal_connect (LIVES_GUI_OBJECT (procw->preview_button), LIVES_WIDGET_CLICKED_EVENT, + LIVES_GUI_CALLBACK (multitrack_preview_clicked), mainw->multitrack); } else { - g_signal_connect (GTK_OBJECT (procw->preview_button), "clicked", - G_CALLBACK (on_preview_clicked), + lives_signal_connect (LIVES_GUI_OBJECT (procw->preview_button), LIVES_WIDGET_CLICKED_EVENT, + LIVES_GUI_CALLBACK (on_preview_clicked), NULL); } - g_signal_connect (GTK_OBJECT (procw->cancel_button), "clicked", - G_CALLBACK (on_cancel_keep_button_clicked), + lives_signal_connect (LIVES_GUI_OBJECT (procw->cancel_button), LIVES_WIDGET_CLICKED_EVENT, + LIVES_GUI_CALLBACK (on_cancel_keep_button_clicked), NULL); @@ -405,65 +406,65 @@ label = lives_standard_label_new (_("Format")); lives_table_attach (LIVES_TABLE (table), label, 0, 1, 0, 1, - (GtkAttachOptions) (LIVES_FILL|LIVES_EXPAND), - (GtkAttachOptions) (0), 0, 0); + (LiVESAttachOptions) (LIVES_FILL|LIVES_EXPAND), + (LiVESAttachOptions) (0), 0, 0); label = lives_standard_label_new (_("Frame size")); lives_table_attach (LIVES_TABLE (table), label, 0, 1, 1, 2, - (GtkAttachOptions) (LIVES_FILL|LIVES_EXPAND), - (GtkAttachOptions) (0), 0, 0); + (LiVESAttachOptions) (LIVES_FILL|LIVES_EXPAND), + (LiVESAttachOptions) (0), 0, 0); if (!is_mt) label = lives_standard_label_new (_("File size")); else label = lives_standard_label_new (_("Byte size")); lives_table_attach (LIVES_TABLE (table), label, 0, 1, 2, 3, - (GtkAttachOptions) (LIVES_FILL|LIVES_EXPAND), - (GtkAttachOptions) (0), 0, 0); + (LiVESAttachOptions) (LIVES_FILL|LIVES_EXPAND), + (LiVESAttachOptions) (0), 0, 0); label = lives_standard_label_new (_("FPS")); lives_table_attach (LIVES_TABLE (table), label, 2, 3, 0, 1, - (GtkAttachOptions) (LIVES_FILL|LIVES_EXPAND), - (GtkAttachOptions) (0), 0, 0); + (LiVESAttachOptions) (LIVES_FILL|LIVES_EXPAND), + (LiVESAttachOptions) (0), 0, 0); if (!is_mt) label = lives_standard_label_new (_("Frames")); else label = lives_standard_label_new (_("Events")); lives_table_attach (LIVES_TABLE (table), label, 2, 3, 1, 2, - (GtkAttachOptions) (LIVES_FILL|LIVES_EXPAND), - (GtkAttachOptions) (0), 0, 0); + (LiVESAttachOptions) (LIVES_FILL|LIVES_EXPAND), + (LiVESAttachOptions) (0), 0, 0); label = lives_standard_label_new (_("Total time")); lives_table_attach (LIVES_TABLE (table), label, 2, 3, 2, 3, - (GtkAttachOptions) (LIVES_FILL|LIVES_EXPAND), - (GtkAttachOptions) (0), 0, 0); + (LiVESAttachOptions) (LIVES_FILL|LIVES_EXPAND), + (LiVESAttachOptions) (0), 0, 0); filew->textview24 = vid_text_view_new (); lives_table_attach (LIVES_TABLE (table), filew->textview24, 1, 2, 0, 1, - (GtkAttachOptions) (LIVES_FILL|LIVES_EXPAND), - (GtkAttachOptions) (0), 0, 0); + (LiVESAttachOptions) (LIVES_FILL|LIVES_EXPAND), + (LiVESAttachOptions) (0), 0, 0); filew->textview25 = vid_text_view_new (); lives_table_attach (LIVES_TABLE (table), filew->textview25, 3, 4, 0, 1, - (GtkAttachOptions) (LIVES_FILL|LIVES_EXPAND), - (GtkAttachOptions) (0), 0, 0); + (LiVESAttachOptions) (LIVES_FILL|LIVES_EXPAND), + (LiVESAttachOptions) (0), 0, 0); filew->textview26 = vid_text_view_new (); lives_table_attach (LIVES_TABLE (table), filew->textview26, 1, 2, 1, 2, - (GtkAttachOptions) (LIVES_FILL|LIVES_EXPAND), - (GtkAttachOptions) (0), 0, 0); + (LiVESAttachOptions) (LIVES_FILL|LIVES_EXPAND), + (LiVESAttachOptions) (0), 0, 0); filew->textview27 = vid_text_view_new (); lives_table_attach (LIVES_TABLE (table), filew->textview27, 3, 4, 1, 2, - (GtkAttachOptions) (LIVES_FILL|LIVES_EXPAND), - (GtkAttachOptions) (0), 0, 0); + (LiVESAttachOptions) (LIVES_FILL|LIVES_EXPAND), + (LiVESAttachOptions) (0), 0, 0); filew->textview28 = vid_text_view_new (); lives_table_attach (LIVES_TABLE (table), filew->textview28, 3, 4, 2, 3,
View file
LiVES-2.2.7.tar.bz2/src/interface.h -> LiVES-2.2.8.tar.bz2/src/interface.h
Changed
@@ -80,7 +80,7 @@ LiVESWidget *textview; } text_window; -text_window* create_text_window (const gchar *title_part, const gchar *text, GtkTextBuffer *); +text_window* create_text_window (const gchar *title_part, const gchar *text, LiVESTextBuffer *); typedef struct {
View file
LiVES-2.2.7.tar.bz2/src/jack.c -> LiVES-2.2.8.tar.bz2/src/jack.c
Changed
@@ -400,7 +400,7 @@ uint64_t numFramesToWrite; /* num frames we are writing this loop */ int64_t in_frames=0; uint64_t in_bytes=0,xin_bytes=0; - gfloat shrink_factor=1.f; + float shrink_factor=1.f; double vol; lives_clip_t *xfile=afile; @@ -473,7 +473,7 @@ in_bytes=ABS((in_frames=((double)jackd->sample_in_rate/(double)jackd->sample_out_rate* (double)jackFramesAvailable+((double)fastrand()/(double)G_MAXUINT32)))) *jackd->num_input_channels*jackd->bytes_per_channel; - if ((shrink_factor=(gfloat)in_frames/(gfloat)jackFramesAvailable)<0.f) { + if ((shrink_factor=(float)in_frames/(float)jackFramesAvailable)<0.f) { // reverse playback if ((jackd->seek_pos-=in_bytes)<0) { // reached beginning backwards
View file
LiVES-2.2.7.tar.bz2/src/keyboard.c -> LiVES-2.2.8.tar.bz2/src/keyboard.c
Changed
@@ -196,7 +196,7 @@ // we also auto-repeat our cached keys if (cached_key&¤t_kb_time-last_kb_time>KEY_RPT_INTERVAL*10) { last_kb_time=current_kb_time; - lives_accel_groups_activate (G_OBJECT (mainw->LiVES),(uint32_t)cached_key, (GdkModifierType)cached_mod); + lives_accel_groups_activate (G_OBJECT (mainw->LiVES),(uint32_t)cached_key, (LiVESXModifierType)cached_mod); } return TRUE; @@ -210,7 +210,7 @@ // (via a polling mechanism) // mask for ctrl and alt - LiVESModifierType state=(LiVESModifierType)(keymod&(LIVES_CONTROL_MASK|LIVES_ALT_MASK)); + LiVESXModifierType state=(LiVESXModifierType)(keymod&(LIVES_CONTROL_MASK|LIVES_ALT_MASK)); // hmmm...only works with GTK+2.x @@ -335,82 +335,82 @@ // key callback functions - ones which have keys and need wrappers -boolean slower_callback (GtkAccelGroup *group, GObject *obj, uint32_t keyval, GdkModifierType mod, gpointer user_data) { +boolean slower_callback (LiVESAccelGroup *group, LiVESObject *obj, uint32_t keyval, LiVESXModifierType mod, gpointer user_data) { on_slower_pressed (NULL,user_data); return TRUE; } -boolean faster_callback (GtkAccelGroup *group, GObject *obj, uint32_t keyval, GdkModifierType mod, gpointer user_data) { +boolean faster_callback (LiVESAccelGroup *group, LiVESObject *obj, uint32_t keyval, LiVESXModifierType mod, gpointer user_data) { on_faster_pressed (NULL,user_data); return TRUE; } -boolean skip_back_callback (GtkAccelGroup *group, GObject *obj, uint32_t keyval, GdkModifierType mod, gpointer user_data) { +boolean skip_back_callback (LiVESAccelGroup *group, LiVESObject *obj, uint32_t keyval, LiVESXModifierType mod, gpointer user_data) { on_back_pressed (NULL,user_data); return TRUE; } -boolean skip_forward_callback (GtkAccelGroup *group, GObject *obj, uint32_t keyval, GdkModifierType mod, gpointer user_data) { +boolean skip_forward_callback (LiVESAccelGroup *group, LiVESObject *obj, uint32_t keyval, LiVESXModifierType mod, gpointer user_data) { on_forward_pressed (NULL,user_data); return TRUE; } -boolean stop_callback (GtkAccelGroup *group, GObject *obj, uint32_t keyval, GdkModifierType mod, gpointer user_data) { +boolean stop_callback (LiVESAccelGroup *group, LiVESObject *obj, uint32_t keyval, LiVESXModifierType mod, gpointer user_data) { on_stop_activate (NULL,NULL); return TRUE; } -boolean fullscreen_callback (GtkAccelGroup *group, GObject *obj, uint32_t keyval, GdkModifierType mod, gpointer user_data) { +boolean fullscreen_callback (LiVESAccelGroup *group, LiVESObject *obj, uint32_t keyval, LiVESXModifierType mod, gpointer user_data) { on_full_screen_pressed (NULL,NULL); return TRUE; } -boolean sepwin_callback (GtkAccelGroup *group, GObject *obj, uint32_t keyval, GdkModifierType mod, gpointer user_data) { +boolean sepwin_callback (LiVESAccelGroup *group, LiVESObject *obj, uint32_t keyval, LiVESXModifierType mod, gpointer user_data) { on_sepwin_pressed (NULL,NULL); return TRUE; } -boolean loop_cont_callback (GtkAccelGroup *group, GObject *obj, uint32_t keyval, GdkModifierType mod, gpointer user_data) { +boolean loop_cont_callback (LiVESAccelGroup *group, LiVESObject *obj, uint32_t keyval, LiVESXModifierType mod, gpointer user_data) { on_loop_button_activate (NULL,NULL); return TRUE; } -boolean ping_pong_callback (GtkAccelGroup *group, GObject *obj, uint32_t keyval, GdkModifierType mod, gpointer user_data) { +boolean ping_pong_callback (LiVESAccelGroup *group, LiVESObject *obj, uint32_t keyval, LiVESXModifierType mod, gpointer user_data) { on_ping_pong_activate (NULL,NULL); return TRUE; } -boolean fade_callback (GtkAccelGroup *group, GObject *obj, uint32_t keyval, GdkModifierType mod, gpointer user_data) { +boolean fade_callback (LiVESAccelGroup *group, LiVESObject *obj, uint32_t keyval, LiVESXModifierType mod, gpointer user_data) { on_fade_pressed (NULL,NULL); return TRUE; } -boolean showfct_callback (GtkAccelGroup *group, GObject *obj, uint32_t keyval, GdkModifierType mod, gpointer user_data) { - lives_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(mainw->showfct),!prefs->show_framecount); +boolean showfct_callback (LiVESAccelGroup *group, LiVESObject *obj, uint32_t keyval, LiVESXModifierType mod, gpointer user_data) { + lives_check_menu_item_set_active(LIVES_CHECK_MENU_ITEM(mainw->showfct),!prefs->show_framecount); return TRUE; } -boolean showsubs_callback (GtkAccelGroup *group, GObject *obj, uint32_t keyval, GdkModifierType mod, gpointer user_data) { - lives_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(mainw->showsubs),!prefs->show_subtitles); +boolean showsubs_callback (LiVESAccelGroup *group, LiVESObject *obj, uint32_t keyval, LiVESXModifierType mod, gpointer user_data) { + lives_check_menu_item_set_active(LIVES_CHECK_MENU_ITEM(mainw->showsubs),!prefs->show_subtitles); return TRUE; } -boolean loop_callback (GtkAccelGroup *group, GObject *obj, uint32_t keyval, GdkModifierType mod, gpointer user_data) { - lives_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(mainw->loop_video),!mainw->loop); +boolean loop_callback (LiVESAccelGroup *group, LiVESObject *obj, uint32_t keyval, LiVESXModifierType mod, gpointer user_data) { + lives_check_menu_item_set_active(LIVES_CHECK_MENU_ITEM(mainw->loop_video),!mainw->loop); return TRUE; } -boolean dblsize_callback (GtkAccelGroup *group, GObject *obj, uint32_t keyval, GdkModifierType mod, gpointer user_data) { +boolean dblsize_callback (LiVESAccelGroup *group, LiVESObject *obj, uint32_t keyval, LiVESXModifierType mod, gpointer user_data) { on_double_size_pressed (NULL,NULL); return TRUE; } -boolean rec_callback (GtkAccelGroup *group, GObject *obj, uint32_t keyval, GdkModifierType mod, gpointer user_data) { - lives_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(mainw->record_perf),!gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (mainw->record_perf))); +boolean rec_callback (LiVESAccelGroup *group, LiVESObject *obj, uint32_t keyval, LiVESXModifierType mod, gpointer user_data) { + lives_check_menu_item_set_active(LIVES_CHECK_MENU_ITEM(mainw->record_perf),!lives_check_menu_item_get_active (LIVES_CHECK_MENU_ITEM (mainw->record_perf))); return TRUE; }
View file
LiVES-2.2.7.tar.bz2/src/keyboard.h -> LiVES-2.2.8.tar.bz2/src/keyboard.h
Changed
@@ -20,41 +20,41 @@ boolean ext_triggers_poll(gpointer); ///< poll for external playback start -GdkFilterReturn filter_func(GdkXEvent *xevent, GdkEvent *event, gpointer data); +GdkFilterReturn filter_func(GdkXEvent *xevent, LiVESXEvent *event, gpointer data); boolean plugin_poll_keyboard (void); boolean pl_key_function (boolean down, uint16_t unicode, uint16_t keymod); -boolean faster_callback (GtkAccelGroup *, GObject *, uint32_t, GdkModifierType, gpointer user_data); +boolean faster_callback (LiVESAccelGroup *, LiVESObject *, uint32_t, LiVESXModifierType, gpointer user_data); -boolean slower_callback (GtkAccelGroup *, GObject *, uint32_t, GdkModifierType, gpointer user_data); +boolean slower_callback (LiVESAccelGroup *, LiVESObject *, uint32_t, LiVESXModifierType, gpointer user_data); -boolean skip_back_callback (GtkAccelGroup *, GObject *, uint32_t, GdkModifierType, gpointer user_data); +boolean skip_back_callback (LiVESAccelGroup *, LiVESObject *, uint32_t, LiVESXModifierType, gpointer user_data); -boolean skip_forward_callback (GtkAccelGroup *, GObject *, uint32_t, GdkModifierType, gpointer user_data); +boolean skip_forward_callback (LiVESAccelGroup *, LiVESObject *, uint32_t, LiVESXModifierType, gpointer user_data); -boolean stop_callback (GtkAccelGroup *, GObject *, uint32_t, GdkModifierType, gpointer user_data); +boolean stop_callback (LiVESAccelGroup *, LiVESObject *, uint32_t, LiVESXModifierType, gpointer user_data); -boolean rec_callback (GtkAccelGroup *, GObject *, uint32_t, GdkModifierType, gpointer user_data); +boolean rec_callback (LiVESAccelGroup *, LiVESObject *, uint32_t, LiVESXModifierType, gpointer user_data); -boolean loop_callback (GtkAccelGroup *, GObject *, uint32_t, GdkModifierType, gpointer user_data); +boolean loop_callback (LiVESAccelGroup *, LiVESObject *, uint32_t, LiVESXModifierType, gpointer user_data); -boolean loop_cont_callback (GtkAccelGroup *, GObject *, uint32_t, GdkModifierType, gpointer user_data); +boolean loop_cont_callback (LiVESAccelGroup *, LiVESObject *, uint32_t, LiVESXModifierType, gpointer user_data); -boolean ping_pong_callback (GtkAccelGroup *, GObject *, uint32_t, GdkModifierType, gpointer user_data); +boolean ping_pong_callback (LiVESAccelGroup *, LiVESObject *, uint32_t, LiVESXModifierType, gpointer user_data); -boolean dblsize_callback (GtkAccelGroup *, GObject *, uint32_t, GdkModifierType, gpointer user_data); +boolean dblsize_callback (LiVESAccelGroup *, LiVESObject *, uint32_t, LiVESXModifierType, gpointer user_data); -boolean showfct_callback (GtkAccelGroup *, GObject *, uint32_t, GdkModifierType, gpointer user_data); +boolean showfct_callback (LiVESAccelGroup *, LiVESObject *, uint32_t, LiVESXModifierType, gpointer user_data); -boolean showsubs_callback (GtkAccelGroup *, GObject *, uint32_t, GdkModifierType, gpointer user_data); +boolean showsubs_callback (LiVESAccelGroup *, LiVESObject *, uint32_t, LiVESXModifierType, gpointer user_data); -boolean fullscreen_callback (GtkAccelGroup *, GObject *, uint32_t, GdkModifierType, gpointer user_data); +boolean fullscreen_callback (LiVESAccelGroup *, LiVESObject *, uint32_t, LiVESXModifierType, gpointer user_data); -boolean sepwin_callback (GtkAccelGroup *, GObject *, uint32_t, GdkModifierType, gpointer user_data); +boolean sepwin_callback (LiVESAccelGroup *, LiVESObject *, uint32_t, LiVESXModifierType, gpointer user_data); -boolean fade_callback (GtkAccelGroup *, GObject *, uint32_t, GdkModifierType, gpointer user_data); +boolean fade_callback (LiVESAccelGroup *, LiVESObject *, uint32_t, LiVESXModifierType, gpointer user_data); #define KEY_RPT_INTERVAL 4
View file
LiVES-2.2.7.tar.bz2/src/ldvcallbacks.h -> LiVES-2.2.8.tar.bz2/src/ldvcallbacks.h
Changed
@@ -5,13 +5,13 @@ // see file ../COPYING for licensing details -void on_camgrab_clicked (GtkButton *, gpointer s_cam); -void on_camplay_clicked (GtkButton *, gpointer s_cam); -void on_camstop_clicked (GtkButton *, gpointer s_cam); -void on_camrew_clicked (GtkButton *, gpointer s_cam); -void on_camff_clicked (GtkButton *, gpointer s_cam); -void on_cameject_clicked (GtkButton *, gpointer s_cam); -void on_campause_clicked (GtkButton *, gpointer s_cam); -void on_camquit_clicked (GtkButton *, gpointer s_cam); +void on_camgrab_clicked (LiVESButton *, gpointer s_cam); +void on_camplay_clicked (LiVESButton *, gpointer s_cam); +void on_camstop_clicked (LiVESButton *, gpointer s_cam); +void on_camrew_clicked (LiVESButton *, gpointer s_cam); +void on_camff_clicked (LiVESButton *, gpointer s_cam); +void on_cameject_clicked (LiVESButton *, gpointer s_cam); +void on_campause_clicked (LiVESButton *, gpointer s_cam); +void on_camquit_clicked (LiVESButton *, gpointer s_cam); -boolean on_camdelete_event (LiVESWidget *, GdkEvent *, gpointer s_cam); +boolean on_camdelete_event (LiVESWidget *, LiVESXEvent *, gpointer s_cam);
View file
LiVES-2.2.7.tar.bz2/src/ldvgrab.h -> LiVES-2.2.8.tar.bz2/src/ldvgrab.h
Changed
@@ -32,7 +32,7 @@ void close_raw1394(raw1394handle_t handle); -gchar *find_free_camfile(gint format); +gchar *find_free_camfile(int format); struct _dvgrabw { @@ -44,7 +44,7 @@ LiVESWidget *quit; LiVESWidget *status_entry; LiVESWidget *split; - GdkCursor *cursor; + LiVESXCursor *cursor; boolean playing; gchar *dirname; gchar *filename;
View file
LiVES-2.2.7.tar.bz2/src/ldvinterface.c -> LiVES-2.2.8.tar.bz2/src/ldvinterface.c
Changed
@@ -10,8 +10,7 @@ #include "ldvinterface.h" -struct _dvgrabw *create_camwindow (s_cam *cam, int type) -{ +struct _dvgrabw *create_camwindow (s_cam *cam, int type) { LiVESWidget *hbuttonbox1; LiVESWidget *hbuttonbox2; LiVESWidget *button3; @@ -58,7 +57,7 @@ g_free(tmp); - g_signal_connect(buttond, "clicked", G_CALLBACK (on_filesel_button_clicked), (gpointer)direntry); + lives_signal_connect(buttond, LIVES_WIDGET_CLICKED_EVENT, LIVES_GUI_CALLBACK (on_filesel_button_clicked), (gpointer)direntry); ////////////////// @@ -86,7 +85,7 @@ lives_box_pack_start(LIVES_BOX(vbox),dvgrabw->status_entry,FALSE,FALSE,widget_opts.packing_height); lives_entry_set_text(LIVES_ENTRY(dvgrabw->status_entry),_("Status: Ready")); - gtk_editable_set_editable (GTK_EDITABLE(dvgrabw->status_entry),FALSE); + lives_editable_set_editable (LIVES_EDITABLE(dvgrabw->status_entry),FALSE); add_hsep_to_box(LIVES_BOX(vbox)); @@ -162,12 +161,12 @@ ////////////////////////////////////////////////////////////////////////////////////////// - g_signal_connect (button3, "clicked",G_CALLBACK (on_camrew_clicked),(gpointer)cam); - g_signal_connect (button4, "clicked",G_CALLBACK (on_camff_clicked),(gpointer)cam); - g_signal_connect (dvgrabw->stop, "clicked",G_CALLBACK (on_camstop_clicked),(gpointer)cam); - g_signal_connect (dvgrabw->play, "clicked",G_CALLBACK (on_camplay_clicked),(gpointer)cam); - g_signal_connect (dvgrabw->grab, "clicked",G_CALLBACK (on_camgrab_clicked),(gpointer)cam); - g_signal_connect (dvgrabw->quit, "clicked",G_CALLBACK (on_camquit_clicked),(gpointer)cam); + lives_signal_connect (button3, LIVES_WIDGET_CLICKED_EVENT,LIVES_GUI_CALLBACK (on_camrew_clicked),(gpointer)cam); + lives_signal_connect (button4, LIVES_WIDGET_CLICKED_EVENT,LIVES_GUI_CALLBACK (on_camff_clicked),(gpointer)cam); + lives_signal_connect (dvgrabw->stop, LIVES_WIDGET_CLICKED_EVENT,LIVES_GUI_CALLBACK (on_camstop_clicked),(gpointer)cam); + lives_signal_connect (dvgrabw->play, LIVES_WIDGET_CLICKED_EVENT,LIVES_GUI_CALLBACK (on_camplay_clicked),(gpointer)cam); + lives_signal_connect (dvgrabw->grab, LIVES_WIDGET_CLICKED_EVENT,LIVES_GUI_CALLBACK (on_camgrab_clicked),(gpointer)cam); + lives_signal_connect (dvgrabw->quit, LIVES_WIDGET_CLICKED_EVENT,LIVES_GUI_CALLBACK (on_camquit_clicked),(gpointer)cam); lives_widget_show_all(dvgrabw->dialog);
View file
LiVES-2.2.7.tar.bz2/src/lives-yuv4mpeg.c -> LiVES-2.2.8.tar.bz2/src/lives-yuv4mpeg.c
Changed
@@ -606,7 +606,7 @@ response=lives_dialog_run(LIVES_DIALOG(card_dialog)); - if (response==GTK_RESPONSE_CANCEL) { + if (response==LIVES_RESPONSE_CANCEL) { lives_widget_destroy(card_dialog); g_free(fifofile); g_free(tvcardw); @@ -741,7 +741,7 @@ card_dialog=create_cdtrack_dialog(5,NULL); response=lives_dialog_run(LIVES_DIALOG(card_dialog)); - if (response==GTK_RESPONSE_CANCEL) { + if (response==LIVES_RESPONSE_CANCEL) { lives_widget_destroy(card_dialog); g_free(fifofile); return;
View file
LiVES-2.2.7.tar.bz2/src/lives-yuv4mpeg.h -> LiVES-2.2.8.tar.bz2/src/lives-yuv4mpeg.h
Changed
@@ -34,9 +34,9 @@ void weed_layer_set_from_yuv4m (weed_plant_t *layer, lives_clip_t *); // callbacks -void on_open_yuv4m_activate (GtkMenuItem *, gpointer); -void on_live_tvcard_activate (GtkMenuItem *, gpointer); -void on_live_fw_activate (GtkMenuItem *, gpointer); +void on_open_yuv4m_activate (LiVESMenuItem *, gpointer); +void on_live_tvcard_activate (LiVESMenuItem *, gpointer); +void on_live_fw_activate (LiVESMenuItem *, gpointer); void lives_yuv_stream_stop_read (lives_yuv4m_t *);
View file
LiVES-2.2.7.tar.bz2/src/main.c -> LiVES-2.2.8.tar.bz2/src/main.c
Changed
@@ -1,6 +1,6 @@ // main.c // LiVES (lives-exe) -// (c) G. Finch 2003 - 2012 +// (c) G. Finch 2003 - 2015 /* This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License version 3 or higher as published by @@ -76,8 +76,6 @@ #endif -#include <sys/stat.h> - //////////////////////////////// capability *capable; _palette *palette; @@ -656,12 +654,12 @@ rfx->menu_text=g_strdup(mtext); // disconnect old menu entry - g_signal_handler_disconnect(mainw->resize_menuitem,mainw->fx_candidates[FX_CANDIDATE_RESIZER].func); + lives_signal_handler_disconnect(mainw->resize_menuitem,mainw->fx_candidates[FX_CANDIDATE_RESIZER].func); } // connect new menu entry - mainw->fx_candidates[FX_CANDIDATE_RESIZER].func=g_signal_connect (GTK_OBJECT (mainw->resize_menuitem), "activate", - G_CALLBACK (on_render_fx_pre_activate), + mainw->fx_candidates[FX_CANDIDATE_RESIZER].func=lives_signal_connect (LIVES_GUI_OBJECT (mainw->resize_menuitem), LIVES_WIDGET_ACTIVATE_EVENT, + LIVES_GUI_CALLBACK (on_render_fx_pre_activate), (gpointer)rfx); mainw->fx_candidates[FX_CANDIDATE_RESIZER].rfx=rfx; } @@ -2298,7 +2296,7 @@ void print_notice() { g_printerr("\nLiVES %s\n",LiVES_VERSION); - g_printerr("Copyright 2002-2014 Gabriel Finch (salsaman@gmail.com) and others.\n"); + g_printerr("Copyright 2002-2015 Gabriel Finch (salsaman@gmail.com) and others.\n"); g_printerr("LiVES comes with ABSOLUTELY NO WARRANTY\nThis is free software, and you are welcome to redistribute it\nunder certain conditions; see the file COPYING for details.\n\n"); } @@ -2745,7 +2743,7 @@ #ifdef LIVES_NO_DEBUG // don't crash on GTK+ fatals - g_log_set_always_fatal ((GLogLevelFlags)0); + //g_log_set_always_fatal ((GLogLevelFlags)0); #endif g_log_set_default_handler(lives_log_handler,NULL); @@ -3234,15 +3232,15 @@ } if (mainw->current_file>0&&!(cfile->menuentry==NULL)) { - g_signal_handler_block(mainw->spinbutton_end,mainw->spin_end_func); + lives_signal_handler_block(mainw->spinbutton_end,mainw->spin_end_func); lives_spin_button_set_range(LIVES_SPIN_BUTTON(mainw->spinbutton_end),1,cfile->frames); lives_spin_button_set_value(LIVES_SPIN_BUTTON(mainw->spinbutton_end),cfile->end); - g_signal_handler_unblock(mainw->spinbutton_end,mainw->spin_end_func); + lives_signal_handler_unblock(mainw->spinbutton_end,mainw->spin_end_func); - g_signal_handler_block(mainw->spinbutton_start,mainw->spin_start_func); + lives_signal_handler_block(mainw->spinbutton_start,mainw->spin_start_func); lives_spin_button_set_range(LIVES_SPIN_BUTTON(mainw->spinbutton_start),1,cfile->frames); lives_spin_button_set_value(LIVES_SPIN_BUTTON(mainw->spinbutton_start),cfile->start); - g_signal_handler_unblock(mainw->spinbutton_start,mainw->spin_start_func); + lives_signal_handler_unblock(mainw->spinbutton_start,mainw->spin_start_func); lives_widget_set_sensitive(mainw->spinbutton_start,TRUE); lives_widget_set_sensitive(mainw->spinbutton_end,TRUE); @@ -3371,10 +3369,10 @@ lives_widget_set_sensitive (mainw->loop_continue, TRUE); if (cfile->achans>0&&cfile->frames>0) { - mainw->loop=gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (mainw->loop_video)); + mainw->loop=lives_check_menu_item_get_active (LIVES_CHECK_MENU_ITEM (mainw->loop_video)); } if (cfile->achans>0&&cfile->frames>0) { - mainw->mute=gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (mainw->mute_audio)); + mainw->mute=lives_check_menu_item_get_active (LIVES_CHECK_MENU_ITEM (mainw->mute_audio)); } } if (mainw->current_file>0&&cfile->menuentry==NULL) { @@ -3395,14 +3393,14 @@ // stop the start and end from being changed // better to clamp the range than make insensitive, this way we stop // other widgets (like the video bar) updating it - g_signal_handler_block(mainw->spinbutton_end,mainw->spin_end_func); + lives_signal_handler_block(mainw->spinbutton_end,mainw->spin_end_func); lives_spin_button_set_range(LIVES_SPIN_BUTTON(mainw->spinbutton_end),cfile->end,cfile->end); lives_spin_button_set_value(LIVES_SPIN_BUTTON(mainw->spinbutton_end),cfile->end); - g_signal_handler_unblock(mainw->spinbutton_end,mainw->spin_end_func); - g_signal_handler_block(mainw->spinbutton_start,mainw->spin_start_func); + lives_signal_handler_unblock(mainw->spinbutton_end,mainw->spin_end_func); + lives_signal_handler_block(mainw->spinbutton_start,mainw->spin_start_func); lives_spin_button_set_range(LIVES_SPIN_BUTTON(mainw->spinbutton_start),cfile->start,cfile->start); lives_spin_button_set_value(LIVES_SPIN_BUTTON(mainw->spinbutton_start),cfile->start); - g_signal_handler_unblock(mainw->spinbutton_start,mainw->spin_start_func); + lives_signal_handler_unblock(mainw->spinbutton_start,mainw->spin_start_func); mainw->current_file=current_file; @@ -3431,7 +3429,7 @@ -void set_ce_frame_from_pixbuf(GtkImage *image, LiVESPixbuf *pixbuf, lives_painter_t *cairo) { +void set_ce_frame_from_pixbuf(LiVESImage *image, LiVESPixbuf *pixbuf, lives_painter_t *cairo) { #if GTK_CHECK_VERSION(3,0,0) int rwidth=lives_widget_get_allocation_width(LIVES_WIDGET(image)); @@ -3491,7 +3489,7 @@ if (mainw->multitrack!=NULL) return; #if GTK_CHECK_VERSION(3,0,0) - g_signal_handlers_block_by_func(mainw->start_image,(gpointer)expose_sim,NULL); + lives_signal_handlers_block_by_func(mainw->start_image,(gpointer)expose_sim,NULL); #endif if (mainw->current_file>-1&&cfile!=NULL&&(cfile->clip_type==CLIP_TYPE_YUV4MPEG||cfile->clip_type==CLIP_TYPE_VIDEODEV)) { @@ -3503,10 +3501,10 @@ g_free(tmp); } - set_ce_frame_from_pixbuf(GTK_IMAGE(mainw->start_image),mainw->camframe,NULL); + set_ce_frame_from_pixbuf(LIVES_IMAGE(mainw->start_image),mainw->camframe,NULL); #if GTK_CHECK_VERSION(3,0,0) - g_signal_handlers_unblock_by_func(mainw->start_image,(gpointer)expose_sim,NULL); - g_signal_stop_emission_by_name(mainw->start_image,LIVES_WIDGET_EVENT_EXPOSE_EVENT); + lives_signal_handlers_unblock_by_func(mainw->start_image,(gpointer)expose_sim,NULL); + lives_signal_stop_emission_by_name(mainw->start_image,LIVES_WIDGET_EXPOSE_EVENT); #endif return; } @@ -3515,15 +3513,15 @@ (cfile->clip_type!=CLIP_TYPE_DISK&&cfile->clip_type!=CLIP_TYPE_FILE)) { threaded_dialog_spin(); if (!(mainw->imframe==NULL)) { - set_ce_frame_from_pixbuf(GTK_IMAGE(mainw->start_image),mainw->imframe,NULL); + set_ce_frame_from_pixbuf(LIVES_IMAGE(mainw->start_image),mainw->imframe,NULL); } else { - set_ce_frame_from_pixbuf(GTK_IMAGE(mainw->start_image),NULL,NULL); + set_ce_frame_from_pixbuf(LIVES_IMAGE(mainw->start_image),NULL,NULL); } threaded_dialog_spin(); #if GTK_CHECK_VERSION(3,0,0) - g_signal_handlers_unblock_by_func(mainw->start_image,(gpointer)expose_sim,NULL); - g_signal_stop_emission_by_name(mainw->start_image,LIVES_WIDGET_EVENT_EXPOSE_EVENT); + lives_signal_handlers_unblock_by_func(mainw->start_image,(gpointer)expose_sim,NULL); + lives_signal_stop_emission_by_name(mainw->start_image,LIVES_WIDGET_EXPOSE_EVENT); #endif return; } @@ -3555,7 +3553,7 @@ weed_plant_free(layer); if (LIVES_IS_PIXBUF(start_pixbuf)) { - set_ce_frame_from_pixbuf(GTK_IMAGE(mainw->start_image),start_pixbuf,NULL); + set_ce_frame_from_pixbuf(LIVES_IMAGE(mainw->start_image),start_pixbuf,NULL); } if (start_pixbuf!=NULL) { if (G_IS_OBJECT(start_pixbuf)) { @@ -3564,8 +3562,8 @@ } threaded_dialog_spin(); #if GTK_CHECK_VERSION(3,0,0) - g_signal_handlers_unblock_by_func(mainw->start_image,(gpointer)expose_sim,NULL); - g_signal_stop_emission_by_name(mainw->start_image,LIVES_WIDGET_EVENT_EXPOSE_EVENT); + lives_signal_handlers_unblock_by_func(mainw->start_image,(gpointer)expose_sim,NULL); + lives_signal_stop_emission_by_name(mainw->start_image,LIVES_WIDGET_EXPOSE_EVENT); #endif return; } @@ -3614,7 +3612,7 @@ weed_plant_free(layer); if (LIVES_IS_PIXBUF(start_pixbuf)) { - set_ce_frame_from_pixbuf(GTK_IMAGE(mainw->start_image),start_pixbuf,NULL); + set_ce_frame_from_pixbuf(LIVES_IMAGE(mainw->start_image),start_pixbuf,NULL); } if (start_pixbuf!=NULL) { if (G_IS_OBJECT(start_pixbuf)) { @@ -3641,8 +3639,8 @@ mainw->noswitch=noswitch; #if GTK_CHECK_VERSION(3,0,0) - g_signal_handlers_unblock_by_func(mainw->start_image,(gpointer)expose_sim,NULL); - g_signal_stop_emission_by_name(mainw->start_image,LIVES_WIDGET_EVENT_EXPOSE_EVENT); + lives_signal_handlers_unblock_by_func(mainw->start_image,(gpointer)expose_sim,NULL); + lives_signal_stop_emission_by_name(mainw->start_image,LIVES_WIDGET_EXPOSE_EVENT); #endif } @@ -3662,7 +3660,7 @@ if (mainw->multitrack!=NULL) return; #if GTK_CHECK_VERSION(3,0,0) - g_signal_handlers_block_by_func(mainw->end_image,(gpointer)expose_eim,NULL);
View file
LiVES-2.2.7.tar.bz2/src/main.h -> LiVES-2.2.8.tar.bz2/src/main.h
Changed
@@ -1,6 +1,6 @@ // main.h // LiVES -// (c) G. Finch (salsaman@gmail.com) 2003 - 2014 +// (c) G. Finch (salsaman@gmail.com) 2003 - 2015 // see file ../COPYING for full licensing details /* This program is free software; you can redistribute it and/or modify @@ -51,9 +51,16 @@ #ifndef HAS_LIVES_MAIN_H #define HAS_LIVES_MAIN_H +#ifdef __cplusplus +#undef HAVE_UNICAP +#endif + #define GUI_GTK #define PAINTER_CAIRO +//#define GUI_QT +//#define PAINTER_QPAINTER + #ifdef GUI_GTK #include <gtk/gtk.h> @@ -77,7 +84,6 @@ #include <winbase.h> #include <tlhelp32.h> #include <sddl.h> -#include <sys/stat.h> #define O_SYNC (FILE_FLAG_NO_BUFFERING|FILE_FLAG_WRITE_THROUGH) @@ -96,53 +102,21 @@ #ifndef GDK_WINDOWING_X11 #define GDK_WINDOWING_X11 #endif -#endif +#else +#include <sys/types.h> +#include <unistd.h> +#endif // GUI_GTK typedef pid_t lives_pid_t; typedef int lives_pgid_t; -#endif - +#endif // IS_MINGW -#ifdef GUI_GTK -#ifdef GDK_WINDOWING_WIN32 -#include <gdk/gdkwin32.h> - -#ifndef GDK_IS_WIN32_DISPLAY -#define GDK_IS_WIN32_DISPLAY(display) (TRUE) -#endif - -#endif //GDK_WINDOWING_WIN32 - -#ifdef GDK_WINDOWING_X11 - -// needed for GDK_WINDOW_XID - for fileselector preview -// needed for gdk_x11_screen_get_window_manager_name() - -#include <gdk/gdkx.h> - -#ifndef GDK_IS_X11_DISPLAY -#define GDK_IS_X11_DISPLAY(display) (TRUE) -#endif - -#ifndef GDK_IS_WIN32_DISPLAY -#define GDK_IS_WIN32_DISPLAY(display) (FALSE) -#endif - - -#else - -#ifndef GDK_IS_X11_DISPLAY -#define GDK_IS_X11_DISPLAY(display) (FALSE) -#endif - -#endif // GDK_WINDOWING_X11 - -#endif // GUI_GTK +#include <sys/stat.h> #include <stdlib.h> #include <stdio.h> #include <unistd.h> @@ -222,7 +196,7 @@ #define LIVES_FEATURE_URL "https://sourceforge.net/p/lives/feature-requests/" #define LIVES_TRANSLATE_URL "https://translations.launchpad.net/lives/trunk" -#ifdef IS_DARWIN +#if defined (IS_DARWIN) || defined (__FreeBSD__) #ifndef off64_t #define off64_t off_t #endif @@ -282,6 +256,8 @@ #define LIVES_LOG "lives.log" #endif +uint64_t lives_random(void); + #include "widget-helper.h" typedef void *(*fn_ptr) (void *ptr); @@ -836,34 +812,34 @@ LiVESTextView *create_output_textview(void); gchar *choose_file(gchar *dir, gchar *fname, gchar **filt, LiVESFileChooserAction act, const char *title, LiVESWidget *extra); LiVESWidget *choose_file_with_preview (gchar *dir, const gchar *title, int preview_type); -void add_suffix_check(GtkBox *box, const gchar *ext); +void add_suffix_check(LiVESBox *box, const gchar *ext); // dialogs.c boolean do_progress_dialog(boolean visible, boolean cancellable, const gchar *text); boolean do_warning_dialog(const gchar *text); boolean do_warning_dialog_with_check(const gchar *text, int warn_mask_number); -boolean do_warning_dialog_with_check_transient(const gchar *text, int warn_mask_number, GtkWindow *transient); +boolean do_warning_dialog_with_check_transient(const gchar *text, int warn_mask_number, LiVESWindow *transient); boolean do_yesno_dialog(const gchar *text); boolean do_yesno_dialog_with_check (const gchar *text, int warn_mask_number); -boolean do_yesno_dialog_with_check_transient(const gchar *text, int warn_mask_number, GtkWindow *transient); +boolean do_yesno_dialog_with_check_transient(const gchar *text, int warn_mask_number, LiVESWindow *transient); boolean do_yesno_dialog_with_check(const gchar *text, int warn_mask_number); -boolean do_yesno_dialog_with_check_transient(const gchar *text, int warn_mask_number, GtkWindow *transient); -int do_abort_cancel_retry_dialog(const gchar *text, GtkWindow *transient) WARN_UNUSED; -void do_error_dialog(const gchar *text); -void do_info_dialog(const gchar *text); -void do_error_dialog_with_check(const gchar *text, int warn_mask_number); -void do_blocking_error_dialog(const gchar *text); -void do_blocking_info_dialog(const gchar *text); -void do_error_dialog_with_check_transient(const gchar *text, boolean is_blocking, int warn_mask_number, - GtkWindow *transient); -void do_info_dialog_with_transient(const gchar *text, boolean is_blocking, GtkWindow *transient); +boolean do_yesno_dialog_with_check_transient(const gchar *text, int warn_mask_number, LiVESWindow *transient); +int do_abort_cancel_retry_dialog(const gchar *text, LiVESWindow *transient) WARN_UNUSED; +int do_error_dialog(const gchar *text); +int do_info_dialog(const gchar *text); +int do_error_dialog_with_check(const gchar *text, int warn_mask_number); +int do_blocking_error_dialog(const gchar *text); +int do_blocking_info_dialog(const gchar *text); +int do_error_dialog_with_check_transient(const gchar *text, boolean is_blocking, int warn_mask_number, + LiVESWindow *transient); +int do_info_dialog_with_transient(const gchar *text, boolean is_blocking, LiVESWindow *transient); void do_system_failed_error(const char *com, int retval, const char *addinfo); -int do_write_failed_error_s_with_retry(const gchar *fname, const gchar *errtext, GtkWindow *transient) WARN_UNUSED; +int do_write_failed_error_s_with_retry(const gchar *fname, const gchar *errtext, LiVESWindow *transient) WARN_UNUSED; void do_write_failed_error_s(const char *filename, const char *addinfo); -int do_read_failed_error_s_with_retry(const gchar *fname, const gchar *errtext, GtkWindow *transient) WARN_UNUSED; +int do_read_failed_error_s_with_retry(const gchar *fname, const gchar *errtext, LiVESWindow *transient) WARN_UNUSED; void do_read_failed_error_s(const char *filename, const char *addinfo); boolean do_header_write_error(int clip); int do_header_read_error_with_retry(int clip) WARN_UNUSED; @@ -882,7 +858,7 @@ boolean ask_permission_dialog(int what); boolean do_abort_check(void); -void add_warn_check (GtkBox *box, int warn_mask_number); +void add_warn_check (LiVESBox *box, int warn_mask_number); void do_memory_error_dialog (void); void too_many_files(void); void tempdir_warning (void); @@ -963,7 +939,7 @@ void do_threaded_dialog(gchar *translated_text, boolean has_cancel); void end_threaded_dialog(void); void threaded_dialog_spin (void); -void response_ok (GtkButton *button, gpointer user_data); +void response_ok (LiVESButton *button, gpointer user_data); void pump_io_chan(GIOChannel *iochan); void do_splash_progress(void); @@ -994,7 +970,7 @@ void create_cfile(void); void save_file (int clip, int start, int end, const char *filename); void play_file (void); -void save_frame (GtkMenuItem *menuitem, gpointer user_data); +void save_frame (LiVESMenuItem *menuitem, gpointer user_data); boolean save_frame_inner(int clip, int frame, const gchar *file_name, int width, int height, boolean from_osc); void wait_for_stop (const gchar *stop_command); boolean save_clip_values(int which_file); @@ -1038,7 +1014,7 @@ boolean startup_message_nonfatal_dismissable(const gchar *msg, int warning_mask); capability *get_capabilities(void); void get_monitors(void); -void set_ce_frame_from_pixbuf(GtkImage *image, LiVESPixbuf *pixbuf, lives_painter_t *); +void set_ce_frame_from_pixbuf(LiVESImage *image, LiVESPixbuf *pixbuf, lives_painter_t *); void load_start_image(int frame); void load_end_image(int frame); void load_preview_image(boolean update_always); @@ -1129,7 +1105,6 @@ int lives_kill(lives_pid_t pid, int sig); int lives_killpg(lives_pgid_t pgrp, int sig);
View file
LiVES-2.2.7.tar.bz2/src/mainwindow.h -> LiVES-2.2.8.tar.bz2/src/mainwindow.h
Changed
@@ -377,6 +377,7 @@ uint32_t foreign_key; +#ifdef GUI_GTK #if GTK_CHECK_VERSION(3,0,0) Window foreign_id; #else @@ -384,7 +385,11 @@ GdkColormap *foreign_cmap; GdkPixmap *foreign_map; #endif - GdkWindow *foreign_window; +#else + Window foreign_id; +#endif + + LiVESXWindow *foreign_window; int foreign_width; int foreign_height; int foreign_bpp; @@ -738,7 +743,7 @@ LiVESWidget *show_messages; LiVESWidget *show_layout_errors; LiVESWidget *sel_label; - GtkAccelGroup *accel_group; + LiVESAccelGroup *accel_group; LiVESWidget *sep_image; LiVESWidget *hruler; LiVESWidget *vj_menu; @@ -948,7 +953,7 @@ #endif // layouts - GtkTextBuffer *layout_textbuffer; ///< stores layout errors + LiVESTextBuffer *layout_textbuffer; ///< stores layout errors GList *affected_layouts_map; ///< map of layouts with errors GList *current_layouts_map; ///< map of all layouts for set @@ -994,7 +999,7 @@ GList *file_buffers; - gfloat volume; ///< audio volume level (for jack) + float volume; ///< audio volume level (for jack) int aud_rec_fd; ///< fd of file we are recording audio to double rec_end_time;
View file
LiVES-2.2.7.tar.bz2/src/merge.c -> LiVES-2.2.8.tar.bz2/src/merge.c
Changed
@@ -137,8 +137,8 @@ merge_opts->ins_frame_button=lives_standard_radio_button_new(_("_Insert Frames"),TRUE,radiobutton_insdrop_group,LIVES_BOX(hbox),NULL); radiobutton_insdrop_group = lives_radio_button_get_group (LIVES_RADIO_BUTTON (merge_opts->ins_frame_button)); - merge_opts->ins_frame_function=g_signal_connect (GTK_OBJECT (merge_opts->ins_frame_button), - "toggled",G_CALLBACK (on_ins_frames_toggled),NULL); + merge_opts->ins_frame_function=lives_signal_connect (LIVES_GUI_OBJECT (merge_opts->ins_frame_button), + LIVES_WIDGET_TOGGLED_EVENT,LIVES_GUI_CALLBACK (on_ins_frames_toggled),NULL); merge_opts->drop_frame_button=lives_standard_radio_button_new(_("_Drop Frames"),TRUE,radiobutton_insdrop_group,LIVES_BOX(hbox),NULL); @@ -153,15 +153,15 @@ lives_spin_button_set_value (LIVES_SPIN_BUTTON (merge_opts->spinbutton_loops),mainw->last_transition_loops); lives_widget_set_sensitive(merge_opts->spinbutton_loops,!mainw->last_transition_loop_to_fit); - g_signal_connect_after (GTK_OBJECT (merge_opts->spinbutton_loops), "value_changed", - G_CALLBACK (after_spinbutton_loops_changed), + lives_signal_connect_after (LIVES_GUI_OBJECT (merge_opts->spinbutton_loops), "value_changed", + LIVES_GUI_CALLBACK (after_spinbutton_loops_changed), NULL); fit_button = lives_standard_check_button_new (_("_Loop Clipboard to Fit Selection"),TRUE,LIVES_BOX(hbox),NULL); lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(fit_button),mainw->last_transition_loop_to_fit); - g_signal_connect (GTK_OBJECT (fit_button), "toggled", - G_CALLBACK (on_fit_toggled), + lives_signal_connect (LIVES_GUI_OBJECT (fit_button), LIVES_WIDGET_TOGGLED_EVENT, + LIVES_GUI_CALLBACK (on_fit_toggled), NULL); } @@ -207,32 +207,32 @@ lives_button_box_set_layout (LIVES_BUTTON_BOX (dialog_action_area), LIVES_BUTTONBOX_END); cancelbutton = lives_button_new_from_stock (LIVES_STOCK_CANCEL); - lives_dialog_add_action_widget (LIVES_DIALOG (merge_opts->merge_dialog), cancelbutton, GTK_RESPONSE_CANCEL); + lives_dialog_add_action_widget (LIVES_DIALOG (merge_opts->merge_dialog), cancelbutton, LIVES_RESPONSE_CANCEL); lives_widget_set_can_focus (cancelbutton,TRUE); okbutton = lives_button_new_from_stock (LIVES_STOCK_OK); - lives_dialog_add_action_widget (LIVES_DIALOG (merge_opts->merge_dialog), okbutton, GTK_RESPONSE_OK); + lives_dialog_add_action_widget (LIVES_DIALOG (merge_opts->merge_dialog), okbutton, LIVES_RESPONSE_OK); lives_widget_set_can_focus_and_default (okbutton); lives_widget_grab_default (okbutton); - g_signal_connect (GTK_OBJECT (cancelbutton), "clicked", - G_CALLBACK (on_merge_cancel_clicked), + lives_signal_connect (LIVES_GUI_OBJECT (cancelbutton), LIVES_WIDGET_CLICKED_EVENT, + LIVES_GUI_CALLBACK (on_merge_cancel_clicked), rfx); - lives_widget_add_accelerator (cancelbutton, "activate", accel_group, - LIVES_KEY_Escape, (GdkModifierType)0, (GtkAccelFlags)0); + lives_widget_add_accelerator (cancelbutton, LIVES_WIDGET_CLICKED_EVENT, accel_group, + LIVES_KEY_Escape, (LiVESXModifierType)0, (LiVESAccelFlags)0); - g_signal_connect (GTK_OBJECT (okbutton), "clicked", - G_CALLBACK (on_merge_ok_clicked), + lives_signal_connect (LIVES_GUI_OBJECT (okbutton), LIVES_WIDGET_CLICKED_EVENT, + LIVES_GUI_CALLBACK (on_merge_ok_clicked), rfx); - g_signal_connect (GTK_OBJECT(transition_combo),"changed",G_CALLBACK (on_trans_method_changed),NULL); + lives_signal_connect (LIVES_GUI_OBJECT(transition_combo),LIVES_WIDGET_CHANGED_EVENT,LIVES_GUI_CALLBACK (on_trans_method_changed),NULL); - g_signal_connect (GTK_OBJECT (align_start_button), "toggled", - G_CALLBACK (on_align_start_end_toggled), + lives_signal_connect (LIVES_GUI_OBJECT (align_start_button), LIVES_WIDGET_TOGGLED_EVENT, + LIVES_GUI_CALLBACK (on_align_start_end_toggled), rfx);
View file
LiVES-2.2.7.tar.bz2/src/multitrack.c -> LiVES-2.2.8.tar.bz2/src/multitrack.c
Changed
@@ -189,7 +189,7 @@ -static LIVES_INLINE boolean is_empty_track(GObject *track) { +static LIVES_INLINE boolean is_empty_track(LiVESObject *track) { return (g_object_get_data(track, "blocks")==NULL); } @@ -931,6 +931,7 @@ double offset_endd; boolean needs_text=TRUE; + boolean is_audio=FALSE; int offset_start; int offset_end; @@ -968,7 +969,10 @@ lives_widget_get_bg_color(mt->window,&bgcolor); track=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(eventbox),"layer_number")); - filenum=get_frame_event_clip(block->start_event,track); + if (track<0) is_audio=TRUE; + + if (!is_audio) filenum=get_frame_event_clip(block->start_event,track); + else filenum=get_audio_frame_clip(block->start_event,track); switch (block->state) { case BLOCK_UNSELECTED: @@ -987,7 +991,7 @@ lives_painter_stroke(cr); } else { - if ((!is_audio_eventbox(mt,eventbox))&&track>-1) { + if (!is_audio&&track>-1) { last_framenum=-1; for (i=offset_start;i<offset_end;i+=BLOCK_THUMB_WIDTH) { if (i>x2-x1) break; @@ -1002,7 +1006,7 @@ thumbnail=NULL; - if (framenum!=last_framenum) { + if (mainw->files[filenum]!=NULL&&framenum!=last_framenum) { if (mainw->files[filenum]->frames>0&&mainw->files[filenum]->clip_type==CLIP_TYPE_FILE) { lives_clip_data_t *cdata=((lives_decoder_t *)mainw->files[filenum]->ext_src)->cdata; if (cdata!=NULL&&!(cdata->seek_flag&LIVES_SEEK_FAST)&& @@ -1481,10 +1485,10 @@ ltext=mt_params_label(mt); - g_signal_handlers_block_by_func(mt->node_spinbutton,(gpointer)on_node_spin_value_changed,(gpointer)mt); + lives_signal_handlers_block_by_func(mt->node_spinbutton,(gpointer)on_node_spin_value_changed,(gpointer)mt); lives_spin_button_configure (LIVES_SPIN_BUTTON(mt->node_spinbutton), cur_time-fx_start_time, 0., fx_end_time-fx_start_time, 1./mt->fps, 10./mt->fps); - g_signal_handlers_unblock_by_func(mt->node_spinbutton,(gpointer)on_node_spin_value_changed,(gpointer)mt); + lives_signal_handlers_unblock_by_func(mt->node_spinbutton,(gpointer)on_node_spin_value_changed,(gpointer)mt); widget_opts.packing_height=2.*widget_opts.scale; widget_opts.border_width=2.*widget_opts.scale; @@ -1824,7 +1828,7 @@ } -static boolean atrack_ebox_pressed (LiVESWidget *labelbox, GdkEventButton *event, gpointer user_data) { +static boolean atrack_ebox_pressed (LiVESWidget *labelbox, LiVESXEventButton *event, gpointer user_data) { lives_mt *mt=(lives_mt *)user_data; int current_track=mt->current_track; mt->current_track=GPOINTER_TO_INT(g_object_get_data (G_OBJECT(labelbox),"layer_number")); @@ -1839,7 +1843,7 @@ -static boolean track_ebox_pressed (LiVESWidget *labelbox, GdkEventButton *event, gpointer user_data) { +static boolean track_ebox_pressed (LiVESWidget *labelbox, LiVESXEventButton *event, gpointer user_data) { lives_mt *mt=(lives_mt *)user_data; int current_track=mt->current_track; mt->current_track=GPOINTER_TO_INT(g_object_get_data (G_OBJECT(labelbox),"layer_number")); @@ -1852,9 +1856,7 @@ -static boolean on_mt_timeline_scroll (LiVESWidget *widget, - GdkEventScroll *event, - gpointer user_data) { +static boolean on_mt_timeline_scroll (LiVESWidget *widget, LiVESXEventScroll *event, gpointer user_data) { // scroll timeline up/down with mouse wheel lives_mt *mt=(lives_mt *)user_data; @@ -1864,10 +1866,10 @@ cval=lives_adjustment_get_value(lives_range_get_adjustment(LIVES_RANGE(mt->scrollbar))); - if (event->direction==GDK_SCROLL_UP) { + if (event->direction==LIVES_SCROLL_UP) { if (--cval<0) return FALSE;; } - else if (event->direction==GDK_SCROLL_DOWN) { + else if (event->direction==LIVES_SCROLL_DOWN) { if (++cval>=g_list_length(mt->video_draws)) return FALSE; } @@ -1947,7 +1949,7 @@ void scroll_tracks (lives_mt *mt, int top_track, boolean set_value) { GList *vdraws=mt->video_draws; - GList *table_children; + GList *table_children,*xlist; LiVESWidget *eventbox; LiVESWidget *label; @@ -2088,63 +2090,63 @@ lives_box_pack_start (LIVES_BOX (hbox), label, FALSE, FALSE, 0); lives_container_add (LIVES_CONTAINER (ahbox), arrow); - lives_table_attach (LIVES_TABLE (mt->timeline_table), labelbox, 1, 6, 0, 1, LIVES_FILL, (GtkAttachOptions)0, 0, 0); - lives_table_attach (LIVES_TABLE (mt->timeline_table), ahbox, 6, 7, 0, 1, LIVES_FILL, (GtkAttachOptions)0, 0, 0); + lives_table_attach (LIVES_TABLE (mt->timeline_table), labelbox, 1, 6, 0, 1, LIVES_FILL, (LiVESAttachOptions)0, 0, 0); + lives_table_attach (LIVES_TABLE (mt->timeline_table), ahbox, 6, 7, 0, 1, LIVES_FILL, (LiVESAttachOptions)0, 0, 0); g_object_set_data (G_OBJECT(mt->audio_draws->data),"labelbox",labelbox); g_object_set_data (G_OBJECT(mt->audio_draws->data),"ahbox",ahbox); g_object_set_data (G_OBJECT(ahbox),"eventbox",mt->audio_draws->data); g_object_set_data(G_OBJECT(labelbox),"layer_number",GINT_TO_POINTER(GPOINTER_TO_INT(-1))); - g_signal_connect (GTK_OBJECT (labelbox), "button_press_event", - G_CALLBACK (atrack_ebox_pressed), + lives_signal_connect (LIVES_GUI_OBJECT (labelbox), "button_press_event", + LIVES_GUI_CALLBACK (atrack_ebox_pressed), (gpointer)mt); - g_signal_connect (GTK_OBJECT (ahbox), "button_press_event", - G_CALLBACK (track_arrow_pressed), + lives_signal_connect (LIVES_GUI_OBJECT (ahbox), "button_press_event", + LIVES_GUI_CALLBACK (track_arrow_pressed), (gpointer)mt); lives_table_attach (LIVES_TABLE (mt->timeline_table), (LiVESWidget *)mt->audio_draws->data, 7, 40, 0, 1, - (GtkAttachOptions) (LIVES_EXPAND | LIVES_FILL), - (GtkAttachOptions) (LIVES_FILL), 0, 0); + (LiVESAttachOptions) (LIVES_EXPAND | LIVES_FILL), + (LiVESAttachOptions) (LIVES_FILL), 0, 0); - g_signal_connect (GTK_OBJECT (mt->audio_draws->data), "button_press_event", - G_CALLBACK (on_track_click), + lives_signal_connect (LIVES_GUI_OBJECT (mt->audio_draws->data), "button_press_event", + LIVES_GUI_CALLBACK (on_track_click), (gpointer)mt); - g_signal_connect (GTK_OBJECT (mt->audio_draws->data), "button_release_event", - G_CALLBACK (on_track_release), + lives_signal_connect (LIVES_GUI_OBJECT (mt->audio_draws->data), "button_release_event", + LIVES_GUI_CALLBACK (on_track_release), (gpointer)mt); lives_widget_set_bg_color(LIVES_WIDGET(mt->audio_draws->data), LIVES_WIDGET_STATE_NORMAL, &palette->white); lives_widget_set_app_paintable(LIVES_WIDGET(mt->audio_draws->data),TRUE); - g_signal_connect (GTK_OBJECT (mt->audio_draws->data), LIVES_WIDGET_EVENT_EXPOSE_EVENT, - G_CALLBACK (expose_track_event), + lives_signal_connect (LIVES_GUI_OBJECT (mt->audio_draws->data), LIVES_WIDGET_EXPOSE_EVENT, + LIVES_GUI_CALLBACK (expose_track_event), (gpointer)mt); if (expanded) { xeventbox=(LiVESWidget *)g_object_get_data(G_OBJECT(mt->audio_draws->data),"achan0"); lives_table_attach (LIVES_TABLE (mt->timeline_table), xeventbox, 7, 40, 1, 2, - (GtkAttachOptions) (LIVES_EXPAND | LIVES_FILL), - (GtkAttachOptions) (LIVES_FILL), 0, 0); + (LiVESAttachOptions) (LIVES_EXPAND | LIVES_FILL), + (LiVESAttachOptions) (LIVES_FILL), 0, 0); lives_widget_set_bg_color(xeventbox, LIVES_WIDGET_STATE_NORMAL, &palette->white); lives_widget_set_app_paintable(xeventbox,TRUE); - g_signal_connect (GTK_OBJECT (xeventbox), LIVES_WIDGET_EVENT_EXPOSE_EVENT, - G_CALLBACK (mt_expose_audtrack_event), + lives_signal_connect (LIVES_GUI_OBJECT (xeventbox), LIVES_WIDGET_EXPOSE_EVENT, + LIVES_GUI_CALLBACK (mt_expose_audtrack_event), (gpointer)mt); if (cfile->achans>1) { xeventbox=(LiVESWidget *)g_object_get_data(G_OBJECT(mt->audio_draws->data),"achan1"); lives_table_attach (LIVES_TABLE (mt->timeline_table), xeventbox, 7, 40, 2, 3, - (GtkAttachOptions) (LIVES_EXPAND | LIVES_FILL), - (GtkAttachOptions) (LIVES_FILL), 0, 0); + (LiVESAttachOptions) (LIVES_EXPAND | LIVES_FILL), + (LiVESAttachOptions) (LIVES_FILL), 0, 0); lives_widget_set_bg_color(xeventbox, LIVES_WIDGET_STATE_NORMAL, &palette->white); lives_widget_set_app_paintable(xeventbox,TRUE); - g_signal_connect (GTK_OBJECT (xeventbox), LIVES_WIDGET_EVENT_EXPOSE_EVENT, - G_CALLBACK (mt_expose_audtrack_event), + lives_signal_connect (LIVES_GUI_OBJECT (xeventbox), LIVES_WIDGET_EXPOSE_EVENT, + LIVES_GUI_CALLBACK (mt_expose_audtrack_event), (gpointer)mt); } @@ -2235,48 +2237,48 @@ lives_box_pack_start (LIVES_BOX (hbox), label, FALSE, FALSE, 0); lives_container_add (LIVES_CONTAINER (ahbox), arrow);
View file
LiVES-2.2.7.tar.bz2/src/multitrack.h -> LiVES-2.2.8.tar.bz2/src/multitrack.h
Changed
@@ -241,7 +241,7 @@ LiVESWidget *mm_select; LiVESWidget *ins_menuitem; LiVESWidget *ins_normal; - GtkToolItem *grav_menuitem; + LiVESToolItem *grav_menuitem; LiVESWidget *grav_label; LiVESWidget *grav_normal; LiVESWidget *grav_left; @@ -318,7 +318,7 @@ LiVESWidget *clear_marks; LiVESWidget *fd_frame; LiVESWidget *apply_fx_button; - GtkToolItem *eview_button; + LiVESToolItem *eview_button; LiVESWidget *eview_label; LiVESWidget *follow_play; LiVESWidget *change_max_disp; @@ -359,11 +359,11 @@ LiVESWidget *insa_checkbutton; LiVESWidget *snapo_checkbutton; - GObject *spinbutton_in_adj; - GObject *spinbutton_out_adj; + LiVESObject *spinbutton_in_adj; + LiVESObject *spinbutton_out_adj; - GObject *hadjustment; - GObject *node_adj; + LiVESObject *hadjustment; + LiVESObject *node_adj; GList *audio_draws; ///< list of audio boxes, 0 == backing audio, 1 == track 0 audio, etc. @@ -372,7 +372,7 @@ LiVESAccelGroup *accel_group; GList *video_draws; ///< list of video timeline eventboxes, in layer order - GObject *vadjustment; + LiVESObject *vadjustment; GdkDisplay *display; @@ -668,7 +668,7 @@ lives_mt *multitrack (weed_plant_t *, int orig_file, double fps); ///< create and return lives_mt struct void mt_init_tracks (lives_mt *, boolean set_min_max); ///< add basic tracks, or set tracks from mt->event_list -boolean on_multitrack_activate (GtkMenuItem *menuitem, weed_plant_t *event_list); ///< menuitem callback +boolean on_multitrack_activate (LiVESMenuItem *menuitem, weed_plant_t *event_list); ///< menuitem callback // delete function boolean multitrack_delete (lives_mt *, boolean save); @@ -681,38 +681,38 @@ void mt_sensitise (lives_mt *); // external control callbacks -void insert_here_cb (GtkMenuItem *, gpointer mt); -void insert_audio_here_cb (GtkMenuItem *, gpointer mt); -void insert_at_ctx_cb (GtkMenuItem *, gpointer mt); -void insert_audio_at_ctx_cb (GtkMenuItem *, gpointer mt); -void multitrack_end_cb (GtkMenuItem *, gpointer mt); -void delete_block_cb (GtkMenuItem *, gpointer mt); -void selblock_cb (GtkMenuItem *, gpointer mt); -void list_fx_here_cb (GtkMenuItem *, gpointer mt); -void edit_start_end_cb (GtkMenuItem *, gpointer mt); -void close_clip_cb (GtkMenuItem *, gpointer mt); -void show_clipinfo_cb (GtkMenuItem *, gpointer mt); - -void multitrack_insert (GtkMenuItem *, gpointer mt); +void insert_here_cb (LiVESMenuItem *, gpointer mt); +void insert_audio_here_cb (LiVESMenuItem *, gpointer mt); +void insert_at_ctx_cb (LiVESMenuItem *, gpointer mt); +void insert_audio_at_ctx_cb (LiVESMenuItem *, gpointer mt); +void multitrack_end_cb (LiVESMenuItem *, gpointer mt); +void delete_block_cb (LiVESMenuItem *, gpointer mt); +void selblock_cb (LiVESMenuItem *, gpointer mt); +void list_fx_here_cb (LiVESMenuItem *, gpointer mt); +void edit_start_end_cb (LiVESMenuItem *, gpointer mt); +void close_clip_cb (LiVESMenuItem *, gpointer mt); +void show_clipinfo_cb (LiVESMenuItem *, gpointer mt); + +void multitrack_insert (LiVESMenuItem *, gpointer mt); // event_list functions weed_plant_t *add_blank_frames_up_to (weed_plant_t *event_list, weed_plant_t *start_event, weed_timecode_t end_tc, double fps); // track functions -void on_cback_audio_activate (GtkMenuItem *, gpointer mt); +void on_cback_audio_activate (LiVESMenuItem *, gpointer mt); LiVESWidget *add_audio_track (lives_mt *, int trackno, boolean behind); -void add_video_track_behind (GtkMenuItem *, gpointer mt); -void add_video_track_front (GtkMenuItem *, gpointer mt); +void add_video_track_behind (LiVESMenuItem *, gpointer mt); +void add_video_track_front (LiVESMenuItem *, gpointer mt); void delete_video_track(lives_mt *, int layer, boolean full); void delete_audio_track(lives_mt *, LiVESWidget *eventbox, boolean full); void delete_audio_tracks(lives_mt *, GList *list, boolean full); -void remove_gaps (GtkMenuItem *, gpointer mt); -void remove_first_gaps (GtkMenuItem *, gpointer mt); -void on_insgap_sel_activate (GtkMenuItem *, gpointer mt); -void on_insgap_cur_activate (GtkMenuItem *, gpointer mt); -void on_split_activate (GtkMenuItem *, gpointer mt); +void remove_gaps (LiVESMenuItem *, gpointer mt); +void remove_first_gaps (LiVESMenuItem *, gpointer mt); +void on_insgap_sel_activate (LiVESMenuItem *, gpointer mt); +void on_insgap_cur_activate (LiVESMenuItem *, gpointer mt); +void on_split_activate (LiVESMenuItem *, gpointer mt); void scroll_tracks (lives_mt *, int top_track, boolean set_value); -boolean track_arrow_pressed (LiVESWidget *ahbox, GdkEventButton *, gpointer mt); +boolean track_arrow_pressed (LiVESWidget *ahbox, LiVESXEventButton *, gpointer mt); void track_select (lives_mt *); ///< must call after setting mt->current_track boolean mt_track_is_audio(lives_mt *, int ntrack); ///< return TRUE if ntrack is a valid backing audio track boolean mt_track_is_video(lives_mt *, int ntrack); ///< return TRUE if ntrack is a valid video track @@ -721,30 +721,30 @@ // track mouse movement -boolean on_track_click (LiVESWidget *eventbox, GdkEventButton *, gpointer mt); -boolean on_atrack_click (LiVESWidget *eventbox, GdkEventButton *, gpointer mt); -boolean on_track_header_click (LiVESWidget *eventbox, GdkEventButton *, gpointer mt); -boolean on_track_between_click (LiVESWidget *eventbox, GdkEventButton *, gpointer mt); -boolean on_track_release (LiVESWidget *eventbox, GdkEventButton *event, gpointer mt); -boolean on_atrack_release (LiVESWidget *eventbox, GdkEventButton *event, gpointer mt); -boolean on_track_header_release (LiVESWidget *eventbox, GdkEventButton *, gpointer mt); -boolean on_track_between_release (LiVESWidget *eventbox, GdkEventButton *, gpointer mt); -boolean on_track_move (LiVESWidget *widget, GdkEventMotion *event, gpointer mt); -boolean on_track_header_move (LiVESWidget *widget, GdkEventMotion *event, gpointer mt); +boolean on_track_click (LiVESWidget *eventbox, LiVESXEventButton *, gpointer mt); +boolean on_atrack_click (LiVESWidget *eventbox, LiVESXEventButton *, gpointer mt); +boolean on_track_header_click (LiVESWidget *eventbox, LiVESXEventButton *, gpointer mt); +boolean on_track_between_click (LiVESWidget *eventbox, LiVESXEventButton *, gpointer mt); +boolean on_track_release (LiVESWidget *eventbox, LiVESXEventButton *event, gpointer mt); +boolean on_atrack_release (LiVESWidget *eventbox, LiVESXEventButton *event, gpointer mt); +boolean on_track_header_release (LiVESWidget *eventbox, LiVESXEventButton *, gpointer mt); +boolean on_track_between_release (LiVESWidget *eventbox, LiVESXEventButton *, gpointer mt); +boolean on_track_move (LiVESWidget *widget, LiVESXEventMotion *event, gpointer mt); +boolean on_track_header_move (LiVESWidget *widget, LiVESXEventMotion *event, gpointer mt); void unselect_all (lives_mt *); ///< unselect all blocks void insert_frames (int filenum, weed_timecode_t offset_start, weed_timecode_t offset_end, weed_timecode_t tc, lives_direction_t direction, LiVESWidget *eventbox, lives_mt *, track_rect *in_block); void insert_audio (int filenum, weed_timecode_t offset_start, weed_timecode_t offset_end, weed_timecode_t tc, double avel, lives_direction_t direction, LiVESWidget *eventbox, lives_mt *, track_rect *in_block); void on_seltrack_toggled (LiVESWidget *, gpointer mt); -void scroll_track_by_scrollbar (GtkScrollbar *sbar, gpointer mt); +void scroll_track_by_scrollbar (LiVESScrollbar *sbar, gpointer mt); // block functions void in_out_start_changed (LiVESWidget *, gpointer mt); void in_out_end_changed (LiVESWidget *, gpointer mt); -void in_anchor_toggled (GtkToggleButton *, gpointer mt); -void out_anchor_toggled (GtkToggleButton *, gpointer mt); -void avel_reverse_toggled (GtkToggleButton *, gpointer mt); -void avel_spin_changed (GtkSpinButton *, gpointer mt); +void in_anchor_toggled (LiVESToggleButton *, gpointer mt); +void out_anchor_toggled (LiVESToggleButton *, gpointer mt); +void avel_reverse_toggled (LiVESToggleButton *, gpointer mt); +void avel_spin_changed (LiVESSpinButton *, gpointer mt); // block API functions int mt_get_last_block_number(lives_mt *, int ntrack); ///< get index of last inserted (wallclock time) block for track @@ -756,18 +756,18 @@ // timeline functions void mt_tl_move(lives_mt *, double pos_rel); void set_timeline_end_secs (lives_mt *, double secs); -boolean on_timeline_press (LiVESWidget *, GdkEventButton *, gpointer mt); -boolean on_timeline_release (LiVESWidget *, GdkEventButton *, gpointer mt); -boolean on_timeline_update (LiVESWidget *, GdkEventMotion *, gpointer mt); +boolean on_timeline_press (LiVESWidget *, LiVESXEventButton *, gpointer mt); +boolean on_timeline_release (LiVESWidget *, LiVESXEventButton *, gpointer mt); +boolean on_timeline_update (LiVESWidget *, LiVESXEventMotion *, gpointer mt); void draw_region (lives_mt *mt); -void tc_to_rs (GtkMenuItem *, gpointer mt); -void tc_to_re (GtkMenuItem *, gpointer mt); -void rs_to_tc (GtkMenuItem *, gpointer mt); -void re_to_tc (GtkMenuItem *, gpointer mt); +void tc_to_rs (LiVESMenuItem *, gpointer mt); +void tc_to_re (LiVESMenuItem *, gpointer mt); +void rs_to_tc (LiVESMenuItem *, gpointer mt); +void re_to_tc (LiVESMenuItem *, gpointer mt); -boolean mt_mark_callback (GtkAccelGroup *group, GObject *obj, guint keyval, GdkModifierType mod, gpointer user_data); +boolean mt_mark_callback (LiVESAccelGroup *group, LiVESObject *obj, uint32_t keyval, LiVESXModifierType mod, gpointer user_data); -void multitrack_clear_marks (GtkMenuItem *, gpointer mt); +void multitrack_clear_marks (LiVESMenuItem *, gpointer mt); void mt_show_current_frame(lives_mt *, boolean return_layer); ///< preview the current frame void mt_clear_timeline(lives_mt *mt); @@ -782,7 +782,7 @@ // playback / animation void multitrack_playall (lives_mt *); -void multitrack_play_sel (GtkMenuItem *, gpointer mt); +void multitrack_play_sel (LiVESMenuItem *, gpointer mt); void animate_multitrack (lives_mt *); void unpaint_line(lives_mt *, LiVESWidget *eventbox); void unpaint_lines(lives_mt *); @@ -795,10 +795,10 @@ void on_next_node_clicked (LiVESWidget *, gpointer mt); void on_prev_node_clicked (LiVESWidget *, gpointer mt); void on_del_node_clicked (LiVESWidget *, gpointer mt);
View file
LiVES-2.2.7.tar.bz2/src/omc-learn.c -> LiVES-2.2.8.tar.bz2/src/omc-learn.c
Changed
@@ -598,7 +598,7 @@ -static void cell1_edited_callback (GtkCellRendererSpin *spinbutton, const gchar *path_string, const gchar *new_text, gpointer user_data) { +static void cell1_edited_callback (LiVESCellRenderer *spinbutton, const gchar *path_string, const gchar *new_text, gpointer user_data) { lives_omc_match_node_t *mnode=(lives_omc_match_node_t *)user_data; lives_omc_macro_t omacro=omc_macros[mnode->macro]; @@ -656,7 +656,7 @@ LiVESTreeIter iter1,iter2; - GObject *spinadj; + LiVESObject *spinadj; gchar *strval=NULL,*vname; gchar *oldval=NULL,*final=NULL; @@ -712,7 +712,7 @@ lives_widget_set_text_color(mnode->treev2, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars_fore); } - renderer = gtk_cell_renderer_text_new (); + renderer = lives_cell_renderer_text_new (); column = lives_tree_view_column_new_with_attributes (NULL, renderer, "text", TITLE2_COLUMN, @@ -720,17 +720,19 @@ lives_tree_view_append_column (LIVES_TREE_VIEW (mnode->treev2), column); - renderer = gtk_cell_renderer_spin_new (); + renderer = lives_cell_renderer_spin_new (); - spinadj=(GObject *)lives_adjustment_new (0., -100000., 100000., 1., 10., 0); + spinadj=(LiVESObject *)lives_adjustment_new (0., -100000., 100000., 1., 10., 0); +#ifdef GUI_GTK g_object_set (renderer, "width-chars", 7, "mode", GTK_CELL_RENDERER_MODE_EDITABLE, "editable", TRUE, "xalign", 1.0, "adjustment", spinadj, NULL); - - g_signal_connect(renderer, "edited", (GCallback) cell1_edited_callback, mnode); +#endif + + lives_signal_connect(renderer, "edited", (GCallback) cell1_edited_callback, mnode); - // renderer = gtk_cell_renderer_text_new (); + // renderer = lives_cell_renderer_text_new (); column = lives_tree_view_column_new_with_attributes (_("value"), renderer, "text", VALUE2_COLUMN, @@ -745,8 +747,8 @@ lives_widget_show (mnode->treev2); lives_table_attach (LIVES_TABLE (omclw->table), mnode->treev2, 3, 4, row, row+1, - (GtkAttachOptions) (LIVES_FILL|LIVES_EXPAND), - (GtkAttachOptions) (0), 0, 0); + (LiVESAttachOptions) (LIVES_FILL|LIVES_EXPAND), + (LiVESAttachOptions) (0), 0, 0); @@ -800,7 +802,7 @@ -static void on_omc_combo_entry_changed (GtkComboBox *combo, gpointer ptr) { +static void on_omc_combo_entry_changed (LiVESCombo *combo, gpointer ptr) { char *macro_text; int i; @@ -848,7 +850,7 @@ -static void cell_toggled_callback (GtkCellRendererToggle *toggle, const gchar *path_string, gpointer user_data) { +static void cell_toggled_callback (LiVESCellRenderer *toggle, const gchar *path_string, gpointer user_data) { lives_omc_match_node_t *mnode=(lives_omc_match_node_t *)user_data; int row; @@ -891,7 +893,7 @@ -static void cell_edited_callback (GtkCellRendererSpin *spinbutton, const gchar *path_string, const gchar *new_text, gpointer user_data) { +static void cell_edited_callback (LiVESCellRenderer *spinbutton, const gchar *path_string, const gchar *new_text, gpointer user_data) { lives_omc_match_node_t *mnode=(lives_omc_match_node_t *)user_data; int col=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(spinbutton),"colnum")); @@ -963,7 +965,7 @@ lives_combo_set_active_index (LIVES_COMBO(combo),mnode->macro); } - g_signal_connect_after (G_OBJECT (combo), "changed", G_CALLBACK (on_omc_combo_entry_changed), mnode); + lives_signal_connect_after (G_OBJECT (combo), LIVES_WIDGET_CHANGED_EVENT, LIVES_GUI_CALLBACK (on_omc_combo_entry_changed), mnode); g_object_set_data(G_OBJECT(combo),"row",GINT_TO_POINTER(row)); g_object_set_data(G_OBJECT(combo),"omclw",(gpointer)omclw); @@ -975,7 +977,7 @@ static void omc_learner_add_row(int type, int detail, lives_omc_match_node_t *mnode, const gchar *string, omclearn_w *omclw) { LiVESWidget *label,*combo; - GObject *spinadj; + LiVESObject *spinadj; LiVESCellRenderer *renderer; LiVESTreeViewColumn *column; @@ -1082,8 +1084,8 @@ omclw->tbl_currow++; lives_table_attach (LIVES_TABLE (omclw->table), label, 0, 1, omclw->tbl_currow, omclw->tbl_currow+1, - (GtkAttachOptions) (0), - (GtkAttachOptions) (0), 0, 0); + (LiVESAttachOptions) (0), + (LiVESAttachOptions) (0), 0, 0); // properties if (palette->style&STYLE_1) { @@ -1091,7 +1093,7 @@ lives_widget_set_text_color(mnode->treev1, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars_fore); } - renderer = gtk_cell_renderer_text_new (); + renderer = lives_cell_renderer_text_new (); column = lives_tree_view_column_new_with_attributes (NULL, renderer, "text", TITLE_COLUMN, @@ -1099,7 +1101,7 @@ lives_tree_view_append_column (LIVES_TREE_VIEW (mnode->treev1), column); - renderer = gtk_cell_renderer_text_new (); + renderer = lives_cell_renderer_text_new (); column = lives_tree_view_column_new_with_attributes (_("value"), renderer, "text", VALUE_COLUMN, @@ -1107,16 +1109,16 @@ lives_tree_view_append_column (LIVES_TREE_VIEW (mnode->treev1), column); - renderer = gtk_cell_renderer_toggle_new (); + renderer = lives_cell_renderer_toggle_new (); column = lives_tree_view_column_new_with_attributes (_("x"), renderer, "active", FILTER_COLUMN, NULL); lives_tree_view_append_column (LIVES_TREE_VIEW (mnode->treev1), column); - g_signal_connect(renderer, "toggled", (GCallback) cell_toggled_callback, mnode); + lives_signal_connect(renderer, LIVES_WIDGET_TOGGLED_EVENT, (GCallback) cell_toggled_callback, mnode); - renderer = gtk_cell_renderer_text_new (); + renderer = lives_cell_renderer_text_new (); column = lives_tree_view_column_new_with_attributes (_("range"), renderer, "text", RANGE_COLUMN, @@ -1124,15 +1126,17 @@ lives_tree_view_append_column (LIVES_TREE_VIEW (mnode->treev1), column); - renderer = gtk_cell_renderer_spin_new (); + renderer = lives_cell_renderer_spin_new (); g_object_set_data(G_OBJECT(renderer), "colnum", GUINT_TO_POINTER(OFFS1_COLUMN)); - spinadj=(GObject *)lives_adjustment_new (0., -100000., 100000., 1., 10., 0); + spinadj=(LiVESObject *)lives_adjustment_new (0., -100000., 100000., 1., 10., 0); +#ifdef GUI_GTK g_object_set (renderer, "width-chars", 7, "mode", GTK_CELL_RENDERER_MODE_EDITABLE, "editable", TRUE, "xalign", 1.0, "adjustment", spinadj, NULL); +#endif - g_signal_connect(renderer, "edited", (GCallback) cell_edited_callback, mnode); + lives_signal_connect(renderer, "edited", (GCallback) cell_edited_callback, mnode); @@ -1142,16 +1146,16 @@ NULL); lives_tree_view_append_column (LIVES_TREE_VIEW (mnode->treev1), column); - renderer = gtk_cell_renderer_spin_new (); + renderer = lives_cell_renderer_spin_new (); - spinadj=(GObject *)lives_adjustment_new (1., -100000., 100000., 1., 10., 0); + spinadj=(LiVESObject *)lives_adjustment_new (1., -100000., 100000., 1., 10., 0); g_object_set (renderer, "width-chars", 12, "mode", GTK_CELL_RENDERER_MODE_EDITABLE, "editable", TRUE, "xalign", 1.0, "adjustment", spinadj, "digits", OMC_FP_FIX, NULL); g_object_set_data(G_OBJECT(renderer), "colnum", GUINT_TO_POINTER(SCALE_COLUMN)); - g_signal_connect(renderer, "edited", (GCallback) cell_edited_callback, mnode); + lives_signal_connect(renderer, "edited", (GCallback) cell_edited_callback, mnode); column = lives_tree_view_column_new_with_attributes (_("* scale"), @@ -1160,16 +1164,16 @@ NULL);
View file
LiVES-2.2.7.tar.bz2/src/omc-learn.h -> LiVES-2.2.8.tar.bz2/src/omc-learn.h
Changed
@@ -93,8 +93,8 @@ LiVESWidget *treev1; LiVESWidget *treev2; - GtkTreeStore *gtkstore; - GtkTreeStore *gtkstore2; + LiVESTreeStore *gtkstore; + LiVESTreeStore *gtkstore2; int *tmpvals; @@ -147,7 +147,7 @@ #define OMC_MIDI_PGM_CHANGE 133 /// start learning MIDI inputs -void on_midi_learn_activate (GtkMenuItem *, gpointer); +void on_midi_learn_activate (LiVESMenuItem *, gpointer); /// process a string (i.e. convert to an OSC message and pass to OSC subsys) /// only need to set omclw if learn is TRUE @@ -157,8 +157,8 @@ #define OMC_FILE_VSTRING "LiVES OMC map version 1.0" -void on_midi_save_activate (GtkMenuItem *, gpointer); -void on_midi_load_activate (GtkMenuItem *, gpointer); +void on_midi_save_activate (LiVESMenuItem *, gpointer); +void on_midi_load_activate (LiVESMenuItem *, gpointer); #include "osc.h"
View file
LiVES-2.2.7.tar.bz2/src/osc.c -> LiVES-2.2.8.tar.bz2/src/osc.c
Changed
@@ -490,8 +490,9 @@ void lives_osc_cb_play_reverse(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) { if (mainw->multitrack!=NULL) return lives_osc_notify_failure(); - if (mainw->current_file<0||((cfile->clip_type!=CLIP_TYPE_DISK&&cfile->clip_type!=CLIP_TYPE_FILE)||mainw->playing_file==-1)) if (mainw->playing_file==-1) lives_osc_notify_failure(); - dirchange_callback(NULL,NULL,0,(LiVESModifierType)0,LIVES_INT_TO_POINTER(TRUE)); + if (mainw->current_file<0||((cfile->clip_type!=CLIP_TYPE_DISK&&cfile->clip_type!=CLIP_TYPE_FILE)||mainw->playing_file==-1)) + if (mainw->playing_file==-1) lives_osc_notify_failure(); + dirchange_callback(NULL,NULL,0,(LiVESXModifierType)0,LIVES_INT_TO_POINTER(TRUE)); lives_osc_notify_success(NULL); } @@ -500,9 +501,12 @@ void lives_osc_cb_bgplay_reverse(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) { if (mainw->multitrack!=NULL) return lives_osc_notify_failure(); - if (mainw->blend_file<1||mainw->files[mainw->blend_file]==NULL||mainw->blend_file==mainw->current_file||mainw->playing_file==-1) if (mainw->playing_file==-1) lives_osc_notify_failure(); + if (mainw->blend_file<1||mainw->files[mainw->blend_file]==NULL||mainw->blend_file==mainw->current_file||mainw->playing_file==-1) + if (mainw->playing_file==-1) lives_osc_notify_failure(); - if (mainw->current_file<0||(mainw->files[mainw->blend_file]->clip_type!=CLIP_TYPE_DISK&&mainw->files[mainw->blend_file]->clip_type!=CLIP_TYPE_FILE)) if (mainw->playing_file==-1) lives_osc_notify_failure(); + if (mainw->current_file<0||(mainw->files[mainw->blend_file]->clip_type!=CLIP_TYPE_DISK&& + mainw->files[mainw->blend_file]->clip_type!=CLIP_TYPE_FILE)) + if (mainw->playing_file==-1) lives_osc_notify_failure(); mainw->files[mainw->blend_file]->pb_fps=-mainw->files[mainw->blend_file]->pb_fps; @@ -514,7 +518,8 @@ void lives_osc_cb_play_forward (void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) { if (mainw->go_away) lives_osc_notify_failure(); // not ready to play yet - if (mainw->current_file<0||(cfile->clip_type!=CLIP_TYPE_DISK&&cfile->clip_type!=CLIP_TYPE_FILE)) if (mainw->playing_file==1) lives_osc_notify_failure(); + if (mainw->current_file<0||(cfile->clip_type!=CLIP_TYPE_DISK&&cfile->clip_type!=CLIP_TYPE_FILE)) + if (mainw->playing_file==1) lives_osc_notify_failure(); if (mainw->playing_file==-1&&mainw->current_file>0) { mainw->osc_auto=TRUE; ///< request early notifiction of success @@ -529,8 +534,9 @@ mainw->osc_auto=FALSE; } else if (mainw->current_file>0) { - if (cfile->pb_fps<0||(cfile->play_paused&&cfile->freeze_fps<0)) dirchange_callback(NULL,NULL,0,(LiVESModifierType)0,LIVES_INT_TO_POINTER(TRUE)); - if (cfile->play_paused) freeze_callback(NULL,NULL,0,(LiVESModifierType)0,NULL); + if (cfile->pb_fps<0||(cfile->play_paused&&cfile->freeze_fps<0)) + dirchange_callback(NULL,NULL,0,(LiVESXModifierType)0,LIVES_INT_TO_POINTER(TRUE)); + if (cfile->play_paused) freeze_callback(NULL,NULL,0,(LiVESXModifierType)0,NULL); lives_osc_notify_success(NULL); } else lives_osc_notify_failure(); @@ -560,8 +566,8 @@ } else if (mainw->current_file>0) { if (cfile->pb_fps>0||(cfile->play_paused&&cfile->freeze_fps>0)) - dirchange_callback(NULL,NULL,0,(LiVESModifierType)0,LIVES_INT_TO_POINTER(TRUE)); - if (cfile->play_paused) freeze_callback(NULL,NULL,0,(LiVESModifierType)0,NULL); + dirchange_callback(NULL,NULL,0,(LiVESXModifierType)0,LIVES_INT_TO_POINTER(TRUE)); + if (cfile->play_paused) freeze_callback(NULL,NULL,0,(LiVESXModifierType)0,NULL); lives_osc_notify_success(NULL); } else lives_osc_notify_failure(); @@ -623,9 +629,9 @@ if (mainw->multitrack!=NULL) return lives_osc_notify_failure(); if (mainw->playing_file==-1) return lives_osc_notify_failure(); - fps_reset_callback(NULL,NULL,0,(LiVESModifierType)0,NULL); - if (cfile->pb_fps<0||(cfile->play_paused&&cfile->freeze_fps<0)) dirchange_callback(NULL,NULL,0,(LiVESModifierType)0,LIVES_INT_TO_POINTER(TRUE)); - if (cfile->play_paused) freeze_callback(NULL,NULL,0,(LiVESModifierType)0,NULL); + fps_reset_callback(NULL,NULL,0,(LiVESXModifierType)0,NULL); + if (cfile->pb_fps<0||(cfile->play_paused&&cfile->freeze_fps<0)) dirchange_callback(NULL,NULL,0,(LiVESXModifierType)0,LIVES_INT_TO_POINTER(TRUE)); + if (cfile->play_paused) freeze_callback(NULL,NULL,0,(LiVESXModifierType)0,NULL); lives_osc_notify_success(NULL); @@ -1606,7 +1612,7 @@ if (mainw->current_file<1||mainw->preview||mainw->is_processing) return lives_osc_notify_failure(); // TODO if (mainw->multitrack!=NULL) return lives_osc_notify_failure(); - nextclip_callback(NULL,NULL,0,(LiVESModifierType)0,LIVES_INT_TO_POINTER(1)); + nextclip_callback(NULL,NULL,0,(LiVESXModifierType)0,LIVES_INT_TO_POINTER(1)); if (mainw->playing_file==-1&&prefs->omc_noisy) { char *msg=g_strdup_printf("%d",mainw->current_file); @@ -1624,7 +1630,7 @@ if (mainw->blend_file<1||mainw->files[mainw->blend_file]==NULL) return lives_osc_notify_failure(); if (mainw->multitrack!=NULL) return lives_osc_notify_failure(); - nextclip_callback(NULL,NULL,0,(LiVESModifierType)0,LIVES_INT_TO_POINTER(2)); + nextclip_callback(NULL,NULL,0,(LiVESXModifierType)0,LIVES_INT_TO_POINTER(2)); if (mainw->playing_file==-1&&prefs->omc_noisy) { char *msg=g_strdup_printf("%d",mainw->blend_file); @@ -1642,7 +1648,7 @@ if (mainw->current_file<1||mainw->preview||mainw->is_processing) return lives_osc_notify_failure(); // TODO if (mainw->multitrack!=NULL) return lives_osc_notify_failure(); - prevclip_callback(NULL,NULL,0,(LiVESModifierType)0,LIVES_INT_TO_POINTER(1)); + prevclip_callback(NULL,NULL,0,(LiVESXModifierType)0,LIVES_INT_TO_POINTER(1)); if (mainw->playing_file==-1&&prefs->omc_noisy) { char *msg=g_strdup_printf("%d",mainw->current_file); @@ -1662,7 +1668,7 @@ if (mainw->blend_file<1||mainw->files[mainw->blend_file]==NULL) return lives_osc_notify_failure(); - prevclip_callback(NULL,NULL,0,(LiVESModifierType)0,LIVES_INT_TO_POINTER(2)); + prevclip_callback(NULL,NULL,0,(LiVESXModifierType)0,LIVES_INT_TO_POINTER(2)); if (mainw->playing_file==-1&&prefs->omc_noisy) { char *msg=g_strdup_printf("%d",mainw->blend_file); @@ -2593,7 +2599,7 @@ if (mainw->playing_file<1) return lives_osc_notify_failure(); if (!mainw->osc_block) { - freeze_callback(NULL,NULL,0,(LiVESModifierType)0,NULL); + freeze_callback(NULL,NULL,0,(LiVESXModifierType)0,NULL); } if (prefs->omc_noisy) { lives_osc_notify_success(NULL); @@ -6172,14 +6178,14 @@ void lives_osc_cb_swap(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) { if (mainw->multitrack!=NULL) return lives_osc_notify_failure(); - swap_fg_bg_callback (NULL,NULL,0,(LiVESModifierType)0,NULL); + swap_fg_bg_callback (NULL,NULL,0,(LiVESXModifierType)0,NULL); lives_osc_notify_success(NULL); } void lives_osc_record_start(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) { if (mainw->multitrack!=NULL) return lives_osc_notify_failure(); - record_toggle_callback (NULL,NULL,0,(LiVESModifierType)0,LIVES_INT_TO_POINTER((int)TRUE)); + record_toggle_callback (NULL,NULL,0,(LiVESXModifierType)0,LIVES_INT_TO_POINTER((int)TRUE)); lives_osc_notify_success(NULL); // TODO - send record start and record stop events } @@ -6187,13 +6193,13 @@ void lives_osc_record_stop(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) { if (mainw->multitrack!=NULL) return lives_osc_notify_failure(); - record_toggle_callback (NULL,NULL,0,(LiVESModifierType)0,LIVES_INT_TO_POINTER((int)FALSE)); + record_toggle_callback (NULL,NULL,0,(LiVESXModifierType)0,LIVES_INT_TO_POINTER((int)FALSE)); lives_osc_notify_success(NULL); } void lives_osc_record_toggle(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) { if (mainw->multitrack!=NULL) return lives_osc_notify_failure(); - record_toggle_callback (NULL,NULL,0,(LiVESModifierType)0,LIVES_INT_TO_POINTER(!mainw->record)); + record_toggle_callback (NULL,NULL,0,(LiVESXModifierType)0,LIVES_INT_TO_POINTER(!mainw->record)); lives_osc_notify_success(NULL); } @@ -6871,7 +6877,7 @@ -boolean lives_osc_init(guint udp_port) { +boolean lives_osc_init(uint32_t udp_port) { char *tmp; if (livesOSC!=NULL&&udp_port!=0) {
View file
LiVES-2.2.7.tar.bz2/src/paramspecial.c -> LiVES-2.2.8.tar.bz2/src/paramspecial.c
Changed
@@ -29,8 +29,6 @@ static GList *fileread; static GList *passwd_widgets; -// TODO - rewrite all of this more sensibly - void init_special (void) { framedraw.type=LIVES_PARAM_SPECIAL_TYPE_NONE; @@ -57,7 +55,7 @@ register int i; - // TODO - make sure only one of each of these + // TODO - assert only one of each of these if (!strcmp (array[0],"aspect")) { @@ -112,7 +110,7 @@ } if (num_widgets>framedraw.stdwidgets) framedraw.extra_params= - (gint *)g_malloc(((framedraw.num_extra=(num_widgets-framedraw.stdwidgets)))*sizint); + (int *)g_malloc(((framedraw.num_extra=(num_widgets-framedraw.stdwidgets)))*sizint); for (i=0;i<num_widgets;i++) { pnum=atoi(array[i+2]); @@ -146,14 +144,14 @@ fileread=g_list_append(fileread,(gpointer)&rfx->params[idx]); // ensure we get an entry and not a text_view - if ((gint)rfx->params[idx].max>RFX_TEXT_MAGIC) rfx->params[idx].max=(gdouble)RFX_TEXT_MAGIC; + if ((int)rfx->params[idx].max>RFX_TEXT_MAGIC) rfx->params[idx].max=(double)RFX_TEXT_MAGIC; } else if (!strcmp (array[0],"password")) { int idx=atoi(array[1]); passwd_widgets=g_list_append(passwd_widgets,(gpointer)&rfx->params[idx]); // ensure we get an entry and not a text_view - if ((gint)rfx->params[idx].max>RFX_TEXT_MAGIC) rfx->params[idx].max=(gdouble)RFX_TEXT_MAGIC; + if ((int)rfx->params[idx].max>RFX_TEXT_MAGIC) rfx->params[idx].max=(double)RFX_TEXT_MAGIC; } g_strfreev (array); @@ -177,7 +175,7 @@ } -static void passwd_toggle_vis(GtkToggleButton *b, gpointer entry) { +static void passwd_toggle_vis(LiVESToggleButton *b, gpointer entry) { lives_entry_set_visibility(LIVES_ENTRY(entry),lives_toggle_button_get_active(b)); } @@ -200,29 +198,33 @@ param->special_type_index=0; if (framedraw.type==LIVES_PARAM_SPECIAL_TYPE_RECT_DEMASK) lives_spin_button_set_value (LIVES_SPIN_BUTTON (param->widgets[0]),0.); - g_signal_connect_after (GTK_OBJECT (param->widgets[0]), "value_changed", G_CALLBACK (after_framedraw_widget_changed), &framedraw); + lives_signal_connect_after (LIVES_GUI_OBJECT (param->widgets[0]), "value_changed", + LIVES_GUI_CALLBACK (after_framedraw_widget_changed), &framedraw); } if (param==framedraw.ystart_param) { param->special_type=framedraw.type; param->special_type_index=1; if (framedraw.type==LIVES_PARAM_SPECIAL_TYPE_RECT_DEMASK) lives_spin_button_set_value (LIVES_SPIN_BUTTON (param->widgets[0]),0.); - g_signal_connect_after (GTK_OBJECT (param->widgets[0]), "value_changed", G_CALLBACK (after_framedraw_widget_changed), &framedraw); + lives_signal_connect_after (LIVES_GUI_OBJECT (param->widgets[0]), "value_changed", + LIVES_GUI_CALLBACK (after_framedraw_widget_changed), &framedraw); } if (mainw->current_file>-1) { if (param==framedraw.xend_param) { param->special_type=framedraw.type; param->special_type_index=2; if (framedraw.type==LIVES_PARAM_SPECIAL_TYPE_RECT_DEMASK) - lives_spin_button_set_value (LIVES_SPIN_BUTTON (param->widgets[0]),(gdouble)cfile->hsize); - g_signal_connect_after (GTK_OBJECT (param->widgets[0]), "value_changed", G_CALLBACK (after_framedraw_widget_changed), &framedraw); + lives_spin_button_set_value (LIVES_SPIN_BUTTON (param->widgets[0]),(double)cfile->hsize); + lives_signal_connect_after (LIVES_GUI_OBJECT (param->widgets[0]), "value_changed", + LIVES_GUI_CALLBACK (after_framedraw_widget_changed), &framedraw); } if (param==framedraw.yend_param) { param->special_type=framedraw.type; param->special_type_index=3; if (framedraw.type==LIVES_PARAM_SPECIAL_TYPE_RECT_DEMASK) - lives_spin_button_set_value (LIVES_SPIN_BUTTON (param->widgets[0]),(gdouble)cfile->vsize); - g_signal_connect_after (GTK_OBJECT (param->widgets[0]), "value_changed", G_CALLBACK (after_framedraw_widget_changed), &framedraw); + lives_spin_button_set_value (LIVES_SPIN_BUTTON (param->widgets[0]),(double)cfile->vsize); + lives_signal_connect_after (LIVES_GUI_OBJECT (param->widgets[0]), "value_changed", + LIVES_GUI_CALLBACK (after_framedraw_widget_changed), &framedraw); } @@ -244,15 +246,15 @@ } if (param==aspect.width_param) { - lives_spin_button_set_value (LIVES_SPIN_BUTTON (param->widgets[0]),(gdouble)cfile->hsize); - aspect.width_func=g_signal_connect_after (GTK_OBJECT (param->widgets[0]), "value_changed", - G_CALLBACK (after_aspect_width_changed), + lives_spin_button_set_value (LIVES_SPIN_BUTTON (param->widgets[0]),(double)cfile->hsize); + aspect.width_func=lives_signal_connect_after (LIVES_GUI_OBJECT (param->widgets[0]), "value_changed", + LIVES_GUI_CALLBACK (after_aspect_width_changed), NULL); } if (param==aspect.height_param) { - lives_spin_button_set_value (LIVES_SPIN_BUTTON (param->widgets[0]),(gdouble)cfile->vsize); - aspect.height_func=g_signal_connect_after (GTK_OBJECT (param->widgets[0]), "value_changed", - G_CALLBACK (after_aspect_height_changed), + lives_spin_button_set_value (LIVES_SPIN_BUTTON (param->widgets[0]),(double)cfile->vsize); + aspect.height_func=lives_signal_connect_after (LIVES_GUI_OBJECT (param->widgets[0]), "value_changed", + LIVES_GUI_CALLBACK (after_aspect_height_changed), NULL); box = lives_hbox_new (FALSE, 0); @@ -278,7 +280,7 @@ while (slist!=NULL) { if (param==(lives_param_t *)(slist->data)) { GList *clist; - gint epos; + int epos; param->special_type=LIVES_PARAM_SPECIAL_TYPE_FILEREAD; @@ -299,11 +301,11 @@ buttond = lives_standard_file_button_new (FALSE,g_get_current_dir()); lives_box_pack_start(LIVES_BOX(box),buttond,FALSE,FALSE,widget_opts.packing_width); lives_box_reorder_child(LIVES_BOX(box),buttond,epos); // insert after label, before textbox - g_signal_connect(buttond, "clicked", G_CALLBACK (on_filesel_button_clicked), (gpointer)param->widgets[0]); + lives_signal_connect(buttond, LIVES_WIDGET_CLICKED_EVENT, LIVES_GUI_CALLBACK (on_filesel_button_clicked), (gpointer)param->widgets[0]); if (!lives_widget_is_sensitive(param->widgets[0])) lives_widget_set_sensitive(buttond,FALSE); - if (GTK_IS_ENTRY(param->widgets[0])) { + if (LIVES_IS_ENTRY(param->widgets[0])) { lives_entry_set_editable(LIVES_ENTRY(param->widgets[0]),FALSE); if (param->widgets[1]!=NULL&& LIVES_IS_LABEL(param->widgets[1])&& @@ -343,8 +345,8 @@ if (!lives_widget_is_sensitive(param->widgets[0])) lives_widget_set_sensitive(checkbutton,FALSE); lives_widget_show_all(hbox); - g_signal_connect_after (GTK_OBJECT (checkbutton), "toggled", - G_CALLBACK (passwd_toggle_vis), + lives_signal_connect_after (LIVES_GUI_OBJECT (checkbutton), LIVES_WIDGET_TOGGLED_EVENT, + LIVES_GUI_CALLBACK (passwd_toggle_vis), (gpointer)param->widgets[0]); @@ -358,62 +360,62 @@ -void after_aspect_width_changed (GtkSpinButton *spinbutton, gpointer user_data) { +void after_aspect_width_changed (LiVESSpinButton *spinbutton, gpointer user_data) { if (lives_toggle_button_get_active (LIVES_TOGGLE_BUTTON (aspect.checkbutton))) { boolean keepeven=FALSE; - gint width=lives_spin_button_get_value_as_int (spinbutton); - gint height=lives_spin_button_get_value_as_int (LIVES_SPIN_BUTTON (aspect.height_param->widgets[0])); - g_signal_handler_block (aspect.height_param->widgets[0],aspect.height_func); + int width=lives_spin_button_get_value_as_int (spinbutton); + int height=lives_spin_button_get_value_as_int (LIVES_SPIN_BUTTON (aspect.height_param->widgets[0])); + lives_signal_handler_block (aspect.height_param->widgets[0],aspect.height_func); if (((cfile->hsize>>1)<<1)==cfile->hsize&&((cfile->vsize>>1)<<1)==cfile->vsize) { // try to keep even keepeven=TRUE; } - height=(gint)(width*cfile->vsize/cfile->hsize+.5); + height=(int)(width*cfile->vsize/cfile->hsize+.5); if (keepeven&&((height>>1)<<1)!=height) { - gint owidth=width; + int owidth=width; height--; - width=(gint)(height*cfile->hsize/cfile->vsize+.5); + width=(int)(height*cfile->hsize/cfile->vsize+.5); if (width!=owidth) { height+=2; width=owidth; } } - lives_spin_button_set_value (LIVES_SPIN_BUTTON (aspect.height_param->widgets[0]), (gdouble)height); - g_signal_handler_unblock (aspect.height_param->widgets[0],aspect.height_func); + lives_spin_button_set_value (LIVES_SPIN_BUTTON (aspect.height_param->widgets[0]), (double)height); + lives_signal_handler_unblock (aspect.height_param->widgets[0],aspect.height_func); } } -void after_aspect_height_changed (GtkToggleButton *spinbutton, gpointer user_data){ +void after_aspect_height_changed (LiVESToggleButton *spinbutton, gpointer user_data){ if (lives_toggle_button_get_active (LIVES_TOGGLE_BUTTON (aspect.checkbutton))) { boolean keepeven=FALSE; - gint height=lives_spin_button_get_value_as_int (LIVES_SPIN_BUTTON (spinbutton)); - gint width=lives_spin_button_get_value_as_int (LIVES_SPIN_BUTTON (aspect.width_param->widgets[0])); + int height=lives_spin_button_get_value_as_int (LIVES_SPIN_BUTTON (spinbutton)); + int width=lives_spin_button_get_value_as_int (LIVES_SPIN_BUTTON (aspect.width_param->widgets[0]));
View file
LiVES-2.2.7.tar.bz2/src/paramspecial.h -> LiVES-2.2.8.tar.bz2/src/paramspecial.h
Changed
@@ -50,15 +50,15 @@ void add_to_special (const gchar *special_string, lives_rfx_t *); -void check_for_special (lives_rfx_t *, lives_param_t *param, GtkBox *); +void check_for_special (lives_rfx_t *, lives_param_t *param, LiVESBox *); void fd_connect_spinbutton(lives_rfx_t *); void fd_tweak(lives_rfx_t *); -void after_aspect_width_changed (GtkSpinButton *, gpointer); +void after_aspect_width_changed (LiVESSpinButton *, gpointer); -void after_aspect_height_changed (GtkToggleButton *, gpointer); +void after_aspect_height_changed (LiVESToggleButton *, gpointer); void special_cleanup (void);
View file
LiVES-2.2.7.tar.bz2/src/paramwindow.c -> LiVES-2.2.8.tar.bz2/src/paramwindow.c
Changed
@@ -454,8 +454,8 @@ radiobutton_group = lives_radio_button_get_group (LIVES_RADIO_BUTTON (radiobutton_in)); - g_signal_connect_after (GTK_OBJECT (radiobutton_in), "toggled", - G_CALLBACK (transition_in_pressed), + lives_signal_connect_after (LIVES_GUI_OBJECT (radiobutton_in), LIVES_WIDGET_TOGGLED_EVENT, + LIVES_GUI_CALLBACK (transition_in_pressed), (gpointer)rfx); @@ -481,8 +481,8 @@ lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(checkbutton),FALSE); else lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (checkbutton), TRUE); - g_signal_connect_after (GTK_OBJECT (checkbutton), "toggled", - G_CALLBACK (after_transaudio_toggled), + lives_signal_connect_after (LIVES_GUI_OBJECT (checkbutton), LIVES_WIDGET_TOGGLED_EVENT, + LIVES_GUI_CALLBACK (after_transaudio_toggled), (gpointer)rfx); after_transaudio_toggled(LIVES_TOGGLE_BUTTON(checkbutton),(gpointer)rfx); @@ -498,8 +498,8 @@ widget_opts.pack_end=FALSE; - g_signal_connect_after (GTK_OBJECT (radiobutton_out), "toggled", - G_CALLBACK (transition_out_pressed), + lives_signal_connect_after (LIVES_GUI_OBJECT (radiobutton_out), LIVES_WIDGET_TOGGLED_EVENT, + LIVES_GUI_CALLBACK (transition_out_pressed), (gpointer)rfx); if (palette->style&STYLE_1) { @@ -570,8 +570,8 @@ spinbuttonf = lives_standard_spin_button_new (_("Target _FPS (plugin may override this)"),TRUE, def_fps,1.,FPS_MAX,1.,10.,3,LIVES_BOX(hbox),NULL); - g_signal_connect_after (GTK_OBJECT (spinbuttonf), "value_changed", - G_CALLBACK (gen_fps_changed), + lives_signal_connect_after (LIVES_GUI_OBJECT (spinbuttonf), "value_changed", + LIVES_GUI_CALLBACK (gen_fps_changed), filter); add_fill_to_box(LIVES_BOX(hbox)); @@ -618,8 +618,8 @@ width_step==1?16:width_step*4,0, LIVES_BOX(hbox),NULL); - g_signal_connect_after (GTK_OBJECT (spinbuttonw), "value_changed", - G_CALLBACK (gen_width_changed), + lives_signal_connect_after (LIVES_GUI_OBJECT (spinbuttonw), "value_changed", + LIVES_GUI_CALLBACK (gen_width_changed), tmpl); weed_leaf_delete(tmpl,"host_width"); // force a reset gen_width_changed(LIVES_SPIN_BUTTON(spinbuttonw),tmpl); @@ -637,8 +637,8 @@ height_step==1?16:height_step*4,0, LIVES_BOX(hbox),NULL); - g_signal_connect_after (GTK_OBJECT (spinbuttonh), "value_changed", - G_CALLBACK (gen_height_changed), + lives_signal_connect_after (LIVES_GUI_OBJECT (spinbuttonh), "value_changed", + LIVES_GUI_CALLBACK (gen_height_changed), tmpl); weed_leaf_delete(tmpl,"host_height"); // force a reset gen_height_changed(LIVES_SPIN_BUTTON(spinbuttonh),tmpl); @@ -702,8 +702,8 @@ lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (radiobutton), !mainw->gen_to_clipboard); - g_signal_connect_after (GTK_OBJECT (radiobutton), "toggled", - G_CALLBACK (gen_cb_toggled), + lives_signal_connect_after (LIVES_GUI_OBJECT (radiobutton), LIVES_WIDGET_TOGGLED_EVENT, + LIVES_GUI_CALLBACK (gen_cb_toggled), (gpointer)rfx); } @@ -912,9 +912,9 @@ if (!no_process||is_defaults||rfx->status==RFX_STATUS_SCRAP) { lives_button_box_set_layout (LIVES_BUTTON_BOX (dialog_action_area), LIVES_BUTTONBOX_END); - lives_dialog_add_action_widget (LIVES_DIALOG (fx_dialog[didx]), cancelbutton, GTK_RESPONSE_CANCEL); - lives_widget_add_accelerator (cancelbutton, "activate", fxw_accel_group, - LIVES_KEY_Escape, (GdkModifierType)0, (GtkAccelFlags)0); + lives_dialog_add_action_widget (LIVES_DIALOG (fx_dialog[didx]), cancelbutton, LIVES_RESPONSE_CANCEL); + lives_widget_add_accelerator (cancelbutton, LIVES_WIDGET_CLICKED_EVENT, fxw_accel_group, + LIVES_KEY_Escape, (LiVESXModifierType)0, (LiVESAccelFlags)0); if (is_defaults) { okbutton = lives_button_new_with_mnemonic (_("Set as default")); @@ -924,7 +924,7 @@ lives_dialog_add_action_widget (LIVES_DIALOG (fx_dialog[didx]), resetbutton, LIVES_RESET); } else okbutton = lives_button_new_from_stock (LIVES_STOCK_OK); - lives_dialog_add_action_widget (LIVES_DIALOG (fx_dialog[didx]), okbutton, GTK_RESPONSE_OK); + lives_dialog_add_action_widget (LIVES_DIALOG (fx_dialog[didx]), okbutton, LIVES_RESPONSE_OK); } else { okbutton = lives_button_new_with_mnemonic (_("Set as default")); @@ -937,11 +937,11 @@ if (rfx->status==RFX_STATUS_WEED) { resetbutton = lives_button_new_with_mnemonic (_("Reset")); lives_dialog_add_action_widget (LIVES_DIALOG (fx_dialog[didx]), resetbutton, LIVES_RESET); - lives_dialog_add_action_widget (LIVES_DIALOG (fx_dialog[didx]), okbutton, GTK_RESPONSE_OK); + lives_dialog_add_action_widget (LIVES_DIALOG (fx_dialog[didx]), okbutton, LIVES_RESPONSE_OK); } - lives_dialog_add_action_widget (LIVES_DIALOG (fx_dialog[didx]), cancelbutton, GTK_RESPONSE_CANCEL); - lives_widget_add_accelerator (cancelbutton, "activate", fxw_accel_group, - LIVES_KEY_Escape, (GdkModifierType)0, (GtkAccelFlags)0); + lives_dialog_add_action_widget (LIVES_DIALOG (fx_dialog[didx]), cancelbutton, LIVES_RESPONSE_CANCEL); + lives_widget_add_accelerator (cancelbutton, LIVES_WIDGET_CLICKED_EVENT, fxw_accel_group, + LIVES_KEY_Escape, (LiVESXModifierType)0, (LiVESAccelFlags)0); } @@ -957,68 +957,68 @@ if (no_process&&!is_defaults) { if (!is_realtime) { if (lives_widget_get_parent(okbutton)!=NULL) - g_signal_connect (GTK_OBJECT (okbutton), "clicked", - G_CALLBACK (on_paramwindow_cancel_clicked), + lives_signal_connect (LIVES_GUI_OBJECT (okbutton), LIVES_WIDGET_CLICKED_EVENT, + LIVES_GUI_CALLBACK (on_paramwindow_cancel_clicked), rfx); - g_signal_connect (GTK_OBJECT (cancelbutton), "clicked", - G_CALLBACK (on_paramwindow_cancel_clicked), + lives_signal_connect (LIVES_GUI_OBJECT (cancelbutton), LIVES_WIDGET_CLICKED_EVENT, + LIVES_GUI_CALLBACK (on_paramwindow_cancel_clicked), rfx); - g_signal_connect (GTK_OBJECT (fx_dialog[didx]), "delete_event", - G_CALLBACK (on_paramwindow_cancel_clicked), + lives_signal_connect (LIVES_GUI_OBJECT (fx_dialog[didx]), "delete_event", + LIVES_GUI_CALLBACK (on_paramwindow_cancel_clicked), rfx); } else { - g_signal_connect (GTK_OBJECT (cancelbutton), "clicked", - G_CALLBACK (on_paramwindow_cancel_clicked2), + lives_signal_connect (LIVES_GUI_OBJECT (cancelbutton), LIVES_WIDGET_CLICKED_EVENT, + LIVES_GUI_CALLBACK (on_paramwindow_cancel_clicked2), rfx); if (rfx->status==RFX_STATUS_SCRAP) - g_signal_connect (GTK_OBJECT (okbutton), "clicked", - G_CALLBACK (on_paramwindow_cancel_clicked2), + lives_signal_connect (LIVES_GUI_OBJECT (okbutton), LIVES_WIDGET_CLICKED_EVENT, + LIVES_GUI_CALLBACK (on_paramwindow_cancel_clicked2), rfx); else { - g_signal_connect (GTK_OBJECT (okbutton), "clicked", - G_CALLBACK (rte_set_key_defs), + lives_signal_connect (LIVES_GUI_OBJECT (okbutton), LIVES_WIDGET_CLICKED_EVENT, + LIVES_GUI_CALLBACK (rte_set_key_defs), rfx); if (resetbutton!=NULL) { - g_signal_connect_after (GTK_OBJECT (resetbutton), "clicked", - G_CALLBACK (rte_reset_defs_clicked), + lives_signal_connect_after (LIVES_GUI_OBJECT (resetbutton), LIVES_WIDGET_CLICKED_EVENT, + LIVES_GUI_CALLBACK (rte_reset_defs_clicked), rfx); } } - g_signal_connect (GTK_OBJECT (fx_dialog[didx]), "delete_event", - G_CALLBACK (on_paramwindow_cancel_clicked2), + lives_signal_connect (LIVES_GUI_OBJECT (fx_dialog[didx]), "delete_event", + LIVES_GUI_CALLBACK (on_paramwindow_cancel_clicked2), rfx); } } else { if (!is_defaults) { - g_signal_connect (GTK_OBJECT (okbutton), "clicked", - G_CALLBACK (on_paramwindow_ok_clicked), + lives_signal_connect (LIVES_GUI_OBJECT (okbutton), LIVES_WIDGET_CLICKED_EVENT, + LIVES_GUI_CALLBACK (on_paramwindow_ok_clicked), (gpointer)rfx); - g_signal_connect (GTK_OBJECT (cancelbutton), "clicked", - G_CALLBACK (on_paramwindow_cancel_clicked), + lives_signal_connect (LIVES_GUI_OBJECT (cancelbutton), LIVES_WIDGET_CLICKED_EVENT, + LIVES_GUI_CALLBACK (on_paramwindow_cancel_clicked), (gpointer)rfx); - g_signal_connect (GTK_OBJECT (fx_dialog[didx]), "delete_event", - G_CALLBACK (on_paramwindow_cancel_clicked), + lives_signal_connect (LIVES_GUI_OBJECT (fx_dialog[didx]), "delete_event", + LIVES_GUI_CALLBACK (on_paramwindow_cancel_clicked), (gpointer)rfx); } else { - g_signal_connect_after (GTK_OBJECT (okbutton), "clicked", - G_CALLBACK (rte_set_defs_ok), + lives_signal_connect_after (LIVES_GUI_OBJECT (okbutton), LIVES_WIDGET_CLICKED_EVENT, + LIVES_GUI_CALLBACK (rte_set_defs_ok), rfx); if (resetbutton!=NULL) { - g_signal_connect_after (GTK_OBJECT (resetbutton), "clicked", - G_CALLBACK (rte_reset_defs_clicked), + lives_signal_connect_after (LIVES_GUI_OBJECT (resetbutton), LIVES_WIDGET_CLICKED_EVENT, + LIVES_GUI_CALLBACK (rte_reset_defs_clicked), rfx); g_object_set_data(G_OBJECT(resetbutton),"cancelbutton",(gpointer)cancelbutton);
View file
LiVES-2.2.7.tar.bz2/src/paramwindow.h -> LiVES-2.2.8.tar.bz2/src/paramwindow.h
Changed
@@ -56,7 +56,7 @@ /// object should have g_set_object_data "param_number" set to parameter number /// /// (0 based, -ve for init onchanges) -GList *do_onchange (GObject *object, lives_rfx_t *) WARN_UNUSED; +GList *do_onchange (LiVESObject *object, lives_rfx_t *) WARN_UNUSED; GList *do_onchange_init(lives_rfx_t *) WARN_UNUSED;
View file
LiVES-2.2.7.tar.bz2/src/plugins.c -> LiVES-2.2.8.tar.bz2/src/plugins.c
Changed
@@ -1076,11 +1076,11 @@ cancelbutton = lives_button_new_from_stock (LIVES_STOCK_CANCEL); - lives_dialog_add_action_widget (LIVES_DIALOG (vppa->dialog), cancelbutton, GTK_RESPONSE_CANCEL); + lives_dialog_add_action_widget (LIVES_DIALOG (vppa->dialog), cancelbutton, LIVES_RESPONSE_CANCEL); lives_widget_set_can_focus (cancelbutton,TRUE); - lives_widget_add_accelerator (cancelbutton, "activate", accel_group, - LIVES_KEY_Escape, (GdkModifierType)0, (GtkAccelFlags)0); + lives_widget_add_accelerator (cancelbutton, LIVES_WIDGET_CLICKED_EVENT, accel_group, + LIVES_KEY_Escape, (LiVESXModifierType)0, (LiVESAccelFlags)0); savebutton = lives_button_new_from_stock (LIVES_STOCK_SAVE_AS); @@ -1089,19 +1089,19 @@ lives_widget_set_tooltip_text( savebutton, _("Save settings to an alternate file.\n")); okbutton = lives_button_new_from_stock (LIVES_STOCK_OK); - lives_dialog_add_action_widget (LIVES_DIALOG (vppa->dialog), okbutton, GTK_RESPONSE_OK); + lives_dialog_add_action_widget (LIVES_DIALOG (vppa->dialog), okbutton, LIVES_RESPONSE_OK); lives_widget_set_can_focus_and_default (okbutton); - g_signal_connect (GTK_OBJECT (cancelbutton), "clicked", - G_CALLBACK (on_vppa_cancel_clicked), + lives_signal_connect (LIVES_GUI_OBJECT (cancelbutton), LIVES_WIDGET_CLICKED_EVENT, + LIVES_GUI_CALLBACK (on_vppa_cancel_clicked), vppa); - g_signal_connect (GTK_OBJECT (savebutton), "clicked", - G_CALLBACK (on_vppa_save_clicked), + lives_signal_connect (LIVES_GUI_OBJECT (savebutton), LIVES_WIDGET_CLICKED_EVENT, + LIVES_GUI_CALLBACK (on_vppa_save_clicked), vppa); - g_signal_connect (GTK_OBJECT (okbutton), "clicked", - G_CALLBACK (on_vppa_ok_clicked), + lives_signal_connect (LIVES_GUI_OBJECT (okbutton), LIVES_WIDGET_CLICKED_EVENT, + LIVES_GUI_CALLBACK (on_vppa_ok_clicked), vppa); @@ -1233,7 +1233,7 @@ if ((vpp->set_palette=(boolean (*)(int))dlsym (handle,"set_palette"))==NULL) { OK=FALSE; } - if ((vpp->get_capabilities=(guint64 (*)(int))dlsym (handle,"get_capabilities"))==NULL) { + if ((vpp->get_capabilities=(uint64_t (*)(int))dlsym (handle,"get_capabilities"))==NULL) { OK=FALSE; } if ((vpp->render_frame=(boolean (*)(int, int, int64_t, void**, void**, weed_plant_t **)) @@ -1284,7 +1284,7 @@ vpp->send_keycodes=(boolean (*)(plugin_keyfunc))dlsym (handle,"send_keycodes"); vpp->get_audio_fmts=(int* (*)())dlsym (handle,"get_audio_fmts"); vpp->init_screen=(boolean (*)(int, int, boolean, uint64_t, int, gchar**))dlsym (handle,"init_screen"); - vpp->exit_screen=(void (*)(guint16, guint16))dlsym (handle,"exit_screen"); + vpp->exit_screen=(void (*)(uint16_t, uint16_t))dlsym (handle,"exit_screen"); vpp->module_unload=(void (*)())dlsym (handle,"module_unload"); vpp->YUV_sampling=0; @@ -2616,7 +2616,7 @@ } -static void on_dpa_cb_toggled(GtkToggleButton *button, gchar *decname) { +static void on_dpa_cb_toggled(LiVESToggleButton *button, gchar *decname) { if (!lives_toggle_button_get_active(button)) // unchecked is disabled future_prefs->disabled_decoders_new=g_list_append(future_prefs->disabled_decoders_new,g_strdup(decname)); @@ -2682,8 +2682,8 @@ lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(checkbutton), lives_list_index(future_prefs->disabled_decoders,dpsys->name)==-1); - g_signal_connect_after (GTK_OBJECT (checkbutton), "toggled", - G_CALLBACK (on_dpa_cb_toggled), + lives_signal_connect_after (LIVES_GUI_OBJECT (checkbutton), LIVES_WIDGET_TOGGLED_EVENT, + LIVES_GUI_CALLBACK (on_dpa_cb_toggled), dpsys->name); decoder_plugin=decoder_plugin->next; @@ -2691,18 +2691,18 @@ cancelbutton = lives_button_new_from_stock (LIVES_STOCK_CANCEL); - lives_dialog_add_action_widget (LIVES_DIALOG (dialog), cancelbutton, GTK_RESPONSE_CANCEL); + lives_dialog_add_action_widget (LIVES_DIALOG (dialog), cancelbutton, LIVES_RESPONSE_CANCEL); okbutton = lives_button_new_from_stock (LIVES_STOCK_OK); - lives_dialog_add_action_widget (LIVES_DIALOG (dialog), okbutton, GTK_RESPONSE_OK); + lives_dialog_add_action_widget (LIVES_DIALOG (dialog), okbutton, LIVES_RESPONSE_OK); lives_widget_set_can_focus_and_default (okbutton); - g_signal_connect (GTK_OBJECT (cancelbutton), "clicked", - G_CALLBACK (dpa_cancel_clicked), + lives_signal_connect (LIVES_GUI_OBJECT (cancelbutton), LIVES_WIDGET_CLICKED_EVENT, + LIVES_GUI_CALLBACK (dpa_cancel_clicked), NULL); - g_signal_connect (GTK_OBJECT (okbutton), "clicked", - G_CALLBACK (dpa_ok_clicked), + lives_signal_connect (LIVES_GUI_OBJECT (okbutton), LIVES_WIDGET_CLICKED_EVENT, + LIVES_GUI_CALLBACK (dpa_ok_clicked), NULL); lives_widget_show_all(dialog); @@ -3869,7 +3869,7 @@ } lives_window_set_modal (LIVES_WINDOW (fx_dialog[1]), TRUE); - if (lives_dialog_run(LIVES_DIALOG(fx_dialog[1]))==GTK_RESPONSE_OK) { + if (lives_dialog_run(LIVES_DIALOG(fx_dialog[1]))==LIVES_RESPONSE_OK) { // marshall our params for passing to the plugin res_string=param_marshall(rfx,FALSE); }
View file
LiVES-2.2.7.tar.bz2/src/plugins.h -> LiVES-2.2.8.tar.bz2/src/plugins.h
Changed
@@ -7,7 +7,10 @@ #ifndef HAS_LIVES_PLUGINS_H #define HAS_LIVES_PLUGINS_H +#ifdef GUI_GTK #include <gmodule.h> +#endif + #include <unistd.h> #include <string.h> #include <fcntl.h> @@ -41,7 +44,7 @@ #endif /// video playback plugins -typedef boolean (*plugin_keyfunc) (boolean down, guint16 unicode, guint16 keymod); +typedef boolean (*plugin_keyfunc) (boolean down, uint16_t unicode, uint16_t keymod); typedef struct { @@ -56,14 +59,14 @@ int *(*get_palette_list) (void); boolean (*set_palette) (int palette); - guint64 (*get_capabilities) (int palette); + uint64_t (*get_capabilities) (int palette); boolean (*render_frame) (int hsize, int vsize, int64_t timecode, void **pixel_data, void **return_data, weed_plant_t **play_params); // optional boolean (*init_screen) (int width, int height, boolean fullscreen, uint64_t window_id, int argc, gchar **argv); - void (*exit_screen) (guint16 mouse_x, guint16 mouse_y); + void (*exit_screen) (uint16_t mouse_x, uint16_t mouse_y); void (*module_unload) (void); const gchar *(*get_fps_list) (int palette); boolean (*set_fps) (double fps); @@ -87,11 +90,11 @@ // audio streaming int *(*get_audio_fmts)(void); - guint32 audio_codec; + uint32_t audio_codec; // must match with the "acodec" GList in interface.c // and bitmaps in the encder plugins, with this one addition: - guint64 capabilities; + uint64_t capabilities; #define VPP_CAN_RESIZE 1<<0 #define VPP_CAN_RETURN 1<<1 @@ -142,7 +145,7 @@ typedef struct { gchar name[51]; - guint32 audio_codec; + uint32_t audio_codec; // match with bitmaps in the encoder plugins // and also anames array in plugins.c (see below) @@ -162,7 +165,7 @@ #define AUDIO_CODEC_NONE 32 #define AUDIO_CODEC_UNKNOWN 33 - guint capabilities; + uint32_t capabilities; #define HAS_RFX 1<<0 @@ -483,7 +486,7 @@ lives_rfx_status_t status; - guint32 props; + uint32_t props; #define RFX_PROPS_SLOW 0x0001 ///< hint to GUI #define RFX_PROPS_MAY_RESIZE 0x0002 ///< is a tool #define RFX_PROPS_BATCHG 0x0004 ///< is a batch generator @@ -581,8 +584,8 @@ lives_rfx_t *rfx; } _vppaw; -_vppaw *on_vpp_advanced_clicked (GtkButton *, gpointer); -void on_decplug_advanced_clicked (GtkButton *button, gpointer user_data); +_vppaw *on_vpp_advanced_clicked (LiVESButton *, gpointer); +void on_decplug_advanced_clicked (LiVESButton *button, gpointer user_data); /// for realtime effects, see effects-weed.h
View file
LiVES-2.2.7.tar.bz2/src/preferences.c -> LiVES-2.2.8.tar.bz2/src/preferences.c
Changed
@@ -32,14 +32,14 @@ static void select_pref_list_row(uint32_t selected_idx); #ifdef ENABLE_OSC -static void on_osc_enable_toggled (GtkToggleButton *t1, gpointer t2) { +static void on_osc_enable_toggled (LiVESToggleButton *t1, gpointer t2) { if (prefs->osc_udp_started) return; lives_widget_set_sensitive (prefsw->spinbutton_osc_udp,lives_toggle_button_get_active (t1)|| lives_toggle_button_get_active (LIVES_TOGGLE_BUTTON (t2))); } #endif -static void instopen_toggled (GtkToggleButton *t1, LiVESWidget *button) { +static void instopen_toggled (LiVESToggleButton *t1, LiVESWidget *button) { lives_widget_set_sensitive (button,lives_toggle_button_get_active (t1)); } @@ -1442,7 +1442,7 @@ } -void rdet_acodec_changed (GtkComboBox *acodec_combo, gpointer user_data) { +void rdet_acodec_changed (LiVESCombo *acodec_combo, gpointer user_data) { int listlen=g_list_length (prefs->acodec_list); int idx; char *audio_codec = lives_combo_get_active_text(acodec_combo); @@ -1565,7 +1565,7 @@ -static void on_forcesmon_toggled (GtkToggleButton *tbutton, gpointer user_data) { +static void on_forcesmon_toggled (LiVESToggleButton *tbutton, gpointer user_data) { int gui_monitor=lives_spin_button_get_value(LIVES_SPIN_BUTTON(prefsw->spinbutton_gmoni)); int play_monitor=lives_spin_button_get_value(LIVES_SPIN_BUTTON(prefsw->spinbutton_pmoni)); lives_widget_set_sensitive(prefsw->spinbutton_gmoni,!lives_toggle_button_get_active(tbutton)); @@ -1583,7 +1583,7 @@ capable->nmonitors>0); } -static void on_mtbackevery_toggled (GtkToggleButton *tbutton, gpointer user_data) { +static void on_mtbackevery_toggled (LiVESToggleButton *tbutton, gpointer user_data) { _prefsw *xprefsw; if (user_data!=NULL) xprefsw=(_prefsw *)user_data; @@ -1594,7 +1594,7 @@ } #ifdef ENABLE_JACK_TRANSPORT -static void after_jack_client_toggled(GtkToggleButton *tbutton, gpointer user_data) { +static void after_jack_client_toggled(LiVESToggleButton *tbutton, gpointer user_data) { if (!lives_toggle_button_get_active(tbutton)) { lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_jack_tb_start),FALSE); @@ -1607,7 +1607,7 @@ } } -static void after_jack_tb_start_toggled(GtkToggleButton *tbutton, gpointer user_data) { +static void after_jack_tb_start_toggled(LiVESToggleButton *tbutton, gpointer user_data) { if (!lives_toggle_button_get_active(tbutton)) { lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_jack_tb_client),FALSE); @@ -1625,7 +1625,7 @@ #ifdef ENABLE_OSC #ifdef OMC_MIDI_IMPL #ifdef ALSA_MIDI -static void on_alsa_midi_toggled (GtkToggleButton *tbutton, gpointer user_data) { +static void on_alsa_midi_toggled (LiVESToggleButton *tbutton, gpointer user_data) { _prefsw *xprefsw; if (user_data!=NULL) xprefsw=(_prefsw *)user_data; @@ -1651,12 +1651,12 @@ if (mainw->playing_file>-1) { do_aud_during_play_error(); - g_signal_handler_block(audp_combo, prefsw->audp_entry_func); + lives_signal_handler_block(audp_combo, prefsw->audp_entry_func); lives_combo_set_active_string(LIVES_COMBO(audp_combo), prefsw->audp_name); //lives_widget_queue_draw(audp_entry); - g_signal_handler_unblock(audp_combo, prefsw->audp_entry_func); + lives_signal_handler_unblock(audp_combo, prefsw->audp_entry_func); g_free(audp); return; } @@ -1695,7 +1695,7 @@ } -static void stream_audio_toggled(GtkToggleButton *togglebutton, gpointer user_data) { +static void stream_audio_toggled(LiVESToggleButton *togglebutton, gpointer user_data) { // if audio streaming is enabled, check requisites if (lives_toggle_button_get_active(togglebutton)) { @@ -1792,8 +1792,8 @@ LiVESTreeViewColumn *column1, *column2; GtkListStore *store; - renderer = gtk_cell_renderer_text_new(); - pixbufRenderer = gtk_cell_renderer_pixbuf_new(); + renderer = lives_cell_renderer_text_new(); + pixbufRenderer = lives_cell_renderer_pixbuf_new(); column1 = lives_tree_view_column_new_with_attributes("List Icons", pixbufRenderer, "pixbuf", LIST_ICON, NULL); column2 = lives_tree_view_column_new_with_attributes("List Items", renderer, "text", LIST_ITEM, NULL); @@ -1951,7 +1951,7 @@ -static void spinbutton_crit_ds_value_changed (GtkSpinButton *crit_ds, gpointer user_data) { +static void spinbutton_crit_ds_value_changed (LiVESSpinButton *crit_ds, gpointer user_data) { double myval=lives_spin_button_get_value(crit_ds); lives_spin_button_set_range (LIVES_SPIN_BUTTON (prefsw->spinbutton_warn_ds),myval,DS_WARN_CRIT_MAX); apply_button_set_enabled(NULL,NULL); @@ -2107,7 +2107,7 @@ // Place list on the left panel pref_init_list(prefsw->prefs_list); - list_scroll = gtk_scrolled_window_new(lives_tree_view_get_hadjustment(LIVES_TREE_VIEW(prefsw->prefs_list)), NULL); + list_scroll = lives_scrolled_window_new(lives_tree_view_get_hadjustment(LIVES_TREE_VIEW(prefsw->prefs_list)), NULL); lives_widget_show(list_scroll); lives_scrolled_window_set_policy (LIVES_SCROLLED_WINDOW (list_scroll), LIVES_POLICY_AUTOMATIC, LIVES_POLICY_AUTOMATIC); lives_container_add (LIVES_CONTAINER (list_scroll), prefsw->prefs_list); @@ -2282,8 +2282,8 @@ lives_widget_set_sensitive(prefsw->spinbutton_pmoni,FALSE); } - g_signal_connect (GTK_OBJECT (prefsw->forcesmon), "toggled", - G_CALLBACK (on_forcesmon_toggled), + lives_signal_connect (LIVES_GUI_OBJECT (prefsw->forcesmon), LIVES_WIDGET_TOGGLED_EVENT, + LIVES_GUI_CALLBACK (on_forcesmon_toggled), NULL); @@ -2470,7 +2470,7 @@ // --- - g_signal_connect (GTK_OBJECT (prefsw->mt_autoback_every), "toggled", G_CALLBACK (on_mtbackevery_toggled), prefsw); + lives_signal_connect (LIVES_GUI_OBJECT (prefsw->mt_autoback_every), LIVES_WIDGET_TOGGLED_EVENT, LIVES_GUI_CALLBACK (on_mtbackevery_toggled), prefsw); if (prefs->mt_auto_back==0) { lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(prefsw->mt_autoback_always),TRUE); @@ -2515,13 +2515,13 @@ advbutton = lives_button_new_with_mnemonic (_("_Advanced")); lives_box_pack_start (LIVES_BOX (hbox), advbutton, FALSE, FALSE, widget_opts.packing_width*4); - g_signal_connect (GTK_OBJECT (advbutton), "clicked", - G_CALLBACK (on_decplug_advanced_clicked), + lives_signal_connect (LIVES_GUI_OBJECT (advbutton), LIVES_WIDGET_CLICKED_EVENT, + LIVES_GUI_CALLBACK (on_decplug_advanced_clicked), NULL); lives_widget_set_sensitive(advbutton,prefs->instant_open); - g_signal_connect(GTK_OBJECT(prefsw->checkbutton_instant_open), "toggled", G_CALLBACK(instopen_toggled), advbutton); + lives_signal_connect(LIVES_GUI_OBJECT(prefsw->checkbutton_instant_open), LIVES_WIDGET_TOGGLED_EVENT, LIVES_GUI_CALLBACK(instopen_toggled), advbutton); hbox = lives_hbox_new (FALSE, 0); @@ -2697,8 +2697,8 @@ advbutton = lives_button_new_with_mnemonic (_("_Advanced")); lives_box_pack_start (LIVES_BOX (hbox), advbutton, FALSE, FALSE, 40); - g_signal_connect (GTK_OBJECT (advbutton), "clicked", - G_CALLBACK (on_vpp_advanced_clicked), + lives_signal_connect (LIVES_GUI_OBJECT (advbutton), LIVES_WIDGET_CLICKED_EVENT, + LIVES_GUI_CALLBACK (on_vpp_advanced_clicked), NULL); @@ -2712,7 +2712,7 @@ g_list_free_strings (vid_playback_plugins); g_list_free (vid_playback_plugins); - g_signal_connect_after (G_OBJECT (pp_combo), "changed", G_CALLBACK (after_vpp_changed), (gpointer) advbutton); + lives_signal_connect_after (G_OBJECT (pp_combo), LIVES_WIDGET_CHANGED_EVENT, LIVES_GUI_CALLBACK (after_vpp_changed), (gpointer) advbutton); prefsw->checkbutton_stream_audio = lives_standard_check_button_new((tmp=g_strdup(_("Stream audio"))), @@ -2726,7 +2726,7 @@ prefsw_set_astream_settings(mainw->vpp); - g_signal_connect(GTK_OBJECT(prefsw->checkbutton_stream_audio), "toggled", G_CALLBACK(stream_audio_toggled), NULL); + lives_signal_connect(LIVES_GUI_OBJECT(prefsw->checkbutton_stream_audio), LIVES_WIDGET_TOGGLED_EVENT, LIVES_GUI_CALLBACK(stream_audio_toggled), NULL); @@ -2884,8 +2884,8 @@ lives_widget_set_sensitive (prefsw->rextaudio,FALSE); } - g_signal_connect(GTK_OBJECT(prefsw->rextaudio), "toggled", G_CALLBACK(toggle_set_insensitive), prefsw->checkbutton_aclips); - g_signal_connect(GTK_OBJECT(prefsw->rextaudio), "toggled", G_CALLBACK(toggle_set_insensitive), prefsw->checkbutton_afollow); + lives_signal_connect(LIVES_GUI_OBJECT(prefsw->rextaudio), LIVES_WIDGET_TOGGLED_EVENT, LIVES_GUI_CALLBACK(toggle_set_insensitive), prefsw->checkbutton_aclips); + lives_signal_connect(LIVES_GUI_OBJECT(prefsw->rextaudio), LIVES_WIDGET_TOGGLED_EVENT, LIVES_GUI_CALLBACK(toggle_set_insensitive), prefsw->checkbutton_afollow);
View file
LiVES-2.2.7.tar.bz2/src/preferences.h -> LiVES-2.2.8.tar.bz2/src/preferences.h
Changed
@@ -550,7 +550,7 @@ LiVESWidget *ladspa_entry; LiVESWidget *cdda_hbox; LiVESWidget *midi_hbox; - GtkTreeSelection *selection; + LiVESTreeSelection *selection; boolean needs_restart; } _prefsw; @@ -597,25 +597,25 @@ _prefsw *prefsw; void set_acodec_list_from_allowed (_prefsw *, render_details *); -void rdet_acodec_changed (GtkComboBox *acodec_combo, gpointer user_data); +void rdet_acodec_changed (LiVESCombo *acodec_combo, gpointer user_data); _prefsw* create_prefs_dialog (void); -boolean on_prefs_delete_event (LiVESWidget *, GdkEvent *, gpointer prefsw); +boolean on_prefs_delete_event (LiVESWidget *, LiVESXEvent *, gpointer prefsw); -void on_preferences_activate (GtkMenuItem *, gpointer); +void on_preferences_activate (LiVESMenuItem *, gpointer); -void on_prefs_close_clicked (GtkButton *, gpointer); +void on_prefs_close_clicked (LiVESButton *, gpointer); -void on_prefs_revert_clicked (GtkButton *, gpointer); +void on_prefs_revert_clicked (LiVESButton *, gpointer); void set_vpp(boolean set_in_prefs); -void on_prefDomainChanged(GtkTreeSelection *, gpointer); +void on_prefDomainChanged(LiVESTreeSelection *, gpointer); -void populate_combo_box(GtkComboBox *combo, GList *data); +void populate_combo_box(LiVESCombo *, GList *data); -void set_combo_box_active_string(GtkComboBox *, gchar *active_str); +void set_combo_box_active_string(LiVESCombo *, gchar *active_str); void prefsw_set_astream_settings(_vid_playback_plugin *); void prefsw_set_rec_after_settings(_vid_playback_plugin *);
View file
LiVES-2.2.7.tar.bz2/src/pulse.c -> LiVES-2.2.8.tar.bz2/src/pulse.c
Changed
@@ -24,7 +24,7 @@ static pa_cvolume out_vol; -static guint pulse_server_rate=0; +static uint32_t pulse_server_rate=0; #define PULSE_READ_BYTES 48000 @@ -285,7 +285,7 @@ uint64_t numFramesToWrite; int64_t in_frames=0; uint64_t in_bytes=0,xin_bytes=0; - gfloat shrink_factor=1.f; + float shrink_factor=1.f; int swap_sign; lives_clip_t *xfile=afile; @@ -341,7 +341,7 @@ (double)pulseFramesAvailable+((double)fastrand()/(double)G_MAXUINT32)))) *pulsed->in_achans*(pulsed->in_asamps>>3); //g_print("in bytes=%ld %ld %ld %ld %d %d\n",in_bytes,pulsed->in_arate,pulsed->out_arate,pulseFramesAvailable,pulsed->in_achans,pulsed->in_asamps); - if ((shrink_factor=(gfloat)in_frames/(gfloat)pulseFramesAvailable)<0.f) { + if ((shrink_factor=(float)in_frames/(float)pulseFramesAvailable)<0.f) { // reverse playback if ((pulsed->seek_pos-=in_bytes)<0) { if (pulsed->loop==AUDIO_LOOP_NONE) {
View file
LiVES-2.2.7.tar.bz2/src/pulse.h -> LiVES-2.2.8.tar.bz2/src/pulse.h
Changed
@@ -77,7 +77,7 @@ boolean is_paused; - volatile gint64 audio_ticks; ///< ticks when we did the last seek, used to calculate current ticks from audio + volatile int64_t audio_ticks; ///< ticks when we did the last seek, used to calculate current ticks from audio int fd; /**< if >0 we are playing from a lives_clip_t */ boolean is_opening; ///< TRUE if file is opening (audiodump.pcm) @@ -137,7 +137,7 @@ int64_t lives_pulse_get_time(pulse_driver_t *, boolean absolute); ///< get time from pa, in 10^-8 seconds -gdouble lives_pulse_get_pos(pulse_driver_t *); +double lives_pulse_get_pos(pulse_driver_t *); //////////////////////
View file
LiVES-2.2.7.tar.bz2/src/resample.c -> LiVES-2.2.8.tar.bz2/src/resample.c
Changed
@@ -1,6 +1,6 @@ // resample.c // LiVES -// (c) G. Finch 2004 - 2013 <salsaman@gmail.com> +// (c) G. Finch 2004 - 2015 <salsaman@gmail.com> // released under the GNU GPL 3 or later // see file ../COPYING or www.gnu.org for licensing details @@ -1094,7 +1094,7 @@ -_resaudw *create_resaudw (gshort type, render_details *rdet, LiVESWidget *top_vbox) { +_resaudw *create_resaudw (short type, render_details *rdet, LiVESWidget *top_vbox) { // type 1 == resample // type 2 == insert silence // type 3 == enter multitrack or encode or render to clip @@ -1238,21 +1238,21 @@ combo_entry2 = lives_standard_entry_new(_("Rate (Hz) "),FALSE,tmp,10,6,LIVES_BOX(hbox2),NULL); g_free (tmp); - gtk_editable_set_editable (GTK_EDITABLE (combo_entry2), FALSE); + lives_editable_set_editable (LIVES_EDITABLE (combo_entry2), FALSE); lives_widget_set_can_focus (combo_entry2, FALSE); tmp=g_strdup_printf ("%d",(int)mainw->fx2_val); combo_entry3 = lives_standard_entry_new(_("Channels"),FALSE,tmp,6,2,LIVES_BOX(hbox2),NULL); g_free (tmp); - gtk_editable_set_editable (GTK_EDITABLE (combo_entry3), FALSE); + lives_editable_set_editable (LIVES_EDITABLE (combo_entry3), FALSE); lives_widget_set_can_focus (combo_entry3, FALSE); tmp=g_strdup_printf ("%d",(int)mainw->fx3_val); combo_entry1 = lives_standard_entry_new(_("Sample Size "),FALSE,tmp,6,2,LIVES_BOX(hbox2),NULL); g_free (tmp); - gtk_editable_set_editable (GTK_EDITABLE (combo_entry1), FALSE); + lives_editable_set_editable (LIVES_EDITABLE (combo_entry1), FALSE); lives_widget_set_can_focus (combo_entry1, FALSE); vseparator = lives_vseparator_new (); @@ -1342,7 +1342,7 @@ if (rdet!=NULL) lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (resaudw->aud_checkbutton), rdet->achans>0); else lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (resaudw->aud_checkbutton), prefs->mt_def_achans>0); } - else resaudw->aud_checkbutton = gtk_check_button_new (); + else resaudw->aud_checkbutton = lives_check_button_new (); hbox2 = lives_hbox_new (FALSE, 0); lives_box_pack_start (LIVES_BOX (vbox2), hbox2, FALSE, FALSE, widget_opts.packing_height); @@ -1398,7 +1398,7 @@ resaudw->entry_asamps = lives_combo_get_entry(LIVES_COMBO(combo6)); lives_entry_set_max_length (LIVES_ENTRY (resaudw->entry_asamps), 2); - gtk_editable_set_editable (GTK_EDITABLE (resaudw->entry_asamps), FALSE); + lives_editable_set_editable (LIVES_EDITABLE (resaudw->entry_asamps), FALSE); lives_entry_set_width_chars (LIVES_ENTRY (resaudw->entry_asamps), 2); if (type<3||(type>4&&type<8)||type==11) tmp=g_strdup_printf ("%d",(int)mainw->fx3_val); @@ -1481,8 +1481,8 @@ lives_widget_set_sensitive (resaudw->rb_bigend, FALSE); } - g_signal_connect (GTK_OBJECT(resaudw->entry_asamps), "changed", - G_CALLBACK (on_resaudw_asamps_changed), + lives_signal_connect (LIVES_GUI_OBJECT(resaudw->entry_asamps), LIVES_WIDGET_CHANGED_EVENT, + LIVES_GUI_CALLBACK (on_resaudw_asamps_changed), NULL); if (type>=3&&type!=11) label_aud = lives_standard_label_new (_("Audio")); @@ -1545,8 +1545,8 @@ resaudw->unlim_radiobutton=lives_standard_radio_button_new(_("Unlimited"),FALSE,rbgroup,LIVES_BOX(hbox),NULL); rbgroup = lives_radio_button_get_group (LIVES_RADIO_BUTTON (resaudw->unlim_radiobutton)); - g_signal_connect (GTK_OBJECT (radiobutton), "toggled", - G_CALLBACK (on_rb_audrec_time_toggled), + lives_signal_connect (LIVES_GUI_OBJECT (radiobutton), LIVES_WIDGET_TOGGLED_EVENT, + LIVES_GUI_CALLBACK (on_rb_audrec_time_toggled), (gpointer)resaudw); lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(resaudw->unlim_radiobutton),(type==5||type>7)&&type!=11); @@ -1572,42 +1572,42 @@ cancelbutton = lives_button_new_from_stock (LIVES_STOCK_CANCEL); - lives_dialog_add_action_widget (LIVES_DIALOG (resaudw->dialog), cancelbutton, GTK_RESPONSE_CANCEL); + lives_dialog_add_action_widget (LIVES_DIALOG (resaudw->dialog), cancelbutton, LIVES_RESPONSE_CANCEL); lives_widget_set_can_focus_and_default (cancelbutton); - if (accel_group!=NULL) lives_widget_add_accelerator (cancelbutton, "activate", accel_group, - LIVES_KEY_Escape, (GdkModifierType)0, (GtkAccelFlags)0); + if (accel_group!=NULL) lives_widget_add_accelerator (cancelbutton, LIVES_WIDGET_CLICKED_EVENT, accel_group, + LIVES_KEY_Escape, (LiVESXModifierType)0, (LiVESAccelFlags)0); okbutton = lives_button_new_from_stock (LIVES_STOCK_OK); - lives_dialog_add_action_widget (LIVES_DIALOG (resaudw->dialog), okbutton, GTK_RESPONSE_OK); + lives_dialog_add_action_widget (LIVES_DIALOG (resaudw->dialog), okbutton, LIVES_RESPONSE_OK); lives_widget_set_can_focus_and_default (okbutton); lives_widget_grab_default (okbutton); if (type<8||type==11) { - g_signal_connect (GTK_OBJECT (cancelbutton), "clicked", - G_CALLBACK (lives_general_button_clicked), + lives_signal_connect (LIVES_GUI_OBJECT (cancelbutton), LIVES_WIDGET_CLICKED_EVENT, + LIVES_GUI_CALLBACK (lives_general_button_clicked), resaudw); if (type==1) { - g_signal_connect (GTK_OBJECT (okbutton), "clicked", - G_CALLBACK (on_resaudio_ok_clicked), + lives_signal_connect (LIVES_GUI_OBJECT (okbutton), LIVES_WIDGET_CLICKED_EVENT, + LIVES_GUI_CALLBACK (on_resaudio_ok_clicked), NULL); } else if (type==2||type==11) { - g_signal_connect (GTK_OBJECT (okbutton), "clicked", - G_CALLBACK (on_ins_silence_details_clicked), + lives_signal_connect (LIVES_GUI_OBJECT (okbutton), LIVES_WIDGET_CLICKED_EVENT, + LIVES_GUI_CALLBACK (on_ins_silence_details_clicked), NULL); } else if (type==5) { - g_signal_connect (GTK_OBJECT (okbutton), "clicked", - G_CALLBACK (on_recaudclip_ok_clicked), + lives_signal_connect (LIVES_GUI_OBJECT (okbutton), LIVES_WIDGET_CLICKED_EVENT, + LIVES_GUI_CALLBACK (on_recaudclip_ok_clicked), GINT_TO_POINTER(0)); } else if (type==6||type==7) { - g_signal_connect (GTK_OBJECT (okbutton), "clicked", - G_CALLBACK (on_recaudclip_ok_clicked), + lives_signal_connect (LIVES_GUI_OBJECT (okbutton), LIVES_WIDGET_CLICKED_EVENT, + LIVES_GUI_CALLBACK (on_recaudclip_ok_clicked), GINT_TO_POINTER(1)); } @@ -1618,8 +1618,8 @@ } else { if (type>2&&type<5) { - g_signal_connect_after (GTK_OBJECT(resaudw->aud_checkbutton), "toggled", - G_CALLBACK (on_resaudw_achans_changed), + lives_signal_connect_after (LIVES_GUI_OBJECT(resaudw->aud_checkbutton), LIVES_WIDGET_TOGGLED_EVENT, + LIVES_GUI_CALLBACK (on_resaudw_achans_changed), (gpointer)resaudw); on_resaudw_achans_changed(resaudw->aud_checkbutton,(gpointer)resaudw); } @@ -1751,14 +1751,14 @@ lives_button_box_set_layout (LIVES_BUTTON_BOX (dialog_action_area), LIVES_BUTTONBOX_END); cancelbutton = lives_button_new_from_stock (LIVES_STOCK_CANCEL); - lives_dialog_add_action_widget (LIVES_DIALOG (new_pb_speed), cancelbutton, GTK_RESPONSE_CANCEL); + lives_dialog_add_action_widget (LIVES_DIALOG (new_pb_speed), cancelbutton, LIVES_RESPONSE_CANCEL); lives_widget_set_can_focus (cancelbutton,TRUE); - lives_widget_add_accelerator (cancelbutton, "activate", accel_group, - LIVES_KEY_Escape, (GdkModifierType)0, (GtkAccelFlags)0); + lives_widget_add_accelerator (cancelbutton, LIVES_WIDGET_CLICKED_EVENT, accel_group, + LIVES_KEY_Escape, (LiVESXModifierType)0, (LiVESAccelFlags)0); change_pb_ok = lives_button_new_from_stock (LIVES_STOCK_OK); - lives_dialog_add_action_widget (LIVES_DIALOG (new_pb_speed), change_pb_ok, GTK_RESPONSE_OK); + lives_dialog_add_action_widget (LIVES_DIALOG (new_pb_speed), change_pb_ok, LIVES_RESPONSE_OK); lives_widget_set_can_focus_and_default (change_pb_ok); lives_widget_grab_default (change_pb_ok); lives_widget_grab_focus(spinbutton_pb_speed); @@ -1766,38 +1766,38 @@ reorder_leave_back=FALSE; - g_signal_connect (GTK_OBJECT (change_audio_speed), "toggled", - G_CALLBACK (on_boolean_toggled), + lives_signal_connect (LIVES_GUI_OBJECT (change_audio_speed), LIVES_WIDGET_TOGGLED_EVENT, + LIVES_GUI_CALLBACK (on_boolean_toggled), &mainw->fx1_bool); - g_signal_connect (GTK_OBJECT (cancelbutton), "clicked", - G_CALLBACK (lives_general_button_clicked), + lives_signal_connect (LIVES_GUI_OBJECT (cancelbutton), LIVES_WIDGET_CLICKED_EVENT, + LIVES_GUI_CALLBACK (lives_general_button_clicked), NULL); if (type==1) { - g_signal_connect (GTK_OBJECT (change_pb_ok), "clicked", - G_CALLBACK (on_change_speed_ok_clicked), + lives_signal_connect (LIVES_GUI_OBJECT (change_pb_ok), LIVES_WIDGET_CLICKED_EVENT, + LIVES_GUI_CALLBACK (on_change_speed_ok_clicked), NULL); } else if (type==2) { - g_signal_connect (GTK_OBJECT (change_pb_ok), "clicked", - G_CALLBACK (on_resample_vid_ok), + lives_signal_connect (LIVES_GUI_OBJECT (change_pb_ok), LIVES_WIDGET_CLICKED_EVENT, + LIVES_GUI_CALLBACK (on_resample_vid_ok), NULL); } - g_signal_connect_after (GTK_OBJECT (spinbutton_pb_speed), "value_changed", - G_CALLBACK (on_spin_value_changed), + lives_signal_connect_after (LIVES_GUI_OBJECT (spinbutton_pb_speed), "value_changed",
View file
LiVES-2.2.7.tar.bz2/src/resample.h -> LiVES-2.2.8.tar.bz2/src/resample.h
Changed
@@ -40,34 +40,34 @@ weed_timecode_t q_gint64(weed_timecode_t in, double fps); weed_timecode_t q_gint64_floor(weed_timecode_t in, double fps); -weed_timecode_t q_dbl (gdouble in, gdouble fps); +weed_timecode_t q_dbl (double in, double fps); -weed_plant_t *quantise_events (weed_plant_t *in_list, gdouble new_fps, gboolean allow_gap); ///< quantise frame events for a single clip +weed_plant_t *quantise_events (weed_plant_t *in_list, double new_fps, boolean allow_gap); ///< quantise frame events for a single clip /////////////////////////////////////////////////////// -gint count_resampled_frames (gint in_frames, gdouble orig_fps, gdouble resampled_fps); +int count_resampled_frames (int in_frames, double orig_fps, double resampled_fps); ///////////////////////////////////////// // GUI functions /// window change speed from Tools menu -void create_new_pb_speed (gshort type); +void create_new_pb_speed (short type); /// resample audio window /// /// type 1 : show current and new, /// type 2 : show new -_resaudw* create_resaudw (gshort type, render_details *rdet, LiVESWidget *top_vbox); +_resaudw* create_resaudw (short type, render_details *rdet, LiVESWidget *top_vbox); -void on_change_speed_activate (GtkMenuItem *, gpointer); -void on_change_speed_ok_clicked (GtkButton *, gpointer); +void on_change_speed_activate (LiVESMenuItem *, gpointer); +void on_change_speed_ok_clicked (LiVESButton *, gpointer); -gboolean auto_resample_resize (gint width, gint height, gdouble fps, gint fps_num, - gint fps_denom, gint arate, gint asigned, gboolean swap_endian); -gint reorder_frames(int rwidth, int rheight); -gint deorder_frames(gint old_framecount, gboolean leave_bak); ///< leave_bak is a special mode for the clipboard +boolean auto_resample_resize (int width, int height, double fps, int fps_num, + int fps_denom, int arate, int asigned, boolean swap_endian); +int reorder_frames(int rwidth, int rheight); +int deorder_frames(int old_framecount, boolean leave_bak); ///< leave_bak is a special mode for the clipboard -gboolean resample_clipboard(gdouble new_fps); ///< call this to resample clipboard video +boolean resample_clipboard(double new_fps); ///< call this to resample clipboard video #endif
View file
LiVES-2.2.7.tar.bz2/src/rfx-builder.c -> LiVES-2.2.8.tar.bz2/src/rfx-builder.c
Changed
@@ -328,73 +328,73 @@ lives_button_box_set_layout (LIVES_BUTTON_BOX (dialog_action_area), LIVES_BUTTONBOX_END); cancelbutton = lives_button_new_from_stock (LIVES_STOCK_CANCEL); - lives_dialog_add_action_widget (LIVES_DIALOG (rfxbuilder->dialog), cancelbutton, GTK_RESPONSE_CANCEL); + lives_dialog_add_action_widget (LIVES_DIALOG (rfxbuilder->dialog), cancelbutton, LIVES_RESPONSE_CANCEL); okbutton = lives_button_new_from_stock (LIVES_STOCK_OK); - lives_dialog_add_action_widget (LIVES_DIALOG (rfxbuilder->dialog), okbutton, GTK_RESPONSE_OK); + lives_dialog_add_action_widget (LIVES_DIALOG (rfxbuilder->dialog), okbutton, LIVES_RESPONSE_OK); lives_widget_set_can_focus_and_default (okbutton); - lives_widget_add_accelerator (cancelbutton, "activate", accel_group, - LIVES_KEY_Escape, (GdkModifierType)0, (GtkAccelFlags)0); + lives_widget_add_accelerator (cancelbutton, LIVES_WIDGET_CLICKED_EVENT, accel_group, + LIVES_KEY_Escape, (LiVESXModifierType)0, (LiVESAccelFlags)0); - lives_widget_add_accelerator (okbutton, "activate", accel_group, - LIVES_KEY_Return, (GdkModifierType)0, (GtkAccelFlags)0); + lives_widget_add_accelerator (okbutton, LIVES_WIDGET_CLICKED_EVENT, accel_group, + LIVES_KEY_Return, (LiVESXModifierType)0, (LiVESAccelFlags)0); - g_signal_connect (GTK_OBJECT (okbutton), "clicked", - G_CALLBACK (on_rfxbuilder_ok), + lives_signal_connect (LIVES_GUI_OBJECT (okbutton), LIVES_WIDGET_CLICKED_EVENT, + LIVES_GUI_CALLBACK (on_rfxbuilder_ok), (gpointer)rfxbuilder); - g_signal_connect (GTK_OBJECT (cancelbutton), "clicked", - G_CALLBACK (on_rfxbuilder_cancel), + lives_signal_connect (LIVES_GUI_OBJECT (cancelbutton), LIVES_WIDGET_CLICKED_EVENT, + LIVES_GUI_CALLBACK (on_rfxbuilder_cancel), (gpointer)rfxbuilder); - g_signal_connect(rfxbuilder->requirements_button, "clicked", - G_CALLBACK (on_list_table_clicked), + lives_signal_connect(rfxbuilder->requirements_button, LIVES_WIDGET_CLICKED_EVENT, + LIVES_GUI_CALLBACK (on_list_table_clicked), (gpointer)rfxbuilder); - g_signal_connect(rfxbuilder->properties_button, "clicked", - G_CALLBACK (on_properties_clicked), + lives_signal_connect(rfxbuilder->properties_button, LIVES_WIDGET_CLICKED_EVENT, + LIVES_GUI_CALLBACK (on_properties_clicked), (gpointer)rfxbuilder); - g_signal_connect(rfxbuilder->params_button, "clicked", - G_CALLBACK (on_list_table_clicked), + lives_signal_connect(rfxbuilder->params_button, LIVES_WIDGET_CLICKED_EVENT, + LIVES_GUI_CALLBACK (on_list_table_clicked), (gpointer)rfxbuilder); - g_signal_connect(rfxbuilder->param_window_button, "clicked", - G_CALLBACK (on_list_table_clicked), + lives_signal_connect(rfxbuilder->param_window_button, LIVES_WIDGET_CLICKED_EVENT, + LIVES_GUI_CALLBACK (on_list_table_clicked), (gpointer)rfxbuilder); - g_signal_connect(rfxbuilder->trigger_button, "clicked", - G_CALLBACK (on_list_table_clicked), + lives_signal_connect(rfxbuilder->trigger_button, LIVES_WIDGET_CLICKED_EVENT, + LIVES_GUI_CALLBACK (on_list_table_clicked), (gpointer)rfxbuilder); - g_signal_connect(rfxbuilder->pre_button, "clicked", - G_CALLBACK (on_code_clicked), + lives_signal_connect(rfxbuilder->pre_button, LIVES_WIDGET_CLICKED_EVENT, + LIVES_GUI_CALLBACK (on_code_clicked), (gpointer)rfxbuilder); - g_signal_connect(rfxbuilder->loop_button, "clicked", - G_CALLBACK (on_code_clicked), + lives_signal_connect(rfxbuilder->loop_button, LIVES_WIDGET_CLICKED_EVENT, + LIVES_GUI_CALLBACK (on_code_clicked), (gpointer)rfxbuilder); - g_signal_connect(rfxbuilder->post_button, "clicked", - G_CALLBACK (on_code_clicked), + lives_signal_connect(rfxbuilder->post_button, LIVES_WIDGET_CLICKED_EVENT, + LIVES_GUI_CALLBACK (on_code_clicked), (gpointer)rfxbuilder); - g_signal_connect_after (GTK_OBJECT (rfxbuilder->type_effect1_radiobutton), "toggled", - G_CALLBACK (after_rfxbuilder_type_toggled), + lives_signal_connect_after (LIVES_GUI_OBJECT (rfxbuilder->type_effect1_radiobutton), LIVES_WIDGET_TOGGLED_EVENT, + LIVES_GUI_CALLBACK (after_rfxbuilder_type_toggled), (gpointer)rfxbuilder); - g_signal_connect_after (GTK_OBJECT (rfxbuilder->type_effect2_radiobutton), "toggled", - G_CALLBACK (after_rfxbuilder_type_toggled), + lives_signal_connect_after (LIVES_GUI_OBJECT (rfxbuilder->type_effect2_radiobutton), LIVES_WIDGET_TOGGLED_EVENT, + LIVES_GUI_CALLBACK (after_rfxbuilder_type_toggled), (gpointer)rfxbuilder); - g_signal_connect_after (GTK_OBJECT (rfxbuilder->type_effect0_radiobutton), "toggled", - G_CALLBACK (after_rfxbuilder_type_toggled), + lives_signal_connect_after (LIVES_GUI_OBJECT (rfxbuilder->type_effect0_radiobutton), LIVES_WIDGET_TOGGLED_EVENT, + LIVES_GUI_CALLBACK (after_rfxbuilder_type_toggled), (gpointer)rfxbuilder); - g_signal_connect_after (GTK_OBJECT (rfxbuilder->type_tool_radiobutton), "toggled", - G_CALLBACK (after_rfxbuilder_type_toggled), + lives_signal_connect_after (LIVES_GUI_OBJECT (rfxbuilder->type_tool_radiobutton), LIVES_WIDGET_TOGGLED_EVENT, + LIVES_GUI_CALLBACK (after_rfxbuilder_type_toggled), (gpointer)rfxbuilder); - g_signal_connect_after (GTK_OBJECT (rfxbuilder->type_utility_radiobutton), "toggled", - G_CALLBACK (after_rfxbuilder_type_toggled), + lives_signal_connect_after (LIVES_GUI_OBJECT (rfxbuilder->type_utility_radiobutton), LIVES_WIDGET_TOGGLED_EVENT, + LIVES_GUI_CALLBACK (after_rfxbuilder_type_toggled), (gpointer)rfxbuilder); @@ -656,74 +656,74 @@ lives_button_box_set_layout (LIVES_BUTTON_BOX (dialog_action_area), LIVES_BUTTONBOX_END); cancelbutton = lives_button_new_from_stock (LIVES_STOCK_CANCEL); - lives_dialog_add_action_widget (LIVES_DIALOG (dialog), cancelbutton, GTK_RESPONSE_CANCEL); + lives_dialog_add_action_widget (LIVES_DIALOG (dialog), cancelbutton, LIVES_RESPONSE_CANCEL); - lives_widget_add_accelerator (cancelbutton, "activate", accel_group, - LIVES_KEY_Escape, (GdkModifierType)0, (GtkAccelFlags)0); + lives_widget_add_accelerator (cancelbutton, LIVES_WIDGET_CLICKED_EVENT, accel_group, + LIVES_KEY_Escape, (LiVESXModifierType)0, (LiVESAccelFlags)0); okbutton = lives_button_new_from_stock (LIVES_STOCK_OK); - lives_dialog_add_action_widget (LIVES_DIALOG (dialog), okbutton, GTK_RESPONSE_OK); + lives_dialog_add_action_widget (LIVES_DIALOG (dialog), okbutton, LIVES_RESPONSE_OK); lives_widget_set_can_focus_and_default (okbutton); if (rfxbuilder->table_type==RFX_TABLE_TYPE_REQUIREMENTS) { - g_signal_connect (GTK_OBJECT (okbutton), "clicked", - G_CALLBACK (on_requirements_ok), + lives_signal_connect (LIVES_GUI_OBJECT (okbutton), LIVES_WIDGET_CLICKED_EVENT, + LIVES_GUI_CALLBACK (on_requirements_ok), user_data); - g_signal_connect (GTK_OBJECT (cancelbutton), "clicked", - G_CALLBACK (on_requirements_cancel), + lives_signal_connect (LIVES_GUI_OBJECT (cancelbutton), LIVES_WIDGET_CLICKED_EVENT, + LIVES_GUI_CALLBACK (on_requirements_cancel), user_data); } else if (rfxbuilder->table_type==RFX_TABLE_TYPE_PARAMS) { - g_signal_connect (GTK_OBJECT (okbutton), "clicked", - G_CALLBACK (on_params_ok), + lives_signal_connect (LIVES_GUI_OBJECT (okbutton), LIVES_WIDGET_CLICKED_EVENT, + LIVES_GUI_CALLBACK (on_params_ok), user_data); - g_signal_connect (GTK_OBJECT (cancelbutton), "clicked", - G_CALLBACK (on_params_cancel), + lives_signal_connect (LIVES_GUI_OBJECT (cancelbutton), LIVES_WIDGET_CLICKED_EVENT, + LIVES_GUI_CALLBACK (on_params_cancel), user_data); } else if (rfxbuilder->table_type==RFX_TABLE_TYPE_PARAM_WINDOW) { - g_signal_connect (GTK_OBJECT (okbutton), "clicked", - G_CALLBACK (on_param_window_ok), + lives_signal_connect (LIVES_GUI_OBJECT (okbutton), LIVES_WIDGET_CLICKED_EVENT, + LIVES_GUI_CALLBACK (on_param_window_ok), user_data); - g_signal_connect (GTK_OBJECT (cancelbutton), "clicked", - G_CALLBACK (on_param_window_cancel), + lives_signal_connect (LIVES_GUI_OBJECT (cancelbutton), LIVES_WIDGET_CLICKED_EVENT, + LIVES_GUI_CALLBACK (on_param_window_cancel), user_data); } else if (rfxbuilder->table_type==RFX_TABLE_TYPE_TRIGGERS) { - g_signal_connect (GTK_OBJECT (okbutton), "clicked", - G_CALLBACK (on_triggers_ok), + lives_signal_connect (LIVES_GUI_OBJECT (okbutton), LIVES_WIDGET_CLICKED_EVENT, + LIVES_GUI_CALLBACK (on_triggers_ok), user_data); - g_signal_connect (GTK_OBJECT (cancelbutton), "clicked", - G_CALLBACK (on_triggers_cancel), + lives_signal_connect (LIVES_GUI_OBJECT (cancelbutton), LIVES_WIDGET_CLICKED_EVENT, + LIVES_GUI_CALLBACK (on_triggers_cancel), user_data); } - g_signal_connect (GTK_OBJECT (rfxbuilder->new_entry_button), "clicked", - G_CALLBACK (on_table_add_row), + lives_signal_connect (LIVES_GUI_OBJECT (rfxbuilder->new_entry_button), LIVES_WIDGET_CLICKED_EVENT, + LIVES_GUI_CALLBACK (on_table_add_row), user_data); - g_signal_connect (GTK_OBJECT (rfxbuilder->edit_entry_button), "clicked", - G_CALLBACK (on_table_edit_row), + lives_signal_connect (LIVES_GUI_OBJECT (rfxbuilder->edit_entry_button), LIVES_WIDGET_CLICKED_EVENT, + LIVES_GUI_CALLBACK (on_table_edit_row), user_data); - g_signal_connect (GTK_OBJECT (rfxbuilder->remove_entry_button), "clicked", - G_CALLBACK (on_table_delete_row), + lives_signal_connect (LIVES_GUI_OBJECT (rfxbuilder->remove_entry_button), LIVES_WIDGET_CLICKED_EVENT, + LIVES_GUI_CALLBACK (on_table_delete_row), user_data);
View file
LiVES-2.2.7.tar.bz2/src/rte_window.c -> LiVES-2.2.8.tar.bz2/src/rte_window.c
Changed
@@ -69,9 +69,9 @@ // set (delayed) keycheck state register int i; for (i=0;i<prefs->rte_keys_virtual;i++) { - g_signal_handler_block(key_checks[i],ch_fns[i]); + lives_signal_handler_block(key_checks[i],ch_fns[i]); lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(key_checks[i]),GPOINTER_TO_INT(g_object_get_data(G_OBJECT(key_checks[i]),"active"))); - g_signal_handler_unblock(key_checks[i],ch_fns[i]); + lives_signal_handler_unblock(key_checks[i],ch_fns[i]); } } @@ -1761,8 +1761,8 @@ lives_button_box_set_button_width (LIVES_BUTTON_BOX (hbuttonbox), ok_button, DEF_BUTTON_WIDTH); - g_signal_connect (GTK_OBJECT (ok_button), "clicked", - G_CALLBACK (lives_general_button_clicked), + lives_signal_connect (LIVES_GUI_OBJECT (ok_button), LIVES_WIDGET_CLICKED_EVENT, + LIVES_GUI_CALLBACK (lives_general_button_clicked), NULL); g_free(filter_name); @@ -1973,7 +1973,7 @@ -void fx_changed (GtkComboBox *combo, gpointer user_data) { +void fx_changed (LiVESCombo *combo, gpointer user_data) { LiVESTreeIter iter1; LiVESTreeModel *model; @@ -2231,7 +2231,7 @@ lives_table_set_col_spacings (LIVES_TABLE (table), 4*widget_opts.scale); // dummy button for "no grab", we dont show this...there is a button instead - dummy_radio = gtk_radio_button_new (grab_group); + dummy_radio = lives_radio_button_new (grab_group); grab_group = lives_radio_button_get_group (LIVES_RADIO_BUTTON (dummy_radio)); name_list=weed_get_all_names(FX_LIST_NAME); @@ -2250,8 +2250,8 @@ hbox = lives_hbox_new (FALSE, 0); lives_table_attach (LIVES_TABLE (table), hbox, i, i+1, 0, 1, - (GtkAttachOptions) (LIVES_EXPAND | LIVES_FILL), - (GtkAttachOptions) (LIVES_EXPAND | LIVES_FILL), 0, 0); + (LiVESAttachOptions) (LIVES_EXPAND | LIVES_FILL), + (LiVESAttachOptions) (LIVES_EXPAND | LIVES_FILL), 0, 0); lives_container_set_border_width (LIVES_CONTAINER (hbox), widget_opts.border_width); label = lives_standard_label_new ((tmp=g_strdup_printf(_("Ctrl-%d"),i+1))); @@ -2268,8 +2268,8 @@ lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(key_checks[i]),mainw->rte&(GU641<<i)); g_object_set_data(G_OBJECT(key_checks[i]),"active",GINT_TO_POINTER(lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(key_checks[i])))); - ch_fns[i]=g_signal_connect_after (GTK_OBJECT (key_checks[i]), "toggled", - G_CALLBACK (rte_on_off_callback_hook),GINT_TO_POINTER (i+1)); + ch_fns[i]=lives_signal_connect_after (LIVES_GUI_OBJECT (key_checks[i]), LIVES_WIDGET_TOGGLED_EVENT, + LIVES_GUI_CALLBACK (rte_on_off_callback_hook),GINT_TO_POINTER (i+1)); @@ -2282,8 +2282,8 @@ grab_group = lives_radio_button_get_group (LIVES_RADIO_BUTTON (key_grabs[i])); lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(key_grabs[i]),mainw->rte_keys==i); - gr_fns[i]=g_signal_connect_after (GTK_OBJECT (key_grabs[i]), "toggled", - G_CALLBACK (grabkeys_callback_hook),GINT_TO_POINTER (i)); + gr_fns[i]=lives_signal_connect_after (LIVES_GUI_OBJECT (key_grabs[i]), LIVES_WIDGET_TOGGLED_EVENT, + LIVES_GUI_CALLBACK (grabkeys_callback_hook),GINT_TO_POINTER (i)); mode_group=NULL; @@ -2293,8 +2293,8 @@ idx=i*modes+j; hbox = lives_hbox_new (FALSE, 0); lives_table_attach (LIVES_TABLE (table), hbox, i, i+1, j+1, j+2, - (GtkAttachOptions) (LIVES_EXPAND | LIVES_FILL), - (GtkAttachOptions) (LIVES_EXPAND | LIVES_FILL), 0, 0); + (LiVESAttachOptions) (LIVES_EXPAND | LIVES_FILL), + (LiVESAttachOptions) (LIVES_EXPAND | LIVES_FILL), 0, 0); lives_container_set_border_width (LIVES_CONTAINER (hbox), widget_opts.border_width); @@ -2306,8 +2306,8 @@ if (rte_key_getmode(i+1)==j) lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(mode_radios[idx]),TRUE); - mode_ra_fns[idx]=g_signal_connect_after (GTK_OBJECT (mode_radios[idx]), "toggled", - G_CALLBACK (rtemode_callback_hook),GINT_TO_POINTER (idx)); + mode_ra_fns[idx]=lives_signal_connect_after (LIVES_GUI_OBJECT (mode_radios[idx]), LIVES_WIDGET_TOGGLED_EVENT, + LIVES_GUI_CALLBACK (rtemode_callback_hook),GINT_TO_POINTER (idx)); type_labels[idx] = lives_standard_label_new (""); @@ -2347,20 +2347,20 @@ hbox = lives_hbox_new (FALSE, 0); lives_box_pack_start (LIVES_BOX (vbox), hbox, FALSE, FALSE, widget_opts.packing_height); - g_signal_connect(GTK_OBJECT (combo), "changed", - G_CALLBACK (fx_changed),GINT_TO_POINTER(i*rte_getmodespk()+j)); + lives_signal_connect(LIVES_GUI_OBJECT (combo), LIVES_WIDGET_CHANGED_EVENT, + LIVES_GUI_CALLBACK (fx_changed),GINT_TO_POINTER(i*rte_getmodespk()+j)); - g_signal_connect (GTK_OBJECT (info_buttons[idx]), "clicked", - G_CALLBACK (on_rte_info_clicked),GINT_TO_POINTER (idx)); + lives_signal_connect (LIVES_GUI_OBJECT (info_buttons[idx]), LIVES_WIDGET_CLICKED_EVENT, + LIVES_GUI_CALLBACK (on_rte_info_clicked),GINT_TO_POINTER (idx)); - g_signal_connect (GTK_OBJECT (clear_buttons[idx]), "clicked", - G_CALLBACK (on_clear_clicked),GINT_TO_POINTER (idx)); + lives_signal_connect (LIVES_GUI_OBJECT (clear_buttons[idx]), LIVES_WIDGET_CLICKED_EVENT, + LIVES_GUI_CALLBACK (on_clear_clicked),GINT_TO_POINTER (idx)); - g_signal_connect (GTK_OBJECT (param_buttons[idx]), "clicked", - G_CALLBACK (on_params_clicked),GINT_TO_POINTER (idx)); + lives_signal_connect (LIVES_GUI_OBJECT (param_buttons[idx]), LIVES_WIDGET_CLICKED_EVENT, + LIVES_GUI_CALLBACK (on_params_clicked),GINT_TO_POINTER (idx)); - g_signal_connect (GTK_OBJECT (conx_buttons[idx]), "clicked", - G_CALLBACK (on_datacon_clicked),GINT_TO_POINTER (idx)); + lives_signal_connect (LIVES_GUI_OBJECT (conx_buttons[idx]), LIVES_WIDGET_CLICKED_EVENT, + LIVES_GUI_CALLBACK (on_datacon_clicked),GINT_TO_POINTER (idx)); lives_box_pack_start (LIVES_BOX (hbox), type_labels[idx], FALSE, FALSE, widget_opts.packing_width); lives_box_pack_end (LIVES_BOX (hbox), conx_buttons[idx], FALSE, FALSE, widget_opts.packing_width); @@ -2411,27 +2411,27 @@ rtew_accel_group = LIVES_ACCEL_GROUP(lives_accel_group_new ()); lives_window_add_accel_group (LIVES_WINDOW (rte_window), rtew_accel_group); - lives_widget_add_accelerator (ok_button, "activate", rtew_accel_group, - LIVES_KEY_Escape, (GdkModifierType)0, (GtkAccelFlags)0); + lives_widget_add_accelerator (ok_button, LIVES_WIDGET_CLICKED_EVENT, rtew_accel_group, + LIVES_KEY_Escape, (LiVESXModifierType)0, (LiVESAccelFlags)0); - g_signal_connect (GTK_OBJECT (rte_window), "delete_event", - G_CALLBACK (on_rtew_ok_clicked), + lives_signal_connect (LIVES_GUI_OBJECT (rte_window), "delete_event", + LIVES_GUI_CALLBACK (on_rtew_ok_clicked), NULL); - g_signal_connect (GTK_OBJECT (ok_button), "clicked", - G_CALLBACK (on_rtew_ok_clicked), + lives_signal_connect (LIVES_GUI_OBJECT (ok_button), LIVES_WIDGET_CLICKED_EVENT, + LIVES_GUI_CALLBACK (on_rtew_ok_clicked), NULL); - g_signal_connect (GTK_OBJECT (save_keymap_button), "clicked", - G_CALLBACK (on_save_keymap_clicked), + lives_signal_connect (LIVES_GUI_OBJECT (save_keymap_button), LIVES_WIDGET_CLICKED_EVENT, + LIVES_GUI_CALLBACK (on_save_keymap_clicked), NULL); - g_signal_connect (GTK_OBJECT (load_keymap_button), "clicked", - G_CALLBACK (on_load_keymap_clicked), + lives_signal_connect (LIVES_GUI_OBJECT (load_keymap_button), LIVES_WIDGET_CLICKED_EVENT, + LIVES_GUI_CALLBACK (on_load_keymap_clicked), GINT_TO_POINTER(1)); - g_signal_connect (GTK_OBJECT (clear_all_button), "clicked", - G_CALLBACK (on_clear_all_clicked), + lives_signal_connect (LIVES_GUI_OBJECT (clear_all_button), LIVES_WIDGET_CLICKED_EVENT, + LIVES_GUI_CALLBACK (on_clear_all_clicked), GINT_TO_POINTER(1)); rte_window_ready: @@ -2482,21 +2482,21 @@ void rtew_set_keych (int key, boolean on) { - g_signal_handler_block(key_checks[key],ch_fns[key]); + lives_signal_handler_block(key_checks[key],ch_fns[key]); if (!pthread_mutex_trylock(&mainw->gtk_mutex)) { lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON(key_checks[key]),on); pthread_mutex_unlock(&mainw->gtk_mutex); } - g_signal_handler_unblock(key_checks[key],ch_fns[key]); + lives_signal_handler_unblock(key_checks[key],ch_fns[key]); g_object_set_data(G_OBJECT(key_checks[key]),"active",GINT_TO_POINTER(on)); } void rtew_set_keygr (int key) { if (key>=0) { - g_signal_handler_block(key_grabs[key],gr_fns[key]); + lives_signal_handler_block(key_grabs[key],gr_fns[key]); lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON(key_grabs[key]),TRUE); - g_signal_handler_unblock(key_grabs[key],gr_fns[key]); + lives_signal_handler_unblock(key_grabs[key],gr_fns[key]); } else { lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON(dummy_radio),TRUE); @@ -2505,9 +2505,9 @@ void rtew_set_mode_radio (int key, int mode) { int modes=rte_getmodespk(); - g_signal_handler_block(mode_radios[key*modes+mode],mode_ra_fns[key*modes+mode]); + lives_signal_handler_block(mode_radios[key*modes+mode],mode_ra_fns[key*modes+mode]); lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON(mode_radios[key*modes+mode]),TRUE);
View file
LiVES-2.2.7.tar.bz2/src/rte_window.h -> LiVES-2.2.8.tar.bz2/src/rte_window.h
Changed
@@ -11,8 +11,8 @@ #define RTE_INFO_HEIGHT ((int)(200.*widget_opts.scale)) -void on_assign_rte_keys_activate (GtkMenuItem *, gpointer); -void on_rte_info_clicked (GtkButton *, gpointer data); +void on_assign_rte_keys_activate (LiVESMenuItem *, gpointer); +void on_rte_info_clicked (LiVESButton *, gpointer data); void load_default_keymap(void); void rtew_set_keych (int key, boolean on); void ret_set_key_check_state(void); @@ -26,12 +26,12 @@ LiVESWidget *rte_window; -void rte_set_defs_activate (GtkMenuItem *, gpointer user_data); -void rte_set_defs_cancel (GtkButton *, lives_rfx_t *); -void rte_set_defs_ok (GtkButton *, lives_rfx_t *); -void rte_reset_defs_clicked (GtkButton *, lives_rfx_t *rfx); -void rte_set_key_defs (GtkButton *, lives_rfx_t *); -void on_save_rte_defs_activate (GtkMenuItem *, gpointer); -boolean on_clear_all_clicked (GtkButton *, gpointer user_data); +void rte_set_defs_activate (LiVESMenuItem *, gpointer user_data); +void rte_set_defs_cancel (LiVESButton *, lives_rfx_t *); +void rte_set_defs_ok (LiVESButton *, lives_rfx_t *); +void rte_reset_defs_clicked (LiVESButton *, lives_rfx_t *rfx); +void rte_set_key_defs (LiVESButton *, lives_rfx_t *); +void on_save_rte_defs_activate (LiVESMenuItem *, gpointer); +boolean on_clear_all_clicked (LiVESButton *, gpointer user_data); #endif // HAS_LIVES_RTE_WINDOW_H
View file
LiVES-2.2.7.tar.bz2/src/saveplay.c -> LiVES-2.2.8.tar.bz2/src/saveplay.c
Changed
@@ -1,6 +1,6 @@ // saveplay.c // LiVES (lives-exe) -// (c) G. Finch 2003 - 2013 +// (c) G. Finch 2003 - 2015 // released under the GNU GPL 3 or later // see file ../COPYING or www.gnu.org for licensing details @@ -1025,15 +1025,15 @@ cfile->frames++; cfile->end++; - g_signal_handler_block(mainw->spinbutton_end,mainw->spin_end_func); + lives_signal_handler_block(mainw->spinbutton_end,mainw->spin_end_func); lives_spin_button_set_range(LIVES_SPIN_BUTTON(mainw->spinbutton_end),cfile->frames==0?0:1,cfile->frames); lives_spin_button_set_value(LIVES_SPIN_BUTTON(mainw->spinbutton_end),cfile->end); - g_signal_handler_unblock(mainw->spinbutton_end,mainw->spin_end_func); + lives_signal_handler_unblock(mainw->spinbutton_end,mainw->spin_end_func); - g_signal_handler_block(mainw->spinbutton_start,mainw->spin_start_func); + lives_signal_handler_block(mainw->spinbutton_start,mainw->spin_start_func); lives_spin_button_set_range(LIVES_SPIN_BUTTON(mainw->spinbutton_start),cfile->frames==0?0:1,cfile->frames); lives_spin_button_set_value(LIVES_SPIN_BUTTON(mainw->spinbutton_start),cfile->start); - g_signal_handler_unblock(mainw->spinbutton_start,mainw->spin_start_func); + lives_signal_handler_unblock(mainw->spinbutton_start,mainw->spin_start_func); lives_set_cursor_style(LIVES_CURSOR_NORMAL,NULL); mainw->noswitch=FALSE; @@ -1216,7 +1216,25 @@ } +static void save_log_file(const char *prefix) { + int logfd; + // save the logfile in tempdir +#ifndef IS_MINGW + gchar *logfile=g_strdup_printf("%s/%s_%d_%d.txt",prefs->tmpdir,prefix,lives_getuid(),lives_getgid()); + if ((logfd=creat(logfile,S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH))!=-1) { +#else + gchar *logfile=g_strdup_printf("%s\\%s_%d_%d.txt",prefs->tmpdir,prefix,lives_getuid(),lives_getgid()); + if ((logfd=creat(logfile,S_IRUSR|S_IWUSR))!=-1) { +#endif + gchar *btext=lives_text_view_get_text(mainw->optextview); + lives_write(logfd,btext,strlen(btext),TRUE); // not really important if it fails + g_free(btext); + close (logfd); + } + + g_free(logfile); +} @@ -1280,7 +1298,7 @@ response=lives_dialog_run(LIVES_DIALOG(rdet->dialog)); lives_widget_hide (rdet->dialog); - if (response==GTK_RESPONSE_CANCEL) { + if (response==LIVES_RESPONSE_CANCEL) { lives_widget_destroy (rdet->dialog); g_free(rdet->encoder_name); g_free(rdet); @@ -2036,11 +2054,17 @@ } switch_to_file(mainw->current_file,current_file); - do_blocking_error_dialog(_ ("\n\nEncoder error - output file was not created !\n")); + retval=do_blocking_error_dialog(_ ("\n\nEncoder error - output file was not created !\n")); + + if (retval==LIVES_RESPONSE_SHOW_DETAILS) { + // show iochan (encoder) details + on_details_button_clicked(); + } if (mainw->iochan!=NULL) { - mainw->iochan=NULL; - lives_object_unref(mainw->optextview); + save_log_file("failed_encoder_log"); + mainw->iochan=NULL; + lives_object_unref(mainw->optextview); } if (mainw->subt_save_file!=NULL) g_free(mainw->subt_save_file); @@ -2142,23 +2166,7 @@ switch_to_file(mainw->current_file,current_file); if (mainw->iochan!=NULL) { - int logfd; - - // save the logfile in tempdir - -#ifndef IS_MINGW - gchar *logfile=g_strdup_printf("%s/encoder_log_%d_%d.txt",prefs->tmpdir,lives_getuid(),lives_getgid()); - if ((logfd=creat(logfile,S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH))!=-1) { -#else - gchar *logfile=g_strdup_printf("%s\\encoder_log_%d_%d.txt",prefs->tmpdir,lives_getuid(),lives_getgid()); - if ((logfd=creat(logfile,S_IRUSR|S_IWUSR))!=-1) { -#endif - gchar *btext=lives_text_view_get_text(mainw->optextview); - lives_write(logfd,btext,strlen(btext),TRUE); // not really important if it fails - g_free(btext); - close (logfd); - } - g_free(logfile); + save_log_file("encoder_log"); lives_object_unref(mainw->optextview); mainw->iochan=NULL; } @@ -2259,8 +2267,8 @@ mainw->pre_src_audio_file=mainw->current_file; // enable the freeze button - lives_accel_group_connect (LIVES_ACCEL_GROUP (mainw->accel_group), LIVES_KEY_BackSpace, (GdkModifierType)LIVES_CONTROL_MASK, - (GtkAccelFlags)0, (freeze_closure=g_cclosure_new (G_CALLBACK (freeze_callback),NULL,NULL))); + lives_accel_group_connect (LIVES_ACCEL_GROUP (mainw->accel_group), LIVES_KEY_BackSpace, (LiVESXModifierType)LIVES_CONTROL_MASK, + (LiVESAccelFlags)0, (freeze_closure=g_cclosure_new (LIVES_GUI_CALLBACK (freeze_callback),NULL,NULL))); if (mainw->multitrack!=NULL) { mainw->event_list=mainw->multitrack->event_list; @@ -2427,8 +2435,8 @@ if (mainw->preview_box!=NULL&&lives_widget_get_parent(mainw->preview_box)!=NULL) { lives_container_remove (LIVES_CONTAINER (mainw->play_window), mainw->preview_box); - mainw->pw_scroll_func=g_signal_connect (GTK_OBJECT (mainw->play_window), "scroll_event", - G_CALLBACK (on_mouse_scroll), + mainw->pw_scroll_func=lives_signal_connect (LIVES_GUI_OBJECT (mainw->play_window), LIVES_WIDGET_SCROLL_EVENT, + LIVES_GUI_CALLBACK (on_mouse_scroll), NULL); } @@ -2447,8 +2455,8 @@ if (mainw->preview_box!=NULL&&lives_widget_get_parent(mainw->preview_box)!=NULL) { lives_container_remove (LIVES_CONTAINER (mainw->play_window), mainw->preview_box); - mainw->pw_scroll_func=g_signal_connect (GTK_OBJECT (mainw->play_window), "scroll_event", - G_CALLBACK (on_mouse_scroll), + mainw->pw_scroll_func=lives_signal_connect (LIVES_GUI_OBJECT (mainw->play_window), LIVES_WIDGET_SCROLL_EVENT, + LIVES_GUI_CALLBACK (on_mouse_scroll), NULL); } } @@ -3178,7 +3186,7 @@ // update screen for internal players lives_widget_hide(mainw->framebar); lives_entry_set_text(LIVES_ENTRY(mainw->framecounter),""); - lives_image_set_from_pixbuf(GTK_IMAGE(mainw->play_image),NULL); + lives_image_set_from_pixbuf(LIVES_IMAGE(mainw->play_image),NULL); } // kill the separate play window @@ -3193,7 +3201,7 @@ (cfile->clip_type!=CLIP_TYPE_GENERATOR)) { if (mainw->preview_box==NULL) { // create the preview in the sepwin - g_signal_handler_disconnect (mainw->play_window, mainw->pw_scroll_func); + lives_signal_handler_disconnect (mainw->play_window, mainw->pw_scroll_func); make_preview_box(); } if (mainw->current_file!=current_file) { @@ -3295,9 +3303,9 @@ // TODO - ???? if (mainw->current_file>-1&&cfile->clip_type==CLIP_TYPE_DISK&&cfile->frames==0&&mainw->record_perf) { - g_signal_handler_block(mainw->record_perf,mainw->record_perf_func); - lives_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(mainw->record_perf),FALSE); - g_signal_handler_unblock(mainw->record_perf,mainw->record_perf_func); + lives_signal_handler_block(mainw->record_perf,mainw->record_perf_func); + lives_check_menu_item_set_active(LIVES_CHECK_MENU_ITEM(mainw->record_perf),FALSE); + lives_signal_handler_unblock(mainw->record_perf,mainw->record_perf_func); } // TODO - can this be done earlier ? @@ -5401,7 +5409,7 @@ resp=lives_dialog_run(LIVES_DIALOG(chooser)); - if (resp==GTK_RESPONSE_ACCEPT) { + if (resp==LIVES_RESPONSE_ACCEPT) { newname=lives_file_chooser_get_filename (LIVES_FILE_CHOOSER(chooser)); lives_widget_destroy(LIVES_WIDGET(chooser));
View file
LiVES-2.2.7.tar.bz2/src/startup.c -> LiVES-2.2.8.tar.bz2/src/startup.c
Changed
@@ -81,7 +81,7 @@ while (!ok) { response=lives_dialog_run(LIVES_DIALOG(tdentry->dialog)); - if (response==GTK_RESPONSE_CANCEL) { + if (response==LIVES_RESPONSE_CANCEL) { return FALSE; } dirname=g_strdup(lives_entry_get_text(LIVES_ENTRY(tdentry->entry))); @@ -176,7 +176,7 @@ -static void on_init_aplayer_toggled (GtkToggleButton *tbutton, gpointer user_data) { +static void on_init_aplayer_toggled (LiVESToggleButton *tbutton, gpointer user_data) { int audp=GPOINTER_TO_INT(user_data); if (!lives_toggle_button_get_active(tbutton)) return; @@ -305,8 +305,8 @@ set_pref("audio_player","pulse"); } - g_signal_connect (GTK_OBJECT (radiobutton0), "toggled", - G_CALLBACK (on_init_aplayer_toggled), + lives_signal_connect (LIVES_GUI_OBJECT (radiobutton0), LIVES_WIDGET_TOGGLED_EVENT, + LIVES_GUI_CALLBACK (on_init_aplayer_toggled), GINT_TO_POINTER(AUD_PLAYER_PULSE)); @@ -326,8 +326,8 @@ set_pref("audio_player","jack"); } - g_signal_connect (GTK_OBJECT (radiobutton1), "toggled", - G_CALLBACK (on_init_aplayer_toggled), + lives_signal_connect (LIVES_GUI_OBJECT (radiobutton1), LIVES_WIDGET_TOGGLED_EVENT, + LIVES_GUI_CALLBACK (on_init_aplayer_toggled), GINT_TO_POINTER(AUD_PLAYER_JACK)); @@ -347,8 +347,8 @@ set_pref("audio_player","sox"); } - g_signal_connect (GTK_OBJECT (radiobutton2), "toggled", - G_CALLBACK (on_init_aplayer_toggled), + lives_signal_connect (LIVES_GUI_OBJECT (radiobutton2), LIVES_WIDGET_TOGGLED_EVENT, + LIVES_GUI_CALLBACK (on_init_aplayer_toggled), GINT_TO_POINTER(AUD_PLAYER_SOX)); @@ -367,8 +367,8 @@ set_pref("audio_player","mplayer"); } - g_signal_connect (GTK_OBJECT (radiobutton3), "toggled", - G_CALLBACK (on_init_aplayer_toggled), + lives_signal_connect (LIVES_GUI_OBJECT (radiobutton3), LIVES_WIDGET_TOGGLED_EVENT, + LIVES_GUI_CALLBACK (on_init_aplayer_toggled), GINT_TO_POINTER(AUD_PLAYER_MPLAYER)); @@ -387,8 +387,8 @@ set_pref("audio_player","mplayer2"); } - g_signal_connect (GTK_OBJECT (radiobutton4), "toggled", - G_CALLBACK (on_init_aplayer_toggled), + lives_signal_connect (LIVES_GUI_OBJECT (radiobutton4), LIVES_WIDGET_TOGGLED_EVENT, + LIVES_GUI_CALLBACK (on_init_aplayer_toggled), GINT_TO_POINTER(AUD_PLAYER_MPLAYER2)); @@ -396,15 +396,15 @@ cancelbutton = lives_button_new_from_stock (LIVES_STOCK_CANCEL); lives_widget_show (cancelbutton); - lives_dialog_add_action_widget (LIVES_DIALOG (dialog), cancelbutton, GTK_RESPONSE_CANCEL); + lives_dialog_add_action_widget (LIVES_DIALOG (dialog), cancelbutton, LIVES_RESPONSE_CANCEL); - lives_widget_add_accelerator (cancelbutton, "activate", accel_group, - LIVES_KEY_Escape, (GdkModifierType)0, (GtkAccelFlags)0); + lives_widget_add_accelerator (cancelbutton, LIVES_WIDGET_CLICKED_EVENT, accel_group, + LIVES_KEY_Escape, (LiVESXModifierType)0, (LiVESAccelFlags)0); okbutton = lives_button_new_from_stock (LIVES_STOCK_GO_FORWARD); lives_button_set_label(LIVES_BUTTON(okbutton),_("_Next")); lives_widget_show (okbutton); - lives_dialog_add_action_widget (LIVES_DIALOG (dialog), okbutton, GTK_RESPONSE_OK); + lives_dialog_add_action_widget (LIVES_DIALOG (dialog), okbutton, LIVES_RESPONSE_OK); lives_widget_set_can_focus_and_default (okbutton); lives_widget_grab_default(okbutton); lives_widget_grab_focus(okbutton); @@ -412,7 +412,7 @@ if (prefs->audio_player==-1) { do_no_mplayer_sox_error(); - return GTK_RESPONSE_CANCEL; + return LIVES_RESPONSE_CANCEL; } lives_widget_show_all(dialog); @@ -429,14 +429,14 @@ lives_widget_context_update(); - return (response==GTK_RESPONSE_OK); + return (response==LIVES_RESPONSE_OK); } static void add_test(LiVESWidget *table, int row, gchar *ttext, boolean noskip) { LiVESWidget *label=lives_standard_label_new(ttext); - lives_table_attach (LIVES_TABLE (table), label, 0, 1, row, row+1, (GtkAttachOptions)0, (GtkAttachOptions)0, 10, 10); + lives_table_attach (LIVES_TABLE (table), label, 0, 1, row, row+1, (LiVESAttachOptions)0, (LiVESAttachOptions)0, 10, 10); lives_widget_show(label); if (!noskip) { @@ -444,10 +444,10 @@ // TRANSLATORS - as in "skipped test" label=lives_standard_label_new(_("Skipped")); - lives_table_attach (LIVES_TABLE (table), label, 1, 2, row, row+1, (GtkAttachOptions)0, (GtkAttachOptions)0, 10, 10); + lives_table_attach (LIVES_TABLE (table), label, 1, 2, row, row+1, (LiVESAttachOptions)0, (LiVESAttachOptions)0, 10, 10); lives_widget_show(label); - lives_table_attach (LIVES_TABLE (table), image, 2, 3, row, row+1, (GtkAttachOptions)0, (GtkAttachOptions)0, 0, 10); + lives_table_attach (LIVES_TABLE (table), image, 2, 3, row, row+1, (LiVESAttachOptions)0, (LiVESAttachOptions)0, 0, 10); lives_widget_show(image); } @@ -465,10 +465,10 @@ LiVESWidget *image=lives_image_new_from_stock(LIVES_STOCK_APPLY,LIVES_ICON_SIZE_LARGE_TOOLBAR); #endif - lives_table_attach (LIVES_TABLE (table), label, 1, 2, row, row+1, (GtkAttachOptions)0, (GtkAttachOptions)0, 10, 10); + lives_table_attach (LIVES_TABLE (table), label, 1, 2, row, row+1, (LiVESAttachOptions)0, (LiVESAttachOptions)0, 10, 10); lives_widget_show(label); - lives_table_attach (LIVES_TABLE (table), image, 2, 3, row, row+1, (GtkAttachOptions)0, (GtkAttachOptions)0, 0, 10); + lives_table_attach (LIVES_TABLE (table), image, 2, 3, row, row+1, (LiVESAttachOptions)0, (LiVESAttachOptions)0, 0, 10); lives_widget_show(image); lives_widget_context_update(); @@ -486,16 +486,16 @@ label=lives_standard_label_new(ftext); - lives_table_attach (LIVES_TABLE (table), label, 3, 4, row, row+1, (GtkAttachOptions)0, (GtkAttachOptions)0, 10, 10); + lives_table_attach (LIVES_TABLE (table), label, 3, 4, row, row+1, (LiVESAttachOptions)0, (LiVESAttachOptions)0, 10, 10); lives_widget_show(label); // TRANSLATORS - as in "failed test" label=lives_standard_label_new(_("Failed")); - lives_table_attach (LIVES_TABLE (table), label, 1, 2, row, row+1, (GtkAttachOptions)0, (GtkAttachOptions)0, 10, 10); + lives_table_attach (LIVES_TABLE (table), label, 1, 2, row, row+1, (LiVESAttachOptions)0, (LiVESAttachOptions)0, 10, 10); lives_widget_show(label); - lives_table_attach (LIVES_TABLE (table), image, 2, 3, row, row+1, (GtkAttachOptions)0, (GtkAttachOptions)0, 0, 10); + lives_table_attach (LIVES_TABLE (table), image, 2, 3, row, row+1, (LiVESAttachOptions)0, (LiVESAttachOptions)0, 0, 10); lives_widget_show(image); lives_widget_context_update(); @@ -570,10 +570,10 @@ cancelbutton = lives_button_new_from_stock (LIVES_STOCK_CANCEL); lives_widget_show (cancelbutton); - lives_dialog_add_action_widget (LIVES_DIALOG (dialog), cancelbutton, GTK_RESPONSE_CANCEL); + lives_dialog_add_action_widget (LIVES_DIALOG (dialog), cancelbutton, LIVES_RESPONSE_CANCEL); - lives_widget_add_accelerator (cancelbutton, "activate", accel_group, - LIVES_KEY_Escape, (GdkModifierType)0, (GtkAccelFlags)0); + lives_widget_add_accelerator (cancelbutton, LIVES_WIDGET_CLICKED_EVENT, accel_group, + LIVES_KEY_Escape, (LiVESXModifierType)0, (LiVESAccelFlags)0); if (!tshoot) { okbutton = lives_button_new_from_stock (LIVES_STOCK_GO_FORWARD); @@ -581,7 +581,7 @@ } else okbutton = lives_button_new_from_stock (LIVES_STOCK_OK); lives_widget_show (okbutton); - lives_dialog_add_action_widget (LIVES_DIALOG (dialog), okbutton, GTK_RESPONSE_OK); + lives_dialog_add_action_widget (LIVES_DIALOG (dialog), okbutton, LIVES_RESPONSE_OK); lives_widget_set_can_focus_and_default (okbutton); lives_widget_grab_default(okbutton); lives_widget_grab_focus(okbutton); @@ -927,7 +927,7 @@ mainw->multitrack->idlefunc=mt_idle_add(mainw->multitrack); } - return (response==GTK_RESPONSE_OK); + return (response==LIVES_RESPONSE_OK); } @@ -992,7 +992,7 @@ lives_button_set_label(LIVES_BUTTON(okbutton),_("_Finish"));
View file
LiVES-2.2.7.tar.bz2/src/startup.h -> LiVES-2.2.8.tar.bz2/src/startup.h
Changed
@@ -14,7 +14,7 @@ boolean do_startup_tests(boolean tshoot); void do_startup_interface_query(void); -void on_troubleshoot_activate (GtkMenuItem *, gpointer); +void on_troubleshoot_activate (LiVESMenuItem *, gpointer); #endif
View file
LiVES-2.2.7.tar.bz2/src/stream.c -> LiVES-2.2.8.tar.bz2/src/stream.c
Changed
@@ -1020,7 +1020,7 @@ vppa=on_vpp_advanced_clicked(NULL,NULL); resp=lives_dialog_run(LIVES_DIALOG(vppa->dialog)); - if (resp==GTK_RESPONSE_CANCEL) { + if (resp==LIVES_RESPONSE_CANCEL) { g_free(orig_name); return; } @@ -1046,7 +1046,7 @@ int port=0; int response=lives_dialog_run (LIVES_DIALOG (pandh->dialog)); - if (response==GTK_RESPONSE_OK) { + if (response==LIVES_RESPONSE_OK) { if (!lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(pandh->rb_anyhost))) { host=g_strdup_printf("%s.%s.%s.%s",lives_entry_get_text(LIVES_ENTRY(pandh->entry1)), lives_entry_get_text(LIVES_ENTRY(pandh->entry2)), @@ -1072,7 +1072,7 @@ -static void pandhw_anyhost_toggled(GtkToggleButton *tbut, gpointer user_data) { +static void pandhw_anyhost_toggled(LiVESToggleButton *tbut, gpointer user_data) { lives_pandh_w *pandhw=(lives_pandh_w *)user_data; if (lives_toggle_button_get_active(tbut)) { @@ -1133,8 +1133,8 @@ g_free(tmp); g_free(tmp2); - g_signal_connect_after (GTK_OBJECT (pandhw->rb_anyhost), "toggled", - G_CALLBACK (pandhw_anyhost_toggled), + lives_signal_connect_after (LIVES_GUI_OBJECT (pandhw->rb_anyhost), LIVES_WIDGET_TOGGLED_EVENT, + LIVES_GUI_CALLBACK (pandhw_anyhost_toggled), (gpointer)pandhw); hbox = lives_hbox_new (FALSE, 0);
View file
LiVES-2.2.7.tar.bz2/src/stream.h -> LiVES-2.2.8.tar.bz2/src/stream.h
Changed
@@ -43,9 +43,9 @@ void lives2lives_read_stream (const gchar *host, int port); -void weed_layer_set_from_lives2lives (weed_plant_t *layer, gint clip, lives_vstream_t *lstream); -void on_open_lives2lives_activate (GtkMenuItem *, gpointer); -void on_send_lives2lives_activate (GtkMenuItem *, gpointer); +void weed_layer_set_from_lives2lives (weed_plant_t *layer, int clip, lives_vstream_t *lstream); +void on_open_lives2lives_activate (LiVESMenuItem *, gpointer); +void on_send_lives2lives_activate (LiVESMenuItem *, gpointer); typedef struct { LiVESWidget *dialog; @@ -57,7 +57,7 @@ LiVESWidget *rb_anyhost; } lives_pandh_w; -lives_pandh_w* create_pandh_dialog (gint type); +lives_pandh_w* create_pandh_dialog (int type);
View file
LiVES-2.2.7.tar.bz2/src/support.h -> LiVES-2.2.8.tar.bz2/src/support.h
Changed
@@ -1,6 +1,6 @@ // support.h // LiVES -// portions of this file were auto-generated by glade, the remainder is (c) G. Finch (salsaman) +// portions of this file were auto-generated by glade, the remainder is (c) G. Finch (salsaman) 2002 - 2015 // released under the GNU GPL 3 or later // see file ../COPYING or www.gnu.org for licensing details @@ -8,7 +8,9 @@ #ifndef HAS_LIVES_SUPPORT_H #define HAS_LIVES_SUPPORT_H +#ifndef NO_GTK #include <gtk/gtk.h> +#endif /* * Standard gettext macros. @@ -32,6 +34,7 @@ # define textdomain(String) (String) # define gettext(String) (String) # define dgettext(Domain,Message) (Message) +# define dngettext(Domain,Message,MsgPlur,n) (Message) # define dcgettext(Domain,Message,Type) (Message) # define bindtextdomain(Domain,Directory) (Domain) # define _(String) (String) @@ -39,3 +42,4 @@ #endif #endif +
View file
LiVES-2.2.7.tar.bz2/src/utils.c -> LiVES-2.2.8.tar.bz2/src/utils.c
Changed
@@ -1,6 +1,6 @@ // utils.c // LiVES -// (c) G. Finch 2003 - 2012 <salsaman@gmail.com> +// (c) G. Finch 2003 - 2015 <salsaman@gmail.com> // released under the GNU GPL 3 or later // see file ../COPYING or www.gnu.org for licensing details @@ -1680,7 +1680,7 @@ nframe+=last_frame; // normal if (nframe>last_frame) { nframe=last_frame-(nframe-last_frame); - if (mainw->playing_file==fileno) dirchange_callback (NULL,NULL,0,(GdkModifierType)0,LIVES_INT_TO_POINTER(FALSE)); + if (mainw->playing_file==fileno) dirchange_callback (NULL,NULL,0,(LiVESXModifierType)0,LIVES_INT_TO_POINTER(FALSE)); else sfile->pb_fps=-sfile->pb_fps; } } @@ -1690,7 +1690,7 @@ nframe=ABS(nframe)+first_frame; if (mainw->ping_pong) { // bounce - if (mainw->playing_file==fileno) dirchange_callback (NULL,NULL,0,(GdkModifierType)0,LIVES_INT_TO_POINTER(FALSE)); + if (mainw->playing_file==fileno) dirchange_callback (NULL,NULL,0,(LiVESXModifierType)0,LIVES_INT_TO_POINTER(FALSE)); else sfile->pb_fps=-sfile->pb_fps; } } @@ -1703,7 +1703,7 @@ if (mainw->ping_pong) { // bounce nframe=last_frame-(nframe-(first_frame-1)); - if (mainw->playing_file==fileno) dirchange_callback (NULL,NULL,0,(GdkModifierType)0,LIVES_INT_TO_POINTER(FALSE)); + if (mainw->playing_file==fileno) dirchange_callback (NULL,NULL,0,(LiVESXModifierType)0,LIVES_INT_TO_POINTER(FALSE)); else sfile->pb_fps=-sfile->pb_fps; } } @@ -1718,7 +1718,7 @@ // scratch or transport backwards if (mainw->ping_pong) { nframe=first_frame; - if (mainw->playing_file==fileno) dirchange_callback (NULL,NULL,0,(GdkModifierType)0,LIVES_INT_TO_POINTER(FALSE)); + if (mainw->playing_file==fileno) dirchange_callback (NULL,NULL,0,(LiVESXModifierType)0,LIVES_INT_TO_POINTER(FALSE)); else sfile->pb_fps=-sfile->pb_fps; } @@ -3328,14 +3328,14 @@ } void zero_spinbuttons (void) { - g_signal_handler_block(mainw->spinbutton_start,mainw->spin_start_func); + lives_signal_handler_block(mainw->spinbutton_start,mainw->spin_start_func); lives_spin_button_set_range(LIVES_SPIN_BUTTON(mainw->spinbutton_start),0.,0.); lives_spin_button_set_value(LIVES_SPIN_BUTTON(mainw->spinbutton_start),0.); - g_signal_handler_unblock(mainw->spinbutton_start,mainw->spin_start_func); - g_signal_handler_block(mainw->spinbutton_end,mainw->spin_end_func); + lives_signal_handler_unblock(mainw->spinbutton_start,mainw->spin_start_func); + lives_signal_handler_block(mainw->spinbutton_end,mainw->spin_end_func); lives_spin_button_set_range(LIVES_SPIN_BUTTON(mainw->spinbutton_end),0.,0.); lives_spin_button_set_value(LIVES_SPIN_BUTTON(mainw->spinbutton_end),0.); - g_signal_handler_unblock(mainw->spinbutton_end,mainw->spin_end_func); + lives_signal_handler_unblock(mainw->spinbutton_end,mainw->spin_end_func); } @@ -3855,7 +3855,7 @@ void set_menu_text(LiVESWidget *menuitem, const char *text, boolean use_mnemonic) { LiVESWidget *label; if (GTK_IS_MENU_ITEM (menuitem)) { - label=lives_bin_get_child(GTK_BIN(menuitem)); + label=lives_bin_get_child(LIVES_BIN(menuitem)); if (use_mnemonic) { lives_label_set_text_with_mnemonic(LIVES_LABEL(label),text); } @@ -3867,13 +3867,13 @@ void get_menu_text(LiVESWidget *menuitem, char *text) { - LiVESWidget *label=lives_bin_get_child(GTK_BIN(menuitem)); + LiVESWidget *label=lives_bin_get_child(LIVES_BIN(menuitem)); g_snprintf(text,255,"%s",lives_label_get_text(LIVES_LABEL(label))); } void get_menu_text_long(LiVESWidget *menuitem, char *text) { - LiVESWidget *label=lives_bin_get_child(GTK_BIN(menuitem)); + LiVESWidget *label=lives_bin_get_child(LIVES_BIN(menuitem)); g_snprintf(text,32768,"%s",lives_label_get_text(LIVES_LABEL(label))); } @@ -3892,9 +3892,9 @@ // This function will clean up the 'x's and so on. if (mainw->current_file>0&&cfile!=NULL&&cfile->menuentry!=NULL) { - g_signal_handler_block (cfile->menuentry, cfile->menuentry_func); + lives_signal_handler_block (cfile->menuentry, cfile->menuentry_func); lives_check_menu_item_set_active(LIVES_CHECK_MENU_ITEM(cfile->menuentry), TRUE); - g_signal_handler_unblock (cfile->menuentry, cfile->menuentry_func); + lives_signal_handler_unblock (cfile->menuentry, cfile->menuentry_func); } } @@ -5246,7 +5246,7 @@ -LIVES_INLINE LiVESInterpType get_interp_value(gshort quality) { +LIVES_INLINE LiVESInterpType get_interp_value(short quality) { if (quality==PB_QUALITY_HIGH) return LIVES_INTERP_BEST; else if (quality==PB_QUALITY_MED) return LIVES_INTERP_NORMAL; return LIVES_INTERP_FAST;
View file
LiVES-2.2.7.tar.bz2/src/videodev.c -> LiVES-2.2.8.tar.bz2/src/videodev.c
Changed
@@ -513,7 +513,7 @@ response=lives_dialog_run(LIVES_DIALOG(card_dialog)); g_list_free(devlist); - if (response==GTK_RESPONSE_CANCEL) { + if (response==LIVES_RESPONSE_CANCEL) { lives_widget_destroy(card_dialog); return; }
View file
LiVES-2.2.7.tar.bz2/src/videodev.h -> LiVES-2.2.8.tar.bz2/src/videodev.h
Changed
@@ -25,7 +25,7 @@ #define MAX_DEVICES 1024 #define MAX_FORMATS 1024 -void on_open_vdev_activate (GtkMenuItem *, gpointer); +void on_open_vdev_activate (LiVESMenuItem *, gpointer); boolean weed_layer_set_from_lvdev (weed_plant_t *layer, lives_clip_t *sfile, double timeoutsecs); void lives_vdev_free(lives_vdev_t *);
View file
LiVES-2.2.8.tar.bz2/src/widget-helper-gtk.h
Added
@@ -0,0 +1,872 @@ +// widget-helper-gtk.h +// LiVES +// (c) G. Finch 2012 - 2015 <salsaman@gmail.com> +// released under the GNU GPL 3 or later +// see file ../COPYING or www.gnu.org for licensing details + +// widget implementation for GTK+ + +#ifndef HAS_LIVES_WIDGET_HELPER_GTK_H +#define HAS_LIVES_WIDGET_HELPER_GTK_H + +#ifdef GUI_GTK + +#ifndef IS_MINGW +typedef gboolean boolean; +#endif + +#ifdef GDK_WINDOWING_WIN32 +#include <gdk/gdkwin32.h> + +#ifndef GDK_IS_WIN32_DISPLAY +#define GDK_IS_WIN32_DISPLAY(display) (TRUE) +#endif + +#endif //GDK_WINDOWING_WIN32 + +#ifdef GDK_WINDOWING_X11 + +// needed for GDK_WINDOW_XID - for fileselector preview +// needed for gdk_x11_screen_get_window_manager_name() + +#include <gdk/gdkx.h> + +#ifndef GDK_IS_X11_DISPLAY +#define GDK_IS_X11_DISPLAY(display) (TRUE) +#endif + +#ifndef GDK_IS_WIN32_DISPLAY +#define GDK_IS_WIN32_DISPLAY(display) (FALSE) +#endif + + +#else + +#ifndef GDK_IS_X11_DISPLAY +#define GDK_IS_X11_DISPLAY(display) (FALSE) +#endif + +#endif // GDK_WINDOWING_X11 + +#endif // GUI_GTK + + +#ifdef PAINTER_CAIRO + +#ifndef GUI_GTK +#include <cairo/cairo.h> +#endif + + +typedef cairo_t lives_painter_t; +typedef cairo_surface_t lives_painter_surface_t; + +boolean lives_painter_surface_destroy(lives_painter_surface_t *); + + +typedef cairo_format_t lives_painter_format_t; + +#define LIVES_PAINTER_FORMAT_A1 CAIRO_FORMAT_A1 +#define LIVES_PAINTER_FORMAT_A8 CAIRO_FORMAT_A8 +#define LIVES_PAINTER_FORMAT_ARGB32 CAIRO_FORMAT_ARGB32 + + +typedef cairo_content_t lives_painter_content_t; // eg. color, alpha, color+alpha + +#define LIVES_PAINTER_CONTENT_COLOR CAIRO_CONTENT_COLOR + + +typedef cairo_operator_t lives_painter_operator_t; + +#define LIVES_PAINTER_OPERATOR_UNKNOWN CAIRO_OPERATOR_OVER +#define LIVES_PAINTER_OPERATOR_DEFAULT CAIRO_OPERATOR_OVER + +#define LIVES_PAINTER_OPERATOR_DEST_OUT CAIRO_OPERATOR_DEST_OUT +#if CAIRO_VERSION < CAIRO_VERSION_ENCODE(1, 10, 0) +#define LIVES_PAINTER_OPERATOR_DIFFERENCE CAIRO_OPERATOR_OVER +#define LIVES_PAINTER_OPERATOR_OVERLAY CAIRO_OPERATOR_OVER +#else +#define LIVES_PAINTER_OPERATOR_DIFFERENCE CAIRO_OPERATOR_DIFFERENCE +#define LIVES_PAINTER_OPERATOR_OVERLAY CAIRO_OPERATOR_OVERLAY +#endif + +typedef cairo_fill_rule_t lives_painter_fill_rule_t; + +#define LIVES_PAINTER_FILL_RULE_WINDING CAIRO_FILL_RULE_WINDING +#define LIVES_PAINTER_FILL_RULE_EVEN_ODD CAIRO_FILL_RULE_EVEN_ODD + + +#endif + + +#ifdef GUI_GTK + +#include "support.h" + + + +/// Glib type stuff ////////////////////////////////////////// +#ifndef G_ENCODE_VERSION +#define G_ENCODE_VERSION(major,minor) ((major) << 16 | (minor) << 8) +#endif + + +typedef GError LiVESError; + + +typedef GList LiVESList; +typedef GSList LiVESSList; + + +typedef gpointer livespointer; + + +typedef GClosure LiVESWidgetClosure; + +typedef GObject LiVESObject; + +typedef GLogLevelFlags LiVESLogLevelFlags; + +#define LIVES_LOG_LEVEL_WARNING G_LOG_LEVEL_WARNING +#define LIVES_LOG_LEVEL_MASK G_LOG_LEVEL_MASK +#define LIVES_LOG_LEVEL_CRITICAL G_LOG_LEVEL_CRITICAL +#define LIVES_LOG_FATAL_MASK G_LOG_FATAL_MASK + + +////////////////////////////////////////////////// + +#if GTK_CHECK_VERSION(3,10,0) +#define LIVES_TABLE_IS_GRID 1 +#endif + +#define return_true gtk_true + +typedef void (*LiVESGuiCallback) (void); +typedef void (*LiVESWidgetCallback) (GtkWidget *widget, gpointer data); +typedef gboolean (*LiVESWidgetSourceFunc) (gpointer data); + + + +#define LIVES_GUI_CALLBACK(f) ((LiVESGuiCallback) (f)) + + +typedef GtkJustification LiVESJustification; + +#define LIVES_JUSTIFY_LEFT GTK_JUSTIFY_LEFT +#define LIVES_JUSTIFY_RIGHT GTK_JUSTIFY_RIGHT +#define LIVES_JUSTIFY_CENTER GTK_JUSTIFY_CENTER +#define LIVES_JUSTIFY_FILL GTK_JUSTIFY_RIGHT + +typedef GtkOrientation LiVESOrientation; +#define LIVES_ORIENTATION_HORIZONTAL GTK_ORIENTATION_HORIZONTAL +#define LIVES_ORIENTATION_VERTICAL GTK_ORIENTATION_VERTICAL + +typedef GdkEvent LiVESXEvent; +typedef GdkEventButton LiVESXEventButton; +typedef GdkEventMotion LiVESXEventMotion; +typedef GdkEventScroll LiVESXEventScroll; +typedef GdkDisplay LiVESXDisplay; +typedef GdkScreen LiVESXScreen; +typedef GdkDevice LiVESXDevice; + +#define LIVES_SCROLL_UP GDK_SCROLL_UP +#define LIVES_SCROLL_DOWN GDK_SCROLL_DOWN + +#if GTK_CHECK_VERSION(3,0,0) +#undef LIVES_HAS_DEVICE_MANAGER +#define LIVES_HAS_DEVICE_MANAGER 1 +typedef GdkDeviceManager LiVESXDeviceManager; +#endif + +#if GTK_CHECK_VERSION(3,0,0) +#define LIVES_WIDGET_EXPOSE_EVENT "draw" +#define LIVES_GUI_OBJECT(a) a +#else +#define LIVES_GUI_OBJECT(a) GTK_OBJECT(a) +#define LIVES_WIDGET_EXPOSE_EVENT "expose_event" +#define LIVES_GUI_OBJECT_CLASS(a) GTK_OBJECT_CLASS(a) +#endif + + +#define LIVES_WIDGET_SCROLL_EVENT "scroll_event" +#define LIVES_WIDGET_CLICKED_EVENT "clicked" +#define LIVES_WIDGET_TOGGLED_EVENT "toggled" +#define LIVES_WIDGET_CHANGED_EVENT "changed" +#define LIVES_WIDGET_ACTIVATE_EVENT "activate" +#define LIVES_WIDGET_VALUE_CHANGED_EVENT "value-changed" + + +typedef GtkWidget LiVESWidget;
View file
LiVES-2.2.8.tar.bz2/src/widget-helper-qt.h
Added
@@ -0,0 +1,2761 @@ +// widget-helper.h +// LiVES +// (c) G. Finch 2012 - 2015 <salsaman@gmail.com> +// released under the GNU GPL 3 or later +// see file ../COPYING or www.gnu.org for licensing details + +// this is kind of a fun project. +// a) for me to learn more C++ +// b) to experiment with another widget toolkit +// c) to make LiVES a little less dependent on GKT+ + + +#ifndef HAS_LIVES_WIDGET_HELPER_QT_H +#define HAS_LIVES_WIDGET_HELPER_QT_H + +#ifdef GUI_QT +// just for testing !!!! + +using namespace std; + +#include <QtCore/QLinkedList> + +#include <QtGui/QScreen> +#include <QtGui/QWindow> +#include <QtGui/QTextCursor> +#include <QtGui/QTextDocumentFragment> +#include <QtGui/QShortcutEvent> +#include <QtGui/QWheelEvent> + +#include <QtWidgets/QLabel> +#include <QtWidgets/QStyledItemDelegate> +#include <QtWidgets/QHeaderView> +#include <QtWidgets/QSplitter> +#include <QtWidgets/QLineEdit> +#include <QtWidgets/QPushButton> +#include <QtWidgets/QToolButton> +#include <QtWidgets/QToolBar> +#include <QtWidgets/QTableWidget> +#include <QtWidgets/QDialog> +#include <QtWidgets/QDialogButtonBox> +#include <QtWidgets/QBoxLayout> +#include <QtWidgets/QComboBox> +#include <QtWidgets/QMenu> +#include <QtWidgets/QLabel> +#include <QtWidgets/QMainWindow> +#include <QtWidgets/QFileDialog> +#include <QtWidgets/QLayout> +#include <QtWidgets/QTextEdit> +#include <QtWidgets/QTreeWidget> +#include <QtWidgets/QRadioButton> +#include <QtWidgets/QButtonGroup> +#include <QtWidgets/QProgressBar> +#include <QtWidgets/QDoubleSpinBox> +#include <QtWidgets/QCheckBox> +#include <QtWidgets/QShortcut> +#include <QtWidgets/QGridLayout> +#include <QtWidgets/QFrame> +#include <QtWidgets/QScrollArea> +#include <QtWidgets/QScrollBar> + +#include <QtGui/QColor> +#include <QtCore/QAbstractItemModel> +#include <QtCore/QSharedPointer> +#include <QtGui/QStandardItemModel> +#include <QtCore/QModelIndex> + +#define GTK_CHECK_VERSION(a,b,c) 0 + +#define g_free(a) lives_free(a) + +typedef char gchar; + +#define NO_GTK +#include "support.h" + +// TODO - move to support.c +char *translate(const char *String) { + delete trString; // be very careful, as trString is free()d automatically here + if (strlen(String)) { + QString qs = QString::fromLocal8Bit(dgettext (PACKAGE, String)); + trString = strdup(qs.toUtf8().constData()); + } + else trString=strdup(String); + return trString; +} + +char *translate_with_plural(const char *String, const char *StringPlural, unsigned long int n) { + delete trString; // be very careful, as trString is free()d automatically here + if (strlen(String)) { + QString qs = QString::fromLocal8Bit(dngettext (PACKAGE, String, StringPlural, n)); + trString = strdup(qs.toUtf8().constData()); + } + else trString=strdup(String); + return trString; +} + +////////////////// + +#ifndef IS_MINGW +typedef bool boolean; +#endif + +#ifndef FALSE +#define FALSE false +#endif + +#ifndef TRUE +#define TRUE true +#endif + +typedef void* gpointer; // TODO +typedef void* livespointer; + +typedef int gint; +typedef uchar guchar; + +typedef void *(*LiVESPixbufDestroyNotify(uchar *, void *)); + + +typedef int lives_painter_content_t; + +typedef gpointer livespointer; +typedef ulong gulong; + +typedef void GError; +typedef void LiVESError; + +typedef QScreen LiVESXScreen; +typedef QScreen LiVESXDisplay; +typedef QScreen GdkDisplay; +typedef QScreen LiVESXDevice; + +//#define LIVES_TABLE_IS_GRID 1 + + + +typedef void PangoLayout; // TODO - replace + +typedef QStyle::StateFlag LiVESWidgetState; + +#define LIVES_WIDGET_STATE_NORMAL QStyle::State_Enabled +#define LIVES_WIDGET_STATE_ACTIVE QStyle::State_Active +#define LIVES_WIDGET_STATE_PRELIGHT QStyle::State_MouseOver +#define LIVES_WIDGET_STATE_SELECTED QStyle::State_Selected + +#define LIVES_WIDGET_STATE_INSENSITIVE QStyle::State_None + +#define LIVES_WIDGET_STATE_FOCUSED QStyle::State_HasFocus + +//#define LIVES_WIDGET_STATE_INCONSISTENT GTK_STATE_FLAG_INCONSISTENT +//#define LIVES_WIDGET_STATE_BACKDROP GTK_STATE_FLAG_BACKDROP + +#define LIVES_WIDGET_COLOR_HAS_ALPHA (1) +#define LIVES_WIDGET_COLOR_SCALE(x) (x) ///< macro to get 0. to 1. +#define LIVES_WIDGET_COLOR_SCALE_255(x) ((double)x/255.) ///< macro to convert from (0. - 255.) to component + + +typedef Qt::Modifier LiVESXModifierType; + +#define LIVES_CONTROL_MASK Qt::CTRL +#define LIVES_ALT_MASK Qt::ALT +#define LIVES_SHIFT_MASK Qt::SHIFT +#define LIVES_LOCK_MASK Qt::SHIFT + + +#define LIVES_KEY_Left (static_cast<uint32_t>(Qt::Key_Left)) +#define LIVES_KEY_Right (static_cast<uint32_t>(Qt::Key_Right)) +#define LIVES_KEY_Up (static_cast<uint32_t>(Qt::Key_Up)) +#define LIVES_KEY_Down (static_cast<uint32_t>(Qt::Key_Down)) + +#define LIVES_KEY_BackSpace (static_cast<uint32_t>(Qt::Key_Backspace)) +#define LIVES_KEY_Return (static_cast<uint32_t>(Qt::Key_Return)) +#define LIVES_KEY_Tab (static_cast<uint32_t>(Qt::Key_Tab)) +#define LIVES_KEY_Home (static_cast<uint32_t>(Qt::Key_Home)) +#define LIVES_KEY_End (static_cast<uint32_t>(Qt::Key_End)) +#define LIVES_KEY_Slash (static_cast<uint32_t>(Qt::Key_Slash)) +#define LIVES_KEY_Space (static_cast<uint32_t>(Qt::Key_Space)) +#define LIVES_KEY_Plus (static_cast<uint32_t>(Qt::Key_Plus)) +#define LIVES_KEY_Minus (static_cast<uint32_t>(Qt::Key_Minus)) +#define LIVES_KEY_Equal (static_cast<uint32_t>(Qt::Key_Equal)) + +#define LIVES_KEY_1 (static_cast<uint32_t>(Qt::Key_1)) +#define LIVES_KEY_2 (static_cast<uint32_t>(Qt::Key_2)) +#define LIVES_KEY_3 (static_cast<uint32_t>(Qt::Key_3)) +#define LIVES_KEY_4 (static_cast<uint32_t>(Qt::Key_4)) +#define LIVES_KEY_5 (static_cast<uint32_t>(Qt::Key_5)) +#define LIVES_KEY_6 (static_cast<uint32_t>(Qt::Key_6)) +#define LIVES_KEY_7 (static_cast<uint32_t>(Qt::Key_7)) +#define LIVES_KEY_8 (static_cast<uint32_t>(Qt::Key_8)) +#define LIVES_KEY_9 (static_cast<uint32_t>(Qt::Key_9)) +#define LIVES_KEY_0 (static_cast<uint32_t>(Qt::Key_0)) + +#define LIVES_KEY_a (static_cast<uint32_t>(Qt::Key_a)) +#define LIVES_KEY_b (static_cast<uint32_t>(Qt::Key_b)) +#define LIVES_KEY_c (static_cast<uint32_t>(Qt::Key_c)) +#define LIVES_KEY_d (static_cast<uint32_t>(Qt::Key_d)) +#define LIVES_KEY_e (static_cast<uint32_t>(Qt::Key_e)) +#define LIVES_KEY_f (static_cast<uint32_t>(Qt::Key_f)) +#define LIVES_KEY_g (static_cast<uint32_t>(Qt::Key_g))
View file
LiVES-2.2.7.tar.bz2/src/widget-helper.c -> LiVES-2.2.8.tar.bz2/src/widget-helper.c
Changed
@@ -1,6 +1,6 @@ // widget-helper.c // LiVES -// (c) G. Finch 2012 - 2014 <salsaman@gmail.com> +// (c) G. Finch 2012 - 2015 <salsaman@gmail.com> // released under the GNU GPL 3 or later // see file ../COPYING or www.gnu.org for licensing details @@ -27,6 +27,9 @@ #ifdef PAINTER_CAIRO cr=cairo_create(target); #endif +#ifdef PAINTER_QPAINTER + cr = new lives_painter_t(target); +#endif return cr; } @@ -41,112 +44,224 @@ } #endif #endif +#ifdef PAINTER_QPAINTER + QWidget *widg = ((QWidget *)widget); + if (widg!=NULL) cr = new lives_painter_t(widg); +#endif return cr; } -LIVES_INLINE void lives_painter_set_source_pixbuf (lives_painter_t *cr, const LiVESPixbuf *pixbuf, double pixbuf_x, double pixbuf_y) { +LIVES_INLINE boolean lives_painter_set_source_pixbuf (lives_painter_t *cr, const LiVESPixbuf *pixbuf, double pixbuf_x, double pixbuf_y) { + // blit pixbuf to cairo at x,y #ifdef PAINTER_CAIRO gdk_cairo_set_source_pixbuf(cr,pixbuf,pixbuf_x,pixbuf_y); + return TRUE; #endif +#ifdef PAINTER_QPAINTER + QPointF qp(pixbuf_x,pixbuf_y); + const QImage *qi = (const QImage *)pixbuf; + cr->drawImage(qp, *qi); + return TRUE; +#endif + return FALSE; } -LIVES_INLINE void lives_painter_set_source_surface (lives_painter_t *cr, lives_painter_surface_t *surface, double x, double y) { +LIVES_INLINE boolean lives_painter_set_source_surface (lives_painter_t *cr, lives_painter_surface_t *surface, double x, double y) { #ifdef PAINTER_CAIRO cairo_set_source_surface(cr,surface,x,y); + return TRUE; +#endif +#ifdef PAINTER_QPAINTER + QPointF qp(x,y); + cr->drawImage(qp,*surface); + return TRUE; #endif + return FALSE; + } -LIVES_INLINE void lives_painter_paint(lives_painter_t *cr) { +LIVES_INLINE boolean lives_painter_paint(lives_painter_t *cr) { #ifdef PAINTER_CAIRO cairo_paint(cr); + return TRUE; +#endif +#ifdef PAINTER_QPAINTER + return TRUE; #endif + return FALSE; } -LIVES_INLINE void lives_painter_fill(lives_painter_t *cr) { + +LIVES_INLINE boolean lives_painter_fill(lives_painter_t *cr) { #ifdef PAINTER_CAIRO cairo_fill(cr); + return TRUE; +#endif +#ifdef PAINTER_QPAINTER + cr->fillPath(*(cr->p),cr->pen.color()); + delete cr->p; + cr->p = new QPainterPath; + return TRUE; #endif + return FALSE; } -LIVES_INLINE void lives_painter_stroke(lives_painter_t *cr) { +LIVES_INLINE boolean lives_painter_stroke(lives_painter_t *cr) { #ifdef PAINTER_CAIRO cairo_stroke(cr); + return TRUE; #endif +#ifdef PAINTER_QPAINTER + cr->strokePath(*(cr->p),cr->pen); + delete cr->p; + cr->p = new QPainterPath; + return TRUE; +#endif + return FALSE; } -LIVES_INLINE void lives_painter_clip(lives_painter_t *cr) { +LIVES_INLINE boolean lives_painter_clip(lives_painter_t *cr) { #ifdef PAINTER_CAIRO cairo_clip(cr); + return TRUE; +#endif +#ifdef PAINTER_QPAINTER + cr->setClipPath(*(cr->p),Qt::IntersectClip); + delete cr->p; + cr->p = new QPainterPath; + return TRUE; #endif + return FALSE; } -LIVES_INLINE void lives_painter_destroy(lives_painter_t *cr) { +LIVES_INLINE boolean lives_painter_destroy(lives_painter_t *cr) { #ifdef PAINTER_CAIRO cairo_destroy(cr); + return TRUE; +#endif +#ifdef PAINTER_QPAINTER + delete cr; + return TRUE; #endif + return FALSE; } -LIVES_INLINE void lives_painter_surface_destroy(lives_painter_surface_t *surf) { +LIVES_INLINE boolean lives_painter_surface_destroy(lives_painter_surface_t *surf) { #ifdef PAINTER_CAIRO cairo_surface_destroy(surf); + return TRUE; #endif +#ifdef PAINTER_QPAINTER + surf->dec_refcount(); + return TRUE; +#endif + return FALSE; } -LIVES_INLINE void lives_painter_new_path(lives_painter_t *cr) { +LIVES_INLINE boolean lives_painter_new_path(lives_painter_t *cr) { #ifdef PAINTER_CAIRO cairo_new_path(cr); + return TRUE; +#endif +#ifdef PAINTER_QPAINTER + delete cr->p; + cr->p = new QPainterPath; + return TRUE; #endif + return FALSE; } -LIVES_INLINE void lives_painter_translate(lives_painter_t *cr, double x, double y) { +LIVES_INLINE boolean lives_painter_translate(lives_painter_t *cr, double x, double y) { #ifdef PAINTER_CAIRO cairo_translate(cr,x,y); + return TRUE; #endif +#ifdef PAINTER_QPAINTER + QTransform qt; + qt.translate(x,y); + cr->setTransform(qt,true); + return TRUE; +#endif + return FALSE; } -LIVES_INLINE void lives_painter_set_line_width(lives_painter_t *cr, double width) { +LIVES_INLINE boolean lives_painter_set_line_width(lives_painter_t *cr, double width) { #ifdef PAINTER_CAIRO cairo_set_line_width(cr,width); + return TRUE; #endif - +#ifdef PAINTER_QPAINTER + cr->pen.setWidthF(width); + return TRUE; +#endif + return FALSE; } -LIVES_INLINE void lives_painter_move_to(lives_painter_t *cr, double x, double y) { +LIVES_INLINE boolean lives_painter_move_to(lives_painter_t *cr, double x, double y) { #ifdef PAINTER_CAIRO cairo_move_to(cr,x,y); + return TRUE;
View file
LiVES-2.2.7.tar.bz2/src/widget-helper.h -> LiVES-2.2.8.tar.bz2/src/widget-helper.h
Changed
@@ -1,6 +1,6 @@ // widget-helper.h // LiVES -// (c) G. Finch 2012 - 2014 <salsaman@gmail.com> +// (c) G. Finch 2012 - 2015 <salsaman@gmail.com> // released under the GNU GPL 3 or later // see file ../COPYING or www.gnu.org for licensing details @@ -26,794 +26,16 @@ #define W_PACKING_HEIGHT 10 // packing height for widgets #define W_BORDER_WIDTH 10 // default border width +#define ulong_random() lives_random() -#ifdef PAINTER_CAIRO -typedef cairo_t lives_painter_t; -typedef cairo_surface_t lives_painter_surface_t;
View file
LiVES-rpmlintrc
Changed
@@ -1,2 +1,5 @@ -addFilter("explicit-lib-dependency libvisual") -addFilter("explicit-lib-dependency libvisual-plugins") +# This line is mandatory to access the configuration functions +from Config import * + +addFilter("explicit-lib-dependency") +addFilter("no-manual-page-for-binary")
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
.