Hello community, here is the log from the commit of package cutterff for openSUSE:Factory checked in at 2018-10-04 19:00:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cutterff (Old) and /work/SRC/openSUSE:Factory/.cutterff.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cutterff" Thu Oct 4 19:00:54 2018 rev:2 rq:639583 version:0.4.2 Changes: -------- --- /work/SRC/openSUSE:Factory/cutterff/cutterff.changes 2018-07-28 12:45:22.892987674 +0200 +++ /work/SRC/openSUSE:Factory/.cutterff.new/cutterff.changes 2018-10-04 19:00:58.167236398 +0200 @@ -1,0 +2,17 @@ +Tue Oct 02 11:45:43 UTC 2018 - [email protected] + +- Update to version 0.4.2 + + gui.c + - since GTK+ version 3.22.30 the window will not be proper + drawn after start, but when changing the size of the window + everything works fine. Testing the cairo surface pointer in + the redraw functions and create a surface if the pointer is + NULL fix this bug! + - removed depricated functions 'gtk_color_button_get_rgb' and + 'gtk_scrolled_window_add_with_viewport', since the required + GTK+ version is min 3.10. (GTK-3 only) + + + ffmpeg.c + - works with FFmpeg version 4.0.2. + +------------------------------------------------------------------- Old: ---- cutterff-0.4.1-src.tar.bz2 New: ---- cutterff-0.4.2-src.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cutterff.spec ++++++ --- /var/tmp/diff_new_pack.0i6SDT/_old 2018-10-04 19:00:58.955235572 +0200 +++ /var/tmp/diff_new_pack.0i6SDT/_new 2018-10-04 19:00:58.959235568 +0200 @@ -18,7 +18,7 @@ Name: cutterff Summary: Video cutter that uses FFmpeg and GTK+ -Version: 0.4.1 +Version: 0.4.2 Release: 0 Url: https://cutterff.sourceforge.io/ Source0: %{name}-%{version}-src.tar.bz2 ++++++ cutterff-0.4.1-src.tar.bz2 -> cutterff-0.4.2-src.tar.bz2 ++++++ ++++ 2920 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/cutterff-0.4.1/ChangeLog new/cutterff-0.4.2/ChangeLog --- old/cutterff-0.4.1/ChangeLog 2018-07-07 01:39:51.000000000 +0200 +++ new/cutterff-0.4.2/ChangeLog 2018-08-11 01:52:29.000000000 +0200 @@ -4,6 +4,22 @@ ********** +version 0.4.2 (Aug 11 2018) +------------- + +* gui.c + + since GTK+ version 3.22.30 the window will not be + proper drawn after start, but when changing the size + of the window everything works fine. Testing the cairo + surface pointer in the redraw functions and create a + surface if the pointer is NULL fix this bug! + + removed depricated functions 'gtk_color_button_get_rgb' + and 'gtk_scrolled_window_add_with_viewport', since the + required GTK+ version is min 3.10. (GTK-3 only) + +* ffmpeg.c + + works with FFmpeg version 4.0.2 + version 0.4.1 (Jul 07 2018) ------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/cutterff-0.4.1/INSTALL new/cutterff-0.4.2/INSTALL --- old/cutterff-0.4.1/INSTALL 2018-05-26 21:09:09.000000000 +0200 +++ new/cutterff-0.4.2/INSTALL 2018-08-09 23:37:58.000000000 +0200 @@ -1,16 +1,16 @@ ------------------------- - INSTALL (CutterFF 0.4) ------------------------- +-------------------------- + INSTALL (CutterFF 0.4.2) +-------------------------- CutterFF is distributed under GNU-GPL 2 or later. To compile CutterFF properly, you will need an ANSI-C compiler and the following additional libraries: - * Required: either GTK+-2.4 or GTK+-3.x installed + * Required: either min GTK+-2.4 or min GTK+-3.10 installed => "http://www.gtk.org/"; - * Required: FFmpeg-3.x installed + * Required: FFmpeg-3.x or FFmpeg-4.x installed => "http://ffmpeg.org/"; * Optional: the libintl library (or libc with gettext support) for diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/cutterff-0.4.1/README new/cutterff-0.4.2/README --- old/cutterff-0.4.1/README 2018-07-07 01:40:29.000000000 +0200 +++ new/cutterff-0.4.2/README 2018-08-11 02:20:24.000000000 +0200 @@ -1,5 +1,5 @@ ------------------------- - README (CutterFF 0.4.1) + README (CutterFF 0.4.2) ------------------------- Welcome to 'CutterFF', a small program for cutting videos using @@ -208,6 +208,8 @@ Clicking with the right mouse button on the log window displays a popup menu. Selecting the entry 'Color ...' opens a dialog, which lets you choose the text and background color. +Note: any level above 'warning' may throw a lot of messages and slow +down the program, so use with care! 4. Help diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/cutterff-0.4.1/compile new/cutterff-0.4.2/compile --- old/cutterff-0.4.1/compile 1970-01-01 01:00:00.000000000 +0100 +++ new/cutterff-0.4.2/compile 2018-08-09 21:16:12.000000000 +0200 @@ -0,0 +1,348 @@ +#! /bin/sh +# Wrapper for compilers which do not understand '-c -o'. + +scriptversion=2016-01-11.22; # UTC + +# Copyright (C) 1999-2017 Free Software Foundation, Inc. +# Written by Tom Tromey <[email protected]>. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# This file is maintained in Automake, please report +# bugs to <[email protected]> or send patches to +# <[email protected]>. + +nl=' +' + +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent tools from complaining about whitespace usage. +IFS=" "" $nl" + +file_conv= + +# func_file_conv build_file lazy +# Convert a $build file to $host form and store it in $file +# Currently only supports Windows hosts. If the determined conversion +# type is listed in (the comma separated) LAZY, no conversion will +# take place. +func_file_conv () +{ + file=$1 + case $file in + / | /[!/]*) # absolute file, and not a UNC file + if test -z "$file_conv"; then + # lazily determine how to convert abs files + case `uname -s` in + MINGW*) + file_conv=mingw + ;; + CYGWIN*) + file_conv=cygwin + ;; + *) + file_conv=wine + ;; + esac + fi + case $file_conv/,$2, in + *,$file_conv,*) + ;; + mingw/*) + file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` + ;; + cygwin/*) + file=`cygpath -m "$file" || echo "$file"` + ;; + wine/*) + file=`winepath -w "$file" || echo "$file"` + ;; + esac + ;; + esac +} + +# func_cl_dashL linkdir +# Make cl look for libraries in LINKDIR +func_cl_dashL () +{ + func_file_conv "$1" + if test -z "$lib_path"; then + lib_path=$file + else + lib_path="$lib_path;$file" + fi + linker_opts="$linker_opts -LIBPATH:$file" +} + +# func_cl_dashl library +# Do a library search-path lookup for cl +func_cl_dashl () +{ + lib=$1 + found=no + save_IFS=$IFS + IFS=';' + for dir in $lib_path $LIB + do + IFS=$save_IFS + if $shared && test -f "$dir/$lib.dll.lib"; then + found=yes + lib=$dir/$lib.dll.lib + break + fi + if test -f "$dir/$lib.lib"; then + found=yes + lib=$dir/$lib.lib + break + fi + if test -f "$dir/lib$lib.a"; then + found=yes + lib=$dir/lib$lib.a + break + fi + done + IFS=$save_IFS + + if test "$found" != yes; then + lib=$lib.lib + fi +} + +# func_cl_wrapper cl arg... +# Adjust compile command to suit cl +func_cl_wrapper () +{ + # Assume a capable shell + lib_path= + shared=: + linker_opts= + for arg + do + if test -n "$eat"; then + eat= + else + case $1 in + -o) + # configure might choose to run compile as 'compile cc -o foo foo.c'. + eat=1 + case $2 in + *.o | *.[oO][bB][jJ]) + func_file_conv "$2" + set x "$@" -Fo"$file" + shift + ;; + *) + func_file_conv "$2" + set x "$@" -Fe"$file" + shift + ;; + esac + ;; + -I) + eat=1 + func_file_conv "$2" mingw + set x "$@" -I"$file" + shift + ;; + -I*) + func_file_conv "${1#-I}" mingw + set x "$@" -I"$file" + shift + ;; + -l) + eat=1 + func_cl_dashl "$2" + set x "$@" "$lib" + shift + ;; + -l*) + func_cl_dashl "${1#-l}" + set x "$@" "$lib" + shift + ;; + -L) + eat=1 + func_cl_dashL "$2" + ;; + -L*) + func_cl_dashL "${1#-L}" + ;; + -static) + shared=false + ;; + -Wl,*) + arg=${1#-Wl,} + save_ifs="$IFS"; IFS=',' + for flag in $arg; do + IFS="$save_ifs" + linker_opts="$linker_opts $flag" + done + IFS="$save_ifs" + ;; + -Xlinker) + eat=1 + linker_opts="$linker_opts $2" + ;; + -*) + set x "$@" "$1" + shift + ;; + *.cc | *.CC | *.cxx | *.CXX | *.[cC]++) + func_file_conv "$1" + set x "$@" -Tp"$file" + shift + ;; + *.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO]) + func_file_conv "$1" mingw + set x "$@" "$file" + shift + ;; + *) + set x "$@" "$1" + shift + ;; + esac + fi + shift + done + if test -n "$linker_opts"; then + linker_opts="-link$linker_opts" + fi + exec "$@" $linker_opts + exit 1 +} + +eat= + +case $1 in + '') + echo "$0: No command. Try '$0 --help' for more information." 1>&2 + exit 1; + ;; + -h | --h*) + cat <<\EOF +Usage: compile [--help] [--version] PROGRAM [ARGS] + +Wrapper for compilers which do not understand '-c -o'. +Remove '-o dest.o' from ARGS, run PROGRAM with the remaining +arguments, and rename the output as expected. + +If you are trying to build a whole package this is not the +right script to run: please start by reading the file 'INSTALL'. + +Report bugs to <[email protected]>. +EOF + exit $? + ;; + -v | --v*) + echo "compile $scriptversion" + exit $? + ;; + cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \ + icl | *[/\\]icl | icl.exe | *[/\\]icl.exe ) + func_cl_wrapper "$@" # Doesn't return... + ;; +esac + +ofile= +cfile= + +for arg +do + if test -n "$eat"; then + eat= + else + case $1 in + -o) + # configure might choose to run compile as 'compile cc -o foo foo.c'. + # So we strip '-o arg' only if arg is an object. + eat=1 + case $2 in + *.o | *.obj) + ofile=$2 + ;; + *) + set x "$@" -o "$2" + shift + ;; + esac + ;; + *.c) + cfile=$1 + set x "$@" "$1" + shift + ;; + *) + set x "$@" "$1" + shift + ;; + esac + fi + shift +done + +if test -z "$ofile" || test -z "$cfile"; then + # If no '-o' option was seen then we might have been invoked from a + # pattern rule where we don't need one. That is ok -- this is a + # normal compilation that the losing compiler can handle. If no + # '.c' file was seen then we are probably linking. That is also + # ok. + exec "$@" +fi + +# Name of file we expect compiler to create. +cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'` + +# Create the lock directory. +# Note: use '[/\\:.-]' here to ensure that we don't use the same name +# that we are using for the .o file. Also, base the name on the expected +# object file name, since that is what matters with a parallel build. +lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d +while true; do + if mkdir "$lockdir" >/dev/null 2>&1; then + break + fi + sleep 1 +done +# FIXME: race condition here if user kills between mkdir and trap. +trap "rmdir '$lockdir'; exit 1" 1 2 15 + +# Run the compile. +"$@" +ret=$? + +if test -f "$cofile"; then + test "$cofile" = "$ofile" || mv "$cofile" "$ofile" +elif test -f "${cofile}bj"; then + test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile" +fi + +rmdir "$lockdir" +exit $ret + +# Local Variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC0" +# time-stamp-end: "; # UTC" +# End: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/cutterff-0.4.1/configure.ac new/cutterff-0.4.2/configure.ac --- old/cutterff-0.4.1/configure.ac 2018-07-06 23:45:22.000000000 +0200 +++ new/cutterff-0.4.2/configure.ac 2018-08-09 21:12:44.000000000 +0200 @@ -1,13 +1,13 @@ dnl ************************************* dnl -dnl configure.ac for cutterff 0.4.1 +dnl configure.ac for cutterff 0.4.2 dnl ---------------------------------- dnl dnl autoreconf dnl dnl ************************************* -AC_INIT([cutterff], [0.4.1], []) +AC_INIT([cutterff], [0.4.2], []) AC_PREFIX_DEFAULT([/usr/local]) @@ -124,7 +124,7 @@ AC_MSG_RESULT([$CFF_CONFIG_ENABLE_GTK_2]) if test "x$CFF_CONFIG_ENABLE_GTK_2" = "xno"; then - AM_PATH_GTK_3_0([3.0.0], [ac_have_gtk_3_0="yes"], [], []) + AM_PATH_GTK_3_0([3.10.0], [ac_have_gtk_3_0="yes"], [], []) fi if test -z "$ac_have_gtk_3_0"; then Binary files old/cutterff-0.4.1/po/de.mo and new/cutterff-0.4.2/po/de.mo differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/cutterff-0.4.1/po/de.po new/cutterff-0.4.2/po/de.po --- old/cutterff-0.4.1/po/de.po 2018-07-07 01:13:43.000000000 +0200 +++ new/cutterff-0.4.2/po/de.po 2018-08-10 23:22:18.000000000 +0200 @@ -1,13 +1,13 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# Harald Förster <[email protected]>,2017 +# Harald Förster <[email protected]>,2018 # msgid "" msgstr "" -"Project-Id-Version: cutterff 0.2\n" +"Project-Id-Version: cutterff 0.4.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-07-07 01:13+0200\n" +"POT-Creation-Date: 2018-08-10 23:19+0200\n" "PO-Revision-Date: 2017-07-16 00:55+0200\n" "Last-Translator: Harald Förster <[email protected]>\n" "Language-Team: German <[email protected]>\n" @@ -35,15 +35,14 @@ "Wähle einen Menü-Eintrag und drücke die bevorzugte Taste, z.B. Beenden => " "'Strg' + 'Q'" -#: cff_accel-gtk.c:457 cff_gui-gtk.c:629 cff_gui-gtk.c:1247 cff_gui-gtk.c:2546 -#: cff_gui-gtk.c:3867 cff_gui-gtk.c:4033 cff_gui-gtk.c:4214 cff_gui-gtk.c:4308 -#: cff_gui-gtk.c:4420 cff_gui-gtk.c:4477 +#: cff_accel-gtk.c:457 cff_gui-gtk.c:629 cff_gui-gtk.c:1247 cff_gui-gtk.c:2537 +#: cff_gui-gtk.c:3925 cff_gui-gtk.c:4091 cff_gui-gtk.c:4272 cff_gui-gtk.c:4366 +#: cff_gui-gtk.c:4478 cff_gui-gtk.c:4535 msgid "Cancel" msgstr "Abbrechen" -#: cff_accel-gtk.c:461 cff_gui-gtk.c:1235 cff_gui-gtk.c:2259 -#: cff_gui-gtk.c:2547 cff_gui-gtk.c:4036 cff_gui-gtk.c:4795 -#: cff_tools-gtk.c:240 +#: cff_accel-gtk.c:461 cff_gui-gtk.c:1235 cff_gui-gtk.c:2254 cff_gui-gtk.c:2538 +#: cff_gui-gtk.c:4094 cff_gui-gtk.c:4853 cff_tools-gtk.c:240 msgid "OK" msgstr "OK" @@ -287,8 +286,8 @@ msgid "File already exists! Overwrite?" msgstr "Die Datei ist schon vorhanden! Überschreiben?" -#: cff_gui-gtk.c:630 cff_gui-gtk.c:3868 cff_gui-gtk.c:4215 cff_gui-gtk.c:4309 -#: cff_gui-gtk.c:4421 cff_gui-gtk.c:4478 +#: cff_gui-gtk.c:630 cff_gui-gtk.c:3926 cff_gui-gtk.c:4273 cff_gui-gtk.c:4367 +#: cff_gui-gtk.c:4479 cff_gui-gtk.c:4536 msgid "Yes" msgstr "Ja" @@ -324,7 +323,7 @@ msgid "The filename or the folder must differ!" msgstr "Der Dateiname oder der Ordner müssen unterschiedlich sein!" -#: cff_gui-gtk.c:1583 cff_gui-gtk.c:2273 +#: cff_gui-gtk.c:1583 cff_gui-gtk.c:2268 msgid "No info available!" msgstr "Keine Information verfügbar!" @@ -360,229 +359,229 @@ msgid "None" msgstr "Keiner" -#: cff_gui-gtk.c:2582 +#: cff_gui-gtk.c:2573 msgid "Text" msgstr "Text" -#: cff_gui-gtk.c:2586 +#: cff_gui-gtk.c:2577 msgid "Background" msgstr "Hintergrund" -#: cff_gui-gtk.c:2625 +#: cff_gui-gtk.c:2616 msgid "Color ..." msgstr "Farbe ..." -#: cff_gui-gtk.c:3792 +#: cff_gui-gtk.c:3850 msgid "Scanning ..." msgstr "" -#: cff_gui-gtk.c:3866 cff_gui-gtk.c:4213 +#: cff_gui-gtk.c:3924 cff_gui-gtk.c:4271 msgid "Discard changes?" msgstr "Änderungen verwerfen?" -#: cff_gui-gtk.c:3875 +#: cff_gui-gtk.c:3933 msgid "Open Video File" msgstr "Öffne Video-Datei" -#: cff_gui-gtk.c:3912 +#: cff_gui-gtk.c:3970 msgid "Save Video File" msgstr "Video-Datei speichern" -#: cff_gui-gtk.c:3953 +#: cff_gui-gtk.c:4011 msgid "Available" msgstr "Verfügbar" -#: cff_gui-gtk.c:3965 +#: cff_gui-gtk.c:4023 msgid "Up" msgstr "Rauf" -#: cff_gui-gtk.c:3980 +#: cff_gui-gtk.c:4038 msgid "Down" msgstr "Runter" -#: cff_gui-gtk.c:3985 +#: cff_gui-gtk.c:4043 msgid "Output" msgstr "Ausgabe" -#: cff_gui-gtk.c:3998 +#: cff_gui-gtk.c:4056 msgid "Extra" msgstr "Extra" -#: cff_gui-gtk.c:4003 +#: cff_gui-gtk.c:4061 msgid "General" msgstr "Allgemein" -#: cff_gui-gtk.c:4012 +#: cff_gui-gtk.c:4070 msgid "Keep start timestamps" msgstr "Behalte Start-Zeitstempel" -#: cff_gui-gtk.c:4020 +#: cff_gui-gtk.c:4078 msgid "Format" msgstr "Format" -#: cff_gui-gtk.c:4021 +#: cff_gui-gtk.c:4079 msgid "Auto" msgstr "Automatisch" -#: cff_gui-gtk.c:4189 +#: cff_gui-gtk.c:4247 msgid "Video File Info" msgstr "Video-Datei Info" -#: cff_gui-gtk.c:4307 +#: cff_gui-gtk.c:4365 msgid "Add list to existing cutpoints?" msgstr "Liste zu existierenden Schnittpunkten hinzufügen?" -#: cff_gui-gtk.c:4315 +#: cff_gui-gtk.c:4373 msgid "Load Cut List" msgstr "Schnitt-Liste laden" -#: cff_gui-gtk.c:4329 +#: cff_gui-gtk.c:4387 msgid "Cannot load cut list!" msgstr "Kann die Schnitt-Liste nicht laden!" -#: cff_gui-gtk.c:4346 +#: cff_gui-gtk.c:4404 msgid "item was discarded!" msgstr "Eintrag wurde verworfen!" -#: cff_gui-gtk.c:4347 +#: cff_gui-gtk.c:4405 msgid "items were discarded!" msgstr "Einträge wurden verworfen!" -#: cff_gui-gtk.c:4382 +#: cff_gui-gtk.c:4440 msgid "Save Cut List" msgstr "Schnitt-Liste speichern" -#: cff_gui-gtk.c:4409 +#: cff_gui-gtk.c:4467 msgid "Cannot save cut list!" msgstr "Kann Schnitt-Liste nicht speichern!" -#: cff_gui-gtk.c:4419 cff_gui-gtk.c:4476 +#: cff_gui-gtk.c:4477 cff_gui-gtk.c:4534 msgid "Clear cut list?" msgstr "Die Schnitt-Liste löschen?" -#: cff_gui-gtk.c:4591 +#: cff_gui-gtk.c:4649 msgid "Libs" msgstr "Bibliotheken" -#: cff_gui-gtk.c:4595 +#: cff_gui-gtk.c:4653 msgid "Formats" msgstr "Formate" -#: cff_gui-gtk.c:4599 +#: cff_gui-gtk.c:4657 msgid "Codecs" msgstr "Codecs" -#: cff_gui-gtk.c:4603 +#: cff_gui-gtk.c:4661 msgid "Bitstream Filters" msgstr "Bitstream-Filter" -#: cff_gui-gtk.c:4617 +#: cff_gui-gtk.c:4675 msgid "CutterFF: FFmpeg" msgstr "CutterFF: FFmpeg" -#: cff_gui-gtk.c:4626 +#: cff_gui-gtk.c:4684 msgid "Navigation" msgstr "Navigation" -#: cff_gui-gtk.c:4627 cff_gui-gtk.c:4636 +#: cff_gui-gtk.c:4685 cff_gui-gtk.c:4694 msgid "Button '<' or Key 'Left' | Button '>' or Key 'Right'" msgstr "Knopf '<' oder Taste 'Links' | Knopf '>' oder Taste 'Rechts'" -#: cff_gui-gtk.c:4628 +#: cff_gui-gtk.c:4686 msgid "Previous or next frame" msgstr "Vorheriges oder nächstes Bild" -#: cff_gui-gtk.c:4629 cff_gui-gtk.c:4638 +#: cff_gui-gtk.c:4687 cff_gui-gtk.c:4696 msgid "Button '<<' or Key 'Down' | Button '>>' or Key 'Up'" msgstr "Knopf '<<' oder Taste 'Runter' | Knopf '>>' oder Taste 'Hoch'" -#: cff_gui-gtk.c:4630 +#: cff_gui-gtk.c:4688 msgid "Half second back or forward" msgstr "Halbe Sekunde zurück oder vor" -#: cff_gui-gtk.c:4631 cff_gui-gtk.c:4640 +#: cff_gui-gtk.c:4689 cff_gui-gtk.c:4698 msgid "Button '<<<' or Key 'Page Down' | Button '>>>' or Key 'Page Up'" msgstr "" "Knopf '<<<' oder Taste 'Seite runter' | Knopf '>>>' oder Taste 'Seite hoch'" -#: cff_gui-gtk.c:4632 +#: cff_gui-gtk.c:4690 msgid "Five seconds back or forward" msgstr "Fünf Sekunden zurück oder vor" -#: cff_gui-gtk.c:4633 cff_gui-gtk.c:4642 +#: cff_gui-gtk.c:4691 cff_gui-gtk.c:4700 msgid "Button '|<' or Key 'Home' | Button '>|' or Key 'End'" msgstr "Knopf '|<' oder Taste 'Home' | Knopf '>|' oder Taste 'Ende'" -#: cff_gui-gtk.c:4634 +#: cff_gui-gtk.c:4692 msgid "Previous or next cutpoint or start or end of video" msgstr "Vorheriger oder nächster Schnittpunkt bzw. Start oder Ende vom Video" -#: cff_gui-gtk.c:4635 +#: cff_gui-gtk.c:4693 msgid "With shift key" msgstr "Mit Umschalt-Taste" -#: cff_gui-gtk.c:4637 +#: cff_gui-gtk.c:4695 msgid "One minute back or forward" msgstr "Eine Minute zurück oder vor" -#: cff_gui-gtk.c:4639 +#: cff_gui-gtk.c:4697 msgid "Five minutes back or forward" msgstr "Fünf Minuten zurück oder vor" -#: cff_gui-gtk.c:4641 +#: cff_gui-gtk.c:4699 msgid "Ten minutes back or forward" msgstr "Zehn Minuten zurück oder vor" -#: cff_gui-gtk.c:4643 +#: cff_gui-gtk.c:4701 msgid "Start or end of video" msgstr "Start oder Ende vom Video" -#: cff_gui-gtk.c:4644 +#: cff_gui-gtk.c:4702 msgid "A mouseclick on the position bar will jump to this postion." msgstr "Ein Mausklick auf die Positions-Anzeige springt zu dieser Position." -#: cff_gui-gtk.c:4645 +#: cff_gui-gtk.c:4703 msgid "Note: the times above depends on the video and may differ!" msgstr "" "Hinweis: die obigen Zeitangaben hängen vom Video ab und können abweichen!" -#: cff_gui-gtk.c:4729 +#: cff_gui-gtk.c:4787 msgid "CutterFF: Help" msgstr "CutterFF: Hilfe" -#: cff_gui-gtk.c:4737 +#: cff_gui-gtk.c:4795 msgid "A small programm for cuttting videos" msgstr "Ein kleines Programm zum Schneiden von Videos" -#: cff_gui-gtk.c:4739 +#: cff_gui-gtk.c:4797 msgid "Distributed under GNU-GPL 2 or later" msgstr "Veröffentlicht unter GNU-GPL 2 oder später" -#: cff_gui-gtk.c:4740 +#: cff_gui-gtk.c:4798 msgid "Version" msgstr "Version" -#: cff_gui-gtk.c:4741 +#: cff_gui-gtk.c:4799 msgid "Author:" msgstr "Autor:" -#: cff_gui-gtk.c:4750 +#: cff_gui-gtk.c:4808 msgid "CutterFF: About" msgstr "CutterFF: Über" -#: cff_gui-gtk.c:5235 +#: cff_gui-gtk.c:5293 msgid "File" msgstr "Datei" -#: cff_gui-gtk.c:5236 +#: cff_gui-gtk.c:5294 msgid "Edit" msgstr "Bearbeiten" -#: cff_gui-gtk.c:5237 +#: cff_gui-gtk.c:5295 msgid "Options" msgstr "Optionen" -#: cff_gui-gtk.c:5238 +#: cff_gui-gtk.c:5296 msgid "Help" msgstr "Hilfe" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/cutterff-0.4.1/src/cff_gui-gtk.c new/cutterff-0.4.2/src/cff_gui-gtk.c --- old/cutterff-0.4.1/src/cff_gui-gtk.c 2018-07-07 02:42:17.000000000 +0200 +++ new/cutterff-0.4.2/src/cff_gui-gtk.c 2018-08-09 21:11:57.000000000 +0200 @@ -2242,17 +2242,12 @@ swin = guitl_scrolled_window_new(frame, 320, 180, GTK_POLICY_AUTOMATIC); gtk_container_set_border_width(GTK_CONTAINER(ibox), 8); - if (gtk_major_version == 2 || - (gtk_major_version == 3 && gtk_minor_version < 8)) - { - /* Deprecated since version 3.8 */ - gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(swin), ibox); - } - - else - { - gtk_container_add(GTK_CONTAINER(swin), ibox); - } +#if GTK_MAJOR_VERSION == 2 + gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(swin), ibox); +#else + /* Above is deprecated since version 3.8 */ + gtk_container_add(GTK_CONTAINER(swin), ibox); +#endif hbox = guitl_hbutton_box_new(vbox, 8, GTK_BUTTONBOX_END); button = guitl_button_box_add_button(hbox, @@ -2518,16 +2513,12 @@ #if GTK_MAJOR_VERSION == 2 func = (GuiSignalFunc) gtk_color_button_get_color; #else - if (gtk_minor_version < 4) - { - /* Deprecated since version 3.4 */ - func = (GuiSignalFunc) gtk_color_button_get_rgba; - } +#if 0 + /* Deprecated since version 3.4 */ + func = (GuiSignalFunc) gtk_color_button_get_rgba; +#endif /* 0 */ - else - { - func = (GuiSignalFunc) gtk_color_chooser_get_rgba; - } + func = (GuiSignalFunc) gtk_color_chooser_get_rgba; #endif GuiSignalConnect(button, "color-set", func, color); @@ -2900,50 +2891,72 @@ #if GTK_MAJOR_VERSION > 2 -static void cff_gui_cairo_surface_create(GtkWidget *widget, cairo_surface_t **surface) +static gboolean _cff_gui_cairo_surface_create(GtkWidget *widget, cairo_surface_t **surface, const cff_video_t *video) { - if (*surface != NULL) + GdkWindow *wnd; + cairo_surface_t *ptr; + + ptr = *surface; + + if (ptr != NULL) { - cairo_surface_destroy(*surface); + cairo_surface_destroy(ptr); } - *surface = gdk_window_create_similar_surface( - gtk_widget_get_window(widget), - CAIRO_CONTENT_COLOR, - gtk_widget_get_allocated_width(widget), - gtk_widget_get_allocated_height(widget)); + wnd = gtk_widget_get_window(widget); -} /* static void cff_gui_cairo_surface_create(GtkWidget*, cairo_surface_*t*) */ - -static void cff_gui_cairo_surface_image_create(GtkWidget *widget, cairo_surface_t **surface, const cff_video_t *video) -{ - if (*surface != NULL) + if (video == NULL) { - cairo_surface_destroy(*surface); + ptr = gdk_window_create_similar_surface( + wnd, + CAIRO_CONTENT_COLOR, + gtk_widget_get_allocated_width(widget), + gtk_widget_get_allocated_height(widget)); } - gCairo.rgb24_width = video->vframe.rgb24.width; - gCairo.rgb24_height = video->vframe.rgb24.height; + else + { + gCairo.rgb24_width = video->vframe.rgb24.width; + gCairo.rgb24_height = video->vframe.rgb24.height; - *surface = gdk_window_create_similar_image_surface( - gtk_widget_get_window(widget), - CAIRO_FORMAT_RGB24, - video->vframe.rgb24.width, - video->vframe.rgb24.height, - 0); /* scale */ + ptr = gdk_window_create_similar_image_surface( + wnd, + CAIRO_FORMAT_RGB24, + video->vframe.rgb24.width, + video->vframe.rgb24.height, + 0); /* scale */ - if (cairo_surface_status(*surface) != CAIRO_STATUS_SUCCESS) + } /* if (video == NULL) .. else */ + + if (ptr != NULL && + cairo_surface_status(ptr) != CAIRO_STATUS_SUCCESS) { - cairo_surface_destroy(*surface); - *surface = NULL; + cairo_surface_destroy(ptr); + ptr = NULL; } -} /* static void cff_gui_cairo_surface_image_create(GtkWidget*, cairo_surface_t**, const cff_video_t*) */ + *surface = ptr; + + return (ptr == NULL) ? FALSE : TRUE; + +} /* static gboolean _cff_gui_cairo_surface_create(GtkWidget*, cairo_surface_t**, const cff_video_t*) */ + +static gboolean cff_gui_cairo_surface_create(GtkWidget *widget, cairo_surface_t **surface) +{ + return _cff_gui_cairo_surface_create(widget, surface, NULL); + +} /* static gboolean cff_gui_cairo_surface_create(GtkWidget*, cairo_surface_*t*) */ + +static gboolean cff_gui_cairo_surface_image_create(GtkWidget *widget, cairo_surface_t **surface, const cff_video_t *video) +{ + return _cff_gui_cairo_surface_create(widget, surface, video); + +} /* static gboolean cff_gui_cairo_surface_image_create(GtkWidget*, cairo_surface_t**, const cff_video_t*) */ static void cff_gui_cairo_surface_image_fill(cairo_surface_t *surface, const cff_video_t *video) { int i; - unsigned char *src, *dst; + unsigned char z, *src, *dst; if (surface == NULL) { @@ -2959,12 +2972,13 @@ dst = cairo_image_surface_get_data(surface); i = video->vframe.rgb24.width * video->vframe.rgb24.height; + z = 0; do { #if G_BYTE_ORDER == G_BIG_ENDIAN - *(dst++) = 0; + *(dst++) = z; *(dst++) = *(src++); *(dst++) = *(src++); *(dst++) = *(src++); @@ -2972,7 +2986,7 @@ *(dst++) = *(--src); *(dst++) = *(--src); *(dst++) = *(--src); - *(dst++) = 0; + *(dst++) = z; src += 6; #endif @@ -3118,7 +3132,20 @@ cff_video_t *video; #if GTK_MAJOR_VERSION > 2 - cairo_set_source_surface(cr, gCairo.surfaceFrame, 0, 0); + + cairo_surface_t **surface; + + surface = &(gCairo.surfaceFrame); + + if (*surface == NULL) + { + if (cff_gui_cairo_surface_create(widget, surface) == FALSE) + { + return TRUE; + } + } + + cairo_set_source_surface(cr, *surface, 0, 0); #endif video = data; width = GuiWidgetGetAllocatedWidth(widget); @@ -3381,7 +3408,11 @@ gCairo.rgb24_width != video->vframe.rgb24.width || gCairo.rgb24_height != video->vframe.rgb24.height) { - cff_gui_cairo_surface_image_create(widget, &gCairo.surfaceRGB24, video); + if (cff_gui_cairo_surface_image_create(widget, + &gCairo.surfaceRGB24, video) == FALSE) + { + return TRUE; + } } cff_gui_cairo_surface_image_fill(gCairo.surfaceRGB24, video); @@ -3538,7 +3569,20 @@ cff_video_t *video; #if GTK_MAJOR_VERSION > 2 - cairo_set_source_surface(cr, gCairo.surfaceBar, 0, 0); + + cairo_surface_t **surface; + + surface = &(gCairo.surfaceBar); + + if (*surface == NULL) + { + if (cff_gui_cairo_surface_create(widget, surface) == FALSE) + { + return TRUE; + } + } + + cairo_set_source_surface(cr, *surface, 0, 0); #endif video = data; width = GuiWidgetGetAllocatedWidth(widget); @@ -3682,7 +3726,21 @@ gdk_draw_line(widget->window, gContext[kColorBlack], 1, height / 2, width - 1, height / 2); #else - cairo_set_source_surface(cr, gCairo.surfaceSlider, 0, 0); + + cairo_surface_t **surface; + + surface = &(gCairo.surfaceSlider); + + if (*surface == NULL) + { + if (cff_gui_cairo_surface_create(widget, surface) == FALSE) + { + return TRUE; + } + } + + cairo_set_source_surface(cr, *surface, 0, 0); + cff_gui_cairo_draw_line(cr, kColorBlack, 1, height / 2, width - 1, height / 2); #endif Binary files old/cutterff-0.4.1/src/cffwinres.a and new/cutterff-0.4.2/src/cffwinres.a differ
