Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package xjadeo for openSUSE:Factory checked in at 2021-01-28 21:22:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xjadeo (Old) and /work/SRC/openSUSE:Factory/.xjadeo.new.28504 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xjadeo" Thu Jan 28 21:22:31 2021 rev:5 rq:867305 version:0.8.10 Changes: -------- --- /work/SRC/openSUSE:Factory/xjadeo/xjadeo.changes 2020-06-10 00:48:19.758931351 +0200 +++ /work/SRC/openSUSE:Factory/.xjadeo.new.28504/xjadeo.changes 2021-01-28 21:22:31.991650265 +0100 @@ -1,0 +2,8 @@ +Wed Jan 27 21:45:48 UTC 2021 - Luigi Baldoni <aloi...@gmx.com> + +- Update to version 0.8.10 + * add keyboard shortcuts for +/- 1 second offsets + * fix Linux gcc10 builds +- Drop xjadeo-gcc10.patch (merged upstream) + +------------------------------------------------------------------- Old: ---- xjadeo-0.8.9.tar.gz xjadeo-gcc10.patch New: ---- xjadeo-0.8.10.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xjadeo.spec ++++++ --- /var/tmp/diff_new_pack.EFdBiG/_old 2021-01-28 21:22:32.595651223 +0100 +++ /var/tmp/diff_new_pack.EFdBiG/_new 2021-01-28 21:22:32.599651228 +0100 @@ -1,7 +1,7 @@ # # spec file for package xjadeo # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # Copyright (c) 2015 Packman Team <pack...@links2linux.de> # # All modifications and additions to the file contributed by third parties @@ -18,15 +18,13 @@ Name: xjadeo -Version: 0.8.9 +Version: 0.8.10 Release: 0 Summary: Video player that gets sync from Jack License: GPL-2.0-or-later Group: Productivity/Multimedia/Sound/Visualization URL: http://xjadeo.sourceforge.net/ Source0: https://sourceforge.net/projects/xjadeo/files/xjadeo/v%{version}/%{name}-%{version}.tar.gz -# PATCH-FIX-OPENSUSE xjadeo-gcc10.patch -Patch0: xjadeo-gcc10.patch BuildRequires: pkgconfig BuildRequires: update-desktop-files BuildRequires: pkgconfig(alsa) ++++++ xjadeo-0.8.9.tar.gz -> xjadeo-0.8.10.tar.gz ++++++ ++++ 4742 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/xjadeo-0.8.9/ChangeLog new/xjadeo-0.8.10/ChangeLog --- old/xjadeo-0.8.9/ChangeLog 2018-12-01 00:34:30.000000000 +0100 +++ new/xjadeo-0.8.10/ChangeLog 2021-01-06 16:11:31.000000000 +0100 @@ -1,3 +1,9 @@ +2021-01-06 (0.8.10) Robin Gareus <ro...@gareus.org> +* add keyboard shortcuts for +/- 1 second offsets +* tweak Windows installer 32/64bit reg-keys +* fix Linux gcc10 builds +* add support for macOS BigSur and Apple/ARM + 2018-11-30 (0.8.9) Robin Gareus <ro...@gareus.org> * prefer -pthread over -lpthread, fixes #18 * mainly a build-system, binary only update 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/xjadeo-0.8.9/INSTALL new/xjadeo-0.8.10/INSTALL --- old/xjadeo-0.8.9/INSTALL 2017-01-25 19:15:10.000000000 +0100 +++ new/xjadeo-0.8.10/INSTALL 2019-09-29 16:44:40.000000000 +0200 @@ -1,8 +1,8 @@ Installation Instructions ************************* -Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation, -Inc. + Copyright (C) 1994-1996, 1999-2002, 2004-2016 Free Software +Foundation, Inc. Copying and distribution of this file, with or without modification, are permitted in any medium without royalty provided the copyright @@ -12,97 +12,96 @@ Basic Installation ================== - Briefly, the shell command `./configure && make && make install' + Briefly, the shell command './configure && make && make install' should configure, build, and install this package. The following -more-detailed instructions are generic; see the `README' file for +more-detailed instructions are generic; see the 'README' file for instructions specific to this package. Some packages provide this -`INSTALL' file but do not implement all of the features documented +'INSTALL' file but do not implement all of the features documented below. The lack of an optional feature in a given package is not necessarily a bug. More recommendations for GNU packages can be found in *note Makefile Conventions: (standards)Makefile Conventions. - The `configure' shell script attempts to guess correct values for + The 'configure' shell script attempts to guess correct values for various system-dependent variables used during compilation. It uses -those values to create a `Makefile' in each directory of the package. -It may also create one or more `.h' files containing system-dependent -definitions. Finally, it creates a shell script `config.status' that +those values to create a 'Makefile' in each directory of the package. +It may also create one or more '.h' files containing system-dependent +definitions. Finally, it creates a shell script 'config.status' that you can run in the future to recreate the current configuration, and a -file `config.log' containing compiler output (useful mainly for -debugging `configure'). +file 'config.log' containing compiler output (useful mainly for +debugging 'configure'). - It can also use an optional file (typically called `config.cache' -and enabled with `--cache-file=config.cache' or simply `-C') that saves -the results of its tests to speed up reconfiguring. Caching is -disabled by default to prevent problems with accidental use of stale -cache files. + It can also use an optional file (typically called 'config.cache' and +enabled with '--cache-file=config.cache' or simply '-C') that saves the +results of its tests to speed up reconfiguring. Caching is disabled by +default to prevent problems with accidental use of stale cache files. If you need to do unusual things to compile the package, please try -to figure out how `configure' could check whether to do them, and mail -diffs or instructions to the address given in the `README' so they can +to figure out how 'configure' could check whether to do them, and mail +diffs or instructions to the address given in the 'README' so they can be considered for the next release. If you are using the cache, and at -some point `config.cache' contains results you don't want to keep, you +some point 'config.cache' contains results you don't want to keep, you may remove or edit it. - The file `configure.ac' (or `configure.in') is used to create -`configure' by a program called `autoconf'. You need `configure.ac' if -you want to change it or regenerate `configure' using a newer version -of `autoconf'. + The file 'configure.ac' (or 'configure.in') is used to create +'configure' by a program called 'autoconf'. You need 'configure.ac' if +you want to change it or regenerate 'configure' using a newer version of +'autoconf'. The simplest way to compile this package is: - 1. `cd' to the directory containing the package's source code and type - `./configure' to configure the package for your system. + 1. 'cd' to the directory containing the package's source code and type + './configure' to configure the package for your system. - Running `configure' might take a while. While running, it prints + Running 'configure' might take a while. While running, it prints some messages telling which features it is checking for. - 2. Type `make' to compile the package. + 2. Type 'make' to compile the package. - 3. Optionally, type `make check' to run any self-tests that come with + 3. Optionally, type 'make check' to run any self-tests that come with the package, generally using the just-built uninstalled binaries. - 4. Type `make install' to install the programs and any data files and + 4. Type 'make install' to install the programs and any data files and documentation. When installing into a prefix owned by root, it is recommended that the package be configured and built as a regular - user, and only the `make install' phase executed with root + user, and only the 'make install' phase executed with root privileges. - 5. Optionally, type `make installcheck' to repeat any self-tests, but + 5. Optionally, type 'make installcheck' to repeat any self-tests, but this time using the binaries in their final installed location. This target does not install anything. Running this target as a - regular user, particularly if the prior `make install' required + regular user, particularly if the prior 'make install' required root privileges, verifies that the installation completed correctly. 6. You can remove the program binaries and object files from the - source code directory by typing `make clean'. To also remove the - files that `configure' created (so you can compile the package for - a different kind of computer), type `make distclean'. There is - also a `make maintainer-clean' target, but that is intended mainly + source code directory by typing 'make clean'. To also remove the + files that 'configure' created (so you can compile the package for + a different kind of computer), type 'make distclean'. There is + also a 'make maintainer-clean' target, but that is intended mainly for the package's developers. If you use it, you may have to get all sorts of other programs in order to regenerate files that came with the distribution. - 7. Often, you can also type `make uninstall' to remove the installed + 7. Often, you can also type 'make uninstall' to remove the installed files again. In practice, not all packages have tested that uninstallation works correctly, even though it is required by the GNU Coding Standards. - 8. Some packages, particularly those that use Automake, provide `make + 8. Some packages, particularly those that use Automake, provide 'make distcheck', which can by used by developers to test that all other - targets like `make install' and `make uninstall' work correctly. + targets like 'make install' and 'make uninstall' work correctly. This target is generally not run by end users. Compilers and Options ===================== Some systems require unusual options for compilation or linking that -the `configure' script does not know about. Run `./configure --help' +the 'configure' script does not know about. Run './configure --help' for details on some of the pertinent environment variables. - You can give `configure' initial values for configuration parameters -by setting variables in the command line or in the environment. Here -is an example: + You can give 'configure' initial values for configuration parameters +by setting variables in the command line or in the environment. Here is +an example: ./configure CC=c99 CFLAGS=-g LIBS=-lposix @@ -113,21 +112,21 @@ You can compile the package for more than one kind of computer at the same time, by placing the object files for each architecture in their -own directory. To do this, you can use GNU `make'. `cd' to the +own directory. To do this, you can use GNU 'make'. 'cd' to the directory where you want the object files and executables to go and run -the `configure' script. `configure' automatically checks for the -source code in the directory that `configure' is in and in `..'. This -is known as a "VPATH" build. +the 'configure' script. 'configure' automatically checks for the source +code in the directory that 'configure' is in and in '..'. This is known +as a "VPATH" build. - With a non-GNU `make', it is safer to compile the package for one + With a non-GNU 'make', it is safer to compile the package for one architecture at a time in the source code directory. After you have -installed the package for one architecture, use `make distclean' before +installed the package for one architecture, use 'make distclean' before reconfiguring for another architecture. On MacOS X 10.5 and later systems, you can create libraries and executables that work on multiple system types--known as "fat" or -"universal" binaries--by specifying multiple `-arch' options to the -compiler but only a single `-arch' option to the preprocessor. Like +"universal" binaries--by specifying multiple '-arch' options to the +compiler but only a single '-arch' option to the preprocessor. Like this: ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ @@ -136,105 +135,104 @@ This is not guaranteed to produce working output in all cases, you may have to build one architecture at a time and combine the results -using the `lipo' tool if you have problems. +using the 'lipo' tool if you have problems. Installation Names ================== - By default, `make install' installs the package's commands under -`/usr/local/bin', include files under `/usr/local/include', etc. You -can specify an installation prefix other than `/usr/local' by giving -`configure' the option `--prefix=PREFIX', where PREFIX must be an + By default, 'make install' installs the package's commands under +'/usr/local/bin', include files under '/usr/local/include', etc. You +can specify an installation prefix other than '/usr/local' by giving +'configure' the option '--prefix=PREFIX', where PREFIX must be an absolute file name. You can specify separate installation prefixes for architecture-specific files and architecture-independent files. If you -pass the option `--exec-prefix=PREFIX' to `configure', the package uses +pass the option '--exec-prefix=PREFIX' to 'configure', the package uses PREFIX as the prefix for installing programs and libraries. Documentation and other data files still use the regular prefix. In addition, if you use an unusual directory layout you can give -options like `--bindir=DIR' to specify different values for particular -kinds of files. Run `configure --help' for a list of the directories -you can set and what kinds of files go in them. In general, the -default for these options is expressed in terms of `${prefix}', so that -specifying just `--prefix' will affect all of the other directory +options like '--bindir=DIR' to specify different values for particular +kinds of files. Run 'configure --help' for a list of the directories +you can set and what kinds of files go in them. In general, the default +for these options is expressed in terms of '${prefix}', so that +specifying just '--prefix' will affect all of the other directory specifications that were not explicitly provided. The most portable way to affect installation locations is to pass the -correct locations to `configure'; however, many packages provide one or +correct locations to 'configure'; however, many packages provide one or both of the following shortcuts of passing variable assignments to the -`make install' command line to change installation locations without +'make install' command line to change installation locations without having to reconfigure or recompile. The first method involves providing an override variable for each -affected directory. For example, `make install +affected directory. For example, 'make install prefix=/alternate/directory' will choose an alternate location for all directory configuration variables that were expressed in terms of -`${prefix}'. Any directories that were specified during `configure', -but not in terms of `${prefix}', must each be overridden at install -time for the entire installation to be relocated. The approach of -makefile variable overrides for each directory variable is required by -the GNU Coding Standards, and ideally causes no recompilation. -However, some platforms have known limitations with the semantics of -shared libraries that end up requiring recompilation when using this -method, particularly noticeable in packages that use GNU Libtool. - - The second method involves providing the `DESTDIR' variable. For -example, `make install DESTDIR=/alternate/directory' will prepend -`/alternate/directory' before all installation names. The approach of -`DESTDIR' overrides is not required by the GNU Coding Standards, and +'${prefix}'. Any directories that were specified during 'configure', +but not in terms of '${prefix}', must each be overridden at install time +for the entire installation to be relocated. The approach of makefile +variable overrides for each directory variable is required by the GNU +Coding Standards, and ideally causes no recompilation. However, some +platforms have known limitations with the semantics of shared libraries +that end up requiring recompilation when using this method, particularly +noticeable in packages that use GNU Libtool. + + The second method involves providing the 'DESTDIR' variable. For +example, 'make install DESTDIR=/alternate/directory' will prepend +'/alternate/directory' before all installation names. The approach of +'DESTDIR' overrides is not required by the GNU Coding Standards, and does not work on platforms that have drive letters. On the other hand, it does better at avoiding recompilation issues, and works well even -when some directory options were not specified in terms of `${prefix}' -at `configure' time. +when some directory options were not specified in terms of '${prefix}' +at 'configure' time. Optional Features ================= If the package supports it, you can cause programs to be installed -with an extra prefix or suffix on their names by giving `configure' the -option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. +with an extra prefix or suffix on their names by giving 'configure' the +option '--program-prefix=PREFIX' or '--program-suffix=SUFFIX'. - Some packages pay attention to `--enable-FEATURE' options to -`configure', where FEATURE indicates an optional part of the package. -They may also pay attention to `--with-PACKAGE' options, where PACKAGE -is something like `gnu-as' or `x' (for the X Window System). The -`README' should mention any `--enable-' and `--with-' options that the + Some packages pay attention to '--enable-FEATURE' options to +'configure', where FEATURE indicates an optional part of the package. +They may also pay attention to '--with-PACKAGE' options, where PACKAGE +is something like 'gnu-as' or 'x' (for the X Window System). The +'README' should mention any '--enable-' and '--with-' options that the package recognizes. - For packages that use the X Window System, `configure' can usually + For packages that use the X Window System, 'configure' can usually find the X include and library files automatically, but if it doesn't, -you can use the `configure' options `--x-includes=DIR' and -`--x-libraries=DIR' to specify their locations. +you can use the 'configure' options '--x-includes=DIR' and +'--x-libraries=DIR' to specify their locations. Some packages offer the ability to configure how verbose the -execution of `make' will be. For these packages, running `./configure +execution of 'make' will be. For these packages, running './configure --enable-silent-rules' sets the default to minimal output, which can be -overridden with `make V=1'; while running `./configure +overridden with 'make V=1'; while running './configure --disable-silent-rules' sets the default to verbose, which can be -overridden with `make V=0'. +overridden with 'make V=0'. Particular systems ================== - On HP-UX, the default C compiler is not ANSI C compatible. If GNU -CC is not installed, it is recommended to use the following options in + On HP-UX, the default C compiler is not ANSI C compatible. If GNU CC +is not installed, it is recommended to use the following options in order to use an ANSI C compiler: ./configure CC="cc -Ae -D_XOPEN_SOURCE=500" and if that doesn't work, install pre-built binaries of GCC for HP-UX. - HP-UX `make' updates targets which have the same time stamps as -their prerequisites, which makes it generally unusable when shipped -generated files such as `configure' are involved. Use GNU `make' -instead. + HP-UX 'make' updates targets which have the same time stamps as their +prerequisites, which makes it generally unusable when shipped generated +files such as 'configure' are involved. Use GNU 'make' instead. On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot -parse its `<wchar.h>' header file. The option `-nodtk' can be used as -a workaround. If GNU CC is not installed, it is therefore recommended -to try +parse its '<wchar.h>' header file. The option '-nodtk' can be used as a +workaround. If GNU CC is not installed, it is therefore recommended to +try ./configure CC="cc" @@ -242,26 +240,26 @@ ./configure CC="cc -nodtk" - On Solaris, don't put `/usr/ucb' early in your `PATH'. This + On Solaris, don't put '/usr/ucb' early in your 'PATH'. This directory contains several dysfunctional programs; working variants of -these programs are available in `/usr/bin'. So, if you need `/usr/ucb' -in your `PATH', put it _after_ `/usr/bin'. +these programs are available in '/usr/bin'. So, if you need '/usr/ucb' +in your 'PATH', put it _after_ '/usr/bin'. - On Haiku, software installed for all users goes in `/boot/common', -not `/usr/local'. It is recommended to use the following options: + On Haiku, software installed for all users goes in '/boot/common', +not '/usr/local'. It is recommended to use the following options: ./configure --prefix=/boot/common Specifying the System Type ========================== - There may be some features `configure' cannot figure out + There may be some features 'configure' cannot figure out automatically, but needs to determine by the type of machine the package will run on. Usually, assuming the package is built to be run on the -_same_ architectures, `configure' can figure that out, but if it prints +_same_ architectures, 'configure' can figure that out, but if it prints a message saying it cannot guess the machine type, give it the -`--build=TYPE' option. TYPE can either be a short name for the system -type, such as `sun4', or a canonical name which has the form: +'--build=TYPE' option. TYPE can either be a short name for the system +type, such as 'sun4', or a canonical name which has the form: CPU-COMPANY-SYSTEM @@ -270,101 +268,101 @@ OS KERNEL-OS - See the file `config.sub' for the possible values of each field. If -`config.sub' isn't included in this package, then this package doesn't + See the file 'config.sub' for the possible values of each field. If +'config.sub' isn't included in this package, then this package doesn't need to know the machine type. If you are _building_ compiler tools for cross-compiling, you should -use the option `--target=TYPE' to select the type of system they will +use the option '--target=TYPE' to select the type of system they will produce code for. If you want to _use_ a cross compiler, that generates code for a platform different from the build platform, you should specify the "host" platform (i.e., that on which the generated programs will -eventually be run) with `--host=TYPE'. +eventually be run) with '--host=TYPE'. Sharing Defaults ================ - If you want to set default values for `configure' scripts to share, -you can create a site shell script called `config.site' that gives -default values for variables like `CC', `cache_file', and `prefix'. -`configure' looks for `PREFIX/share/config.site' if it exists, then -`PREFIX/etc/config.site' if it exists. Or, you can set the -`CONFIG_SITE' environment variable to the location of the site script. -A warning: not all `configure' scripts look for a site script. + If you want to set default values for 'configure' scripts to share, +you can create a site shell script called 'config.site' that gives +default values for variables like 'CC', 'cache_file', and 'prefix'. +'configure' looks for 'PREFIX/share/config.site' if it exists, then +'PREFIX/etc/config.site' if it exists. Or, you can set the +'CONFIG_SITE' environment variable to the location of the site script. +A warning: not all 'configure' scripts look for a site script. Defining Variables ================== Variables not defined in a site shell script can be set in the -environment passed to `configure'. However, some packages may run +environment passed to 'configure'. However, some packages may run configure again during the build, and the customized values of these variables may be lost. In order to avoid this problem, you should set -them in the `configure' command line, using `VAR=value'. For example: +them in the 'configure' command line, using 'VAR=value'. For example: ./configure CC=/usr/local2/bin/gcc -causes the specified `gcc' to be used as the C compiler (unless it is +causes the specified 'gcc' to be used as the C compiler (unless it is overridden in the site shell script). -Unfortunately, this technique does not work for `CONFIG_SHELL' due to -an Autoconf limitation. Until the limitation is lifted, you can use -this workaround: +Unfortunately, this technique does not work for 'CONFIG_SHELL' due to an +Autoconf limitation. Until the limitation is lifted, you can use this +workaround: CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash -`configure' Invocation +'configure' Invocation ====================== - `configure' recognizes the following options to control how it + 'configure' recognizes the following options to control how it operates. -`--help' -`-h' - Print a summary of all of the options to `configure', and exit. +'--help' +'-h' + Print a summary of all of the options to 'configure', and exit. -`--help=short' -`--help=recursive' +'--help=short' +'--help=recursive' Print a summary of the options unique to this package's - `configure', and exit. The `short' variant lists options used - only in the top level, while the `recursive' variant lists options - also present in any nested packages. - -`--version' -`-V' - Print the version of Autoconf used to generate the `configure' + 'configure', and exit. The 'short' variant lists options used only + in the top level, while the 'recursive' variant lists options also + present in any nested packages. + +'--version' +'-V' + Print the version of Autoconf used to generate the 'configure' script, and exit. -`--cache-file=FILE' +'--cache-file=FILE' Enable the cache: use and save the results of the tests in FILE, - traditionally `config.cache'. FILE defaults to `/dev/null' to + traditionally 'config.cache'. FILE defaults to '/dev/null' to disable caching. -`--config-cache' -`-C' - Alias for `--cache-file=config.cache'. - -`--quiet' -`--silent' -`-q' +'--config-cache' +'-C' + Alias for '--cache-file=config.cache'. + +'--quiet' +'--silent' +'-q' Do not print messages saying which checks are being made. To - suppress all normal output, redirect it to `/dev/null' (any error + suppress all normal output, redirect it to '/dev/null' (any error messages will still be shown). -`--srcdir=DIR' +'--srcdir=DIR' Look for the package's source code in directory DIR. Usually - `configure' can determine that directory automatically. + 'configure' can determine that directory automatically. -`--prefix=DIR' - Use DIR as the installation prefix. *note Installation Names:: - for more details, including other options available for fine-tuning - the installation locations. +'--prefix=DIR' + Use DIR as the installation prefix. *note Installation Names:: for + more details, including other options available for fine-tuning the + installation locations. -`--no-create' -`-n' +'--no-create' +'-n' Run the configure checks, but stop before creating any output files. -`configure' also accepts some other, not widely useful, options. Run -`configure --help' for more details. +'configure' also accepts some other, not widely useful, options. Run +'configure --help' for more details. 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/xjadeo-0.8.9/compile new/xjadeo-0.8.10/compile --- old/xjadeo-0.8.9/compile 2017-01-25 19:15:10.000000000 +0100 +++ new/xjadeo-0.8.10/compile 2019-09-29 16:44:40.000000000 +0200 @@ -1,9 +1,9 @@ #! /bin/sh # Wrapper for compilers which do not understand '-c -o'. -scriptversion=2012-10-14.11; # UTC +scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2018 Free Software Foundation, Inc. # Written by Tom Tromey <tro...@cygnus.com>. # # This program is free software; you can redistribute it and/or modify @@ -17,7 +17,7 @@ # 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/>. +# along with this program. If not, see <https://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 @@ -255,7 +255,8 @@ echo "compile $scriptversion" exit $? ;; - cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) + cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \ + icl | *[/\\]icl | icl.exe | *[/\\]icl.exe ) func_cl_wrapper "$@" # Doesn't return... ;; esac @@ -339,9 +340,9 @@ # Local Variables: # mode: shell-script # sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" +# 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/xjadeo-0.8.9/config.h new/xjadeo-0.8.10/config.h --- old/xjadeo-0.8.9/config.h 2018-12-01 01:26:36.000000000 +0100 +++ new/xjadeo-0.8.10/config.h 2021-01-06 16:20:24.000000000 +0100 @@ -105,7 +105,7 @@ #define HAVE_PTHREAD_H 1 /* Define as 1 if you have the SDL toolkit (linux,netbsd,osx,win) */ -/* #undef HAVE_SDL */ +#define HAVE_SDL 1 /* Define to 1 if you have the <stdint.h> header file. */ #define HAVE_STDINT_H 1 @@ -152,7 +152,7 @@ /* Define to 1 if `major', `minor', and `makedev' are declared in <sysmacros.h>. */ -/* #undef MAJOR_IN_SYSMACROS */ +#define MAJOR_IN_SYSMACROS 1 /* max length of a remote control line. */ #define MQLEN 512 @@ -226,7 +226,7 @@ /* #undef TTFFONTFILE */ /* Version number of package */ -#define VERSION "0.8.9" +#define VERSION "0.8.10" /* enable xjadeo windows context-menu */ #define WINMENU 1 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/xjadeo-0.8.9/configure.ac new/xjadeo-0.8.10/configure.ac --- old/xjadeo-0.8.9/configure.ac 2018-12-01 00:33:14.000000000 +0100 +++ new/xjadeo-0.8.10/configure.ac 2021-01-06 16:11:40.000000000 +0100 @@ -8,7 +8,7 @@ VERSION_MAJOR=0 VERSION_MINOR=8 -VERSION_SUB=9 +VERSION_SUB=10 AM_INIT_AUTOMAKE(xjadeo, [${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_SUB}]) AM_CONFIG_HEADER(config.h) @@ -27,7 +27,7 @@ AC_ARG_ENABLE(midi, AC_HELP_STRING([--disable-midi], [Do not build any of the MIDI drivers (default:on)])) AC_ARG_ENABLE(portmidi, AC_HELP_STRING([--disable-portmidi], [disable portmidi support (default:auto)])) AC_ARG_ENABLE(alsamidi, AC_HELP_STRING([--disable-alsamidi], [disable alsamidi support (default:auto)])) -AC_ARG_ENABLE(embed-font, AC_HELP_STRING([--embed-font], [include OnScreenDisplay font in binary (default: off)])) +AC_ARG_ENABLE(embed-font, AC_HELP_STRING([--enable-embed-font], [include OnScreenDisplay font in binary (default: off)])) AC_ARG_ENABLE(qtgui, AC_HELP_STRING([--enable-qtgui],[Build the Qt GUI controller (default:off)])) AC_ARG_WITH(qt4prefix, AS_HELP_STRING([--with-qt4prefix], [prefix for Qt4 installation, e.g. "/usr/lib/qt4"]), qt4prefix="$withval", qt4prefix="") AC_ARG_WITH(qmakeargs, AS_HELP_STRING([--with-qmakeargs], [specify custom qmake arguments]), qmakeargs="$withval", qmakeargs="") @@ -46,7 +46,7 @@ PM_OS=mac AC_DEFINE([PLATFORM_OSX], [], [Mac OSX version]) PLATFORM_OSX=1 - LDFLAGS="$LDFLAGS -lz -lbz2 -framework Carbon -framework Quicktime" + LDFLAGS="$LDFLAGS -lz -lbz2" GL_LIBS="-framework Cocoa -framework OpenGL" AC_DEFINE(HAVE_GL) HAVE_GL=1 @@ -54,6 +54,9 @@ AM_CONDITIONAL([TARGET_LINUX], false) AM_CONDITIONAL([TARGET_NETBSD], false) AM_CONDITIONAL([TARGET_WIN32], false) + if test $(sw_vers -productVersion | cut -d '.' -f 1) -lt 11 -a $(sw_vers -productVersion | cut -d '.' -f 2) -lt 15; then + LDFLAGS="$LDFLAGS -framework Carbon -framework Quicktime" + fi dnl 2006/11/13 : 32 bit RGBA is known not to work on OSX ffmpeg+imlib2 dnl IMLIB2RGBA ;; 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/xjadeo-0.8.9/doc/xjadeo.1 new/xjadeo-0.8.10/doc/xjadeo.1 --- old/xjadeo-0.8.9/doc/xjadeo.1 2018-12-01 01:26:44.000000000 +0100 +++ new/xjadeo-0.8.10/doc/xjadeo.1 2021-01-06 16:24:31.000000000 +0100 @@ -1,5 +1,5 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.4. -.TH XJADEO "1" "December 2018" "xjadeo version 0.8.9" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.8. +.TH XJADEO "1" "January 2021" "xjadeo version 0.8.10" "User Commands" .SH NAME xjadeo \- X Jack Video Monitor .SH SYNOPSIS @@ -303,12 +303,18 @@ \&'\e' Reset timecode offset to zero .TP -\&'+' +\&'=' Increase timecode offset by one frame .TP \&'\-' Decrease timecode offset by one frame .TP +\&'+' +Increase timecode offset by one second +.TP +\&'_' +Decrease timecode offset by one second +.TP \&'{' Decrement timecode offset by one minute .TP @@ -356,16 +362,16 @@ Website: <http://xjadeo.sf.net/> .TP built from: -scm\-v0.8.9 +scm\-v0.8.10 .IP -compiled with: AVFORMAT=0x393865 AVCODEC=0x394065 AVUTIL:0x372265 +compiled with: AVFORMAT=0x3a1464 AVCODEC=0x3a2364 AVUTIL:0x381664 configuration: [ LTC JACK\-SESSION POSIX\-MQueue OSC ] .br MTC/MIDI: [ jack\-midi alsa\-sequencer portmidi alsa\-raw ] .br -Display(s): [ openGL Xv X11/imlib2(RGBA32) ] +Display(s): [ openGL Xv SDL X11/imlib2(RGBA32) ] .SH COPYRIGHT -Copyright \(co GPL 2006\-2015 Robin Gareus <ro...@gareus.org> +Copyright \(co GPL 2006\-2021 Robin Gareus <ro...@gareus.org> .br Copyright \(co GPL 2006\-2011 Luis Garrido <luisgarr...@users.sourceforge.net> .br 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/xjadeo-0.8.9/doc/xjremote.1 new/xjadeo-0.8.10/doc/xjremote.1 --- old/xjadeo-0.8.9/doc/xjremote.1 2018-12-01 01:26:44.000000000 +0100 +++ new/xjadeo-0.8.10/doc/xjremote.1 2021-01-06 16:24:31.000000000 +0100 @@ -1,5 +1,5 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.4. -.TH XJREMOTE "1" "December 2018" "xjremote version 0.8.9" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.8. +.TH XJREMOTE "1" "January 2021" "xjremote version 0.8.10" "User Commands" .SH NAME xjremote \- X Jack Video Monitor Remote Control .SH SYNOPSIS @@ -54,12 +54,12 @@ Website: <https://github.com/x42/xjadeo> .TP built from: -scm\-v0.8.9 +scm\-v0.8.10 .TP configuration: [ POSIX\-MQueue ] .SH COPYRIGHT -Copyright \(co GPL 2006,2014 Robin Gareus <ro...@gareus.org> +Copyright \(co GPL 2006\-2021 Robin Gareus <ro...@gareus.org> .br This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. 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/xjadeo-0.8.9/missing new/xjadeo-0.8.10/missing --- old/xjadeo-0.8.9/missing 2017-01-25 19:15:10.000000000 +0100 +++ new/xjadeo-0.8.10/missing 2019-09-29 16:44:40.000000000 +0200 @@ -1,9 +1,9 @@ #! /bin/sh # Common wrapper for a few potentially missing GNU programs. -scriptversion=2013-10-28.13; # UTC +scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# Copyright (C) 1996-2018 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard <pin...@iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify @@ -17,7 +17,7 @@ # 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/>. +# along with this program. If not, see <https://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 @@ -101,9 +101,9 @@ exit $st fi -perl_URL=http://www.perl.org/ -flex_URL=http://flex.sourceforge.net/ -gnu_software_URL=http://www.gnu.org/software +perl_URL=https://www.perl.org/ +flex_URL=https://github.com/westes/flex +gnu_software_URL=https://www.gnu.org/software program_details () { @@ -207,9 +207,9 @@ exit $st # Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" +# 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/xjadeo-0.8.9/src/xjadeo/configfile.c new/xjadeo-0.8.10/src/xjadeo/configfile.c --- old/xjadeo-0.8.9/src/xjadeo/configfile.c 2015-11-10 21:54:37.000000000 +0100 +++ new/xjadeo-0.8.10/src/xjadeo/configfile.c 2020-08-19 17:31:39.000000000 +0200 @@ -90,8 +90,8 @@ extern char OSD_text[128]; extern int OSD_fx, OSD_tx, OSD_sx, OSD_fy, OSD_sy, OSD_ty; -int start_ontop; -int start_fullscreen; +extern int start_ontop; +extern int start_fullscreen; extern char *current_file; #ifdef JACK_SESSION 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/xjadeo-0.8.9/src/xjadeo/display.c new/xjadeo-0.8.10/src/xjadeo/display.c --- old/xjadeo-0.8.9/src/xjadeo/display.c 2015-11-22 13:00:15.000000000 +0100 +++ new/xjadeo-0.8.10/src/xjadeo/display.c 2020-11-02 13:17:00.000000000 +0100 @@ -814,6 +814,22 @@ case 1: ++ts_offset; break; + case -4: + if (framerate > 0) { + // TODO drop-frame ?? + ts_offset -= framerate ; + } else { + ts_offset -= 25; + } + break; + case 4: + if (framerate > 0) { + // TODO drop-frame ?? + ts_offset += framerate ; + } else { + ts_offset += 25; + } + break; case -2: if (framerate > 0) { // TODO drop-frame ?? 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/xjadeo-0.8.9/src/xjadeo/display_gl_common.h new/xjadeo-0.8.10/src/xjadeo/display_gl_common.h --- old/xjadeo-0.8.9/src/xjadeo/display_gl_common.h 2015-11-10 21:54:37.000000000 +0100 +++ new/xjadeo-0.8.10/src/xjadeo/display_gl_common.h 2020-11-02 13:17:00.000000000 +0100 @@ -266,7 +266,7 @@ XCtimeoffset(0, sym); gl_sync_unlock(); } - else if (!strcmp(key, "+")) { + else if (!strcmp(key, "=")) { gl_sync_lock(); XCtimeoffset(1, sym); gl_sync_unlock(); @@ -276,6 +276,16 @@ XCtimeoffset(-1, sym); gl_sync_unlock(); } + else if (!strcmp(key, "+")) { + gl_sync_lock(); + XCtimeoffset(4, sym); + gl_sync_unlock(); + } + else if (!strcmp(key, "_")) { + gl_sync_lock(); + XCtimeoffset(-4, sym); + gl_sync_unlock(); + } else if (!strcmp(key, "}")) { gl_sync_lock(); XCtimeoffset(2, sym); 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/xjadeo-0.8.9/src/xjadeo/display_gl_osx.m new/xjadeo-0.8.10/src/xjadeo/display_gl_osx.m --- old/xjadeo-0.8.9/src/xjadeo/display_gl_osx.m 2016-04-20 17:11:41.000000000 +0200 +++ new/xjadeo-0.8.10/src/xjadeo/display_gl_osx.m 2021-01-06 16:06:22.000000000 +0100 @@ -1,6 +1,6 @@ /* xjadeo - jack video monitor * - * Copyright (C) 2014,2015 Robin Gareus <ro...@gareus.org> + * Copyright (C) 2014-2021 Robin Gareus <ro...@gareus.org> * * 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 @@ -557,7 +557,7 @@ - (void) showAbout: (id)sender { NSAttributedString *credits = [[NSAttributedString alloc] - initWithString:@"(C) 2006-2015\nRobin Gareus & Luis Garrido" + initWithString:@"(C) 2006-2021\nRobin Gareus & Luis Garrido" ]; NSDictionary *aboutDict = [NSDictionary dictionaryWithObjectsAndKeys: @@ -648,6 +648,8 @@ - (void) offMM: (id)sender { PTLL; XCtimeoffset(-2, 0); PTUL; } - (void) offPH: (id)sender { PTLL; XCtimeoffset( 3, 0); PTUL; } - (void) offMH: (id)sender { PTLL; XCtimeoffset(-3, 0); PTUL; } +- (void) offPS: (id)sender { PTLL; XCtimeoffset( 4, 0); PTUL; } +- (void) offMS: (id)sender { PTLL; XCtimeoffset(-4, 0); PTUL; } - (void) jackPlayPause: (id)sender { jackt_toggle(); } - (void) jackPlay: (id)sender { jackt_start(); } @@ -883,10 +885,17 @@ menuItem = [offMenu addItemWithTitle:@"Reset" action:@selector(offZero:) keyEquivalent:@"\\"]; [menuItem setKeyEquivalentModifierMask:0]; - menuItem = [offMenu addItemWithTitle:@"+1 Frame" action:@selector(offPF:) keyEquivalent:@"+"]; + + menuItem = [offMenu addItemWithTitle:@"+1 Frame" action:@selector(offPF:) keyEquivalent:@"="]; [menuItem setKeyEquivalentModifierMask:0]; menuItem = [offMenu addItemWithTitle:@" \u20131 Frame" action:@selector(offMF:) keyEquivalent:@"-"]; [menuItem setKeyEquivalentModifierMask:0]; + + menuItem = [offMenu addItemWithTitle:@"+1 Second" action:@selector(offPS:) keyEquivalent:@"+"]; + [menuItem setKeyEquivalentModifierMask:0]; + menuItem = [offMenu addItemWithTitle:@" \u20131 Second" action:@selector(offMS:) keyEquivalent:@"_"]; + [menuItem setKeyEquivalentModifierMask:0]; + menuItem = [offMenu addItemWithTitle:@"+1 Minute" action:@selector(offPM:) keyEquivalent:@"{"]; [menuItem setKeyEquivalentModifierMask:0]; menuItem = [offMenu addItemWithTitle:@" \u20131 Minute" action:@selector(offMM:) keyEquivalent:@"}"]; @@ -978,7 +987,7 @@ return 0; } -static void osx_post_event (int data1) { +static void osx_post_event (int data1, int data2) { NSEvent* event = [NSEvent otherEventWithType:NSApplicationDefined location:NSMakePoint (0,0) modifierFlags:0 @@ -987,7 +996,7 @@ context:nil subtype:0 data1:data1 - data2:0]; + data2:data2]; [NSApp postEvent:event atStart:NO]; } @@ -998,7 +1007,7 @@ } if (!pool) pool = [[NSAutoreleasePool alloc] init]; if (osxgui_status > 0) return 0; // already open - osx_post_event (1); + osx_post_event (1, 0); while (osxgui_status == 0) { usleep (10000); } @@ -1007,7 +1016,7 @@ void osx_shutdown () { if (pool && osxgui_status != -1000) { - osx_post_event (0); + osx_post_event (0, 0); } if (pool) { [pool release]; pool = NULL; @@ -1018,7 +1027,7 @@ if (osxgui_status <= 0) { return; } - osx_post_event (2); + osx_post_event (2, 0); while (osxgui_status) { usleep (10000); } @@ -1033,7 +1042,7 @@ sched_yield (); } pthread_mutex_lock (&osxgui_sync); - osx_post_event (0); // TODO only on remote msg or similar event + osx_post_event (0, 0); // TODO only on remote msg or similar event } void osx_main () { @@ -1075,6 +1084,41 @@ pthread_mutex_unlock (&osx_vbuf_lock); [osx_glview setNeedsDisplay:YES]; break; + case 4: + [osx_glview setNeedsDisplay:YES]; + break; + case 5: + if (_gl_ontop) { + [osx_window setLevel:NSFloatingWindowLevel + 1]; + } else { + [osx_window setLevel:NSNormalWindowLevel]; + } + break; + case 6: + if (_gl_fullscreen) { + [osx_glview setFullScreen:YES]; + } else { + [osx_glview setFullScreen:NO]; + } + if (osx_window) { + [osx_window makeKeyAndOrderFront:osx_window]; + [osx_window makeFirstResponder:osx_glview]; + } + break; + case 7: + { + [osx_window setContentSize:NSMakeSize (event.data2 & 0xffff, event.data2 >> 16) ]; + [osx_glview reshape]; + } + break; + case 8: + { + NSRect frame = [osx_window frame]; + frame.origin.x = event.data2 & 0xffff; + frame.origin.y = event.data2 >> 16; + [osx_window setFrame:frame display:YES animate:YES]; + } + break; default: break; } @@ -1108,18 +1152,18 @@ if (!osx_vbuf) return; pthread_mutex_lock (&osx_vbuf_lock); if (_newsrc) { - osx_post_event (1); + osx_post_event (1, 0); } else { memcpy (osx_vbuf, buffer, osx_vbuf_size * sizeof(uint8_t)); } pthread_mutex_unlock (&osx_vbuf_lock); - [osx_glview setNeedsDisplay:YES]; + osx_post_event (4, 0); } void gl_resize (unsigned int x, unsigned int y) { - [osx_window setContentSize:NSMakeSize (x, y) ]; - [osx_glview reshape]; + int xy = (y & 0xffff) << 16 | (x & 0xffff); + osx_post_event (7, xy); } void gl_get_window_size (unsigned int *w, unsigned int *h) { @@ -1128,10 +1172,8 @@ } void gl_position (int x, int y) { - NSRect frame = [osx_window frame]; - frame.origin.x = x; - frame.origin.y = y; - [osx_window setFrame:frame display:YES animate:YES]; + int xy = (y & 0xffff) << 16 | (x & 0xffff); + osx_post_event (8, xy); } void gl_get_window_pos (int *x, int *y) { @@ -1143,26 +1185,14 @@ void gl_set_ontop (int action) { if (action==2) _gl_ontop ^= 1; else _gl_ontop = action ? 1 : 0; - if (_gl_ontop) { - [osx_window setLevel:NSFloatingWindowLevel + 1]; - } else { - [osx_window setLevel:NSNormalWindowLevel]; - } + osx_post_event (5, 0); } void gl_set_fullscreen (int action) { // TODO check if we need performSelectorOnMainThread if (action==2) _gl_fullscreen^=1; else _gl_fullscreen = action ? 1 : 0; - if (_gl_fullscreen) { - [osx_glview setFullScreen:YES]; - } else { - [osx_glview setFullScreen:NO]; - } - if (osx_window) { - [osx_window makeKeyAndOrderFront:osx_window]; - [osx_window makeFirstResponder:osx_glview]; - } + osx_post_event (6, 0); } void gl_mousepointer (int action) { 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/xjadeo-0.8.9/src/xjadeo/display_gl_win.c new/xjadeo-0.8.10/src/xjadeo/display_gl_win.c --- old/xjadeo-0.8.9/src/xjadeo/display_gl_win.c 2018-10-10 15:48:42.000000000 +0200 +++ new/xjadeo-0.8.10/src/xjadeo/display_gl_win.c 2020-11-02 13:31:21.000000000 +0100 @@ -129,6 +129,8 @@ mOffsetZero, mOffsetPF, mOffsetMF, + mOffsetPS, + mOffsetMS, mOffsetPM, mOffsetMM, mOffsetPH, @@ -205,8 +207,10 @@ AppendMenu(hSubMenuOSD, MF_STRING, mOsdClear, "CLear All\t Shift+C"); AppendMenu(hSubMenuOffs, MF_STRING, mOffsetZero, "Reset\t \\"); - AppendMenu(hSubMenuOffs, MF_STRING, mOffsetPF, "+1 Frame\t +"); + AppendMenu(hSubMenuOffs, MF_STRING, mOffsetPF, "+1 Frame\t ="); AppendMenu(hSubMenuOffs, MF_STRING, mOffsetMF, "-1 Frame\t -"); + AppendMenu(hSubMenuOffs, MF_STRING, mOffsetPS, "+1 Second\t +"); + AppendMenu(hSubMenuOffs, MF_STRING, mOffsetMS, "-1 Second\t _"); AppendMenu(hSubMenuOffs, MF_STRING, mOffsetPM, "+1 Minute\t }"); AppendMenu(hSubMenuOffs, MF_STRING, mOffsetMM, "-1 Minute\t {"); AppendMenu(hSubMenuOffs, MF_STRING, mOffsetPH, "+1 Hour"); @@ -428,6 +432,8 @@ case mOffsetZero: PTLL; XCtimeoffset( 0, 0); PTUL; break; case mOffsetPF: PTLL; XCtimeoffset( 1, 0); PTUL; break; case mOffsetMF: PTLL; XCtimeoffset(-1, 0); PTUL; break; + case mOffsetPS: PTLL; XCtimeoffset( 4, 0); PTUL; break; + case mOffsetMS: PTLL; XCtimeoffset(-4, 0); PTUL; break; case mOffsetPM: PTLL; XCtimeoffset( 2, 0); PTUL; break; case mOffsetMM: PTLL; XCtimeoffset(-2, 0); PTUL; break; case mOffsetPH: PTLL; XCtimeoffset( 3, 0); PTUL; break; 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/xjadeo-0.8.9/src/xjadeo/display_mac.c new/xjadeo-0.8.10/src/xjadeo/display_mac.c --- old/xjadeo-0.8.9/src/xjadeo/display_mac.c 2015-11-22 13:00:15.000000000 +0100 +++ new/xjadeo-0.8.10/src/xjadeo/display_mac.c 2020-11-02 13:26:21.000000000 +0100 @@ -1384,7 +1384,7 @@ case '\\': XCtimeoffset(0, (unsigned int) charcode); break; - case '+': + case '=': XCtimeoffset(1, (unsigned int) charcode); break; case '-': @@ -1396,6 +1396,12 @@ case '}': XCtimeoffset(2, (unsigned int) charcode); break; + case '+': + XCtimeoffset(4, (unsigned int) charcode); + break; + case '_': + XCtimeoffset(-4, (unsigned int) charcode); + break; case 'm': mousepointer_mac(2); break; case '.': //'.' // resize 100% XCresize_percent(100); 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/xjadeo-0.8.9/src/xjadeo/display_sdl.c new/xjadeo-0.8.10/src/xjadeo/display_sdl.c --- old/xjadeo-0.8.9/src/xjadeo/display_sdl.c 2015-11-10 21:54:37.000000000 +0100 +++ new/xjadeo-0.8.10/src/xjadeo/display_sdl.c 2020-11-02 13:17:00.000000000 +0100 @@ -421,10 +421,14 @@ ui_osd_permute(); } else if(ev.key.keysym.sym== SDLK_BACKSLASH) { XCtimeoffset(0, (unsigned int) key); - } else if(ev.key.keysym.sym== SDLK_EQUALS && ev.key.keysym.mod&KMOD_SHIFT) { // '+' SDLK_PLUS does not work :/ + } else if(ev.key.keysym.sym== SDLK_EQUALS ) { // '=' :/ XCtimeoffset(1, (unsigned int) key); } else if(ev.key.keysym.sym==SDLK_MINUS) { XCtimeoffset(-1, (unsigned int) key); + } else if(ev.key.keysym.sym== SDLK_EQUALS && ev.key.keysym.mod&KMOD_SHIFT) { // '+' SDLK_PLUS does not work :/ + XCtimeoffset(4, (unsigned int) key); + } else if(ev.key.keysym.sym==SDLK_MINUS && ev.key.keysym.mod&KMOD_SHIFT) { + XCtimeoffset(-4, (unsigned int) key); } else if(ev.key.keysym.sym== SDLK_LEFTBRACKET && ev.key.keysym.mod&KMOD_SHIFT) { // '{' XCtimeoffset(-2, (unsigned int) key); } else if(ev.key.keysym.sym== SDLK_RIGHTBRACKET&& ev.key.keysym.mod&KMOD_SHIFT) { // '}' 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/xjadeo-0.8.9/src/xjadeo/display_x11.c new/xjadeo-0.8.10/src/xjadeo/display_x11.c --- old/xjadeo-0.8.9/src/xjadeo/display_x11.c 2015-11-10 21:54:37.000000000 +0100 +++ new/xjadeo-0.8.10/src/xjadeo/display_x11.c 2020-11-02 13:17:00.000000000 +0100 @@ -487,10 +487,16 @@ XCresize_scale(1); } else if (key == XK_backslash ) { // '\' // A/V offset XCtimeoffset(0, (unsigned int) key); - } else if (key == XK_plus ) { //'+' // A/V offset + } else if (key == XK_equal ) { //'=' // A/V offset XCtimeoffset(1, (unsigned int) key); } else if (key == XK_minus ) { //'-' A/V offset XCtimeoffset(-1, (unsigned int) key); + } else if (key == XK_plus ) { //'+' // A/V offset + XCtimeoffset(4, (unsigned int) key); + puts("click +"); + } else if (key == XK_underscore ) { //'_' A/V offset + XCtimeoffset(-4, (unsigned int) key); + puts("click _"); } else if (key == XK_braceright ) { //'}' // A/V offset XCtimeoffset(2, (unsigned int) key); } else if (key == XK_braceleft) { //'{' A/V offset 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/xjadeo-0.8.9/src/xjadeo/display_x_dialog.c new/xjadeo-0.8.10/src/xjadeo/display_x_dialog.c --- old/xjadeo-0.8.9/src/xjadeo/display_x_dialog.c 2015-11-10 21:54:37.000000000 +0100 +++ new/xjadeo-0.8.10/src/xjadeo/display_x_dialog.c 2020-11-02 13:33:43.000000000 +0100 @@ -26,6 +26,7 @@ void xapi_close (void *d); +#include <X11/Xutil.h> #include <X11/Xresource.h> static XContext _dlg_ctx = 0; @@ -84,6 +85,8 @@ static void ui_offset_mm() { XCtimeoffset(-2, 0); } static void ui_offset_ph() { XCtimeoffset( 3, 0); } static void ui_offset_mh() { XCtimeoffset(-3, 0); } +static void ui_offset_ps() { XCtimeoffset( 4, 0); } +static void ui_offset_ms() { XCtimeoffset(-4, 0); } static void ui_quit() { loop_flag=0; @@ -155,8 +158,10 @@ static struct XjxMenuItem submenu_offs[] = { {"Reset", "\\", NULL, &ui_offset_rst, 0, 1}, - {"+ 1 Frame", "+", NULL, &ui_offset_pf, 0, 1}, + {"+ 1 Frame", "=", NULL, &ui_offset_pf, 0, 1}, {"- 1 Frame", "-", NULL, &ui_offset_mf, 0, 1}, + {"+ 1 Second", "+", NULL, &ui_offset_ps, 0, 1}, + {"- 1 Second", "_", NULL, &ui_offset_ms, 0, 1}, {"+ 1 Minute", "{", NULL, &ui_offset_pm, 0, 1}, {"- 1 Minute", "}", NULL, &ui_offset_mm, 0, 1}, {"+ 1 Hour", "", NULL, &ui_offset_ph, 0, 1}, 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/xjadeo-0.8.9/src/xjadeo/main.c new/xjadeo-0.8.10/src/xjadeo/main.c --- old/xjadeo-0.8.9/src/xjadeo/main.c 2017-03-08 16:35:45.000000000 +0100 +++ new/xjadeo-0.8.10/src/xjadeo/main.c 2021-01-06 16:23:06.000000000 +0100 @@ -1,6 +1,6 @@ /* xjadeo - jack video monitor main * - * (C) 2006-2015 Robin Gareus <ro...@gareus.org> + * (C) 2006-2021 Robin Gareus <ro...@gareus.org> * (C) 2006-2011 Luis Garrido <luisgarr...@users.sourceforge.net> * * This program is free software; you can redistribute it and/or modify @@ -723,8 +723,10 @@ " 'v' Cycle On Screen VTS/frame number display\n" " 'x' Toggle seek-bar (experimental)\n" " '\\' Reset timecode offset to zero\n" -" '+' Increase timecode offset by one frame\n" +" '=' Increase timecode offset by one frame\n" " '-' Decrease timecode offset by one frame\n" +" '+' Increase timecode offset by one second\n" +" '_' Decrease timecode offset by one second\n" " '{' Decrement timecode offset by one minute\n" " '}' Increment timecode offset by one minute\n" " ',' Resize window to match aspect ratio\n" @@ -771,7 +773,7 @@ printf (" MTC/MIDI: [ %s]\n", cfg_midi); printf (" Display(s): [ %s]\n", cfg_displays); printf ("\n" - "Copyright (C) GPL 2006-2015 Robin Gareus <ro...@gareus.org>\n" + "Copyright (C) GPL 2006-2021 Robin Gareus <ro...@gareus.org>\n" "Copyright (C) GPL 2006-2011 Luis Garrido <luisgarr...@users.sourceforge.net>\n" "This is free software; see the source for copying conditions. There is NO\n" "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\n"); 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/xjadeo-0.8.9/src/xjadeo/remote.c new/xjadeo-0.8.10/src/xjadeo/remote.c --- old/xjadeo-0.8.9/src/xjadeo/remote.c 2015-11-10 21:54:37.000000000 +0100 +++ new/xjadeo-0.8.10/src/xjadeo/remote.c 2020-06-08 19:55:08.000000000 +0200 @@ -101,7 +101,7 @@ #ifdef HAVE_MIDI extern int midi_clkconvert; extern int midi_clkadj; -extern char midiid[32]; +extern char midiid[128]; #endif #ifdef TIMEMAP 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/xjadeo-0.8.9/src/xjadeo/xjosc.c new/xjadeo-0.8.10/src/xjadeo/xjosc.c --- old/xjadeo-0.8.9/src/xjadeo/xjosc.c 2015-11-10 21:54:37.000000000 +0100 +++ new/xjadeo-0.8.10/src/xjadeo/xjosc.c 2020-06-08 19:01:04.000000000 +0200 @@ -52,7 +52,7 @@ #ifdef HAVE_MIDI extern int midi_clkconvert; extern int midi_clkadj; -extern char midiid[32]; +extern char midiid[128]; #endif #ifdef TIMEMAP 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/xjadeo-0.8.9/src/xjadeo/xjremote.c new/xjadeo-0.8.10/src/xjadeo/xjremote.c --- old/xjadeo-0.8.9/src/xjadeo/xjremote.c 2015-11-10 21:54:37.000000000 +0100 +++ new/xjadeo-0.8.10/src/xjadeo/xjremote.c 2021-01-06 16:06:48.000000000 +0100 @@ -185,7 +185,7 @@ printf (" configuration: [ stdio ]\n"); #endif printf ( - "Copyright (C) GPL 2006,2014 Robin Gareus <ro...@gareus.org>\n" + "Copyright (C) GPL 2006-2021 Robin Gareus <ro...@gareus.org>\n" "This is free software; see the source for copying conditions. There is NO\n" "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\n"); }
