diff -Nru lebiniou-3.31/BUILD.md lebiniou-3.40/BUILD.md --- lebiniou-3.31/BUILD.md 1970-01-01 00:00:00.000000000 +0000 +++ lebiniou-3.40/BUILD.md 2019-12-15 01:39:28.000000000 +0000 @@ -0,0 +1,41 @@ +# Build options + +The `configure` script will build all plugins if possible. If needed, you +can disable them using the corresponding `--disable-` option. + +## Input plugins + +* `--enable-alsa`: build the ALSA input plugin [default=yes] +* `--enable-jackaudio`: build the JACK Audio input plugin [default=yes] +* `--enable-pulseaudio`: build the PulseAudio input plugin [default=yes] +* `--enable-esd`: build the ESD input plugin [default=no] +* `--enable-sndfile`: build the SndFile input plugin [default=yes] +* `--enable-twip`: build the Twip input plugin [default=yes] + +## Output plugins + +* `--enable-caca`: build the libcaca plugin [default=yes] +* `--enable-diskwriter`: build the diskwriter output plugin [default=yes] + +## Optional plugins + +* `--enable-test-plugins`: build the test/debug plugins [default=no] +* `--enable-old-delay`: build old delay plugins [default=no] + +# Engine options + +* `--enable-fixed="WIDTHxHEIGHT"`: use fixed-size video buffers [default=no] +* `--enable-webcam`: enable webcam support [default=yes] +* `--enable-camsize="WIDTHxHEIGHT"`: set webcam capture size [default="640x480"] + +# Debugging options + +* `--enable-debug`: turn on debugging [default=no] +* `--enable-xdebug`: turn on extra debugging [default=no] +* `--enable-warnings`: treat warnings as errors [default=yes] +* `--enable-dlclose`: call dlclose() when unloading plugins [default=yes] +* `--enable-asan`: use AddressSanitizer [default=no] + +# Other options + +* `--enable-opengl`: enable OpenGL support [default=no] diff -Nru lebiniou-3.31/configure lebiniou-3.40/configure --- lebiniou-3.31/configure 2019-04-14 11:52:28.000000000 +0000 +++ lebiniou-3.40/configure 2020-01-23 13:57:20.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for lebiniou 3.31. +# Generated by GNU Autoconf 2.69 for lebiniou 3.40. # # Report bugs to . # @@ -580,8 +580,8 @@ # Identity of this package. PACKAGE_NAME='lebiniou' PACKAGE_TARNAME='lebiniou' -PACKAGE_VERSION='3.31' -PACKAGE_STRING='lebiniou 3.31' +PACKAGE_VERSION='3.40' +PACKAGE_STRING='lebiniou 3.40' PACKAGE_BUGREPORT='olivier@biniou.info' PACKAGE_URL='' @@ -626,6 +626,7 @@ am__EXEEXT_TRUE LTLIBOBJS LIBOBJS +PLUGIN_LDADD PLUGIN_LDFLAGS PLUGIN_CFLAGS EXTRA_OLD_DELAY_FALSE @@ -635,6 +636,10 @@ EXTRA_DISKWRITER_FALSE EXTRA_DISKWRITER_TRUE DPKG_BUILDFLAGS_CHECK +HAVE_ULFIUS_FALSE +HAVE_ULFIUS_TRUE +ULFIUS_LIBS +ULFIUS_CFLAGS WITH_PANDOC_FALSE WITH_PANDOC_TRUE have_pandoc @@ -680,12 +685,11 @@ ALSA_CFLAGS WITH_TEST_PLUGINS_FALSE WITH_TEST_PLUGINS_TRUE -WITH_CORE_FALSE -WITH_CORE_TRUE OUTPUT_PLUGINS INPUT_PLUGINS AVUTIL_LIBS AVUTIL_CFLAGS +SWSCALE_LDFLAGS SWSCALE_LIBS SWSCALE_CFLAGS LEBINIOU_SCHEMES_FILE @@ -695,6 +699,8 @@ MagickWand_CFLAGS FT2_LIBS FT2_CFLAGS +JANSSON_LIBS +JANSSON_CFLAGS XML2_LIBS XML2_CFLAGS FFTW3_LIBS @@ -811,7 +817,6 @@ enable_silent_rules enable_dependency_tracking enable_largefile -enable_core enable_test_plugins enable_alsa enable_jackaudio @@ -824,6 +829,7 @@ enable_camsize enable_opengl enable_debug +enable_asan enable_xdebug enable_warnings enable_dlclose @@ -848,6 +854,8 @@ FFTW3_LIBS XML2_CFLAGS XML2_LIBS +JANSSON_CFLAGS +JANSSON_LIBS FT2_CFLAGS FT2_LIBS MagickWand_CFLAGS @@ -874,7 +882,9 @@ SDL2_ttf_CFLAGS SDL2_ttf_LIBS GLU_CFLAGS -GLU_LIBS' +GLU_LIBS +ULFIUS_CFLAGS +ULFIUS_LIBS' # Initialize some variables set by options. @@ -1425,7 +1435,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 lebiniou 3.31 to adapt to many kinds of systems. +\`configure' configures lebiniou 3.40 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1497,7 +1507,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of lebiniou 3.31:";; + short | recursive ) echo "Configuration of lebiniou 3.40:";; esac cat <<\_ACEOF @@ -1512,7 +1522,6 @@ --disable-dependency-tracking speeds up one-time build --disable-largefile omit support for large files - --enable-core build the core engine [default=yes] --enable-test-plugins build the test/debug plugins [default=no] --enable-alsa build the ALSA input plugin [default=yes] --enable-jackaudio build the JACK Audio input plugin [default=yes] @@ -1522,17 +1531,18 @@ --enable-twip build the Twip input plugin [default=yes] --enable-caca build the libcaca plugin [default=yes] --enable-fixed="WIDTHxHEIGHT" - Use fixed-size video buffers [default=no] + use fixed-size video buffers [default=no] --enable-camsize="WIDTHxHEIGHT" - Set webcam capture size [default="640x480"] + set webcam capture size [default="640x480"] --enable-opengl enable OpenGL support [default=no] --enable-debug turn on debugging [default=no] + --enable-asan use AddressSanitizer [default=no] --enable-xdebug turn on extra debugging [default=no] --enable-warnings treat warnings as errors [default=yes] - --disable-foo call dlclose() when unloading plugins [default=yes] - --enable-diskwriter compile the diskwriter output plugin [default=yes] - --enable-webcam compile the Webcam plugin [default=yes] - --enable-old-delay compile old delay plugin [default=no] + --enable-dlclose call dlclose() when unloading plugins [default=yes] + --enable-diskwriter build the diskwriter output plugin [default=yes] + --enable-webcam enable webcam support [default=yes] + --enable-old-delay build old delay plugins [default=no] Some influential environment variables: CC C compiler command @@ -1554,6 +1564,10 @@ FFTW3_LIBS linker flags for FFTW3, overriding pkg-config XML2_CFLAGS C compiler flags for XML2, overriding pkg-config XML2_LIBS linker flags for XML2, overriding pkg-config + JANSSON_CFLAGS + C compiler flags for JANSSON, overriding pkg-config + JANSSON_LIBS + linker flags for JANSSON, overriding pkg-config FT2_CFLAGS C compiler flags for FT2, overriding pkg-config FT2_LIBS linker flags for FT2, overriding pkg-config MagickWand_CFLAGS @@ -1592,6 +1606,9 @@ linker flags for SDL2_ttf, overriding pkg-config GLU_CFLAGS C compiler flags for GLU, overriding pkg-config GLU_LIBS linker flags for GLU, overriding pkg-config + ULFIUS_CFLAGS + C compiler flags for ULFIUS, overriding pkg-config + ULFIUS_LIBS linker flags for ULFIUS, overriding pkg-config Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. @@ -1659,7 +1676,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -lebiniou configure 3.31 +lebiniou configure 3.40 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2028,7 +2045,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by lebiniou $as_me 3.31, which was +It was created by lebiniou $as_me 3.40, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3003,7 +3020,7 @@ # Define the identity of the package. PACKAGE='lebiniou' - VERSION='3.31' + VERSION='3.40' cat >>confdefs.h <<_ACEOF @@ -3137,7 +3154,7 @@ BINIOU_MAJOR=3 -BINIOU_MINOR=31 +BINIOU_MINOR=40 BINIOU_VERSION="$BINIOU_MAJOR.$BINIOU_MINOR" @@ -4871,6 +4888,79 @@ fi CFLAGS="$CFLAGS `$PKG_CONFIG libxml-2.0 --cflags`" +# jansson + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for JANSSON" >&5 +$as_echo_n "checking for JANSSON... " >&6; } + +if test -n "$JANSSON_CFLAGS"; then + pkg_cv_JANSSON_CFLAGS="$JANSSON_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"jansson\""; } >&5 + ($PKG_CONFIG --exists --print-errors "jansson") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_JANSSON_CFLAGS=`$PKG_CONFIG --cflags "jansson" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$JANSSON_LIBS"; then + pkg_cv_JANSSON_LIBS="$JANSSON_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"jansson\""; } >&5 + ($PKG_CONFIG --exists --print-errors "jansson") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_JANSSON_LIBS=`$PKG_CONFIG --libs "jansson" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + JANSSON_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "jansson" 2>&1` + else + JANSSON_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "jansson" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$JANSSON_PKG_ERRORS" >&5 + + as_fn_error $? "You must have libjansson-dev installed" "$LINENO" 5 +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + as_fn_error $? "You must have libjansson-dev installed" "$LINENO" 5 +else + JANSSON_CFLAGS=$pkg_cv_JANSSON_CFLAGS + JANSSON_LIBS=$pkg_cv_JANSSON_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + +fi + # freetype-2 pkg_failed=no @@ -5018,7 +5108,7 @@ fi -LIBS="$LIBS ${GLIB_LIBS} ${FFTW3_LIBS} ${XML2_LIBS} -lm -lz" +LIBS="$LIBS ${GLIB_LIBS} ${FFTW3_LIBS} ${XML2_LIBS} -lm -lz ${JANSSON_LIBS}" # We need to know which prefix we used to find some default values if test "x${prefix}" = "xNONE"; then @@ -5109,6 +5199,9 @@ fi CFLAGS="$CFLAGS ${SWSCALE_CFLAGS}" +SWSCALE_LDFLAGS="`$PKG_CONFIG libswscale --libs`" + + pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for AVUTIL" >&5 @@ -5186,22 +5279,6 @@ OUTPUT_PLUGINS="SDL2" -# Check whether --enable-core was given. -if test "${enable_core+set}" = set; then : - enableval=$enable_core; -else - enable_core="yes" -fi - - if test "x${enable_core}" = "xyes"; then - WITH_CORE_TRUE= - WITH_CORE_FALSE='#' -else - WITH_CORE_TRUE='#' - WITH_CORE_FALSE= -fi - - # Check whether --enable-test-plugins was given. if test "${enable_test_plugins+set}" = set; then : enableval=$enable_test_plugins; @@ -5316,10 +5393,10 @@ if test "${enable_jackaudio+set}" = set; then : enableval=$enable_jackaudio; else - enable_jack="yes" + enable_jackaudio="yes" fi -if test "x${enable_jack}" = "xyes"; then +if test "x${enable_jackaudio}" = "xyes"; then pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for JACK" >&5 @@ -6634,6 +6711,94 @@ $as_echo "$as_me: WARNING: pandoc not found, can not build documentation" >&2;} fi +have_ulfius="no" + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ULFIUS" >&5 +$as_echo_n "checking for ULFIUS... " >&6; } + +if test -n "$ULFIUS_CFLAGS"; then + pkg_cv_ULFIUS_CFLAGS="$ULFIUS_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libulfius\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libulfius") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_ULFIUS_CFLAGS=`$PKG_CONFIG --cflags "libulfius" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$ULFIUS_LIBS"; then + pkg_cv_ULFIUS_LIBS="$ULFIUS_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libulfius\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libulfius") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_ULFIUS_LIBS=`$PKG_CONFIG --libs "libulfius" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + ULFIUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libulfius" 2>&1` + else + ULFIUS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libulfius" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$ULFIUS_PKG_ERRORS" >&5 + + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libulfius not found, can not build HTTP server" >&5 +$as_echo "$as_me: WARNING: libulfius not found, can not build HTTP server" >&2;} +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libulfius not found, can not build HTTP server" >&5 +$as_echo "$as_me: WARNING: libulfius not found, can not build HTTP server" >&2;} +else + ULFIUS_CFLAGS=$pkg_cv_ULFIUS_CFLAGS + ULFIUS_LIBS=$pkg_cv_ULFIUS_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + have_ulfius=yes +fi + if test "x${have_ulfius}" = "xyes"; then + HAVE_ULFIUS_TRUE= + HAVE_ULFIUS_FALSE='#' +else + HAVE_ULFIUS_TRUE='#' + HAVE_ULFIUS_FALSE= +fi + +if test "x${have_ulfius}" != "xno"; then +CPPFLAGS="$CPPFLAGS -DWITH_ULFIUS" +CFLAGS="$CFLAGS `$PKG_CONFIG libulfius --cflags`" +LIBS="$LIBS `$PKG_CONFIG libulfius --libs`" +fi + have_webcam="no" for ac_header in linux/videodev2.h do : @@ -6693,6 +6858,17 @@ CFLAGS="$CFLAGS -fomit-frame-pointer" fi +# Check whether --enable-asan was given. +if test "${enable_asan+set}" = set; then : + enableval=$enable_asan; +else + enable_asan="no" +fi + +if test "x${CC}" != "xclang" && test "x${enable_asan}" = "xyes"; then + CFLAGS="$CFLAGS -fsanitize=address" +fi + # Check whether --enable-xdebug was given. if test "${enable_xdebug+set}" = set; then : enableval=$enable_xdebug; @@ -6844,7 +7020,7 @@ ac_config_headers="$ac_config_headers config.h" -ac_config_files="$ac_config_files Makefile src/Makefile src/defaults.h plugins/Makefile doc/Makefile doc/manual/html/Makefile plugins/stable/Makefile plugins/stable/input/Makefile plugins/stable/main/Makefile plugins/stable/output/Makefile plugins/stable/input/alsa/Makefile plugins/stable/input/random/Makefile plugins/stable/input/esound/Makefile plugins/stable/input/oss/Makefile plugins/stable/input/pulseaudio/Makefile plugins/stable/input/sndfile/Makefile plugins/stable/input/twip/Makefile plugins/stable/input/jackaudio/Makefile plugins/stable/main/aurora/Makefile plugins/stable/main/bassline/Makefile plugins/stable/main/blur1/Makefile plugins/stable/main/blur2/Makefile plugins/stable/main/blur3/Makefile plugins/stable/main/blur4/Makefile plugins/stable/main/blur5/Makefile plugins/stable/main/blur6/Makefile plugins/stable/main/blur7/Makefile plugins/stable/main/blur8/Makefile plugins/stable/main/cirrus/Makefile plugins/stable/main/cirrus2/Makefile plugins/stable/main/clear/Makefile plugins/stable/main/color_cycle/Makefile plugins/stable/main/critters/Makefile plugins/stable/main/crp/Makefile plugins/stable/main/cth_bighalfwheel/Makefile plugins/stable/main/cth_hurricane/Makefile plugins/stable/main/cth_smoke/Makefile plugins/stable/main/cth_space_in/Makefile plugins/stable/main/cth_space_out/Makefile plugins/stable/main/cth_spiral/Makefile plugins/stable/main/cth_xroller/Makefile plugins/stable/main/cth_yroller/Makefile plugins/stable/main/delay_l/Makefile plugins/stable/main/delay_p/Makefile plugins/stable/main/delay_pp/Makefile plugins/stable/main/delay_ls/Makefile plugins/stable/main/delay_ps/Makefile plugins/stable/main/delay2/Makefile plugins/stable/main/delay3/Makefile plugins/stable/main/delayS_ls/Makefile plugins/stable/main/delayS_lsp/Makefile plugins/stable/main/drops/Makefile plugins/stable/main/edge/Makefile plugins/stable/main/emboss/Makefile plugins/stable/main/faders/Makefile plugins/stable/main/flow/Makefile plugins/stable/main/foo/Makefile plugins/stable/main/galaxy/Makefile plugins/stable/main/warp/Makefile plugins/stable/main/hodge/Makefile plugins/stable/main/infinity/Makefile plugins/stable/main/iDissolve/Makefile plugins/stable/main/isquares/Makefile plugins/stable/main/isquaresbeat/Makefile plugins/stable/main/iPulse/Makefile plugins/stable/main/iPulse2/Makefile plugins/stable/main/iPulse3/Makefile plugins/stable/main/iPulse4/Makefile plugins/stable/main/kaleid2/Makefile plugins/stable/main/life/Makefile plugins/stable/main/melt/Makefile plugins/stable/main/mosaic/Makefile plugins/stable/main/nspiral/Makefile plugins/stable/main/of_archimedean_spiral_3d/Makefile plugins/stable/main/of_spiral/Makefile plugins/stable/main/poincare/Makefile plugins/stable/main/polaroscillo/Makefile plugins/stable/main/pulse/Makefile plugins/stable/main/ripple/Makefile plugins/stable/main/roscillo/Makefile plugins/stable/main/rotors/Makefile plugins/stable/main/rp/Makefile plugins/stable/main/scroll_bt/Makefile plugins/stable/main/scroll_lr/Makefile plugins/stable/main/scroll_rl/Makefile plugins/stable/main/scroll_tb/Makefile plugins/stable/main/sin1oscillo/Makefile plugins/stable/main/sin2oscillo/Makefile plugins/stable/main/speaker/Makefile plugins/stable/main/spectrum/Makefile plugins/stable/main/spectrumSh/Makefile plugins/stable/main/spectrumSv/Makefile plugins/stable/main/splash/Makefile plugins/stable/main/swarm/Makefile plugins/stable/main/taquin/Makefile plugins/stable/main/touw_eiffel/Makefile plugins/stable/main/tunnel/Makefile plugins/stable/main/venus/Makefile plugins/stable/main/video/Makefile plugins/stable/main/voiceprint/Makefile plugins/stable/main/xgum/Makefile plugins/stable/main/xmirror_bottom/Makefile plugins/stable/main/xmirror_top/Makefile plugins/stable/main/xoscillo/Makefile plugins/stable/main/xoscillo_s/Makefile plugins/stable/main/xscanline/Makefile plugins/stable/main/xshaker/Makefile plugins/stable/main/xwave/Makefile plugins/stable/main/ygum/Makefile plugins/stable/main/ymirror_left/Makefile plugins/stable/main/ymirror_right/Makefile plugins/stable/main/yoscillo/Makefile plugins/stable/main/yoscillo_s/Makefile plugins/stable/main/yscanline/Makefile plugins/stable/main/yshaker/Makefile plugins/stable/main/ywave/Makefile plugins/stable/main/zblur1/Makefile plugins/stable/main/zblur1mist/Makefile plugins/stable/main/zblur1slow/Makefile plugins/stable/main/zblur1beat/Makefile plugins/stable/main/zblur2/Makefile plugins/stable/main/zbroken/Makefile plugins/stable/main/zebu1/Makefile plugins/stable/main/zmonitor/Makefile plugins/stable/main/zreflector/Makefile plugins/stable/main/zspirals/Makefile plugins/stable/main/GLCube/Makefile plugins/stable/main/tv_webcam/Makefile plugins/stable/main/tv_quark/Makefile plugins/stable/main/tv_streak/Makefile plugins/stable/main/tv_1d/Makefile plugins/stable/main/tv_nervous/Makefile plugins/stable/main/tv_predator/Makefile plugins/stable/main/tv_fire/Makefile plugins/stable/main/tv_diff/Makefile plugins/stable/main/tv_diff2/Makefile plugins/stable/main/tv_diff3/Makefile plugins/stable/main/tv_diff4/Makefile plugins/stable/main/tv_diffbeat/Makefile plugins/stable/output/caca/Makefile plugins/stable/output/diskwriter/Makefile plugins/stable/output/mp4/Makefile plugins/stable/output/SDL2/Makefile plugins/stable/output/GL/Makefile plugins/stable/output/RTMP/Makefile plugins/stable/main/test_beat_detection/Makefile" +ac_config_files="$ac_config_files Makefile src/Makefile src/defaults.h plugins/Makefile doc/Makefile doc/manual/html/Makefile plugins/stable/Makefile plugins/stable/input/Makefile plugins/stable/main/Makefile plugins/stable/output/Makefile plugins/stable/input/alsa/Makefile plugins/stable/input/random/Makefile plugins/stable/input/esound/Makefile plugins/stable/input/oss/Makefile plugins/stable/input/pulseaudio/Makefile plugins/stable/input/sndfile/Makefile plugins/stable/input/twip/Makefile plugins/stable/input/jackaudio/Makefile plugins/stable/main/aciddrop/Makefile plugins/stable/main/aurora/Makefile plugins/stable/main/bassline/Makefile plugins/stable/main/blur1/Makefile plugins/stable/main/blur2/Makefile plugins/stable/main/blur3/Makefile plugins/stable/main/blur4/Makefile plugins/stable/main/blur5/Makefile plugins/stable/main/blur6/Makefile plugins/stable/main/blur7/Makefile plugins/stable/main/blur8/Makefile plugins/stable/main/cirrus/Makefile plugins/stable/main/cirrus2/Makefile plugins/stable/main/clear/Makefile plugins/stable/main/color_cycle/Makefile plugins/stable/main/critters/Makefile plugins/stable/main/crp/Makefile plugins/stable/main/cth_bighalfwheel/Makefile plugins/stable/main/cth_hurricane/Makefile plugins/stable/main/cth_smoke/Makefile plugins/stable/main/cth_space_in/Makefile plugins/stable/main/cth_space_out/Makefile plugins/stable/main/cth_spiral/Makefile plugins/stable/main/cth_xroller/Makefile plugins/stable/main/cth_yroller/Makefile plugins/stable/main/delay_l/Makefile plugins/stable/main/delay_p/Makefile plugins/stable/main/delay_pp/Makefile plugins/stable/main/delay_ls/Makefile plugins/stable/main/delay_ps/Makefile plugins/stable/main/delay2/Makefile plugins/stable/main/delay3/Makefile plugins/stable/main/delayS_ls/Makefile plugins/stable/main/delayS_lsp/Makefile plugins/stable/main/drops/Makefile plugins/stable/main/edge/Makefile plugins/stable/main/emboss/Makefile plugins/stable/main/fadeout/Makefile plugins/stable/main/faders/Makefile plugins/stable/main/flow/Makefile plugins/stable/main/foo/Makefile plugins/stable/main/galaxy/Makefile plugins/stable/main/warp/Makefile plugins/stable/main/hodge/Makefile plugins/stable/main/infinity/Makefile plugins/stable/main/iDissolve/Makefile plugins/stable/main/imagedrop/Makefile plugins/stable/main/isquares/Makefile plugins/stable/main/isquaresbeat/Makefile plugins/stable/main/iColrot/Makefile plugins/stable/main/iColrotbeat/Makefile plugins/stable/main/iColrotslow/Makefile plugins/stable/main/iPulse/Makefile plugins/stable/main/iPulse2/Makefile plugins/stable/main/iPulse3/Makefile plugins/stable/main/iPulse4/Makefile plugins/stable/main/kaleid2/Makefile plugins/stable/main/life/Makefile plugins/stable/main/melt/Makefile plugins/stable/main/mosaic/Makefile plugins/stable/main/nspiral/Makefile plugins/stable/main/of_archimedean_spiral_3d/Makefile plugins/stable/main/of_spiral/Makefile plugins/stable/main/paintdrop/Makefile plugins/stable/main/poincare/Makefile plugins/stable/main/polaroscillo/Makefile plugins/stable/main/pulse/Makefile plugins/stable/main/ripple/Makefile plugins/stable/main/roscillo/Makefile plugins/stable/main/rotors/Makefile plugins/stable/main/rotors_freq/Makefile plugins/stable/main/rp/Makefile plugins/stable/main/scroll_bt/Makefile plugins/stable/main/scroll_lr/Makefile plugins/stable/main/scroll_rl/Makefile plugins/stable/main/scroll_tb/Makefile plugins/stable/main/sin1oscillo/Makefile plugins/stable/main/sin2oscillo/Makefile plugins/stable/main/snake/Makefile plugins/stable/main/snake_oscillo/Makefile plugins/stable/main/speaker/Makefile plugins/stable/main/spectrum/Makefile plugins/stable/main/spectrumSh/Makefile plugins/stable/main/spectrumSv/Makefile plugins/stable/main/splash/Makefile plugins/stable/main/swarm/Makefile plugins/stable/main/taquin/Makefile plugins/stable/main/touw_eiffel/Makefile plugins/stable/main/tunnel/Makefile plugins/stable/main/venus/Makefile plugins/stable/main/video/Makefile plugins/stable/main/voiceprint/Makefile plugins/stable/main/xgum/Makefile plugins/stable/main/xmirror_bottom/Makefile plugins/stable/main/xmirror_top/Makefile plugins/stable/main/xoscillo/Makefile plugins/stable/main/xoscillo_s/Makefile plugins/stable/main/xscanline/Makefile plugins/stable/main/xshaker/Makefile plugins/stable/main/xwave/Makefile plugins/stable/main/ygum/Makefile plugins/stable/main/ymirror_left/Makefile plugins/stable/main/ymirror_right/Makefile plugins/stable/main/yoscillo/Makefile plugins/stable/main/yoscillo_s/Makefile plugins/stable/main/yscanline/Makefile plugins/stable/main/yshaker/Makefile plugins/stable/main/ywave/Makefile plugins/stable/main/zblur1/Makefile plugins/stable/main/zblur1mist/Makefile plugins/stable/main/zblur1slow/Makefile plugins/stable/main/zblur1beat/Makefile plugins/stable/main/zblur2/Makefile plugins/stable/main/zbroken/Makefile plugins/stable/main/zebu1/Makefile plugins/stable/main/zmonitor/Makefile plugins/stable/main/zreflector/Makefile plugins/stable/main/zspirals/Makefile plugins/stable/main/GLCube/Makefile plugins/stable/main/tv_webcam/Makefile plugins/stable/main/tv_quark/Makefile plugins/stable/main/tv_streak/Makefile plugins/stable/main/tv_1d/Makefile plugins/stable/main/tv_nervous/Makefile plugins/stable/main/tv_predator/Makefile plugins/stable/main/tv_fire/Makefile plugins/stable/main/tv_diff/Makefile plugins/stable/main/tv_diff2/Makefile plugins/stable/main/tv_diff3/Makefile plugins/stable/main/tv_diff4/Makefile plugins/stable/main/tv_diffbeat/Makefile plugins/stable/main/tv_colrot/Makefile plugins/stable/main/tv_colrotslow/Makefile plugins/stable/main/tv_colrotbeat/Makefile plugins/stable/output/caca/Makefile plugins/stable/output/diskwriter/Makefile plugins/stable/output/mp4/Makefile plugins/stable/output/SDL2/Makefile plugins/stable/output/GL/Makefile plugins/stable/output/RTMP/Makefile plugins/stable/main/test_beat_detection/Makefile" ac_config_files="$ac_config_files lebiniou.1.head lebiniou.1.tail lebiniou.desktop" @@ -6865,9 +7041,10 @@ _ACEOF -COMPILER=`basename $CC` -PLUGIN_CFLAGS="-I$srcdir/../../../../src -fPIC" -PLUGIN_LDFLAGS="-shared -fPIC" +PLUGIN_CFLAGS="-fPIC" +PLUGIN_LDFLAGS="-shared -fPIC -Wl,-z,defs -pthread -Wl,--no-as-needed" +PLUGIN_LDADD="-l:liblebiniou.so.0" + @@ -7013,10 +7190,6 @@ as_fn_error $? "conditional \"OS_NETBSD_OR_OPENBSD\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${WITH_CORE_TRUE}" && test -z "${WITH_CORE_FALSE}"; then - as_fn_error $? "conditional \"WITH_CORE\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi if test -z "${WITH_TEST_PLUGINS_TRUE}" && test -z "${WITH_TEST_PLUGINS_FALSE}"; then as_fn_error $? "conditional \"WITH_TEST_PLUGINS\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -7057,6 +7230,10 @@ as_fn_error $? "conditional \"WITH_PANDOC\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${HAVE_ULFIUS_TRUE}" && test -z "${HAVE_ULFIUS_FALSE}"; then + as_fn_error $? "conditional \"HAVE_ULFIUS\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${EXTRA_DISKWRITER_TRUE}" && test -z "${EXTRA_DISKWRITER_FALSE}"; then as_fn_error $? "conditional \"EXTRA_DISKWRITER\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -7466,7 +7643,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by lebiniou $as_me 3.31, which was +This file was extended by lebiniou $as_me 3.40, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -7532,7 +7709,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -lebiniou config.status 3.31 +lebiniou config.status 3.40 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -7681,6 +7858,7 @@ "plugins/stable/input/sndfile/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/stable/input/sndfile/Makefile" ;; "plugins/stable/input/twip/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/stable/input/twip/Makefile" ;; "plugins/stable/input/jackaudio/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/stable/input/jackaudio/Makefile" ;; + "plugins/stable/main/aciddrop/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/stable/main/aciddrop/Makefile" ;; "plugins/stable/main/aurora/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/stable/main/aurora/Makefile" ;; "plugins/stable/main/bassline/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/stable/main/bassline/Makefile" ;; "plugins/stable/main/blur1/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/stable/main/blur1/Makefile" ;; @@ -7717,6 +7895,7 @@ "plugins/stable/main/drops/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/stable/main/drops/Makefile" ;; "plugins/stable/main/edge/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/stable/main/edge/Makefile" ;; "plugins/stable/main/emboss/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/stable/main/emboss/Makefile" ;; + "plugins/stable/main/fadeout/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/stable/main/fadeout/Makefile" ;; "plugins/stable/main/faders/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/stable/main/faders/Makefile" ;; "plugins/stable/main/flow/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/stable/main/flow/Makefile" ;; "plugins/stable/main/foo/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/stable/main/foo/Makefile" ;; @@ -7725,8 +7904,12 @@ "plugins/stable/main/hodge/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/stable/main/hodge/Makefile" ;; "plugins/stable/main/infinity/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/stable/main/infinity/Makefile" ;; "plugins/stable/main/iDissolve/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/stable/main/iDissolve/Makefile" ;; + "plugins/stable/main/imagedrop/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/stable/main/imagedrop/Makefile" ;; "plugins/stable/main/isquares/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/stable/main/isquares/Makefile" ;; "plugins/stable/main/isquaresbeat/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/stable/main/isquaresbeat/Makefile" ;; + "plugins/stable/main/iColrot/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/stable/main/iColrot/Makefile" ;; + "plugins/stable/main/iColrotbeat/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/stable/main/iColrotbeat/Makefile" ;; + "plugins/stable/main/iColrotslow/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/stable/main/iColrotslow/Makefile" ;; "plugins/stable/main/iPulse/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/stable/main/iPulse/Makefile" ;; "plugins/stable/main/iPulse2/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/stable/main/iPulse2/Makefile" ;; "plugins/stable/main/iPulse3/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/stable/main/iPulse3/Makefile" ;; @@ -7738,12 +7921,14 @@ "plugins/stable/main/nspiral/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/stable/main/nspiral/Makefile" ;; "plugins/stable/main/of_archimedean_spiral_3d/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/stable/main/of_archimedean_spiral_3d/Makefile" ;; "plugins/stable/main/of_spiral/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/stable/main/of_spiral/Makefile" ;; + "plugins/stable/main/paintdrop/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/stable/main/paintdrop/Makefile" ;; "plugins/stable/main/poincare/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/stable/main/poincare/Makefile" ;; "plugins/stable/main/polaroscillo/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/stable/main/polaroscillo/Makefile" ;; "plugins/stable/main/pulse/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/stable/main/pulse/Makefile" ;; "plugins/stable/main/ripple/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/stable/main/ripple/Makefile" ;; "plugins/stable/main/roscillo/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/stable/main/roscillo/Makefile" ;; "plugins/stable/main/rotors/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/stable/main/rotors/Makefile" ;; + "plugins/stable/main/rotors_freq/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/stable/main/rotors_freq/Makefile" ;; "plugins/stable/main/rp/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/stable/main/rp/Makefile" ;; "plugins/stable/main/scroll_bt/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/stable/main/scroll_bt/Makefile" ;; "plugins/stable/main/scroll_lr/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/stable/main/scroll_lr/Makefile" ;; @@ -7751,6 +7936,8 @@ "plugins/stable/main/scroll_tb/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/stable/main/scroll_tb/Makefile" ;; "plugins/stable/main/sin1oscillo/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/stable/main/sin1oscillo/Makefile" ;; "plugins/stable/main/sin2oscillo/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/stable/main/sin2oscillo/Makefile" ;; + "plugins/stable/main/snake/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/stable/main/snake/Makefile" ;; + "plugins/stable/main/snake_oscillo/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/stable/main/snake_oscillo/Makefile" ;; "plugins/stable/main/speaker/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/stable/main/speaker/Makefile" ;; "plugins/stable/main/spectrum/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/stable/main/spectrum/Makefile" ;; "plugins/stable/main/spectrumSh/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/stable/main/spectrumSh/Makefile" ;; @@ -7802,6 +7989,9 @@ "plugins/stable/main/tv_diff3/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/stable/main/tv_diff3/Makefile" ;; "plugins/stable/main/tv_diff4/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/stable/main/tv_diff4/Makefile" ;; "plugins/stable/main/tv_diffbeat/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/stable/main/tv_diffbeat/Makefile" ;; + "plugins/stable/main/tv_colrot/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/stable/main/tv_colrot/Makefile" ;; + "plugins/stable/main/tv_colrotslow/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/stable/main/tv_colrotslow/Makefile" ;; + "plugins/stable/main/tv_colrotbeat/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/stable/main/tv_colrotbeat/Makefile" ;; "plugins/stable/output/caca/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/stable/output/caca/Makefile" ;; "plugins/stable/output/diskwriter/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/stable/output/diskwriter/Makefile" ;; "plugins/stable/output/mp4/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/stable/output/mp4/Makefile" ;; @@ -8570,7 +8760,6 @@ echo " Plugin compiler flags: ${PLUGIN_CFLAGS}" echo " Plugin linker flags: ${PLUGIN_LDFLAGS}" echo -echo " Core engine: ${enable_core}" echo " Debug/test plugins: ${enable_test_plugins}" if test "x${enable_fixed}" != "xno"; then echo " Fixed video buffers: ${enable_fixed}" @@ -8583,6 +8772,7 @@ fi echo " Documentation: ${have_pandoc}" echo " Compile old delay plugins: ${enable_old_delay}" +echo " Embedded HTTP server: ${have_ulfius}" echo echo " * Input plugins:" diff -Nru lebiniou-3.31/configure.ac lebiniou-3.40/configure.ac --- lebiniou-3.31/configure.ac 2019-04-14 00:36:15.000000000 +0000 +++ lebiniou-3.40/configure.ac 2020-01-23 13:56:18.000000000 +0000 @@ -1,4 +1,4 @@ -AC_INIT([lebiniou],[3.31],[olivier@biniou.info]) +AC_INIT([lebiniou],[3.40],[olivier@biniou.info]) AC_PREREQ([2.68]) AC_CONFIG_SRCDIR([src/main.c]) AC_CANONICAL_TARGET @@ -9,7 +9,7 @@ dnl Versioning dnl ------------------------------------------------------------------ BINIOU_MAJOR=3 -BINIOU_MINOR=31 +BINIOU_MINOR=40 BINIOU_VERSION="$BINIOU_MAJOR.$BINIOU_MINOR" AC_SUBST(BINIOU_VERSION) @@ -95,6 +95,9 @@ PKG_CHECK_MODULES([XML2], [libxml-2.0 >= 2.6.0], , [AC_MSG_ERROR([You must have libxml2-dev >= 2.6 installed])]) CFLAGS="$CFLAGS `$PKG_CONFIG libxml-2.0 --cflags`" +# jansson +PKG_CHECK_MODULES([JANSSON], [jansson], , [AC_MSG_ERROR([You must have libjansson-dev installed])]) + # freetype-2 PKG_CHECK_MODULES([FT2], [freetype2], , [AC_MSG_ERROR([You must have libfreetype6-dev installed])]) CFLAGS="$CFLAGS `$PKG_CONFIG freetype2 --cflags`" @@ -102,7 +105,7 @@ # MagickWand PKG_CHECK_MODULES([MagickWand], [MagickWand], , [AC_MSG_ERROR([You must have libmagickwand-dev installed])]) -LIBS="$LIBS ${GLIB_LIBS} ${FFTW3_LIBS} ${XML2_LIBS} -lm -lz" +LIBS="$LIBS ${GLIB_LIBS} ${FFTW3_LIBS} ${XML2_LIBS} -lm -lz ${JANSSON_LIBS}" # We need to know which prefix we used to find some default values if test "x${prefix}" = "xNONE"; then @@ -124,6 +127,9 @@ dnl Check for SwScale PKG_CHECK_MODULES([SWSCALE], [libswscale], , [AC_MSG_ERROR([You must have libswscale-dev installed])]) CFLAGS="$CFLAGS ${SWSCALE_CFLAGS}" +SWSCALE_LDFLAGS="`$PKG_CONFIG libswscale --libs`" +AC_SUBST([SWSCALE_LDFLAGS]) + dnl Check for avutils PKG_CHECK_MODULES([AVUTIL], [libavutil], , [AC_MSG_ERROR([You must have libavutil-dev installed])]) @@ -133,12 +139,6 @@ OUTPUT_PLUGINS="SDL2" AC_SUBST([OUTPUT_PLUGINS]) -dnl Compile the core engine -AC_ARG_ENABLE([core], - AS_HELP_STRING([--enable-core],[build the core engine [default=yes]]),, - enable_core="yes") -AM_CONDITIONAL([WITH_CORE], [test "x${enable_core}" = "xyes"]) - dnl Compile test/debug plugins AC_ARG_ENABLE([test-plugins], AS_HELP_STRING([--enable-test-plugins],[build the test/debug plugins [default=no]]),, @@ -162,8 +162,8 @@ jack_present="no" AC_ARG_ENABLE([jackaudio], AS_HELP_STRING([--enable-jackaudio],[build the JACK Audio input plugin [default=yes]]),, - enable_jack="yes") -if test "x${enable_jack}" = "xyes"; then + enable_jackaudio="yes") +if test "x${enable_jackaudio}" = "xyes"; then PKG_CHECK_MODULES([JACK], jack, jack_present=yes, jack_present=no) fi AM_CONDITIONAL([JACK_PLUGIN], [test "x${jack_present}" = "xyes"]) @@ -233,7 +233,7 @@ dnl Fixed buffers support AC_ARG_ENABLE([fixed], - [AS_HELP_STRING([--enable-fixed="WIDTHxHEIGHT"],[Use fixed-size video buffers [default=no]])], + [AS_HELP_STRING([--enable-fixed="WIDTHxHEIGHT"],[use fixed-size video buffers [default=no]])], [enable_fixed=$enableval], [enable_fixed="no"]) if test "x${enable_fixed}" != "xno"; then @@ -244,7 +244,7 @@ dnl Set webcam capture size AC_ARG_ENABLE([camsize], - [AS_HELP_STRING([--enable-camsize="WIDTHxHEIGHT"],[Set webcam capture size [default="640x480"]])], + [AS_HELP_STRING([--enable-camsize="WIDTHxHEIGHT"],[set webcam capture size [default="640x480"]])], [enable_camsize=$enableval], [enable_camsize="no"]) CAP_W=640 @@ -347,6 +347,16 @@ AC_MSG_WARN([pandoc not found, can not build documentation]) fi +dnl ulfius +have_ulfius="no" +PKG_CHECK_MODULES([ULFIUS], [libulfius], have_ulfius=yes, [AC_MSG_WARN([libulfius not found, can not build HTTP server])]) +AM_CONDITIONAL([HAVE_ULFIUS], [test "x${have_ulfius}" = "xyes"]) +if test "x${have_ulfius}" != "xno"; then +CPPFLAGS="$CPPFLAGS -DWITH_ULFIUS" +CFLAGS="$CFLAGS `$PKG_CONFIG libulfius --cflags`" +LIBS="$LIBS `$PKG_CONFIG libulfius --libs`" +fi + dnl Webcam support have_webcam="no" AC_CHECK_HEADERS(linux/videodev2.h, have_webcam=yes) @@ -378,6 +388,14 @@ CFLAGS="$CFLAGS -fomit-frame-pointer" fi +dnl ASan +AC_ARG_ENABLE([asan], + AS_HELP_STRING([--enable-asan],[use AddressSanitizer [default=no]]),, + enable_asan="no") +if test "x${CC}" != "xclang" && test "x${enable_asan}" = "xyes"; then + CFLAGS="$CFLAGS -fsanitize=address" +fi + dnl Extra debugging option AC_ARG_ENABLE([xdebug], AS_HELP_STRING([--enable-xdebug],[turn on extra debugging [default=no]]),, @@ -402,7 +420,7 @@ dnl Disable calls to dlclose() (for debugging with valgrind) AC_ARG_ENABLE([dlclose], - AS_HELP_STRING([--disable-foo], [call dlclose() when unloading plugins [default=yes]]),[call_dlclose=no],[call_dlclose=yes]) + AS_HELP_STRING([--enable-dlclose], [call dlclose() when unloading plugins [default=yes]]),[call_dlclose=no],[call_dlclose=yes]) if test "x${call_dlclose}" = "xno"; then CPPFLAGS="$CPPFLAGS -DDISABLE_DLCLOSE" fi @@ -430,7 +448,7 @@ dnl Plugin-specific stuff dnl ------------------------------------------------------------------ AC_ARG_ENABLE([diskwriter], - AS_HELP_STRING([--enable-diskwriter],[compile the diskwriter output plugin [default=yes]]),, + AS_HELP_STRING([--enable-diskwriter],[build the diskwriter output plugin [default=yes]]),, enable_diskwriter="yes") AM_CONDITIONAL([EXTRA_DISKWRITER], [test "x${enable_diskwriter}" = "xyes"]) if test "x${enable_diskwriter}" = "xyes"; then @@ -439,7 +457,7 @@ if test "x${have_webcam}" = "xyes"; then AC_ARG_ENABLE([webcam], - AS_HELP_STRING([--enable-webcam],[compile the Webcam plugin [default=yes]]),[enable_webcam=$enableval], + AS_HELP_STRING([--enable-webcam],[enable webcam support [default=yes]]),[enable_webcam=$enableval], [enable_webcam="yes"]) else enable_webcam="no" @@ -450,7 +468,7 @@ fi AC_ARG_ENABLE([old-delay], - AS_HELP_STRING([--enable-old-delay],[compile old delay plugin [default=no]]),, + AS_HELP_STRING([--enable-old-delay],[build old delay plugins [default=no]]),, enable_old_delay="no") AM_CONDITIONAL([EXTRA_OLD_DELAY], [test "x${enable_old_delay}" = "xyes"]) @@ -481,6 +499,7 @@ plugins/stable/input/twip/Makefile plugins/stable/input/jackaudio/Makefile +plugins/stable/main/aciddrop/Makefile plugins/stable/main/aurora/Makefile plugins/stable/main/bassline/Makefile plugins/stable/main/blur1/Makefile @@ -517,6 +536,7 @@ plugins/stable/main/drops/Makefile plugins/stable/main/edge/Makefile plugins/stable/main/emboss/Makefile +plugins/stable/main/fadeout/Makefile plugins/stable/main/faders/Makefile plugins/stable/main/flow/Makefile plugins/stable/main/foo/Makefile @@ -525,8 +545,12 @@ plugins/stable/main/hodge/Makefile plugins/stable/main/infinity/Makefile plugins/stable/main/iDissolve/Makefile +plugins/stable/main/imagedrop/Makefile plugins/stable/main/isquares/Makefile plugins/stable/main/isquaresbeat/Makefile +plugins/stable/main/iColrot/Makefile +plugins/stable/main/iColrotbeat/Makefile +plugins/stable/main/iColrotslow/Makefile plugins/stable/main/iPulse/Makefile plugins/stable/main/iPulse2/Makefile plugins/stable/main/iPulse3/Makefile @@ -538,12 +562,14 @@ plugins/stable/main/nspiral/Makefile plugins/stable/main/of_archimedean_spiral_3d/Makefile plugins/stable/main/of_spiral/Makefile +plugins/stable/main/paintdrop/Makefile plugins/stable/main/poincare/Makefile plugins/stable/main/polaroscillo/Makefile plugins/stable/main/pulse/Makefile plugins/stable/main/ripple/Makefile plugins/stable/main/roscillo/Makefile plugins/stable/main/rotors/Makefile +plugins/stable/main/rotors_freq/Makefile plugins/stable/main/rp/Makefile plugins/stable/main/scroll_bt/Makefile plugins/stable/main/scroll_lr/Makefile @@ -551,6 +577,8 @@ plugins/stable/main/scroll_tb/Makefile plugins/stable/main/sin1oscillo/Makefile plugins/stable/main/sin2oscillo/Makefile +plugins/stable/main/snake/Makefile +plugins/stable/main/snake_oscillo/Makefile plugins/stable/main/speaker/Makefile plugins/stable/main/spectrum/Makefile plugins/stable/main/spectrumSh/Makefile @@ -603,6 +631,9 @@ plugins/stable/main/tv_diff3/Makefile plugins/stable/main/tv_diff4/Makefile plugins/stable/main/tv_diffbeat/Makefile +plugins/stable/main/tv_colrot/Makefile +plugins/stable/main/tv_colrotslow/Makefile +plugins/stable/main/tv_colrotbeat/Makefile plugins/stable/output/caca/Makefile plugins/stable/output/diskwriter/Makefile @@ -624,12 +655,13 @@ AC_DEFINE_UNQUOTED([OUTPUT_PLUGINS], ["$OUTPUT_PLUGINS"], [Available output plugins]) dnl Plugins compilation flags -COMPILER=`basename $CC` -PLUGIN_CFLAGS="-I$srcdir/../../../../src -fPIC" -PLUGIN_LDFLAGS="-shared -fPIC" +PLUGIN_CFLAGS="-fPIC" +PLUGIN_LDFLAGS="-shared -fPIC -Wl,-z,defs -pthread -Wl,--no-as-needed" +PLUGIN_LDADD="-l:liblebiniou.so.0" AC_SUBST([PLUGIN_CFLAGS]) AC_SUBST([PLUGIN_LDFLAGS]) +AC_SUBST([PLUGIN_LDADD]) dnl Output files AC_OUTPUT @@ -666,7 +698,6 @@ echo " Plugin compiler flags: ${PLUGIN_CFLAGS}" echo " Plugin linker flags: ${PLUGIN_LDFLAGS}" echo -echo " Core engine: ${enable_core}" echo " Debug/test plugins: ${enable_test_plugins}" if test "x${enable_fixed}" != "xno"; then echo " Fixed video buffers: ${enable_fixed}" @@ -679,6 +710,7 @@ fi echo " Documentation: ${have_pandoc}" echo " Compile old delay plugins: ${enable_old_delay}" +echo " Embedded HTTP server: ${have_ulfius}" echo echo " * Input plugins:" diff -Nru lebiniou-3.31/debian/changelog lebiniou-3.40/debian/changelog --- lebiniou-3.31/debian/changelog 2019-01-23 09:36:47.000000000 +0000 +++ lebiniou-3.40/debian/changelog 2019-12-07 20:25:22.000000000 +0000 @@ -1,3 +1,26 @@ +lebiniou (3.40-1) unstable; urgency=low + + * New upstream release 3.40. + * debian/control: Add Build-Depends: libjansson-dev, libulfius-dev + * debian/tests/control: Fix Test-Command. (Closes: #947367) + * debian/lebiniou.lintian-overrides: Commented. + * debian/copyright: Update copyright years. + * debian/control: Standards-Version: 4.5.0. + + -- Olivier Girondel Sat, 07 Dec 2019 21:25:22 +0100 + +lebiniou (3.32-1) unstable; urgency=low + + * New upstream release 3.32. + * debian/control: Standards-Version: 4.4.1. + * debian/lebiniou.lintian-overrides: Added. + * debian/control: Build-Depends: Update debhelper-compat (= 12). + * debian/control: Add Rules-Requires-Root: no. + * debian/compat: Remove. + * debian.rules: Add override_dh_shlibdeps. + + -- Olivier Girondel Wed, 09 Oct 2019 17:00:55 +0200 + lebiniou (3.31-1) unstable; urgency=low * New upstream release 3.31. diff -Nru lebiniou-3.31/debian/compat lebiniou-3.40/debian/compat --- lebiniou-3.31/debian/compat 2019-01-23 09:36:47.000000000 +0000 +++ lebiniou-3.40/debian/compat 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -11 diff -Nru lebiniou-3.31/debian/control lebiniou-3.40/debian/control --- lebiniou-3.31/debian/control 2019-01-23 09:36:47.000000000 +0000 +++ lebiniou-3.40/debian/control 2019-12-07 20:25:22.000000000 +0000 @@ -2,11 +2,12 @@ Section: graphics Priority: optional Maintainer: Olivier Girondel -Build-Depends: debhelper (>= 11), libglib2.0-dev, libfftw3-dev, libxml2-dev (>= 2.6), +Build-Depends: debhelper-compat (= 12), libglib2.0-dev, libfftw3-dev, libxml2-dev (>= 2.6), libswscale-dev, libfreetype6-dev, libasound2-dev, libsndfile1-dev, libjack-dev | libjack-jackd2-dev, libsdl2-ttf-dev, - libpulse-dev, libavutil-dev, libmagickwand-dev, pandoc -Standards-Version: 4.3.0 + libpulse-dev, libavutil-dev, libmagickwand-dev, pandoc, libjansson-dev, libulfius-dev +Standards-Version: 4.5.0 +Rules-Requires-Root: no Vcs-Browser: https://gitlab.com/lebiniou/lebiniou Vcs-Git: https://gitlab.com/lebiniou/lebiniou.git Homepage: https://biniou.net diff -Nru lebiniou-3.31/debian/copyright lebiniou-3.40/debian/copyright --- lebiniou-3.31/debian/copyright 2019-01-23 09:36:47.000000000 +0000 +++ lebiniou-3.40/debian/copyright 2019-12-07 20:25:22.000000000 +0000 @@ -4,11 +4,11 @@ Source: https://biniou.net Files: * -Copyright: 1994-2019 Olivier Girondel +Copyright: 1994-2020 Olivier Girondel License: GPL-2+ Files: debian/* -Copyright: 2011-2019 Olivier Girondel +Copyright: 2011-2020 Olivier Girondel License: GPL-2+ Files: src/pnglite.* diff -Nru lebiniou-3.31/debian/lebiniou.lintian-overrides lebiniou-3.40/debian/lebiniou.lintian-overrides --- lebiniou-3.31/debian/lebiniou.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 +++ lebiniou-3.40/debian/lebiniou.lintian-overrides 2019-12-07 20:25:22.000000000 +0000 @@ -0,0 +1,3 @@ +# rationale: liblebiniou.so.0 is a private/internal shared object +lebiniou: package-name-doesnt-match-sonames +lebiniou: no-symbols-control-file diff -Nru lebiniou-3.31/debian/rules lebiniou-3.40/debian/rules --- lebiniou-3.31/debian/rules 2019-01-23 09:36:47.000000000 +0000 +++ lebiniou-3.40/debian/rules 2019-12-07 20:25:22.000000000 +0000 @@ -3,3 +3,6 @@ %: dh $@ + +override_dh_shlibdeps: + dh_shlibdeps -l$(shell pwd)/src diff -Nru lebiniou-3.31/debian/tests/control lebiniou-3.40/debian/tests/control --- lebiniou-3.31/debian/tests/control 2019-01-23 09:36:47.000000000 +0000 +++ lebiniou-3.40/debian/tests/control 2019-12-07 20:25:22.000000000 +0000 @@ -1 +1 @@ -Test-Command: lebiniou --version \ No newline at end of file +Test-Command: lebiniou -i NULL --version \ No newline at end of file diff -Nru lebiniou-3.31/doc/Makefile.in lebiniou-3.40/doc/Makefile.in --- lebiniou-3.31/doc/Makefile.in 2019-04-14 11:52:29.000000000 +0000 +++ lebiniou-3.40/doc/Makefile.in 2020-01-23 13:57:14.000000000 +0000 @@ -258,6 +258,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -285,6 +287,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -299,7 +302,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ diff -Nru lebiniou-3.31/doc/manual/html/bindings.awk lebiniou-3.40/doc/manual/html/bindings.awk --- lebiniou-3.31/doc/manual/html/bindings.awk 2018-12-02 02:32:34.000000000 +0000 +++ lebiniou-3.40/doc/manual/html/bindings.awk 2020-01-22 18:33:57.000000000 +0000 @@ -9,6 +9,8 @@ return "Shift-"; if (mod == "CS") return "Ctrl-Shift-"; + if (mod == "AS") + return "Alt-Shift-"; } diff -Nru lebiniou-3.31/doc/manual/html/Makefile.in lebiniou-3.40/doc/manual/html/Makefile.in --- lebiniou-3.31/doc/manual/html/Makefile.in 2019-04-14 11:52:29.000000000 +0000 +++ lebiniou-3.40/doc/manual/html/Makefile.in 2020-01-23 13:57:14.000000000 +0000 @@ -198,6 +198,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -225,6 +227,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -239,7 +242,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ diff -Nru lebiniou-3.31/doc/manual/html/manual.md.in lebiniou-3.40/doc/manual/html/manual.md.in --- lebiniou-3.31/doc/manual/html/manual.md.in 2019-04-05 20:39:14.000000000 +0000 +++ lebiniou-3.40/doc/manual/html/manual.md.in 2020-01-22 18:33:57.000000000 +0000 @@ -157,6 +157,15 @@ * Use __S3__/__S4__ to select a plugin in the sequence (the selected plugin will have an arrow before it's name) * Use __S5__/__S6__ to move the selected plugin up/down in the sequence +#### Changing plugin parameters +You can change the parameters of the plugins: +* Use __S14__ to select previous plugin parameter to change +* Use __S15__ to select next plugin parameter to change +* Use __S16__ to decrease plugin parameter value +* Use __S17__ to increase plugin parameter value +* Use __S18__ to decrease plugin parameter value quickly +* Use __S19__ to increase plugin parameter value quickly + #### Example sequences Example sequences are available, install them by issuing the following command in your home directory: ```sh @@ -275,6 +284,7 @@ * hflip: flip webcam horizontally * vflip: flip webcam vertically * LEBINIOU_SEED: set this to a (positive) number to initialize the random number generator. + * LEBINIOU_IGNORE_BEQ_NORANDOM: if set, will allow random selection of some usually disabled plugins. Example: ```sh diff -Nru lebiniou-3.31/lebiniou.1.head.in lebiniou-3.40/lebiniou.1.head.in --- lebiniou-3.31/lebiniou.1.head.in 2019-01-20 19:59:25.000000000 +0000 +++ lebiniou-3.40/lebiniou.1.head.in 2019-12-15 01:39:28.000000000 +0000 @@ -39,10 +39,16 @@ B<-v | --version>: Display the version and exit +B<-X | --xpos> I: Set left position of the window + +B<-X | --ypos> I: Set top position of the window + B<-x | --width> I: Set width B<-y | --height> I: Set height +B<-n | --noborder>: Disable window borders + B<-p | --pidfile> I: Set the PID file B<-t | --themes> I: Comma-separated list of themes to use diff -Nru lebiniou-3.31/Makefile.am lebiniou-3.40/Makefile.am --- lebiniou-3.31/Makefile.am 2018-12-02 02:32:34.000000000 +0000 +++ lebiniou-3.40/Makefile.am 2019-12-14 03:24:32.000000000 +0000 @@ -32,4 +32,5 @@ appdir = $(prefix)/share/applications app_DATA = lebiniou.desktop -EXTRA_DIST = $(icon_DATA) $(menu_icon_DATA) $(lebiniou_desktop_DATA) lebiniou.desktop README.md +EXTRA_DIST = $(icon_DATA) $(menu_icon_DATA) $(lebiniou_desktop_DATA) \ + lebiniou.desktop README.md BUILD.md diff -Nru lebiniou-3.31/Makefile.in lebiniou-3.40/Makefile.in --- lebiniou-3.31/Makefile.in 2019-04-14 11:52:29.000000000 +0000 +++ lebiniou-3.40/Makefile.in 2020-01-23 13:57:14.000000000 +0000 @@ -289,6 +289,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -316,6 +318,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -330,7 +333,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -402,7 +408,9 @@ lebiniou_desktop_DATA = lebiniou.png appdir = $(prefix)/share/applications app_DATA = lebiniou.desktop -EXTRA_DIST = $(icon_DATA) $(menu_icon_DATA) $(lebiniou_desktop_DATA) lebiniou.desktop README.md +EXTRA_DIST = $(icon_DATA) $(menu_icon_DATA) $(lebiniou_desktop_DATA) \ + lebiniou.desktop README.md BUILD.md + all: $(BUILT_SOURCES) config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive diff -Nru lebiniou-3.31/plugins/Makefile.in lebiniou-3.40/plugins/Makefile.in --- lebiniou-3.31/plugins/Makefile.in 2019-04-14 11:52:29.000000000 +0000 +++ lebiniou-3.40/plugins/Makefile.in 2020-01-23 13:57:14.000000000 +0000 @@ -228,6 +228,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -255,6 +257,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -269,7 +272,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ diff -Nru lebiniou-3.31/plugins/stable/input/alsa/alsa.c lebiniou-3.40/plugins/stable/input/alsa/alsa.c --- lebiniou-3.31/plugins/stable/input/alsa/alsa.c 2019-04-05 20:39:14.000000000 +0000 +++ lebiniou-3.40/plugins/stable/input/alsa/alsa.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -40,7 +40,7 @@ static char *data = NULL; -void +int8_t create(Context_t *ctx) { frames = Context_get_input_size(ctx); @@ -109,6 +109,8 @@ } ctx->input = Input_new(frames); + + return 1; } diff -Nru lebiniou-3.31/plugins/stable/input/alsa/Makefile.am lebiniou-3.40/plugins/stable/input/alsa/Makefile.am --- lebiniou-3.31/plugins/stable/input/alsa/Makefile.am 2018-12-04 00:52:13.000000000 +0000 +++ lebiniou-3.40/plugins/stable/input/alsa/Makefile.am 2019-12-15 03:01:34.000000000 +0000 @@ -2,6 +2,6 @@ plugin_PROGRAMS = alsa.so alsa_so_SOURCES = alsa.c -alsa_so_CFLAGS = @PLUGIN_CFLAGS@ -alsa_so_LDFLAGS = @PLUGIN_LDFLAGS@ -alsa_so_LDADD = @ALSA_LIBS@ +alsa_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src +alsa_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +alsa_so_LDADD = @PLUGIN_LDADD@ @ALSA_LIBS@ diff -Nru lebiniou-3.31/plugins/stable/input/alsa/Makefile.in lebiniou-3.40/plugins/stable/input/alsa/Makefile.in --- lebiniou-3.31/plugins/stable/input/alsa/Makefile.in 2019-04-14 11:52:29.000000000 +0000 +++ lebiniou-3.40/plugins/stable/input/alsa/Makefile.in 2020-01-23 13:57:14.000000000 +0000 @@ -216,6 +216,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -243,6 +245,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -257,7 +260,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -319,9 +325,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/input/alsa alsa_so_SOURCES = alsa.c -alsa_so_CFLAGS = @PLUGIN_CFLAGS@ -alsa_so_LDFLAGS = @PLUGIN_LDFLAGS@ -alsa_so_LDADD = @ALSA_LIBS@ +alsa_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src +alsa_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +alsa_so_LDADD = @PLUGIN_LDADD@ @ALSA_LIBS@ all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/input/esound/esound.c lebiniou-3.40/plugins/stable/input/esound/esound.c --- lebiniou-3.31/plugins/stable/input/esound/esound.c 2019-04-05 20:39:14.000000000 +0000 +++ lebiniou-3.40/plugins/stable/input/esound/esound.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -37,7 +37,7 @@ static short *esdabuf; -void +int8_t create(Context_t *ctx) { int rate, bits, channels; @@ -89,6 +89,8 @@ esdpfd.events = POLLIN; okdone("ESD initialized"); + + return 1; } diff -Nru lebiniou-3.31/plugins/stable/input/esound/Makefile.am lebiniou-3.40/plugins/stable/input/esound/Makefile.am --- lebiniou-3.31/plugins/stable/input/esound/Makefile.am 2018-11-27 13:50:08.000000000 +0000 +++ lebiniou-3.40/plugins/stable/input/esound/Makefile.am 2019-12-15 03:01:34.000000000 +0000 @@ -2,5 +2,5 @@ plugin_PROGRAMS = esound.so esound_so_SOURCES = esound.c -esound_so_LDFLAGS = @PLUGIN_LDFLAGS@ -esound_so_CFLAGS = @PLUGIN_CFLAGS@ +esound_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +esound_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src diff -Nru lebiniou-3.31/plugins/stable/input/esound/Makefile.in lebiniou-3.40/plugins/stable/input/esound/Makefile.in --- lebiniou-3.31/plugins/stable/input/esound/Makefile.in 2019-04-14 11:52:29.000000000 +0000 +++ lebiniou-3.40/plugins/stable/input/esound/Makefile.in 2020-01-23 13:57:14.000000000 +0000 @@ -216,6 +216,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -243,6 +245,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -257,7 +260,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -319,8 +325,8 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/input/esound esound_so_SOURCES = esound.c -esound_so_LDFLAGS = @PLUGIN_LDFLAGS@ -esound_so_CFLAGS = @PLUGIN_CFLAGS@ +esound_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +esound_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/input/jackaudio/jackaudio.c lebiniou-3.40/plugins/stable/input/jackaudio/jackaudio.c --- lebiniou-3.31/plugins/stable/input/jackaudio/jackaudio.c 2019-04-05 20:39:14.000000000 +0000 +++ lebiniou-3.40/plugins/stable/input/jackaudio/jackaudio.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -124,7 +124,7 @@ } -void +int8_t create(Context_t *ctx) { int i; @@ -176,6 +176,8 @@ } } jack_free(ports); + + return 1; } diff -Nru lebiniou-3.31/plugins/stable/input/jackaudio/Makefile.am lebiniou-3.40/plugins/stable/input/jackaudio/Makefile.am --- lebiniou-3.31/plugins/stable/input/jackaudio/Makefile.am 2018-12-04 00:52:13.000000000 +0000 +++ lebiniou-3.40/plugins/stable/input/jackaudio/Makefile.am 2019-12-15 03:01:34.000000000 +0000 @@ -2,6 +2,6 @@ plugin_PROGRAMS = jackaudio.so jackaudio_so_SOURCES = jackaudio.c -jackaudio_so_CFLAGS = @PLUGIN_CFLAGS@ -jackaudio_so_LDFLAGS = @PLUGIN_LDFLAGS@ -jackaudio_so_LDADD = @JACK_LIBS@ +jackaudio_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src +jackaudio_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +jackaudio_so_LDADD = @PLUGIN_LDADD@ @JACK_LIBS@ diff -Nru lebiniou-3.31/plugins/stable/input/jackaudio/Makefile.in lebiniou-3.40/plugins/stable/input/jackaudio/Makefile.in --- lebiniou-3.31/plugins/stable/input/jackaudio/Makefile.in 2019-04-14 11:52:29.000000000 +0000 +++ lebiniou-3.40/plugins/stable/input/jackaudio/Makefile.in 2020-01-23 13:57:14.000000000 +0000 @@ -216,6 +216,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -243,6 +245,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -257,7 +260,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -319,9 +325,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/input/jackaudio jackaudio_so_SOURCES = jackaudio.c -jackaudio_so_CFLAGS = @PLUGIN_CFLAGS@ -jackaudio_so_LDFLAGS = @PLUGIN_LDFLAGS@ -jackaudio_so_LDADD = @JACK_LIBS@ +jackaudio_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src +jackaudio_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +jackaudio_so_LDADD = @PLUGIN_LDADD@ @JACK_LIBS@ all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/input/Makefile.in lebiniou-3.40/plugins/stable/input/Makefile.in --- lebiniou-3.31/plugins/stable/input/Makefile.in 2019-04-14 11:52:29.000000000 +0000 +++ lebiniou-3.40/plugins/stable/input/Makefile.in 2020-01-23 13:57:14.000000000 +0000 @@ -235,6 +235,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -262,6 +264,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -276,7 +279,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ diff -Nru lebiniou-3.31/plugins/stable/input/oss/Makefile.am lebiniou-3.40/plugins/stable/input/oss/Makefile.am --- lebiniou-3.31/plugins/stable/input/oss/Makefile.am 2018-11-27 13:50:08.000000000 +0000 +++ lebiniou-3.40/plugins/stable/input/oss/Makefile.am 2019-12-15 03:01:34.000000000 +0000 @@ -2,8 +2,9 @@ plugin_PROGRAMS = oss.so oss_so_SOURCES = oss.c -oss_so_LDFLAGS = @PLUGIN_LDFLAGS@ +oss_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +oss_so_LDADD = @PLUGIN_LDADD@ if OS_NETBSD_OR_OPENBSD oss_so_LDFLAGS += -lossaudio endif -oss_so_CFLAGS = @PLUGIN_CFLAGS@ +oss_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src diff -Nru lebiniou-3.31/plugins/stable/input/oss/Makefile.in lebiniou-3.40/plugins/stable/input/oss/Makefile.in --- lebiniou-3.31/plugins/stable/input/oss/Makefile.in 2019-04-14 11:52:29.000000000 +0000 +++ lebiniou-3.40/plugins/stable/input/oss/Makefile.in 2020-01-23 13:57:14.000000000 +0000 @@ -105,7 +105,7 @@ PROGRAMS = $(plugin_PROGRAMS) am_oss_so_OBJECTS = oss_so-oss.$(OBJEXT) oss_so_OBJECTS = $(am_oss_so_OBJECTS) -oss_so_LDADD = $(LDADD) +oss_so_DEPENDENCIES = oss_so_LINK = $(CCLD) $(oss_so_CFLAGS) $(CFLAGS) $(oss_so_LDFLAGS) \ $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -217,6 +217,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -244,6 +246,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -258,7 +261,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -320,8 +326,10 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/input/oss oss_so_SOURCES = oss.c -oss_so_LDFLAGS = @PLUGIN_LDFLAGS@ $(am__append_1) -oss_so_CFLAGS = @PLUGIN_CFLAGS@ +oss_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src \ + $(am__append_1) +oss_so_LDADD = @PLUGIN_LDADD@ +oss_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/input/oss/oss.c lebiniou-3.40/plugins/stable/input/oss/oss.c --- lebiniou-3.31/plugins/stable/input/oss/oss.c 2019-04-05 20:39:14.000000000 +0000 +++ lebiniou-3.40/plugins/stable/input/oss/oss.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -140,7 +140,7 @@ } -void +int8_t create(Context_t *ctx) { int rate; @@ -300,6 +300,8 @@ init(); ctx->input = Input_new(ABUF_SIZE); + + return 1; } diff -Nru lebiniou-3.31/plugins/stable/input/pulseaudio/Makefile.am lebiniou-3.40/plugins/stable/input/pulseaudio/Makefile.am --- lebiniou-3.31/plugins/stable/input/pulseaudio/Makefile.am 2018-12-04 00:52:13.000000000 +0000 +++ lebiniou-3.40/plugins/stable/input/pulseaudio/Makefile.am 2019-12-15 03:01:34.000000000 +0000 @@ -2,6 +2,6 @@ plugin_PROGRAMS = pulseaudio.so pulseaudio_so_SOURCES = pulseaudio.c -pulseaudio_so_CFLAGS = @PLUGIN_CFLAGS@ -pulseaudio_so_LDFLAGS = @PLUGIN_LDFLAGS@ -pulseaudio_so_LDADD = @PULSEAUDIO_LIBS@ +pulseaudio_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src +pulseaudio_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +pulseaudio_so_LDADD = @PLUGIN_LDADD@ @PULSEAUDIO_LIBS@ diff -Nru lebiniou-3.31/plugins/stable/input/pulseaudio/Makefile.in lebiniou-3.40/plugins/stable/input/pulseaudio/Makefile.in --- lebiniou-3.31/plugins/stable/input/pulseaudio/Makefile.in 2019-04-14 11:52:29.000000000 +0000 +++ lebiniou-3.40/plugins/stable/input/pulseaudio/Makefile.in 2020-01-23 13:57:14.000000000 +0000 @@ -216,6 +216,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -243,6 +245,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -257,7 +260,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -319,9 +325,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/input/pulseaudio pulseaudio_so_SOURCES = pulseaudio.c -pulseaudio_so_CFLAGS = @PLUGIN_CFLAGS@ -pulseaudio_so_LDFLAGS = @PLUGIN_LDFLAGS@ -pulseaudio_so_LDADD = @PULSEAUDIO_LIBS@ +pulseaudio_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src +pulseaudio_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +pulseaudio_so_LDADD = @PLUGIN_LDADD@ @PULSEAUDIO_LIBS@ all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/input/pulseaudio/pulseaudio.c lebiniou-3.40/plugins/stable/input/pulseaudio/pulseaudio.c --- lebiniou-3.31/plugins/stable/input/pulseaudio/pulseaudio.c 2019-04-05 20:39:14.000000000 +0000 +++ lebiniou-3.40/plugins/stable/input/pulseaudio/pulseaudio.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -31,7 +31,7 @@ static pa_simple *pa_s; -void +int8_t create(Context_t *ctx) { int error; @@ -69,6 +69,8 @@ ctx->input = Input_new(insize); okdone("pulseaudio initialized"); + + return 1; } diff -Nru lebiniou-3.31/plugins/stable/input/random/Makefile.am lebiniou-3.40/plugins/stable/input/random/Makefile.am --- lebiniou-3.31/plugins/stable/input/random/Makefile.am 2018-11-27 13:50:08.000000000 +0000 +++ lebiniou-3.40/plugins/stable/input/random/Makefile.am 2019-12-15 03:01:34.000000000 +0000 @@ -2,5 +2,6 @@ plugin_PROGRAMS = random.so random_so_SOURCES = random.c -random_so_LDFLAGS = @PLUGIN_LDFLAGS@ -random_so_CFLAGS = @PLUGIN_CFLAGS@ +random_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +random_so_LDADD = @PLUGIN_LDADD@ +random_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src diff -Nru lebiniou-3.31/plugins/stable/input/random/Makefile.in lebiniou-3.40/plugins/stable/input/random/Makefile.in --- lebiniou-3.31/plugins/stable/input/random/Makefile.in 2019-04-14 11:52:29.000000000 +0000 +++ lebiniou-3.40/plugins/stable/input/random/Makefile.in 2020-01-23 13:57:14.000000000 +0000 @@ -104,7 +104,7 @@ PROGRAMS = $(plugin_PROGRAMS) am_random_so_OBJECTS = random_so-random.$(OBJEXT) random_so_OBJECTS = $(am_random_so_OBJECTS) -random_so_LDADD = $(LDADD) +random_so_DEPENDENCIES = random_so_LINK = $(CCLD) $(random_so_CFLAGS) $(CFLAGS) \ $(random_so_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -216,6 +216,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -243,6 +245,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -257,7 +260,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -319,8 +325,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/input/random random_so_SOURCES = random.c -random_so_LDFLAGS = @PLUGIN_LDFLAGS@ -random_so_CFLAGS = @PLUGIN_CFLAGS@ +random_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +random_so_LDADD = @PLUGIN_LDADD@ +random_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/input/random/random.c lebiniou-3.40/plugins/stable/input/random/random.c --- lebiniou-3.31/plugins/stable/input/random/random.c 2019-04-05 20:39:14.000000000 +0000 +++ lebiniou-3.40/plugins/stable/input/random/random.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -22,15 +22,15 @@ u_long id = 945287542; u_long options = BEQ_THREAD; -#define FACT 0.40 -#define DEVICE "/dev/urandom" +#define FACT 0.40 +#define DEVICE "/dev/urandom" -static short *urndbuff; -static int urndfd; -static struct timespec req; +static short *urndbuff; +static int urndfd; +static struct timespec req; -void +int8_t create(Context_t *ctx) { req.tv_sec = 0; @@ -45,6 +45,8 @@ uint32_t insize = Context_get_input_size(ctx); urndbuff = xcalloc(insize * 2, sizeof(short)); ctx->input = Input_new(insize); + + return 1; } diff -Nru lebiniou-3.31/plugins/stable/input/sndfile/Makefile.am lebiniou-3.40/plugins/stable/input/sndfile/Makefile.am --- lebiniou-3.31/plugins/stable/input/sndfile/Makefile.am 2018-12-04 00:52:13.000000000 +0000 +++ lebiniou-3.40/plugins/stable/input/sndfile/Makefile.am 2019-12-15 03:01:34.000000000 +0000 @@ -2,6 +2,6 @@ plugin_PROGRAMS = sndfile.so sndfile_so_SOURCES = sndfile.c -sndfile_so_CFLAGS = @PLUGIN_CFLAGS@ -sndfile_so_LDFLAGS = @PLUGIN_LDFLAGS@ -sndfile_so_LDADD = @SNDFILE_LIBS@ +sndfile_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src +sndfile_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +sndfile_so_LDADD = @PLUGIN_LDADD@ @SNDFILE_LIBS@ diff -Nru lebiniou-3.31/plugins/stable/input/sndfile/Makefile.in lebiniou-3.40/plugins/stable/input/sndfile/Makefile.in --- lebiniou-3.31/plugins/stable/input/sndfile/Makefile.in 2019-04-14 11:52:29.000000000 +0000 +++ lebiniou-3.40/plugins/stable/input/sndfile/Makefile.in 2020-01-23 13:57:14.000000000 +0000 @@ -216,6 +216,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -243,6 +245,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -257,7 +260,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -319,9 +325,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/input/sndfile sndfile_so_SOURCES = sndfile.c -sndfile_so_CFLAGS = @PLUGIN_CFLAGS@ -sndfile_so_LDFLAGS = @PLUGIN_LDFLAGS@ -sndfile_so_LDADD = @SNDFILE_LIBS@ +sndfile_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src +sndfile_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +sndfile_so_LDADD = @PLUGIN_LDADD@ @SNDFILE_LIBS@ all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/input/sndfile/sndfile.c lebiniou-3.40/plugins/stable/input/sndfile/sndfile.c --- lebiniou-3.31/plugins/stable/input/sndfile/sndfile.c 2019-04-05 20:39:14.000000000 +0000 +++ lebiniou-3.40/plugins/stable/input/sndfile/sndfile.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -25,7 +25,7 @@ u_long options = BE_NONE; static const char *file = NULL; -static SF_INFO sfi; +static SF_INFO sfi; static SNDFILE *sf = NULL; /* compteur : nombre de frames restant a lire */ @@ -53,7 +53,7 @@ } -void +int8_t create(Context_t *ctx) { char *loop_env = NULL; @@ -78,6 +78,8 @@ /* printf("[i] Input buffer size = %u\n", bufsize); */ ctx->input = Input_new(bufsize); + + return 1; } diff -Nru lebiniou-3.31/plugins/stable/input/twip/Makefile.am lebiniou-3.40/plugins/stable/input/twip/Makefile.am --- lebiniou-3.31/plugins/stable/input/twip/Makefile.am 2018-11-27 13:50:08.000000000 +0000 +++ lebiniou-3.40/plugins/stable/input/twip/Makefile.am 2019-12-15 03:01:34.000000000 +0000 @@ -2,5 +2,6 @@ plugin_PROGRAMS = twip.so twip_so_SOURCES = twip.c -twip_so_LDFLAGS = @PLUGIN_LDFLAGS@ -twip_so_CFLAGS = @PLUGIN_CFLAGS@ +twip_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +twip_so_LDADD = @PLUGIN_LDADD@ +twip_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src diff -Nru lebiniou-3.31/plugins/stable/input/twip/Makefile.in lebiniou-3.40/plugins/stable/input/twip/Makefile.in --- lebiniou-3.31/plugins/stable/input/twip/Makefile.in 2019-04-14 11:52:29.000000000 +0000 +++ lebiniou-3.40/plugins/stable/input/twip/Makefile.in 2020-01-23 13:57:14.000000000 +0000 @@ -104,7 +104,7 @@ PROGRAMS = $(plugin_PROGRAMS) am_twip_so_OBJECTS = twip_so-twip.$(OBJEXT) twip_so_OBJECTS = $(am_twip_so_OBJECTS) -twip_so_LDADD = $(LDADD) +twip_so_DEPENDENCIES = twip_so_LINK = $(CCLD) $(twip_so_CFLAGS) $(CFLAGS) $(twip_so_LDFLAGS) \ $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -216,6 +216,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -243,6 +245,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -257,7 +260,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -319,8 +325,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/input/twip twip_so_SOURCES = twip.c -twip_so_LDFLAGS = @PLUGIN_LDFLAGS@ -twip_so_CFLAGS = @PLUGIN_CFLAGS@ +twip_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +twip_so_LDADD = @PLUGIN_LDADD@ +twip_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/input/twip/twip.c lebiniou-3.40/plugins/stable/input/twip/twip.c --- lebiniou-3.31/plugins/stable/input/twip/twip.c 2019-04-05 20:39:14.000000000 +0000 +++ lebiniou-3.40/plugins/stable/input/twip/twip.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -22,9 +22,9 @@ u_long id = 1253393977; u_long options = BEQ_THREAD; -#define INSIZE 256 -#define FACT 0.40 -#define DEVICE "/dev/urandom" +#define INSIZE 256 +#define FACT 0.40 +#define DEVICE "/dev/urandom" #define SAMPLES_PER_SECOND 4410.0 #define MIN_FREQUENCY 80.0 @@ -112,7 +112,7 @@ } <-- unused here */ -void +int8_t create(Context_t *ctx) { int i; @@ -131,6 +131,8 @@ speed[i] = RangeRnd(MIN_SPEED, MAX_SPEED); xtime[i] = Rndq(); } + + return 1; } diff -Nru lebiniou-3.31/plugins/stable/main/aciddrop/aciddrop.c lebiniou-3.40/plugins/stable/main/aciddrop/aciddrop.c --- lebiniou-3.31/plugins/stable/main/aciddrop/aciddrop.c 1970-01-01 00:00:00.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/aciddrop/aciddrop.c 2020-01-22 18:33:57.000000000 +0000 @@ -0,0 +1,192 @@ +/* + * Copyright 1994-2020 Olivier Girondel + * Copyright 2019-2020 Tavasti + * + * This file is part of lebiniou. + * + * lebiniou 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 of the License, or + * (at your option) any later version. + * + * lebiniou 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 lebiniou. If not, see . + */ + +/* + * Idea: drops of acid dropping to picture. Drop will grow, and eat + * colors away. Some drops are alcalic, giving COLOR_MAXVAL instead of 0 + */ + +#include "context.h" + +#define DROPCOUNT 30 /* how many drops there can be same time progressing */ +#define INITIAL_WAIT_MAX 5 /* max wait before first drop */ +#define WAIT_MIN 2 /* minimum wait between drops */ +#define WAIT_MAX 15 /* max wait between drops */ +#define DROPSIZE_MIN (WIDTH/17.0) /* minimum radius of drop */ +#define DROPSIZE_MAX (WIDTH/7.0) /* maximum radius of drop */ +#define HAZY_RADIUS 20.0 /* how many pixels on outer ring are hazy */ +#define HAZY_RATIO 23.0 /* 1/x probability hazy pixel to get drawn */ +#define PROG_RATIO 0.11 /* how big ratio of diameter progress in one round */ +#define INCR_RATIO 0.39 /* Ratio how much color value is changed */ +#define READY_TOL 0.06 /* difference to target regarded as ready */ +#define ACID_ALCALIC_RATIO 4 /* how much more acid than alcalic */ + +u_long id = 1555191584; +uint32_t version = 0; +u_long options = BE_BLUR|BE_GFX; +char desc[] = "Color-corroding drops"; + +typedef struct Drop_s { + int x; + int y; + Pixel_t color; /* target color */ + double target; /* target radius */ + double current; /* current radius */ + int incr; /* color increment / decrement value */ +} Drop_t; + +static Drop_t drops[DROPCOUNT]; +static short *mask = NULL; +static int next_drop; /* counter how many rounds before next drop */ + + +int8_t +create(Context_t *ctx) +{ + mask = xmalloc(sizeof(short) * BUFFSIZE); + + return 1; +} + + +void +destroy(Context_t *ctx) +{ + xfree(mask); +} + + +void +on_switch_on(Context_t *ctx) +{ + u_long i; + /* clear drops */ + for (i = 0; i < DROPCOUNT ; i++) { + drops[i].x = -1; + } + next_drop = b_rand_int_range(0, INITIAL_WAIT_MAX); + /* initialize mask */ + for (i = 0; i < BUFFSIZE ; i++) { + mask[i] = -1; + } +} + + +/* helper function for marking affected pixels of circle to mask */ +static void +mark_circle_range(int x, int y, double r, short mark, short *mbuff) +{ + assert(mask != NULL); + + /* calculate bounding box of circle */ + int left = x - r; + left = (left < 0) ? 0 : left; + int right = x + r; + right = (right >= WIDTH) ? WIDTH - 1 : right; + int top = y - r; + top = (top < 0) ? 0 : top; + int bottom = y + r; + bottom = (bottom >= HEIGHT) ? HEIGHT - 1 : bottom; + + /* we handle distances as squared to speed up things, + no need to calculate sqrt for every pixel */ + double distsq = r * r; /* outer ring which is hazy*/ + double distsq2 = (r - HAZY_RADIUS) * (r - HAZY_RADIUS); /* inner ring */ + int i,j; + /* loop thru bounding box, and check if pixel is in circle */ + for (i = top; i <= bottom; i++) { + for (j = left ; j <= right; j++) { + int dx = j - x; + int dy = i - y; + if (((dx * dx) + (dy * dy)) < distsq) { + if (((dx * dx) + (dy * dy)) < distsq2) { + mbuff[i * WIDTH + j] = mark; + } else if (b_rand_int_range(0, HAZY_RATIO) == 0) { + /* hazy pixels */ + mbuff[i * WIDTH + j] = mark; + } else { + /* outside circle */ + mbuff[i * WIDTH + j] = -1; + } + } + } + } +} + + +void +run(Context_t *ctx) +{ + u_long i; + /* Grow existing drops, and release fully grown drops for next use */ + for (i = 0; i < DROPCOUNT; i++) { + if (drops[i].x > -1) { /* in use */ + if ((drops[i].current + READY_TOL) < drops[i].target) { + drops[i].current += (drops[i].target - drops[i].current) * PROG_RATIO; + drops[i].incr = (drops[i].target - drops[i].current) * INCR_RATIO; + if (drops[i].incr < 1.0) { + drops[i].incr = 1.0; /* values less that 1 won't have any effect */ + } + /* mark area where this drop affects this round */ + mark_circle_range(drops[i].x, drops[i].y, drops[i].current, i, mask); + } else { + /* this drop is done */ + mark_circle_range(drops[i].x, drops[i].y, drops[i].current, -1, mask); + drops[i].x = -1; + } + } + } + + /* start checking if we need and can add new drop */ + if (--next_drop <= 0) { + /* time to add drop if there is room in struct */ + for (i = 0; i < DROPCOUNT; i++) { + if (drops[i].x == -1) { /* free entry */ + /* new random drop */ + drops[i].x = b_rand_int_range(0, WIDTH); + drops[i].y = b_rand_int_range(0, HEIGHT); + /* more acid drops than alcalic */ + drops[i].color = (b_rand_int_range(0, ACID_ALCALIC_RATIO) > 1) ? 0 : PIXEL_MAXVAL; + drops[i].target = b_rand_double_range(DROPSIZE_MIN, DROPSIZE_MAX); + drops[i].current = drops[i].target * PROG_RATIO ; + drops[i].incr = drops[i].target; + next_drop = b_rand_int_range(WAIT_MIN, WAIT_MAX); + /* mark area where this drop affects this round */ + mark_circle_range(drops[i].x, drops[i].y, drops[i].current, i, mask); + break; + } + } + } + /* actual picture handling */ + const Pixel_t *src = active_buffer(ctx)->buffer; + Pixel_t *dst = passive_buffer(ctx)->buffer; + + for (i = 0; i < BUFFSIZE; i++) { + Pixel_t col = src[i]; + if (mask[i] >= 0) { + if (col > drops[mask[i]].color) { + col = (col > drops[mask[i]].incr) ? col - drops[mask[i]].incr : drops[mask[i]].color; + } else if (col < drops[mask[i]].color) { + col = (col < (drops[mask[i]].color - drops[mask[i]].incr)) ? col + drops[mask[i]].incr : drops[mask[i]].color; + } + } + *dst++ = col; + } +} diff -Nru lebiniou-3.31/plugins/stable/main/aciddrop/Makefile.am lebiniou-3.40/plugins/stable/main/aciddrop/Makefile.am --- lebiniou-3.31/plugins/stable/main/aciddrop/Makefile.am 1970-01-01 00:00:00.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/aciddrop/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -0,0 +1,7 @@ +plugindir = @libdir@/lebiniou/plugins/main/aciddrop +plugin_PROGRAMS = aciddrop.so + +aciddrop_so_SOURCES = aciddrop.c +aciddrop_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +aciddrop_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +aciddrop_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/aciddrop/Makefile.in lebiniou-3.40/plugins/stable/main/aciddrop/Makefile.in --- lebiniou-3.31/plugins/stable/main/aciddrop/Makefile.in 1970-01-01 00:00:00.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/aciddrop/Makefile.in 2020-01-23 13:57:14.000000000 +0000 @@ -0,0 +1,665 @@ +# Makefile.in generated by automake 1.16.1 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994-2018 Free Software Foundation, Inc. + +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +VPATH = @srcdir@ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +target_triplet = @target@ +plugin_PROGRAMS = aciddrop.so$(EXEEXT) +subdir = plugins/stable/main/aciddrop +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +am__installdirs = "$(DESTDIR)$(plugindir)" +PROGRAMS = $(plugin_PROGRAMS) +am_aciddrop_so_OBJECTS = aciddrop_so-aciddrop.$(OBJEXT) +aciddrop_so_OBJECTS = $(am_aciddrop_so_OBJECTS) +aciddrop_so_DEPENDENCIES = +aciddrop_so_LINK = $(CCLD) $(aciddrop_so_CFLAGS) $(CFLAGS) \ + $(aciddrop_so_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) +depcomp = $(SHELL) $(top_srcdir)/depcomp +am__maybe_remake_depfiles = depfiles +am__depfiles_remade = ./$(DEPDIR)/aciddrop_so-aciddrop.Po +am__mv = mv -f +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = +CCLD = $(CC) +LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = +SOURCES = $(aciddrop_so_SOURCES) +DIST_SOURCES = $(aciddrop_so_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +ALSA_CFLAGS = @ALSA_CFLAGS@ +ALSA_LIBS = @ALSA_LIBS@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AVUTIL_CFLAGS = @AVUTIL_CFLAGS@ +AVUTIL_LIBS = @AVUTIL_LIBS@ +AWK = @AWK@ +BINIOU_VERSION = @BINIOU_VERSION@ +CACA_CFLAGS = @CACA_CFLAGS@ +CACA_LIBS = @CACA_LIBS@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DPKG_BUILDFLAGS_CHECK = @DPKG_BUILDFLAGS_CHECK@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +ESD_CFLAGS = @ESD_CFLAGS@ +ESD_LIBS = @ESD_LIBS@ +EXEEXT = @EXEEXT@ +FFTW3_CFLAGS = @FFTW3_CFLAGS@ +FFTW3_LIBS = @FFTW3_LIBS@ +FT2_CFLAGS = @FT2_CFLAGS@ +FT2_LIBS = @FT2_LIBS@ +GETOPT_LONG_LIBS = @GETOPT_LONG_LIBS@ +GLIB_CFLAGS = @GLIB_CFLAGS@ +GLIB_LIBS = @GLIB_LIBS@ +GLU_CFLAGS = @GLU_CFLAGS@ +GLU_LIBS = @GLU_LIBS@ +GREP = @GREP@ +INPUT_PLUGINS = @INPUT_PLUGINS@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +JACK_CFLAGS = @JACK_CFLAGS@ +JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ +LDFLAGS = @LDFLAGS@ +LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ +LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ +LEBINIOU_SCHEMES_FILE = @LEBINIOU_SCHEMES_FILE@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ +MagickWand_CFLAGS = @MagickWand_CFLAGS@ +MagickWand_LIBS = @MagickWand_LIBS@ +OBJEXT = @OBJEXT@ +OSD_FONT = @OSD_FONT@ +OSD_PTSIZE = @OSD_PTSIZE@ +OUTPUT_PLUGINS = @OUTPUT_PLUGINS@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ +PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ +PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ +PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ +PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ +SDL2_CFLAGS = @SDL2_CFLAGS@ +SDL2_LIBS = @SDL2_LIBS@ +SDL2_ttf_CFLAGS = @SDL2_ttf_CFLAGS@ +SDL2_ttf_LIBS = @SDL2_ttf_LIBS@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +SNDFILE_CFLAGS = @SNDFILE_CFLAGS@ +SNDFILE_LIBS = @SNDFILE_LIBS@ +STRIP = @STRIP@ +SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ +SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ +VERSION = @VERSION@ +XML2_CFLAGS = @XML2_CFLAGS@ +XML2_LIBS = @XML2_LIBS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_CC = @ac_ct_CC@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +have_pandoc = @have_pandoc@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +runstatedir = @runstatedir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target = @target@ +target_alias = @target_alias@ +target_cpu = @target_cpu@ +target_os = @target_os@ +target_vendor = @target_vendor@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +plugindir = @libdir@/lebiniou/plugins/main/aciddrop +aciddrop_so_SOURCES = aciddrop.c +aciddrop_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +aciddrop_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +aciddrop_so_LDADD = @PLUGIN_LDADD@ +all: all-am + +.SUFFIXES: +.SUFFIXES: .c .o .obj +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign plugins/stable/main/aciddrop/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --foreign plugins/stable/main/aciddrop/Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): +install-pluginPROGRAMS: $(plugin_PROGRAMS) + @$(NORMAL_INSTALL) + @list='$(plugin_PROGRAMS)'; test -n "$(plugindir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \ + fi; \ + for p in $$list; do echo "$$p $$p"; done | \ + sed 's/$(EXEEXT)$$//' | \ + while read p p1; do if test -f $$p \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ + done | \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ + -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ + sed 'N;N;N;s,\n, ,g' | \ + $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ + { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ + if ($$2 == $$4) files[d] = files[d] " " $$1; \ + else { print "f", $$3 "/" $$4, $$1; } } \ + END { for (d in files) print "f", d, files[d] }' | \ + while read type dir files; do \ + if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ + test -z "$$files" || { \ + echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(plugindir)$$dir'"; \ + $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(plugindir)$$dir" || exit $$?; \ + } \ + ; done + +uninstall-pluginPROGRAMS: + @$(NORMAL_UNINSTALL) + @list='$(plugin_PROGRAMS)'; test -n "$(plugindir)" || list=; \ + files=`for p in $$list; do echo "$$p"; done | \ + sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ + -e 's/$$/$(EXEEXT)/' \ + `; \ + test -n "$$list" || exit 0; \ + echo " ( cd '$(DESTDIR)$(plugindir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(plugindir)" && rm -f $$files + +clean-pluginPROGRAMS: + -test -z "$(plugin_PROGRAMS)" || rm -f $(plugin_PROGRAMS) + +aciddrop.so$(EXEEXT): $(aciddrop_so_OBJECTS) $(aciddrop_so_DEPENDENCIES) $(EXTRA_aciddrop_so_DEPENDENCIES) + @rm -f aciddrop.so$(EXEEXT) + $(AM_V_CCLD)$(aciddrop_so_LINK) $(aciddrop_so_OBJECTS) $(aciddrop_so_LDADD) $(LIBS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/aciddrop_so-aciddrop.Po@am__quote@ # am--include-marker + +$(am__depfiles_remade): + @$(MKDIR_P) $(@D) + @echo '# dummy' >$@-t && $(am__mv) $@-t $@ + +am--depfiles: $(am__depfiles_remade) + +.c.o: +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< + +.c.obj: +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + +aciddrop_so-aciddrop.o: aciddrop.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(aciddrop_so_CFLAGS) $(CFLAGS) -MT aciddrop_so-aciddrop.o -MD -MP -MF $(DEPDIR)/aciddrop_so-aciddrop.Tpo -c -o aciddrop_so-aciddrop.o `test -f 'aciddrop.c' || echo '$(srcdir)/'`aciddrop.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/aciddrop_so-aciddrop.Tpo $(DEPDIR)/aciddrop_so-aciddrop.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='aciddrop.c' object='aciddrop_so-aciddrop.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(aciddrop_so_CFLAGS) $(CFLAGS) -c -o aciddrop_so-aciddrop.o `test -f 'aciddrop.c' || echo '$(srcdir)/'`aciddrop.c + +aciddrop_so-aciddrop.obj: aciddrop.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(aciddrop_so_CFLAGS) $(CFLAGS) -MT aciddrop_so-aciddrop.obj -MD -MP -MF $(DEPDIR)/aciddrop_so-aciddrop.Tpo -c -o aciddrop_so-aciddrop.obj `if test -f 'aciddrop.c'; then $(CYGPATH_W) 'aciddrop.c'; else $(CYGPATH_W) '$(srcdir)/aciddrop.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/aciddrop_so-aciddrop.Tpo $(DEPDIR)/aciddrop_so-aciddrop.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='aciddrop.c' object='aciddrop_so-aciddrop.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(aciddrop_so_CFLAGS) $(CFLAGS) -c -o aciddrop_so-aciddrop.obj `if test -f 'aciddrop.c'; then $(CYGPATH_W) 'aciddrop.c'; else $(CYGPATH_W) '$(srcdir)/aciddrop.c'; fi` + +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags + +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + set x; \ + here=`pwd`; \ + $(am__define_uniq_tagged_files); \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ + fi +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ + test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(PROGRAMS) +installdirs: + for dir in "$(DESTDIR)$(plugindir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-pluginPROGRAMS mostlyclean-am + +distclean: distclean-am + -rm -f ./$(DEPDIR)/aciddrop_so-aciddrop.Po + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-tags + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: install-pluginPROGRAMS + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f ./$(DEPDIR)/aciddrop_so-aciddrop.Po + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-compile mostlyclean-generic + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-pluginPROGRAMS + +.MAKE: install-am install-strip + +.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \ + clean-generic clean-pluginPROGRAMS cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-pluginPROGRAMS install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \ + ps ps-am tags tags-am uninstall uninstall-am \ + uninstall-pluginPROGRAMS + +.PRECIOUS: Makefile + + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -Nru lebiniou-3.31/plugins/stable/main/aurora/aurora.c lebiniou-3.40/plugins/stable/main/aurora/aurora.c --- lebiniou-3.31/plugins/stable/main/aurora/aurora.c 2019-04-05 20:39:14.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/aurora/aurora.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -21,6 +21,7 @@ u_long id = 1180460310; +uint32_t version = 0; u_long options = BE_BLUR|BEQ_NORANDOM; char desc[] = "Cellular automaton"; diff -Nru lebiniou-3.31/plugins/stable/main/aurora/Makefile.am lebiniou-3.40/plugins/stable/main/aurora/Makefile.am --- lebiniou-3.31/plugins/stable/main/aurora/Makefile.am 2018-11-27 13:50:08.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/aurora/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -2,5 +2,6 @@ plugin_PROGRAMS = aurora.so aurora_so_SOURCES = aurora.c -aurora_so_LDFLAGS = @PLUGIN_LDFLAGS@ -aurora_so_CFLAGS = @PLUGIN_CFLAGS@ +aurora_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +aurora_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +aurora_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/aurora/Makefile.in lebiniou-3.40/plugins/stable/main/aurora/Makefile.in --- lebiniou-3.31/plugins/stable/main/aurora/Makefile.in 2019-04-14 11:52:30.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/aurora/Makefile.in 2020-01-23 13:57:15.000000000 +0000 @@ -104,7 +104,7 @@ PROGRAMS = $(plugin_PROGRAMS) am_aurora_so_OBJECTS = aurora_so-aurora.$(OBJEXT) aurora_so_OBJECTS = $(am_aurora_so_OBJECTS) -aurora_so_LDADD = $(LDADD) +aurora_so_DEPENDENCIES = aurora_so_LINK = $(CCLD) $(aurora_so_CFLAGS) $(CFLAGS) \ $(aurora_so_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -216,6 +216,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -243,6 +245,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -257,7 +260,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -319,8 +325,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/main/aurora aurora_so_SOURCES = aurora.c -aurora_so_LDFLAGS = @PLUGIN_LDFLAGS@ -aurora_so_CFLAGS = @PLUGIN_CFLAGS@ +aurora_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +aurora_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +aurora_so_LDADD = @PLUGIN_LDADD@ all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/main/bassline/bassline.c lebiniou-3.40/plugins/stable/main/bassline/bassline.c --- lebiniou-3.31/plugins/stable/main/bassline/bassline.c 2019-04-05 20:39:14.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/bassline/bassline.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -21,6 +21,7 @@ u_long id = 1058309664; +uint32_t version = 0; u_long options = BE_SFX2D|BEQ_NORANDOM; char desc[] = "Pulsing box"; @@ -30,15 +31,6 @@ void -create(Context_t *ctx) -{ - if (NULL == ctx->input) { - options |= BEQ_DISABLED; - } -} - - -void run(Context_t *ctx) { double max = ctx->input->spectrum_log[A_MONO][BEAT_BAND]; @@ -52,6 +44,6 @@ x1 = max * MAXX; draw_filled_box_nc(passive_buffer(ctx), - 0, HHEIGHT + (HHEIGHT / 8), - x1, HHEIGHT - (HHEIGHT / 8), 255); + 0, HHEIGHT + (HHEIGHT / 8), + x1, HHEIGHT - (HHEIGHT / 8), 255); } diff -Nru lebiniou-3.31/plugins/stable/main/bassline/Makefile.am lebiniou-3.40/plugins/stable/main/bassline/Makefile.am --- lebiniou-3.31/plugins/stable/main/bassline/Makefile.am 2018-11-27 13:50:08.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/bassline/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -2,5 +2,6 @@ plugin_PROGRAMS = bassline.so bassline_so_SOURCES = bassline.c -bassline_so_LDFLAGS = @PLUGIN_LDFLAGS@ -bassline_so_CFLAGS = @PLUGIN_CFLAGS@ +bassline_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +bassline_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +bassline_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/bassline/Makefile.in lebiniou-3.40/plugins/stable/main/bassline/Makefile.in --- lebiniou-3.31/plugins/stable/main/bassline/Makefile.in 2019-04-14 11:52:30.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/bassline/Makefile.in 2020-01-23 13:57:15.000000000 +0000 @@ -104,7 +104,7 @@ PROGRAMS = $(plugin_PROGRAMS) am_bassline_so_OBJECTS = bassline_so-bassline.$(OBJEXT) bassline_so_OBJECTS = $(am_bassline_so_OBJECTS) -bassline_so_LDADD = $(LDADD) +bassline_so_DEPENDENCIES = bassline_so_LINK = $(CCLD) $(bassline_so_CFLAGS) $(CFLAGS) \ $(bassline_so_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -216,6 +216,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -243,6 +245,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -257,7 +260,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -319,8 +325,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/main/bassline bassline_so_SOURCES = bassline.c -bassline_so_LDFLAGS = @PLUGIN_LDFLAGS@ -bassline_so_CFLAGS = @PLUGIN_CFLAGS@ +bassline_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +bassline_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +bassline_so_LDADD = @PLUGIN_LDADD@ all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/main/blur1/blur1.c lebiniou-3.40/plugins/stable/main/blur1/blur1.c --- lebiniou-3.31/plugins/stable/main/blur1/blur1.c 2019-04-05 20:39:14.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/blur1/blur1.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -18,88 +18,29 @@ */ #include "context.h" +#include "image_filter.h" +#include "parameters.h" +#include "blur.h" u_long id = 944355799; +uint32_t version = 0; u_long options = BE_BLUR; char desc[] = "Blur filter"; -/* 900 fps ?!? */ void -run(Context_t *ctx) +on_switch_on(Context_t *ctx) { - const Pixel_t *n, *s, *w, *c, *e; - Pixel_t *d; - const Buffer8_t *src = active_buffer(ctx); - Buffer8_t *dst = passive_buffer(ctx); - u_long i; - - Buffer8_init_mask_3x3(active_buffer(ctx)); - - n = src->buffer + 1; - s = src->buffer + 2 * WIDTH + 1; - w = src->buffer + WIDTH; - c = src->buffer + (WIDTH + 1); - e = src->buffer + (WIDTH + 2); - - d = dst->buffer + (WIDTH + 1); - for (i = BUFFSIZE - WIDTH - (WIDTH + 1); i--; ) { - *d++ = (*n++ + *s++ + (*c++ << 2) + *w++ + *e++) >> 3; - } - - Buffer8_expand_border(dst); + border_mode = BM_TOROIDAL; } -/* 240 fps */ void -run3(Context_t *ctx) -{ - const Pixel_t *n, *s, *w, *c, *e; - Pixel_t *d; - const Buffer8_t *src = active_buffer(ctx); - Buffer8_t *dst = passive_buffer(ctx); - - Buffer8_init_mask_3x3(active_buffer(ctx)); - - n = src->buffer + 1; - s = src->buffer + 2 * WIDTH + 1; - w = src->buffer + WIDTH; - c = src->buffer + (WIDTH + 1); - e = src->buffer + (WIDTH + 2); - - for (d = dst->buffer + (WIDTH + 1); - d < dst->buffer + (BUFFSIZE - WIDTH); ) { - *d++ = (*n++ + *s++ + (*c++ << 2) + *w++ + *e++) >> 3; - } - - Buffer8_expand_border(dst); -} - - -/* 160 fps :( */ -void -run2(Context_t *ctx) +run(Context_t *ctx) { - Pixel_t n, s, w, c, e; - /*Pixel_t *d;*/ const Buffer8_t *src = active_buffer(ctx); Buffer8_t *dst = passive_buffer(ctx); - int i, j; - - Buffer8_init_mask_3x3(active_buffer(ctx)); - - for (j = 1; j < MAXY; j++) - /* do line */ - for (i = 1; i < MAXX; i++) { - c = get_pixel_nc(src, i, j); - n = get_pixel_nc(src, i, j-1); - s = get_pixel_nc(src, i, j+1); - e = get_pixel_nc(src, i-1, j); - w = get_pixel_nc(src, i+1, j); - set_pixel_nc(dst, i, j, (n + s + (c << 2) + w + e) >> 3); - } - Buffer8_expand_border(dst); + image_filter_average(dst, src, FT_BLUR1_3x3, border_mode, 0, NULL); } diff -Nru lebiniou-3.31/plugins/stable/main/blur1/Makefile.am lebiniou-3.40/plugins/stable/main/blur1/Makefile.am --- lebiniou-3.31/plugins/stable/main/blur1/Makefile.am 2018-11-27 13:50:08.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/blur1/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -2,5 +2,6 @@ plugin_PROGRAMS = blur1.so blur1_so_SOURCES = blur1.c -blur1_so_LDFLAGS = @PLUGIN_LDFLAGS@ -blur1_so_CFLAGS = @PLUGIN_CFLAGS@ +blur1_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +blur1_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +blur1_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/blur1/Makefile.in lebiniou-3.40/plugins/stable/main/blur1/Makefile.in --- lebiniou-3.31/plugins/stable/main/blur1/Makefile.in 2019-04-14 11:52:30.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/blur1/Makefile.in 2020-01-23 13:57:15.000000000 +0000 @@ -104,7 +104,7 @@ PROGRAMS = $(plugin_PROGRAMS) am_blur1_so_OBJECTS = blur1_so-blur1.$(OBJEXT) blur1_so_OBJECTS = $(am_blur1_so_OBJECTS) -blur1_so_LDADD = $(LDADD) +blur1_so_DEPENDENCIES = blur1_so_LINK = $(CCLD) $(blur1_so_CFLAGS) $(CFLAGS) \ $(blur1_so_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -216,6 +216,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -243,6 +245,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -257,7 +260,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -319,8 +325,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/main/blur1 blur1_so_SOURCES = blur1.c -blur1_so_LDFLAGS = @PLUGIN_LDFLAGS@ -blur1_so_CFLAGS = @PLUGIN_CFLAGS@ +blur1_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +blur1_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +blur1_so_LDADD = @PLUGIN_LDADD@ all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/main/blur2/blur2.c lebiniou-3.40/plugins/stable/main/blur2/blur2.c --- lebiniou-3.31/plugins/stable/main/blur2/blur2.c 2019-03-01 11:47:47.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/blur2/blur2.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -18,40 +18,29 @@ */ #include "context.h" +#include "image_filter.h" +#include "parameters.h" +#include "blur.h" u_long id = 944355800; +uint32_t version = 0; u_long options = BE_BLUR; char desc[] = "Blur filter"; void +on_switch_on(Context_t *ctx) +{ + border_mode = BM_TOROIDAL; +} + + +void run(Context_t *ctx) { - const Pixel_t *n, *s, *w, *c, *e; - Pixel_t *d; const Buffer8_t *src = active_buffer(ctx); Buffer8_t *dst = passive_buffer(ctx); - u_long i; - - Buffer8_init_mask_3x3(active_buffer(ctx)); - - n = src->buffer + 1; - s = src->buffer + 2 * WIDTH + 1; - w = src->buffer + WIDTH; - c = src->buffer + (WIDTH + 1); - e = src->buffer + (WIDTH + 2); - - d = dst->buffer + (WIDTH + 1); - for (i = BUFFSIZE - WIDTH - (WIDTH + 1); i--; ) { - short somme = - *n++ - + (*w++ << 1) + (*c++ << 1) + (*e++ << 1) - + *s++; - somme >>= 3; - somme &= 255; - *d++ = (Pixel_t)(somme); - } - Buffer8_expand_border(dst); + image_filter_average(dst, src, FT_BLUR2_3x3, border_mode, 0, NULL); } diff -Nru lebiniou-3.31/plugins/stable/main/blur2/Makefile.am lebiniou-3.40/plugins/stable/main/blur2/Makefile.am --- lebiniou-3.31/plugins/stable/main/blur2/Makefile.am 2018-11-27 13:50:08.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/blur2/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -2,5 +2,6 @@ plugin_PROGRAMS = blur2.so blur2_so_SOURCES = blur2.c -blur2_so_LDFLAGS = @PLUGIN_LDFLAGS@ -blur2_so_CFLAGS = @PLUGIN_CFLAGS@ +blur2_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +blur2_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +blur2_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/blur2/Makefile.in lebiniou-3.40/plugins/stable/main/blur2/Makefile.in --- lebiniou-3.31/plugins/stable/main/blur2/Makefile.in 2019-04-14 11:52:30.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/blur2/Makefile.in 2020-01-23 13:57:15.000000000 +0000 @@ -104,7 +104,7 @@ PROGRAMS = $(plugin_PROGRAMS) am_blur2_so_OBJECTS = blur2_so-blur2.$(OBJEXT) blur2_so_OBJECTS = $(am_blur2_so_OBJECTS) -blur2_so_LDADD = $(LDADD) +blur2_so_DEPENDENCIES = blur2_so_LINK = $(CCLD) $(blur2_so_CFLAGS) $(CFLAGS) \ $(blur2_so_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -216,6 +216,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -243,6 +245,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -257,7 +260,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -319,8 +325,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/main/blur2 blur2_so_SOURCES = blur2.c -blur2_so_LDFLAGS = @PLUGIN_LDFLAGS@ -blur2_so_CFLAGS = @PLUGIN_CFLAGS@ +blur2_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +blur2_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +blur2_so_LDADD = @PLUGIN_LDADD@ all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/main/blur3/blur3.c lebiniou-3.40/plugins/stable/main/blur3/blur3.c --- lebiniou-3.31/plugins/stable/main/blur3/blur3.c 2019-04-05 20:39:14.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/blur3/blur3.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -21,6 +21,7 @@ u_long id = 944355801; +uint32_t version = 0; u_long options = BE_BLUR; char desc[] = "Blur filter"; diff -Nru lebiniou-3.31/plugins/stable/main/blur3/Makefile.am lebiniou-3.40/plugins/stable/main/blur3/Makefile.am --- lebiniou-3.31/plugins/stable/main/blur3/Makefile.am 2018-11-27 13:50:08.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/blur3/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -2,5 +2,6 @@ plugin_PROGRAMS = blur3.so blur3_so_SOURCES = blur3.c -blur3_so_LDFLAGS = @PLUGIN_LDFLAGS@ -blur3_so_CFLAGS = @PLUGIN_CFLAGS@ +blur3_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +blur3_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +blur3_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/blur3/Makefile.in lebiniou-3.40/plugins/stable/main/blur3/Makefile.in --- lebiniou-3.31/plugins/stable/main/blur3/Makefile.in 2019-04-14 11:52:30.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/blur3/Makefile.in 2020-01-23 13:57:15.000000000 +0000 @@ -104,7 +104,7 @@ PROGRAMS = $(plugin_PROGRAMS) am_blur3_so_OBJECTS = blur3_so-blur3.$(OBJEXT) blur3_so_OBJECTS = $(am_blur3_so_OBJECTS) -blur3_so_LDADD = $(LDADD) +blur3_so_DEPENDENCIES = blur3_so_LINK = $(CCLD) $(blur3_so_CFLAGS) $(CFLAGS) \ $(blur3_so_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -216,6 +216,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -243,6 +245,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -257,7 +260,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -319,8 +325,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/main/blur3 blur3_so_SOURCES = blur3.c -blur3_so_LDFLAGS = @PLUGIN_LDFLAGS@ -blur3_so_CFLAGS = @PLUGIN_CFLAGS@ +blur3_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +blur3_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +blur3_so_LDADD = @PLUGIN_LDADD@ all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/main/blur4/blur4.c lebiniou-3.40/plugins/stable/main/blur4/blur4.c --- lebiniou-3.31/plugins/stable/main/blur4/blur4.c 2019-04-05 20:39:14.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/blur4/blur4.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -18,31 +18,29 @@ */ #include "context.h" +#include "image_filter.h" +#include "parameters.h" +#include "blur.h" u_long id = 944355802; +uint32_t version = 0; u_long options = BE_BLUR; char desc[] = "Blur filter"; void +on_switch_on(Context_t *ctx) +{ + border_mode = BM_TOROIDAL; +} + + +void run(Context_t *ctx) { - Pixel_t *d; const Buffer8_t *src = active_buffer(ctx); Buffer8_t *dst = passive_buffer(ctx); - const Pixel_t *m = src->buffer; - const Pixel_t *n = src->buffer + WIDTH; - const Pixel_t *o = src->buffer + (2 * WIDTH); - long i; - - Buffer8_init_mask_3x3(active_buffer(ctx)); - - d = dst->buffer + (WIDTH + 1); - for (i = BUFFSIZE - WIDTH - (WIDTH + 1) - 1; i--; m++, n++, o++) - *d++ = (*m + (*(m + 1) << 1) + (*m + 2) - + (*n << 1) + (*(n + 1) << 4) + (*(n + 2) << 1) - + *o + (*(o + 1) << 1) + *(o + 2)) >> 5; - Buffer8_expand_border(dst); + image_filter_average(dst, src, FT_BLUR4_3x3, border_mode, 0, NULL); } diff -Nru lebiniou-3.31/plugins/stable/main/blur4/Makefile.am lebiniou-3.40/plugins/stable/main/blur4/Makefile.am --- lebiniou-3.31/plugins/stable/main/blur4/Makefile.am 2018-11-27 13:50:08.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/blur4/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -2,5 +2,6 @@ plugin_PROGRAMS = blur4.so blur4_so_SOURCES = blur4.c -blur4_so_LDFLAGS = @PLUGIN_LDFLAGS@ -blur4_so_CFLAGS = @PLUGIN_CFLAGS@ +blur4_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +blur4_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +blur4_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/blur4/Makefile.in lebiniou-3.40/plugins/stable/main/blur4/Makefile.in --- lebiniou-3.31/plugins/stable/main/blur4/Makefile.in 2019-04-14 11:52:30.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/blur4/Makefile.in 2020-01-23 13:57:15.000000000 +0000 @@ -104,7 +104,7 @@ PROGRAMS = $(plugin_PROGRAMS) am_blur4_so_OBJECTS = blur4_so-blur4.$(OBJEXT) blur4_so_OBJECTS = $(am_blur4_so_OBJECTS) -blur4_so_LDADD = $(LDADD) +blur4_so_DEPENDENCIES = blur4_so_LINK = $(CCLD) $(blur4_so_CFLAGS) $(CFLAGS) \ $(blur4_so_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -216,6 +216,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -243,6 +245,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -257,7 +260,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -319,8 +325,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/main/blur4 blur4_so_SOURCES = blur4.c -blur4_so_LDFLAGS = @PLUGIN_LDFLAGS@ -blur4_so_CFLAGS = @PLUGIN_CFLAGS@ +blur4_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +blur4_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +blur4_so_LDADD = @PLUGIN_LDADD@ all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/main/blur5/blur5.c lebiniou-3.40/plugins/stable/main/blur5/blur5.c --- lebiniou-3.31/plugins/stable/main/blur5/blur5.c 2019-04-05 20:39:14.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/blur5/blur5.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -18,40 +18,30 @@ */ #include "context.h" +#include "image_filter.h" +#include "parameters.h" +#include "blur.h" u_long id = 1103058149; +uint32_t version = 0; u_long options = BE_BLUR|BEQ_HOR; char dname[] = "H Blur"; char desc[] = "Horizontal blur"; void +on_switch_on(Context_t *ctx) +{ + border_mode = BM_TOROIDAL; +} + + +void run(Context_t *ctx) { - u_short i, j; const Buffer8_t *src = active_buffer(ctx); Buffer8_t *dst = passive_buffer(ctx); - Buffer8_init_mask_3x3(active_buffer(ctx)); - - for (j = 1; j < MAXY - 1; j++) - for (i = 1; i < MAXX - 1; i++) { - u_short somme; - /* - * 0 1 0 - * 2 4 2 => 10 - * 0 1 0 - */ - somme = get_pixel_nc(src, i - 1, j ) * 2; - somme += get_pixel_nc(src, i, j - 1); - somme += get_pixel_nc(src, i, j ) * 4; - somme += get_pixel_nc(src, i, j + 1); - somme += get_pixel_nc(src, i + 1, j ) * 2; - somme /= 10; - - set_pixel_nc(dst, i, j, (Pixel_t)(somme)); - } - - Buffer8_expand_border(dst); + image_filter_average(dst, src, FT_HBLUR_3x3, border_mode, 0, NULL); } diff -Nru lebiniou-3.31/plugins/stable/main/blur5/Makefile.am lebiniou-3.40/plugins/stable/main/blur5/Makefile.am --- lebiniou-3.31/plugins/stable/main/blur5/Makefile.am 2018-11-27 13:50:08.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/blur5/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -2,5 +2,6 @@ plugin_PROGRAMS = blur5.so blur5_so_SOURCES = blur5.c -blur5_so_LDFLAGS = @PLUGIN_LDFLAGS@ -blur5_so_CFLAGS = @PLUGIN_CFLAGS@ +blur5_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +blur5_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +blur5_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/blur5/Makefile.in lebiniou-3.40/plugins/stable/main/blur5/Makefile.in --- lebiniou-3.31/plugins/stable/main/blur5/Makefile.in 2019-04-14 11:52:30.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/blur5/Makefile.in 2020-01-23 13:57:15.000000000 +0000 @@ -104,7 +104,7 @@ PROGRAMS = $(plugin_PROGRAMS) am_blur5_so_OBJECTS = blur5_so-blur5.$(OBJEXT) blur5_so_OBJECTS = $(am_blur5_so_OBJECTS) -blur5_so_LDADD = $(LDADD) +blur5_so_DEPENDENCIES = blur5_so_LINK = $(CCLD) $(blur5_so_CFLAGS) $(CFLAGS) \ $(blur5_so_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -216,6 +216,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -243,6 +245,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -257,7 +260,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -319,8 +325,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/main/blur5 blur5_so_SOURCES = blur5.c -blur5_so_LDFLAGS = @PLUGIN_LDFLAGS@ -blur5_so_CFLAGS = @PLUGIN_CFLAGS@ +blur5_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +blur5_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +blur5_so_LDADD = @PLUGIN_LDADD@ all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/main/blur6/blur6.c lebiniou-3.40/plugins/stable/main/blur6/blur6.c --- lebiniou-3.31/plugins/stable/main/blur6/blur6.c 2019-04-05 20:39:14.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/blur6/blur6.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -18,40 +18,30 @@ */ #include "context.h" +#include "image_filter.h" +#include "parameters.h" +#include "blur.h" u_long id = 1103058150; +uint32_t version = 0; u_long options = BE_BLUR|BEQ_VER; char dname[] = "V Blur"; char desc[] = "Vertical blur"; void +on_switch_on(Context_t *ctx) +{ + border_mode = BM_TOROIDAL; +} + + +void run(Context_t *ctx) { - u_short i, j; const Buffer8_t *src = active_buffer(ctx); Buffer8_t *dst = passive_buffer(ctx); - Buffer8_init_mask_3x3(active_buffer(ctx)); - - for (j = 1; j < MAXY - 1; j++) - for (i = 1; i < MAXX - 1; i++) { - u_short somme; - /* - * 0 2 0 - * 1 4 1 => 10 - * 0 2 0 - */ - somme = get_pixel_nc(src, i - 1, j ); - somme += get_pixel_nc(src, i, j - 1) * 2; - somme += get_pixel_nc(src, i, j ) * 4; - somme += get_pixel_nc(src, i, j + 1) * 2; - somme += get_pixel_nc(src, i + 1, j ); - somme /= 10; - - set_pixel_nc(dst, i, j, (Pixel_t)(somme)); - } - - Buffer8_expand_border(dst); + image_filter_average(dst, src, FT_VBLUR_3x3, border_mode, 0, NULL); } diff -Nru lebiniou-3.31/plugins/stable/main/blur6/Makefile.am lebiniou-3.40/plugins/stable/main/blur6/Makefile.am --- lebiniou-3.31/plugins/stable/main/blur6/Makefile.am 2018-11-27 13:50:08.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/blur6/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -2,5 +2,6 @@ plugin_PROGRAMS = blur6.so blur6_so_SOURCES = blur6.c -blur6_so_LDFLAGS = @PLUGIN_LDFLAGS@ -blur6_so_CFLAGS = @PLUGIN_CFLAGS@ +blur6_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +blur6_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +blur6_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/blur6/Makefile.in lebiniou-3.40/plugins/stable/main/blur6/Makefile.in --- lebiniou-3.31/plugins/stable/main/blur6/Makefile.in 2019-04-14 11:52:30.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/blur6/Makefile.in 2020-01-23 13:57:15.000000000 +0000 @@ -104,7 +104,7 @@ PROGRAMS = $(plugin_PROGRAMS) am_blur6_so_OBJECTS = blur6_so-blur6.$(OBJEXT) blur6_so_OBJECTS = $(am_blur6_so_OBJECTS) -blur6_so_LDADD = $(LDADD) +blur6_so_DEPENDENCIES = blur6_so_LINK = $(CCLD) $(blur6_so_CFLAGS) $(CFLAGS) \ $(blur6_so_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -216,6 +216,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -243,6 +245,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -257,7 +260,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -319,8 +325,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/main/blur6 blur6_so_SOURCES = blur6.c -blur6_so_LDFLAGS = @PLUGIN_LDFLAGS@ -blur6_so_CFLAGS = @PLUGIN_CFLAGS@ +blur6_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +blur6_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +blur6_so_LDADD = @PLUGIN_LDADD@ all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/main/blur7/blur7.c lebiniou-3.40/plugins/stable/main/blur7/blur7.c --- lebiniou-3.31/plugins/stable/main/blur7/blur7.c 2019-04-05 20:39:14.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/blur7/blur7.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -18,41 +18,30 @@ */ #include "context.h" +#include "image_filter.h" +#include "parameters.h" +#include "blur.h" u_long id = 1103058151; +uint32_t version = 0; u_long options = BE_BLUR|BEQ_DIAG; char dname[] = "D-Blur-1"; char desc[] = "Diagonal blur"; void +on_switch_on(Context_t *ctx) +{ + border_mode = BM_TOROIDAL; +} + + +void run(Context_t *ctx) { - u_short i, j; const Buffer8_t *src = active_buffer(ctx); Buffer8_t *dst = passive_buffer(ctx); - Buffer8_init_mask_3x3(active_buffer(ctx)); - - for (j = 1; j < MAXY - 1; j++) - for (i = 1; i < MAXX - 1; i++) { - u_short somme; - /* - * 2 0 1 - * 0 4 0 => 10 - * 1 0 2 - */ - somme = get_pixel_nc(src, i - 1, j - 1) * 2; - somme += get_pixel_nc(src, i + 1, j - 1); - somme += get_pixel_nc(src, i, j ) * 4; - somme += get_pixel_nc(src, i - 1, j + 1); - somme += get_pixel_nc(src, i + 1, j + 1) * 2; - - somme /= 10; - - set_pixel_nc(dst, i, j, (Pixel_t)(somme)); - } - - Buffer8_expand_border(dst); + image_filter_average(dst, src, FT_DBLUR1_3x3, border_mode, 0, NULL); } diff -Nru lebiniou-3.31/plugins/stable/main/blur7/Makefile.am lebiniou-3.40/plugins/stable/main/blur7/Makefile.am --- lebiniou-3.31/plugins/stable/main/blur7/Makefile.am 2018-11-27 13:50:08.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/blur7/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -2,5 +2,6 @@ plugin_PROGRAMS = blur7.so blur7_so_SOURCES = blur7.c -blur7_so_LDFLAGS = @PLUGIN_LDFLAGS@ -blur7_so_CFLAGS = @PLUGIN_CFLAGS@ +blur7_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +blur7_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +blur7_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/blur7/Makefile.in lebiniou-3.40/plugins/stable/main/blur7/Makefile.in --- lebiniou-3.31/plugins/stable/main/blur7/Makefile.in 2019-04-14 11:52:30.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/blur7/Makefile.in 2020-01-23 13:57:15.000000000 +0000 @@ -104,7 +104,7 @@ PROGRAMS = $(plugin_PROGRAMS) am_blur7_so_OBJECTS = blur7_so-blur7.$(OBJEXT) blur7_so_OBJECTS = $(am_blur7_so_OBJECTS) -blur7_so_LDADD = $(LDADD) +blur7_so_DEPENDENCIES = blur7_so_LINK = $(CCLD) $(blur7_so_CFLAGS) $(CFLAGS) \ $(blur7_so_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -216,6 +216,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -243,6 +245,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -257,7 +260,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -319,8 +325,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/main/blur7 blur7_so_SOURCES = blur7.c -blur7_so_LDFLAGS = @PLUGIN_LDFLAGS@ -blur7_so_CFLAGS = @PLUGIN_CFLAGS@ +blur7_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +blur7_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +blur7_so_LDADD = @PLUGIN_LDADD@ all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/main/blur8/blur8.c lebiniou-3.40/plugins/stable/main/blur8/blur8.c --- lebiniou-3.31/plugins/stable/main/blur8/blur8.c 2019-04-05 20:39:14.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/blur8/blur8.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -18,41 +18,30 @@ */ #include "context.h" +#include "image_filter.h" +#include "parameters.h" +#include "blur.h" u_long id = 1103058152; +uint32_t version = 0; u_long options = BE_BLUR|BEQ_DIAG; char dname[] = "D-Blur-2"; char desc[] = "Diagonal blur"; void +on_switch_on(Context_t *ctx) +{ + border_mode = BM_TOROIDAL; +} + + +void run(Context_t *ctx) { - u_short i, j; const Buffer8_t *src = active_buffer(ctx); Buffer8_t *dst = passive_buffer(ctx); - Buffer8_init_mask_3x3(active_buffer(ctx)); - - for (j = 1; j < MAXY - 1; j++) - for (i = 1; i < MAXX - 1; i++) { - u_short somme; - /* - * 1 0 2 - * 0 4 0 => 10 - * 2 0 1 - */ - somme = get_pixel_nc(src, i - 1, j - 1); - somme += get_pixel_nc(src, i + 1, j - 1) * 2; - somme += get_pixel_nc(src, i, j ) * 4; - somme += get_pixel_nc(src, i - 1, j + 1) * 2; - somme += get_pixel_nc(src, i + 1, j + 1); - - somme /= 10; - - set_pixel_nc(dst, i, j, (Pixel_t)(somme)); - } - - Buffer8_expand_border(dst); + image_filter_average(dst, src, FT_DBLUR2_3x3, border_mode, 0, NULL); } diff -Nru lebiniou-3.31/plugins/stable/main/blur8/Makefile.am lebiniou-3.40/plugins/stable/main/blur8/Makefile.am --- lebiniou-3.31/plugins/stable/main/blur8/Makefile.am 2018-11-27 13:50:08.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/blur8/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -2,5 +2,6 @@ plugin_PROGRAMS = blur8.so blur8_so_SOURCES = blur8.c -blur8_so_LDFLAGS = @PLUGIN_LDFLAGS@ -blur8_so_CFLAGS = @PLUGIN_CFLAGS@ +blur8_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +blur8_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +blur8_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/blur8/Makefile.in lebiniou-3.40/plugins/stable/main/blur8/Makefile.in --- lebiniou-3.31/plugins/stable/main/blur8/Makefile.in 2019-04-14 11:52:30.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/blur8/Makefile.in 2020-01-23 13:57:15.000000000 +0000 @@ -104,7 +104,7 @@ PROGRAMS = $(plugin_PROGRAMS) am_blur8_so_OBJECTS = blur8_so-blur8.$(OBJEXT) blur8_so_OBJECTS = $(am_blur8_so_OBJECTS) -blur8_so_LDADD = $(LDADD) +blur8_so_DEPENDENCIES = blur8_so_LINK = $(CCLD) $(blur8_so_CFLAGS) $(CFLAGS) \ $(blur8_so_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -216,6 +216,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -243,6 +245,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -257,7 +260,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -319,8 +325,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/main/blur8 blur8_so_SOURCES = blur8.c -blur8_so_LDFLAGS = @PLUGIN_LDFLAGS@ -blur8_so_CFLAGS = @PLUGIN_CFLAGS@ +blur8_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +blur8_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +blur8_so_LDADD = @PLUGIN_LDADD@ all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/main/cirrus/cirrus.c lebiniou-3.40/plugins/stable/main/cirrus/cirrus.c --- lebiniou-3.31/plugins/stable/main/cirrus/cirrus.c 2019-03-01 11:47:47.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/cirrus/cirrus.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -22,6 +22,7 @@ u_long id = 1181486379; +uint32_t version = 0; u_long options = BEQ_COLORMAP; char dname[] = "Cirrus"; u_long mode = NONE; @@ -47,11 +48,13 @@ static Shuffler_t *shuffler = NULL; -void +int8_t create(Context_t *ctx) { cirrus_alarm = Alarm_new(3, 10); shuffler = Shuffler_new(NCOLORS); + + return 1; } diff -Nru lebiniou-3.31/plugins/stable/main/cirrus/Makefile.am lebiniou-3.40/plugins/stable/main/cirrus/Makefile.am --- lebiniou-3.31/plugins/stable/main/cirrus/Makefile.am 2018-11-27 13:50:08.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/cirrus/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -2,5 +2,6 @@ plugin_PROGRAMS = cirrus.so cirrus_so_SOURCES = cirrus.c -cirrus_so_LDFLAGS = @PLUGIN_LDFLAGS@ -cirrus_so_CFLAGS = @PLUGIN_CFLAGS@ +cirrus_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +cirrus_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +cirrus_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/cirrus/Makefile.in lebiniou-3.40/plugins/stable/main/cirrus/Makefile.in --- lebiniou-3.31/plugins/stable/main/cirrus/Makefile.in 2019-04-14 11:52:30.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/cirrus/Makefile.in 2020-01-23 13:57:15.000000000 +0000 @@ -104,7 +104,7 @@ PROGRAMS = $(plugin_PROGRAMS) am_cirrus_so_OBJECTS = cirrus_so-cirrus.$(OBJEXT) cirrus_so_OBJECTS = $(am_cirrus_so_OBJECTS) -cirrus_so_LDADD = $(LDADD) +cirrus_so_DEPENDENCIES = cirrus_so_LINK = $(CCLD) $(cirrus_so_CFLAGS) $(CFLAGS) \ $(cirrus_so_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -216,6 +216,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -243,6 +245,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -257,7 +260,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -319,8 +325,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/main/cirrus cirrus_so_SOURCES = cirrus.c -cirrus_so_LDFLAGS = @PLUGIN_LDFLAGS@ -cirrus_so_CFLAGS = @PLUGIN_CFLAGS@ +cirrus_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +cirrus_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +cirrus_so_LDADD = @PLUGIN_LDADD@ all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/main/cirrus2/cirrus2.c lebiniou-3.40/plugins/stable/main/cirrus2/cirrus2.c --- lebiniou-3.31/plugins/stable/main/cirrus2/cirrus2.c 2019-03-01 11:47:47.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/cirrus2/cirrus2.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -28,6 +28,7 @@ */ u_long id = 1181600027; +uint32_t version = 0; u_long options = BEQ_COLORMAP; char dname[] = "Cirrus 2"; u_long mode = NONE; @@ -54,11 +55,13 @@ static Shuffler_t *shuffler = NULL; -void +int8_t create(Context_t *ctx) { cirrus_alarm = Alarm_new(3, 10); shuffler = Shuffler_new(NCOLORS); + + return 1; } diff -Nru lebiniou-3.31/plugins/stable/main/cirrus2/Makefile.am lebiniou-3.40/plugins/stable/main/cirrus2/Makefile.am --- lebiniou-3.31/plugins/stable/main/cirrus2/Makefile.am 2018-11-27 13:50:08.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/cirrus2/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -2,5 +2,6 @@ plugin_PROGRAMS = cirrus2.so cirrus2_so_SOURCES = cirrus2.c -cirrus2_so_LDFLAGS = @PLUGIN_LDFLAGS@ -cirrus2_so_CFLAGS = @PLUGIN_CFLAGS@ +cirrus2_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +cirrus2_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +cirrus2_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/cirrus2/Makefile.in lebiniou-3.40/plugins/stable/main/cirrus2/Makefile.in --- lebiniou-3.31/plugins/stable/main/cirrus2/Makefile.in 2019-04-14 11:52:30.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/cirrus2/Makefile.in 2020-01-23 13:57:15.000000000 +0000 @@ -104,7 +104,7 @@ PROGRAMS = $(plugin_PROGRAMS) am_cirrus2_so_OBJECTS = cirrus2_so-cirrus2.$(OBJEXT) cirrus2_so_OBJECTS = $(am_cirrus2_so_OBJECTS) -cirrus2_so_LDADD = $(LDADD) +cirrus2_so_DEPENDENCIES = cirrus2_so_LINK = $(CCLD) $(cirrus2_so_CFLAGS) $(CFLAGS) \ $(cirrus2_so_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -216,6 +216,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -243,6 +245,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -257,7 +260,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -319,8 +325,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/main/cirrus2 cirrus2_so_SOURCES = cirrus2.c -cirrus2_so_LDFLAGS = @PLUGIN_LDFLAGS@ -cirrus2_so_CFLAGS = @PLUGIN_CFLAGS@ +cirrus2_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +cirrus2_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +cirrus2_so_LDADD = @PLUGIN_LDADD@ all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/main/clear/clear.c lebiniou-3.40/plugins/stable/main/clear/clear.c --- lebiniou-3.31/plugins/stable/main/clear/clear.c 2019-03-01 11:47:47.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/clear/clear.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -21,7 +21,8 @@ u_long id = 1091656394; -u_long options = BE_CLEAN|BEQ_FIRST|BEQ_NORANDOM; +uint32_t version = 0; +u_long options = BE_CLEAN|BEQ_FIRST; u_long mode = NORMAL; char desc[] = "Clears the screen"; diff -Nru lebiniou-3.31/plugins/stable/main/clear/Makefile.am lebiniou-3.40/plugins/stable/main/clear/Makefile.am --- lebiniou-3.31/plugins/stable/main/clear/Makefile.am 2018-11-27 13:50:08.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/clear/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -2,5 +2,6 @@ plugin_PROGRAMS = clear.so clear_so_SOURCES = clear.c -clear_so_LDFLAGS = @PLUGIN_LDFLAGS@ -clear_so_CFLAGS = @PLUGIN_CFLAGS@ +clear_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +clear_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +clear_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/clear/Makefile.in lebiniou-3.40/plugins/stable/main/clear/Makefile.in --- lebiniou-3.31/plugins/stable/main/clear/Makefile.in 2019-04-14 11:52:30.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/clear/Makefile.in 2020-01-23 13:57:15.000000000 +0000 @@ -104,7 +104,7 @@ PROGRAMS = $(plugin_PROGRAMS) am_clear_so_OBJECTS = clear_so-clear.$(OBJEXT) clear_so_OBJECTS = $(am_clear_so_OBJECTS) -clear_so_LDADD = $(LDADD) +clear_so_DEPENDENCIES = clear_so_LINK = $(CCLD) $(clear_so_CFLAGS) $(CFLAGS) \ $(clear_so_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -216,6 +216,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -243,6 +245,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -257,7 +260,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -319,8 +325,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/main/clear clear_so_SOURCES = clear.c -clear_so_LDFLAGS = @PLUGIN_LDFLAGS@ -clear_so_CFLAGS = @PLUGIN_CFLAGS@ +clear_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +clear_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +clear_so_LDADD = @PLUGIN_LDADD@ all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/main/color_cycle/color_cycle.c lebiniou-3.40/plugins/stable/main/color_cycle/color_cycle.c --- lebiniou-3.31/plugins/stable/main/color_cycle/color_cycle.c 2019-03-01 11:47:47.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/color_cycle/color_cycle.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -23,6 +23,7 @@ u_long id = 1232813067; char dname[] = "Color cycle"; +uint32_t version = 0; u_long options = BEQ_COLORMAP | BEQ_NORANDOM; u_long mode = NONE; char desc[] = "Cycle the current colormap"; diff -Nru lebiniou-3.31/plugins/stable/main/color_cycle/Makefile.am lebiniou-3.40/plugins/stable/main/color_cycle/Makefile.am --- lebiniou-3.31/plugins/stable/main/color_cycle/Makefile.am 2018-11-27 13:50:08.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/color_cycle/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -2,5 +2,6 @@ plugin_PROGRAMS = color_cycle.so color_cycle_so_SOURCES = color_cycle.c -color_cycle_so_LDFLAGS = @PLUGIN_LDFLAGS@ -color_cycle_so_CFLAGS = @PLUGIN_CFLAGS@ +color_cycle_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +color_cycle_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +color_cycle_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/color_cycle/Makefile.in lebiniou-3.40/plugins/stable/main/color_cycle/Makefile.in --- lebiniou-3.31/plugins/stable/main/color_cycle/Makefile.in 2019-04-14 11:52:30.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/color_cycle/Makefile.in 2020-01-23 13:57:15.000000000 +0000 @@ -104,7 +104,7 @@ PROGRAMS = $(plugin_PROGRAMS) am_color_cycle_so_OBJECTS = color_cycle_so-color_cycle.$(OBJEXT) color_cycle_so_OBJECTS = $(am_color_cycle_so_OBJECTS) -color_cycle_so_LDADD = $(LDADD) +color_cycle_so_DEPENDENCIES = color_cycle_so_LINK = $(CCLD) $(color_cycle_so_CFLAGS) $(CFLAGS) \ $(color_cycle_so_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -216,6 +216,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -243,6 +245,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -257,7 +260,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -319,8 +325,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/main/color_cycle color_cycle_so_SOURCES = color_cycle.c -color_cycle_so_LDFLAGS = @PLUGIN_LDFLAGS@ -color_cycle_so_CFLAGS = @PLUGIN_CFLAGS@ +color_cycle_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +color_cycle_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +color_cycle_so_LDADD = @PLUGIN_LDADD@ all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/main/critters/critters.c lebiniou-3.40/plugins/stable/main/critters/critters.c --- lebiniou-3.31/plugins/stable/main/critters/critters.c 2019-04-05 20:39:14.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/critters/critters.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -21,6 +21,7 @@ u_long id = 1100375479; +uint32_t version = 0; u_long options = BE_SFX2D|BEQ_NORANDOM; u_long mode = OVERLAY; char desc[] = "Critters demo"; @@ -76,7 +77,7 @@ /* if a critter is out of screen, reset it */ if ((tmp.x < MINX) || (tmp.y < MINY) - || (tmp.x > MAXX) || (tmp.y > MAXY)) { + || (tmp.x > MAXX) || (tmp.y > MAXY)) { randomize(&critters[i]); } else { /* update position */ @@ -107,14 +108,9 @@ } -void +int8_t create(Context_t *ctx) { - if (ctx->input == NULL) { - options |= BEQ_DISABLED; - return; - } - nb_critters = ctx->input->size; critters = xcalloc(nb_critters, sizeof(struct Critter)); @@ -123,6 +119,8 @@ } randomize_all(); + + return 1; } diff -Nru lebiniou-3.31/plugins/stable/main/critters/Makefile.am lebiniou-3.40/plugins/stable/main/critters/Makefile.am --- lebiniou-3.31/plugins/stable/main/critters/Makefile.am 2018-11-27 13:50:08.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/critters/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -2,5 +2,6 @@ plugin_PROGRAMS = critters.so critters_so_SOURCES = critters.c -critters_so_LDFLAGS = @PLUGIN_LDFLAGS@ -critters_so_CFLAGS = @PLUGIN_CFLAGS@ +critters_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +critters_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +critters_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/critters/Makefile.in lebiniou-3.40/plugins/stable/main/critters/Makefile.in --- lebiniou-3.31/plugins/stable/main/critters/Makefile.in 2019-04-14 11:52:30.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/critters/Makefile.in 2020-01-23 13:57:15.000000000 +0000 @@ -104,7 +104,7 @@ PROGRAMS = $(plugin_PROGRAMS) am_critters_so_OBJECTS = critters_so-critters.$(OBJEXT) critters_so_OBJECTS = $(am_critters_so_OBJECTS) -critters_so_LDADD = $(LDADD) +critters_so_DEPENDENCIES = critters_so_LINK = $(CCLD) $(critters_so_CFLAGS) $(CFLAGS) \ $(critters_so_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -216,6 +216,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -243,6 +245,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -257,7 +260,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -319,8 +325,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/main/critters critters_so_SOURCES = critters.c -critters_so_LDFLAGS = @PLUGIN_LDFLAGS@ -critters_so_CFLAGS = @PLUGIN_CFLAGS@ +critters_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +critters_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +critters_so_LDADD = @PLUGIN_LDADD@ all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/main/crp/crp.c lebiniou-3.40/plugins/stable/main/crp/crp.c --- lebiniou-3.31/plugins/stable/main/crp/crp.c 2019-04-05 20:39:14.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/crp/crp.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -20,6 +20,7 @@ #include "context.h" u_long id = 1089234657; +uint32_t version = 0; u_long options = BEQ_LAST; char dname[] = "X-Recurrence"; u_long mode = OVERLAY; @@ -66,21 +67,12 @@ dist = sqrtf(dx + dy + dz + dt); dist /= DMAX; - /* return (last_color = (255 - (u_char)(255 * dist))); */ + /* return (last_color = (255 - (u_char)(255 * dist))); */ return (255 - (Pixel_t)(255 * dist)); } void -create(Context_t *ctx) -{ - if (ctx->input == NULL) { - options |= BEQ_DISABLED; - } -} - - -void run(Context_t *ctx) { int ii, jj; @@ -92,21 +84,21 @@ for (jj = 0; jj < MINSCREEN; jj++) { int j = (int)((float)jj - / (float)MINSCREEN - * (float)(ctx->input->size-3.0)); + / (float)MINSCREEN + * (float)(ctx->input->size-3.0)); int last_i = -1; Pixel_t last_c = 0; for (ii = 0; ii < MINSCREEN; ii++) { Pixel_t c = last_c; int i = (int)((float)ii - / (float)MINSCREEN - * (float)(ctx->input->size-3.0)); + / (float)MINSCREEN + * (float)(ctx->input->size-3.0)); if (i != last_i) { - c = get_color(ctx->input, i, j); - last_i = i; - last_c = c; + c = get_color(ctx->input, i, j); + last_i = i; + last_c = c; } /* not-optimized plot */ diff -Nru lebiniou-3.31/plugins/stable/main/crp/Makefile.am lebiniou-3.40/plugins/stable/main/crp/Makefile.am --- lebiniou-3.31/plugins/stable/main/crp/Makefile.am 2018-11-27 13:50:08.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/crp/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -2,5 +2,6 @@ plugin_PROGRAMS = crp.so crp_so_SOURCES = crp.c -crp_so_LDFLAGS = @PLUGIN_LDFLAGS@ -crp_so_CFLAGS = @PLUGIN_CFLAGS@ +crp_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +crp_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +crp_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/crp/Makefile.in lebiniou-3.40/plugins/stable/main/crp/Makefile.in --- lebiniou-3.31/plugins/stable/main/crp/Makefile.in 2019-04-14 11:52:30.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/crp/Makefile.in 2020-01-23 13:57:15.000000000 +0000 @@ -104,7 +104,7 @@ PROGRAMS = $(plugin_PROGRAMS) am_crp_so_OBJECTS = crp_so-crp.$(OBJEXT) crp_so_OBJECTS = $(am_crp_so_OBJECTS) -crp_so_LDADD = $(LDADD) +crp_so_DEPENDENCIES = crp_so_LINK = $(CCLD) $(crp_so_CFLAGS) $(CFLAGS) $(crp_so_LDFLAGS) \ $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -216,6 +216,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -243,6 +245,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -257,7 +260,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -319,8 +325,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/main/crp crp_so_SOURCES = crp.c -crp_so_LDFLAGS = @PLUGIN_LDFLAGS@ -crp_so_CFLAGS = @PLUGIN_CFLAGS@ +crp_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +crp_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +crp_so_LDADD = @PLUGIN_LDADD@ all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/main/cth_bighalfwheel/cth_bighalfwheel.c lebiniou-3.40/plugins/stable/main/cth_bighalfwheel/cth_bighalfwheel.c --- lebiniou-3.31/plugins/stable/main/cth_bighalfwheel/cth_bighalfwheel.c 2019-04-05 20:39:14.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/cth_bighalfwheel/cth_bighalfwheel.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -21,6 +21,7 @@ u_long id = 1071318964; +uint32_t version = 0; u_long options = BE_DISPLACE; char dname[] = "Big half wheel"; char desc[] = "Translation effect"; @@ -40,8 +41,9 @@ static Map_t -cth_bighalfwheel(u_short i, u_short j) +cth_bighalfwheel(const short in_x, const short in_y) { + const u_short i = in_x, j = in_y; int dx, dy; Map_t m; @@ -108,10 +110,12 @@ } -void +int8_t create(Context_t *ctx) { t_bighalfwheel = Translation_new(&cth_bighalfwheel, &init_params); + + return 1; } diff -Nru lebiniou-3.31/plugins/stable/main/cth_bighalfwheel/Makefile.am lebiniou-3.40/plugins/stable/main/cth_bighalfwheel/Makefile.am --- lebiniou-3.31/plugins/stable/main/cth_bighalfwheel/Makefile.am 2018-11-27 13:50:08.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/cth_bighalfwheel/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -2,5 +2,6 @@ plugin_PROGRAMS = cth_bighalfwheel.so cth_bighalfwheel_so_SOURCES = cth_bighalfwheel.c -cth_bighalfwheel_so_LDFLAGS = @PLUGIN_LDFLAGS@ -cth_bighalfwheel_so_CFLAGS = @PLUGIN_CFLAGS@ +cth_bighalfwheel_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +cth_bighalfwheel_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +cth_bighalfwheel_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/cth_bighalfwheel/Makefile.in lebiniou-3.40/plugins/stable/main/cth_bighalfwheel/Makefile.in --- lebiniou-3.31/plugins/stable/main/cth_bighalfwheel/Makefile.in 2019-04-14 11:52:30.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/cth_bighalfwheel/Makefile.in 2020-01-23 13:57:15.000000000 +0000 @@ -105,7 +105,7 @@ am_cth_bighalfwheel_so_OBJECTS = \ cth_bighalfwheel_so-cth_bighalfwheel.$(OBJEXT) cth_bighalfwheel_so_OBJECTS = $(am_cth_bighalfwheel_so_OBJECTS) -cth_bighalfwheel_so_LDADD = $(LDADD) +cth_bighalfwheel_so_DEPENDENCIES = cth_bighalfwheel_so_LINK = $(CCLD) $(cth_bighalfwheel_so_CFLAGS) \ $(CFLAGS) $(cth_bighalfwheel_so_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -218,6 +218,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -245,6 +247,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -259,7 +262,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -321,8 +327,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/main/cth_bighalfwheel cth_bighalfwheel_so_SOURCES = cth_bighalfwheel.c -cth_bighalfwheel_so_LDFLAGS = @PLUGIN_LDFLAGS@ -cth_bighalfwheel_so_CFLAGS = @PLUGIN_CFLAGS@ +cth_bighalfwheel_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +cth_bighalfwheel_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +cth_bighalfwheel_so_LDADD = @PLUGIN_LDADD@ all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/main/cth_hurricane/cth_hurricane.c lebiniou-3.40/plugins/stable/main/cth_hurricane/cth_hurricane.c --- lebiniou-3.31/plugins/stable/main/cth_hurricane/cth_hurricane.c 2019-04-05 20:39:14.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/cth_hurricane/cth_hurricane.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -21,6 +21,7 @@ u_long id = 949050896; +uint32_t version = 0; u_long options = BE_DISPLACE; char dname[] = "Hurricane"; char desc[] = "Hurricane effect"; @@ -33,7 +34,7 @@ static Map_t -hurricane(const u_short x, const u_short y) +hurricane(const short x, const short y) { int dx, dy, map_x, map_y; int speedFactor; @@ -68,16 +69,6 @@ map_x = (int)(x + (dy * sp) / 700); map_y = (int)(y - (dx * sp) / 700); - while (map_x < 0) { - map_x += WIDTH; - } - while (map_y < 0) { - map_y += HEIGHT; - } - - map_x %= WIDTH; - map_y %= HEIGHT; - m.map_x = map_x; m.map_y = map_y; @@ -105,10 +96,12 @@ } -void +int8_t create(Context_t *ctx) { t_hurricane = Translation_new(&hurricane, &init_params); + + return 1; } diff -Nru lebiniou-3.31/plugins/stable/main/cth_hurricane/Makefile.am lebiniou-3.40/plugins/stable/main/cth_hurricane/Makefile.am --- lebiniou-3.31/plugins/stable/main/cth_hurricane/Makefile.am 2018-11-27 13:50:08.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/cth_hurricane/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -2,5 +2,6 @@ plugin_PROGRAMS = cth_hurricane.so cth_hurricane_so_SOURCES = cth_hurricane.c -cth_hurricane_so_LDFLAGS = @PLUGIN_LDFLAGS@ -cth_hurricane_so_CFLAGS = @PLUGIN_CFLAGS@ +cth_hurricane_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +cth_hurricane_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +cth_hurricane_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/cth_hurricane/Makefile.in lebiniou-3.40/plugins/stable/main/cth_hurricane/Makefile.in --- lebiniou-3.31/plugins/stable/main/cth_hurricane/Makefile.in 2019-04-14 11:52:30.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/cth_hurricane/Makefile.in 2020-01-23 13:57:15.000000000 +0000 @@ -105,7 +105,7 @@ am_cth_hurricane_so_OBJECTS = \ cth_hurricane_so-cth_hurricane.$(OBJEXT) cth_hurricane_so_OBJECTS = $(am_cth_hurricane_so_OBJECTS) -cth_hurricane_so_LDADD = $(LDADD) +cth_hurricane_so_DEPENDENCIES = cth_hurricane_so_LINK = $(CCLD) $(cth_hurricane_so_CFLAGS) $(CFLAGS) \ $(cth_hurricane_so_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -217,6 +217,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -244,6 +246,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -258,7 +261,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -320,8 +326,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/main/cth_hurricane cth_hurricane_so_SOURCES = cth_hurricane.c -cth_hurricane_so_LDFLAGS = @PLUGIN_LDFLAGS@ -cth_hurricane_so_CFLAGS = @PLUGIN_CFLAGS@ +cth_hurricane_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +cth_hurricane_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +cth_hurricane_so_LDADD = @PLUGIN_LDADD@ all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/main/cth_smoke/cth_smoke.c lebiniou-3.40/plugins/stable/main/cth_smoke/cth_smoke.c --- lebiniou-3.31/plugins/stable/main/cth_smoke/cth_smoke.c 2019-04-05 20:39:14.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/cth_smoke/cth_smoke.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -21,6 +21,7 @@ u_long id = 949050895; +uint32_t version = 0; u_long options = BE_DISPLACE; char dname[] = "Smoke"; char desc[] = "Give lines a smoky effect"; @@ -31,8 +32,9 @@ static Map_t -smoke(const u_short x, const u_short y) +smoke(const short in_x, const short in_y) { + const u_short x = in_x, y = in_y; int map_x, map_y; Map_t m; @@ -65,10 +67,12 @@ } -void +int8_t create(Context_t *ctx) { t_smoke = Translation_new(&smoke, &init_params); + + return 1; } diff -Nru lebiniou-3.31/plugins/stable/main/cth_smoke/Makefile.am lebiniou-3.40/plugins/stable/main/cth_smoke/Makefile.am --- lebiniou-3.31/plugins/stable/main/cth_smoke/Makefile.am 2018-11-27 13:50:08.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/cth_smoke/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -2,5 +2,6 @@ plugin_PROGRAMS = cth_smoke.so cth_smoke_so_SOURCES = cth_smoke.c -cth_smoke_so_LDFLAGS = @PLUGIN_LDFLAGS@ -cth_smoke_so_CFLAGS = @PLUGIN_CFLAGS@ +cth_smoke_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +cth_smoke_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +cth_smoke_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/cth_smoke/Makefile.in lebiniou-3.40/plugins/stable/main/cth_smoke/Makefile.in --- lebiniou-3.31/plugins/stable/main/cth_smoke/Makefile.in 2019-04-14 11:52:30.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/cth_smoke/Makefile.in 2020-01-23 13:57:15.000000000 +0000 @@ -104,7 +104,7 @@ PROGRAMS = $(plugin_PROGRAMS) am_cth_smoke_so_OBJECTS = cth_smoke_so-cth_smoke.$(OBJEXT) cth_smoke_so_OBJECTS = $(am_cth_smoke_so_OBJECTS) -cth_smoke_so_LDADD = $(LDADD) +cth_smoke_so_DEPENDENCIES = cth_smoke_so_LINK = $(CCLD) $(cth_smoke_so_CFLAGS) $(CFLAGS) \ $(cth_smoke_so_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -216,6 +216,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -243,6 +245,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -257,7 +260,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -319,8 +325,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/main/cth_smoke cth_smoke_so_SOURCES = cth_smoke.c -cth_smoke_so_LDFLAGS = @PLUGIN_LDFLAGS@ -cth_smoke_so_CFLAGS = @PLUGIN_CFLAGS@ +cth_smoke_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +cth_smoke_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +cth_smoke_so_LDADD = @PLUGIN_LDADD@ all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/main/cth_space_in/cth_space_in.c lebiniou-3.40/plugins/stable/main/cth_space_in/cth_space_in.c --- lebiniou-3.31/plugins/stable/main/cth_space_in/cth_space_in.c 2019-03-01 11:47:47.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/cth_space_in/cth_space_in.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -18,10 +18,12 @@ */ #include "translation.h" +#include "parameters.h" /* we don't use Randomness in our version --oliv3 */ u_long id = 1071960047; +uint32_t version = 0; u_long options = BE_DISPLACE; char dname[] = "Space in"; char desc[] = "Inwards space move"; @@ -34,11 +36,22 @@ /* int Randomness = DEFAULT_RAND; */ static int speed = DEFAULT_SPEED; +static float speed_factor = 0; + +json_t * +get_parameters() +{ + json_t *params = json_object(); + plugin_parameters_add_double(params, BPP_SPEED_FACTOR, speed_factor, -0.01, 0.01); + + return params; +} static Map_t -cth_space(u_short x, u_short y) +cth_space(const short in_x, const short in_y) { + const u_short x = in_x, y = in_y; int dx, dy, map_x, map_y; Map_t m; @@ -48,8 +61,7 @@ map_x = (int)((float)(x) - (float)(dx * speed) / 700.0); map_y = (int)((float)(y) - (float)(dy * speed) / 700.0); - if ((map_y > MAXY) || (map_y < MINY) - || (map_x > MAXX) || (map_x < MINX)) { + if ((map_y > MAXY) || (map_y < MINY) || (map_x > MAXX) || (map_x < MINX)) { map_x = 0; map_y = 0; } @@ -64,22 +76,47 @@ static void init_params() { - speed = b_rand_int_range(30, 100); + speed = speed_factor * b_rand_int_range(30, 100); /* Randomness = b_rand_int_range(12, 100); */ } void +set_parameters(const json_t *in_parameters) +{ + int reload = 0; + reload |= plugin_parameter_parse_float_range(in_parameters, BPP_SPEED_FACTOR, &speed_factor, 0, 10); + + if (reload) { + Translation_delete(t_space); + t_space = Translation_new(&cth_space, &init_params); + } +} + + +json_t * +parameters(const json_t *in_parameters) +{ + set_parameters(in_parameters); + + return get_parameters(); +} + + +void on_switch_on(Context_t *ctx) { + speed_factor = 1; Translation_batch_init(t_space); } -void +int8_t create(Context_t *ctx) { t_space = Translation_new(&cth_space, &init_params); + + return 1; } diff -Nru lebiniou-3.31/plugins/stable/main/cth_space_in/Makefile.am lebiniou-3.40/plugins/stable/main/cth_space_in/Makefile.am --- lebiniou-3.31/plugins/stable/main/cth_space_in/Makefile.am 2018-11-27 13:50:08.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/cth_space_in/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -2,5 +2,6 @@ plugin_PROGRAMS = cth_space_in.so cth_space_in_so_SOURCES = cth_space_in.c -cth_space_in_so_LDFLAGS = @PLUGIN_LDFLAGS@ -cth_space_in_so_CFLAGS = @PLUGIN_CFLAGS@ +cth_space_in_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +cth_space_in_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +cth_space_in_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/cth_space_in/Makefile.in lebiniou-3.40/plugins/stable/main/cth_space_in/Makefile.in --- lebiniou-3.31/plugins/stable/main/cth_space_in/Makefile.in 2019-04-14 11:52:31.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/cth_space_in/Makefile.in 2020-01-23 13:57:15.000000000 +0000 @@ -104,7 +104,7 @@ PROGRAMS = $(plugin_PROGRAMS) am_cth_space_in_so_OBJECTS = cth_space_in_so-cth_space_in.$(OBJEXT) cth_space_in_so_OBJECTS = $(am_cth_space_in_so_OBJECTS) -cth_space_in_so_LDADD = $(LDADD) +cth_space_in_so_DEPENDENCIES = cth_space_in_so_LINK = $(CCLD) $(cth_space_in_so_CFLAGS) $(CFLAGS) \ $(cth_space_in_so_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -216,6 +216,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -243,6 +245,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -257,7 +260,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -319,8 +325,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/main/cth_space_in cth_space_in_so_SOURCES = cth_space_in.c -cth_space_in_so_LDFLAGS = @PLUGIN_LDFLAGS@ -cth_space_in_so_CFLAGS = @PLUGIN_CFLAGS@ +cth_space_in_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +cth_space_in_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +cth_space_in_so_LDADD = @PLUGIN_LDADD@ all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/main/cth_space_out/cth_space_out.c lebiniou-3.40/plugins/stable/main/cth_space_out/cth_space_out.c --- lebiniou-3.31/plugins/stable/main/cth_space_out/cth_space_out.c 2019-03-01 11:47:48.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/cth_space_out/cth_space_out.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -18,10 +18,12 @@ */ #include "translation.h" +#include "parameters.h" /* we don't use Randomness in our version --oliv3 */ u_long id = 1071960048; +uint32_t version = 0; u_long options = BE_DISPLACE; char dname[] = "Space out"; char desc[] = "Outwards space move"; @@ -34,11 +36,22 @@ /* int Randomness = DEFAULT_RAND; */ static int speed = DEFAULT_SPEED; +static float speed_factor = 0; + +json_t * +get_parameters() +{ + json_t *params = json_object(); + plugin_parameters_add_double(params, BPP_SPEED_FACTOR, speed_factor, -0.01, 0.01); + + return params; +} static Map_t -cth_space(u_short x, u_short y) +cth_space(const short in_x, const short in_y) { + const u_short x = in_x, y = in_y; int dx, dy, map_x, map_y; Map_t m; @@ -48,8 +61,7 @@ map_x = (int)((float)(x) - (float)(dx * -speed) / 700.0); map_y = (int)((float)(y) - (float)(dy * -speed) / 700.0); - if ((map_y > MAXY) || (map_y < MINY) - || (map_x > MAXX) || (map_x < MINX)) { + if ((map_y > MAXY) || (map_y < MINY) || (map_x > MAXX) || (map_x < MINX)) { map_x = 0; map_y = 0; } @@ -64,22 +76,47 @@ static void init_params() { - speed = b_rand_int_range(30, 100); + speed = speed_factor * b_rand_int_range(30, 100); /* Randomness = b_rand_int_range(12, 100); */ } void +set_parameters(const json_t *in_parameters) +{ + int reload = 0; + reload |= plugin_parameter_parse_float_range(in_parameters, BPP_SPEED_FACTOR, &speed_factor, 0, 10); + + if (reload) { + Translation_delete(t_space); + t_space = Translation_new(&cth_space, &init_params); + } +} + + +json_t * +parameters(const json_t *in_parameters) +{ + set_parameters(in_parameters); + + return get_parameters(); +} + + +void on_switch_on(Context_t *ctx) { + speed_factor = 1; Translation_batch_init(t_space); } -void +int8_t create(Context_t *ctx) { t_space = Translation_new(&cth_space, &init_params); + + return 1; } diff -Nru lebiniou-3.31/plugins/stable/main/cth_space_out/Makefile.am lebiniou-3.40/plugins/stable/main/cth_space_out/Makefile.am --- lebiniou-3.31/plugins/stable/main/cth_space_out/Makefile.am 2018-11-27 13:50:08.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/cth_space_out/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -2,5 +2,6 @@ plugin_PROGRAMS = cth_space_out.so cth_space_out_so_SOURCES = cth_space_out.c -cth_space_out_so_LDFLAGS = @PLUGIN_LDFLAGS@ -cth_space_out_so_CFLAGS = @PLUGIN_CFLAGS@ +cth_space_out_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +cth_space_out_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +cth_space_out_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/cth_space_out/Makefile.in lebiniou-3.40/plugins/stable/main/cth_space_out/Makefile.in --- lebiniou-3.31/plugins/stable/main/cth_space_out/Makefile.in 2019-04-14 11:52:31.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/cth_space_out/Makefile.in 2020-01-23 13:57:15.000000000 +0000 @@ -105,7 +105,7 @@ am_cth_space_out_so_OBJECTS = \ cth_space_out_so-cth_space_out.$(OBJEXT) cth_space_out_so_OBJECTS = $(am_cth_space_out_so_OBJECTS) -cth_space_out_so_LDADD = $(LDADD) +cth_space_out_so_DEPENDENCIES = cth_space_out_so_LINK = $(CCLD) $(cth_space_out_so_CFLAGS) $(CFLAGS) \ $(cth_space_out_so_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -217,6 +217,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -244,6 +246,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -258,7 +261,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -320,8 +326,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/main/cth_space_out cth_space_out_so_SOURCES = cth_space_out.c -cth_space_out_so_LDFLAGS = @PLUGIN_LDFLAGS@ -cth_space_out_so_CFLAGS = @PLUGIN_CFLAGS@ +cth_space_out_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +cth_space_out_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +cth_space_out_so_LDADD = @PLUGIN_LDADD@ all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/main/cth_spiral/cth_spiral.c lebiniou-3.40/plugins/stable/main/cth_spiral/cth_spiral.c --- lebiniou-3.31/plugins/stable/main/cth_spiral/cth_spiral.c 2019-04-05 20:39:14.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/cth_spiral/cth_spiral.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -18,9 +18,11 @@ */ #include "translation.h" +#include "parameters.h" u_long id = 949050897; +uint32_t version = 0; u_long options = BE_DISPLACE; char dname[] = "Spiral"; char desc[] = "Spiral effect"; @@ -36,10 +38,22 @@ const float q = M_PI / 2; const float p = 45.0 / 180.0 * M_PI; +static float p_factor = 0; + +json_t * +get_parameters() +{ + json_t *params = json_object(); + plugin_parameters_add_double(params, BPP_P_FACTOR, p_factor, -0.01, 0.01); + + return params; +} + static Map_t -cth_spiral(const u_short i, const u_short j) +cth_spiral(const short in_x, const short in_y) { + const u_short i = in_x, j = in_y; int dx,dy; Map_t m; @@ -66,8 +80,8 @@ ang += M_PI; } - dx = ceil(-sin(ang-p)*dist/10.0); - dy = ceil(cos(ang-p)*dist/10.0); + dx = ceil(-sin(ang - p * p_factor) * dist / 10.0); + dy = ceil( cos(ang - p * p_factor) * dist / 10.0); if ((i == MINX) || (i == MAXX)) { dx = cx - i; @@ -91,16 +105,41 @@ void +set_parameters(const json_t *in_parameters) +{ + int reload = 0; + reload |= plugin_parameter_parse_float_range(in_parameters, BPP_P_FACTOR, &p_factor, 0, 10); + + if (reload) { + Translation_delete(t_spiral); + t_spiral = Translation_new(&cth_spiral, &init_params); + } +} + + +json_t * +parameters(const json_t *in_parameters) +{ + set_parameters(in_parameters); + + return get_parameters(); +} + + +void on_switch_on(Context_t *ctx) { + p_factor = 1; Translation_batch_init(t_spiral); } -void +int8_t create(Context_t *ctx) { t_spiral = Translation_new(&cth_spiral, &init_params); + + return 1; } diff -Nru lebiniou-3.31/plugins/stable/main/cth_spiral/Makefile.am lebiniou-3.40/plugins/stable/main/cth_spiral/Makefile.am --- lebiniou-3.31/plugins/stable/main/cth_spiral/Makefile.am 2018-11-27 13:50:08.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/cth_spiral/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -2,5 +2,6 @@ plugin_PROGRAMS = cth_spiral.so cth_spiral_so_SOURCES = cth_spiral.c -cth_spiral_so_LDFLAGS = @PLUGIN_LDFLAGS@ -cth_spiral_so_CFLAGS = @PLUGIN_CFLAGS@ +cth_spiral_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +cth_spiral_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +cth_spiral_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/cth_spiral/Makefile.in lebiniou-3.40/plugins/stable/main/cth_spiral/Makefile.in --- lebiniou-3.31/plugins/stable/main/cth_spiral/Makefile.in 2019-04-14 11:52:31.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/cth_spiral/Makefile.in 2020-01-23 13:57:15.000000000 +0000 @@ -104,7 +104,7 @@ PROGRAMS = $(plugin_PROGRAMS) am_cth_spiral_so_OBJECTS = cth_spiral_so-cth_spiral.$(OBJEXT) cth_spiral_so_OBJECTS = $(am_cth_spiral_so_OBJECTS) -cth_spiral_so_LDADD = $(LDADD) +cth_spiral_so_DEPENDENCIES = cth_spiral_so_LINK = $(CCLD) $(cth_spiral_so_CFLAGS) $(CFLAGS) \ $(cth_spiral_so_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -216,6 +216,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -243,6 +245,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -257,7 +260,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -319,8 +325,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/main/cth_spiral cth_spiral_so_SOURCES = cth_spiral.c -cth_spiral_so_LDFLAGS = @PLUGIN_LDFLAGS@ -cth_spiral_so_CFLAGS = @PLUGIN_CFLAGS@ +cth_spiral_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +cth_spiral_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +cth_spiral_so_LDADD = @PLUGIN_LDADD@ all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/main/cth_xroller/cth_xroller.c lebiniou-3.40/plugins/stable/main/cth_xroller/cth_xroller.c --- lebiniou-3.31/plugins/stable/main/cth_xroller/cth_xroller.c 2019-04-05 20:39:14.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/cth_xroller/cth_xroller.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -21,6 +21,7 @@ u_long id = 949677607; +uint32_t version = 0; u_long options = BE_ROLL|BEQ_HOR|BE_LENS; char dname[] = "X roll"; char desc[] = "Rolls the screen vertically"; diff -Nru lebiniou-3.31/plugins/stable/main/cth_xroller/Makefile.am lebiniou-3.40/plugins/stable/main/cth_xroller/Makefile.am --- lebiniou-3.31/plugins/stable/main/cth_xroller/Makefile.am 2018-11-27 13:50:08.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/cth_xroller/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -2,5 +2,6 @@ plugin_PROGRAMS = cth_xroller.so cth_xroller_so_SOURCES = cth_xroller.c -cth_xroller_so_LDFLAGS = @PLUGIN_LDFLAGS@ -cth_xroller_so_CFLAGS = @PLUGIN_CFLAGS@ +cth_xroller_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +cth_xroller_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +cth_xroller_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/cth_xroller/Makefile.in lebiniou-3.40/plugins/stable/main/cth_xroller/Makefile.in --- lebiniou-3.31/plugins/stable/main/cth_xroller/Makefile.in 2019-04-14 11:52:31.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/cth_xroller/Makefile.in 2020-01-23 13:57:15.000000000 +0000 @@ -104,7 +104,7 @@ PROGRAMS = $(plugin_PROGRAMS) am_cth_xroller_so_OBJECTS = cth_xroller_so-cth_xroller.$(OBJEXT) cth_xroller_so_OBJECTS = $(am_cth_xroller_so_OBJECTS) -cth_xroller_so_LDADD = $(LDADD) +cth_xroller_so_DEPENDENCIES = cth_xroller_so_LINK = $(CCLD) $(cth_xroller_so_CFLAGS) $(CFLAGS) \ $(cth_xroller_so_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -216,6 +216,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -243,6 +245,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -257,7 +260,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -319,8 +325,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/main/cth_xroller cth_xroller_so_SOURCES = cth_xroller.c -cth_xroller_so_LDFLAGS = @PLUGIN_LDFLAGS@ -cth_xroller_so_CFLAGS = @PLUGIN_CFLAGS@ +cth_xroller_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +cth_xroller_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +cth_xroller_so_LDADD = @PLUGIN_LDADD@ all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/main/cth_yroller/cth_yroller.c lebiniou-3.40/plugins/stable/main/cth_yroller/cth_yroller.c --- lebiniou-3.31/plugins/stable/main/cth_yroller/cth_yroller.c 2019-04-05 20:39:14.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/cth_yroller/cth_yroller.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -21,6 +21,7 @@ u_long id = 949677608; +uint32_t version = 0; u_long options = BE_ROLL|BEQ_VER|BE_LENS; char dname[] = "Y roll"; char desc[] = "Rolls the screen horizontally"; diff -Nru lebiniou-3.31/plugins/stable/main/cth_yroller/Makefile.am lebiniou-3.40/plugins/stable/main/cth_yroller/Makefile.am --- lebiniou-3.31/plugins/stable/main/cth_yroller/Makefile.am 2018-11-27 13:50:08.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/cth_yroller/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -2,5 +2,6 @@ plugin_PROGRAMS = cth_yroller.so cth_yroller_so_SOURCES = cth_yroller.c -cth_yroller_so_LDFLAGS = @PLUGIN_LDFLAGS@ -cth_yroller_so_CFLAGS = @PLUGIN_CFLAGS@ +cth_yroller_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +cth_yroller_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +cth_yroller_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/cth_yroller/Makefile.in lebiniou-3.40/plugins/stable/main/cth_yroller/Makefile.in --- lebiniou-3.31/plugins/stable/main/cth_yroller/Makefile.in 2019-04-14 11:52:31.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/cth_yroller/Makefile.in 2020-01-23 13:57:15.000000000 +0000 @@ -104,7 +104,7 @@ PROGRAMS = $(plugin_PROGRAMS) am_cth_yroller_so_OBJECTS = cth_yroller_so-cth_yroller.$(OBJEXT) cth_yroller_so_OBJECTS = $(am_cth_yroller_so_OBJECTS) -cth_yroller_so_LDADD = $(LDADD) +cth_yroller_so_DEPENDENCIES = cth_yroller_so_LINK = $(CCLD) $(cth_yroller_so_CFLAGS) $(CFLAGS) \ $(cth_yroller_so_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -216,6 +216,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -243,6 +245,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -257,7 +260,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -319,8 +325,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/main/cth_yroller cth_yroller_so_SOURCES = cth_yroller.c -cth_yroller_so_LDFLAGS = @PLUGIN_LDFLAGS@ -cth_yroller_so_CFLAGS = @PLUGIN_CFLAGS@ +cth_yroller_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +cth_yroller_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +cth_yroller_so_LDADD = @PLUGIN_LDADD@ all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/main/delay2/delay2.c lebiniou-3.40/plugins/stable/main/delay2/delay2.c --- lebiniou-3.31/plugins/stable/main/delay2/delay2.c 2019-04-13 13:36:48.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/delay2/delay2.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -23,6 +23,7 @@ u_long id = 1192734840; +uint32_t version = 0; u_long options = BE_SFX3D|BEQ_PARTICLES|BEQ_NORANDOM; u_long mode = OVERLAY; char desc[] = "Phase-space reconstruction with lines"; @@ -118,14 +119,12 @@ } -void +int8_t create(Context_t *ctx) { - if (ctx->input == NULL) { - options |= BEQ_DISABLED; - } else { - ps = Particle_System_new(MAX_PARTICLES); - } + ps = Particle_System_new(MAX_PARTICLES); + + return 1; } diff -Nru lebiniou-3.31/plugins/stable/main/delay2/Makefile.am lebiniou-3.40/plugins/stable/main/delay2/Makefile.am --- lebiniou-3.31/plugins/stable/main/delay2/Makefile.am 2018-11-27 13:50:08.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/delay2/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -2,5 +2,6 @@ plugin_PROGRAMS = delay2.so delay2_so_SOURCES = delay2.c -delay2_so_LDFLAGS = @PLUGIN_LDFLAGS@ -delay2_so_CFLAGS = @PLUGIN_CFLAGS@ +delay2_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +delay2_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +delay2_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/delay2/Makefile.in lebiniou-3.40/plugins/stable/main/delay2/Makefile.in --- lebiniou-3.31/plugins/stable/main/delay2/Makefile.in 2019-04-14 11:52:31.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/delay2/Makefile.in 2020-01-23 13:57:15.000000000 +0000 @@ -104,7 +104,7 @@ PROGRAMS = $(plugin_PROGRAMS) am_delay2_so_OBJECTS = delay2_so-delay2.$(OBJEXT) delay2_so_OBJECTS = $(am_delay2_so_OBJECTS) -delay2_so_LDADD = $(LDADD) +delay2_so_DEPENDENCIES = delay2_so_LINK = $(CCLD) $(delay2_so_CFLAGS) $(CFLAGS) \ $(delay2_so_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -216,6 +216,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -243,6 +245,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -257,7 +260,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -319,8 +325,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/main/delay2 delay2_so_SOURCES = delay2.c -delay2_so_LDFLAGS = @PLUGIN_LDFLAGS@ -delay2_so_CFLAGS = @PLUGIN_CFLAGS@ +delay2_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +delay2_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +delay2_so_LDADD = @PLUGIN_LDADD@ all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/main/delay3/delay3.c lebiniou-3.40/plugins/stable/main/delay3/delay3.c --- lebiniou-3.31/plugins/stable/main/delay3/delay3.c 2019-04-13 13:36:48.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/delay3/delay3.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -22,6 +22,7 @@ #include "particles.h" u_long id = 1194552390; +uint32_t version = 0; u_long options = BE_SFX3D|BEQ_PARTICLES|BEQ_NORANDOM; u_long mode = OVERLAY; char desc[] = "Fountain effect"; @@ -90,19 +91,17 @@ } -void +int8_t create(Context_t *ctx) { - if (ctx->input == NULL) { - options |= BEQ_DISABLED; - } else { - ps = Particle_System_new(PS_NOLIMIT); + ps = Particle_System_new(PS_NOLIMIT); - s = Spline_new(SPAN_SIZE, ctx->input->size - 2); + s = Spline_new(SPAN_SIZE, ctx->input->size - 2); #ifdef DEBUG - Spline_info(s); + Spline_info(s); #endif - } + + return 1; } diff -Nru lebiniou-3.31/plugins/stable/main/delay3/Makefile.am lebiniou-3.40/plugins/stable/main/delay3/Makefile.am --- lebiniou-3.31/plugins/stable/main/delay3/Makefile.am 2018-11-27 13:50:08.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/delay3/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -2,5 +2,6 @@ plugin_PROGRAMS = delay3.so delay3_so_SOURCES = delay3.c -delay3_so_LDFLAGS = @PLUGIN_LDFLAGS@ -delay3_so_CFLAGS = @PLUGIN_CFLAGS@ +delay3_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +delay3_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +delay3_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/delay3/Makefile.in lebiniou-3.40/plugins/stable/main/delay3/Makefile.in --- lebiniou-3.31/plugins/stable/main/delay3/Makefile.in 2019-04-14 11:52:31.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/delay3/Makefile.in 2020-01-23 13:57:15.000000000 +0000 @@ -104,7 +104,7 @@ PROGRAMS = $(plugin_PROGRAMS) am_delay3_so_OBJECTS = delay3_so-delay3.$(OBJEXT) delay3_so_OBJECTS = $(am_delay3_so_OBJECTS) -delay3_so_LDADD = $(LDADD) +delay3_so_DEPENDENCIES = delay3_so_LINK = $(CCLD) $(delay3_so_CFLAGS) $(CFLAGS) \ $(delay3_so_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -216,6 +216,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -243,6 +245,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -257,7 +260,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -319,8 +325,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/main/delay3 delay3_so_SOURCES = delay3.c -delay3_so_LDFLAGS = @PLUGIN_LDFLAGS@ -delay3_so_CFLAGS = @PLUGIN_CFLAGS@ +delay3_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +delay3_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +delay3_so_LDADD = @PLUGIN_LDADD@ all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/main/delay_l/delay_l.c lebiniou-3.40/plugins/stable/main/delay_l/delay_l.c --- lebiniou-3.31/plugins/stable/main/delay_l/delay_l.c 2019-04-13 13:36:48.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/delay_l/delay_l.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -21,21 +21,13 @@ u_long id = 1547125655; +uint32_t version = 0; u_long options = BE_SFX3D; u_long mode = OVERLAY; char desc[] = "Phase-space reconstruction"; void -create(Context_t *ctx) -{ - if (NULL == ctx->input) { - options |= BEQ_DISABLED; - } -} - - -void run(Context_t *ctx) { Buffer8_t *dst = passive_buffer(ctx); diff -Nru lebiniou-3.31/plugins/stable/main/delay_l/Makefile.am lebiniou-3.40/plugins/stable/main/delay_l/Makefile.am --- lebiniou-3.31/plugins/stable/main/delay_l/Makefile.am 2019-02-02 00:30:10.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/delay_l/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -2,5 +2,6 @@ plugin_PROGRAMS = delay_l.so delay_l_so_SOURCES = delay_l.c -delay_l_so_LDFLAGS = @PLUGIN_LDFLAGS@ -delay_l_so_CFLAGS = @PLUGIN_CFLAGS@ +delay_l_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +delay_l_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +delay_l_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/delay_l/Makefile.in lebiniou-3.40/plugins/stable/main/delay_l/Makefile.in --- lebiniou-3.31/plugins/stable/main/delay_l/Makefile.in 2019-04-14 11:52:31.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/delay_l/Makefile.in 2020-01-23 13:57:16.000000000 +0000 @@ -104,7 +104,7 @@ PROGRAMS = $(plugin_PROGRAMS) am_delay_l_so_OBJECTS = delay_l_so-delay_l.$(OBJEXT) delay_l_so_OBJECTS = $(am_delay_l_so_OBJECTS) -delay_l_so_LDADD = $(LDADD) +delay_l_so_DEPENDENCIES = delay_l_so_LINK = $(CCLD) $(delay_l_so_CFLAGS) $(CFLAGS) \ $(delay_l_so_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -216,6 +216,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -243,6 +245,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -257,7 +260,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -319,8 +325,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/main/delay_l delay_l_so_SOURCES = delay_l.c -delay_l_so_LDFLAGS = @PLUGIN_LDFLAGS@ -delay_l_so_CFLAGS = @PLUGIN_CFLAGS@ +delay_l_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +delay_l_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +delay_l_so_LDADD = @PLUGIN_LDADD@ all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/main/delay_ls/delay_ls.c lebiniou-3.40/plugins/stable/main/delay_ls/delay_ls.c --- lebiniou-3.31/plugins/stable/main/delay_ls/delay_ls.c 2019-04-13 13:36:48.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/delay_ls/delay_ls.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -20,11 +20,12 @@ #include "context.h" #include "spline.h" #include "particles.h" -#include "../include/delay.h" +#include "delay.h" // #define PARTICLES u_long id = 948640645; +uint32_t version = 0; u_long options = BE_SFX3D #ifdef PARTICLES |BEQ_PARTICLES @@ -90,16 +91,14 @@ #endif -void +int8_t create(Context_t *ctx) { - if (ctx->input == NULL) { - options |= BEQ_DISABLED; - } else { #ifdef PARTICLES - ps = Particle_System_new(PS_NOLIMIT); + ps = Particle_System_new(PS_NOLIMIT); #endif - } + + return 1; } diff -Nru lebiniou-3.31/plugins/stable/main/delay_ls/Makefile.am lebiniou-3.40/plugins/stable/main/delay_ls/Makefile.am --- lebiniou-3.31/plugins/stable/main/delay_ls/Makefile.am 2019-02-02 00:30:10.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/delay_ls/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -2,5 +2,6 @@ plugin_PROGRAMS = delay_ls.so delay_ls_so_SOURCES = delay_ls.c -delay_ls_so_LDFLAGS = @PLUGIN_LDFLAGS@ -delay_ls_so_CFLAGS = @PLUGIN_CFLAGS@ +delay_ls_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +delay_ls_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +delay_ls_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/delay_ls/Makefile.in lebiniou-3.40/plugins/stable/main/delay_ls/Makefile.in --- lebiniou-3.31/plugins/stable/main/delay_ls/Makefile.in 2019-04-14 11:52:31.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/delay_ls/Makefile.in 2020-01-23 13:57:16.000000000 +0000 @@ -104,7 +104,7 @@ PROGRAMS = $(plugin_PROGRAMS) am_delay_ls_so_OBJECTS = delay_ls_so-delay_ls.$(OBJEXT) delay_ls_so_OBJECTS = $(am_delay_ls_so_OBJECTS) -delay_ls_so_LDADD = $(LDADD) +delay_ls_so_DEPENDENCIES = delay_ls_so_LINK = $(CCLD) $(delay_ls_so_CFLAGS) $(CFLAGS) \ $(delay_ls_so_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -216,6 +216,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -243,6 +245,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -257,7 +260,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -319,8 +325,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/main/delay_ls delay_ls_so_SOURCES = delay_ls.c -delay_ls_so_LDFLAGS = @PLUGIN_LDFLAGS@ -delay_ls_so_CFLAGS = @PLUGIN_CFLAGS@ +delay_ls_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +delay_ls_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +delay_ls_so_LDADD = @PLUGIN_LDADD@ all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/main/delay_p/delay_p.c lebiniou-3.40/plugins/stable/main/delay_p/delay_p.c --- lebiniou-3.31/plugins/stable/main/delay_p/delay_p.c 2019-04-13 13:36:48.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/delay_p/delay_p.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -21,21 +21,13 @@ u_long id = 1546947361; +uint32_t version = 0; u_long options = BE_SFX3D; u_long mode = OVERLAY; char desc[] = "Phase-space reconstruction"; void -create(Context_t *ctx) -{ - if (NULL == ctx->input) { - options |= BEQ_DISABLED; - } -} - - -void run(Context_t *ctx) { Buffer8_t *dst = passive_buffer(ctx); diff -Nru lebiniou-3.31/plugins/stable/main/delay_p/Makefile.am lebiniou-3.40/plugins/stable/main/delay_p/Makefile.am --- lebiniou-3.31/plugins/stable/main/delay_p/Makefile.am 2019-02-02 00:30:10.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/delay_p/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -2,5 +2,6 @@ plugin_PROGRAMS = delay_p.so delay_p_so_SOURCES = delay_p.c -delay_p_so_LDFLAGS = @PLUGIN_LDFLAGS@ -delay_p_so_CFLAGS = @PLUGIN_CFLAGS@ +delay_p_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +delay_p_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +delay_p_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/delay_p/Makefile.in lebiniou-3.40/plugins/stable/main/delay_p/Makefile.in --- lebiniou-3.31/plugins/stable/main/delay_p/Makefile.in 2019-04-14 11:52:31.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/delay_p/Makefile.in 2020-01-23 13:57:16.000000000 +0000 @@ -104,7 +104,7 @@ PROGRAMS = $(plugin_PROGRAMS) am_delay_p_so_OBJECTS = delay_p_so-delay_p.$(OBJEXT) delay_p_so_OBJECTS = $(am_delay_p_so_OBJECTS) -delay_p_so_LDADD = $(LDADD) +delay_p_so_DEPENDENCIES = delay_p_so_LINK = $(CCLD) $(delay_p_so_CFLAGS) $(CFLAGS) \ $(delay_p_so_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -216,6 +216,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -243,6 +245,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -257,7 +260,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -319,8 +325,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/main/delay_p delay_p_so_SOURCES = delay_p.c -delay_p_so_LDFLAGS = @PLUGIN_LDFLAGS@ -delay_p_so_CFLAGS = @PLUGIN_CFLAGS@ +delay_p_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +delay_p_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +delay_p_so_LDADD = @PLUGIN_LDADD@ all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/main/delay_pp/delay_pp.c lebiniou-3.40/plugins/stable/main/delay_pp/delay_pp.c --- lebiniou-3.31/plugins/stable/main/delay_pp/delay_pp.c 2019-04-13 13:36:48.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/delay_pp/delay_pp.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -19,9 +19,11 @@ #include "context.h" #include "particles.h" +#include "parameters.h" u_long id = 1547215841; +uint32_t version = 0; u_long options = BE_SFX3D|BEQ_PARTICLES; u_long mode = OVERLAY; char desc[] = "Phase-space reconstruction using particles"; @@ -30,6 +32,39 @@ static const Point3d_t ORIGIN = { { 0.0, 0.0, 0.0 } }; static Particle_System_t *ps = NULL; +static float pos_factor = 0; +static float vel_factor = 0; +static float ttl_factor = 0; + +json_t * +get_parameters() +{ + json_t *params = json_object(); + plugin_parameters_add_double(params, BPP_POS_FACTOR, pos_factor, -0.01, 0.01); + plugin_parameters_add_double(params, BPP_VEL_FACTOR, vel_factor, -0.01, 0.01); + plugin_parameters_add_double(params, BPP_TTL_FACTOR, ttl_factor, -0.01, 0.01); + + return params; +} + + +void +set_parameters(const json_t *in_parameters) +{ + plugin_parameter_parse_float_range(in_parameters, BPP_POS_FACTOR, &pos_factor, 0, 100); + plugin_parameter_parse_float_range(in_parameters, BPP_VEL_FACTOR, &vel_factor, 0, 100); + plugin_parameter_parse_float_range(in_parameters, BPP_TTL_FACTOR, &ttl_factor, 0, 100); +} + + +json_t * +parameters(const json_t *in_parameters) +{ + set_parameters(in_parameters); + + return get_parameters(); +} + static void Delay1_particles(Context_t *ctx) @@ -53,9 +88,9 @@ p.pos.x = input->data[A_MONO][x]; p.pos.y = input->data[A_MONO][y]; p.pos.z = input->data[A_MONO][z]; - const float ttl = Input_random_float_range(input, 0.2, 1); + const float ttl = Input_random_float_range(input, 0.2, 1) * ttl_factor; Pixel_t color = Input_random_color(input); - const Particle_t *part = Particle_new_indexed(ttl, color, p3d_mul(&p, 2.5), p3d_mul(&p, .1), ORIGIN, 0.0); + const Particle_t *part = Particle_new_indexed(ttl, color, p3d_mul(&p, pos_factor), p3d_mul(&p, vel_factor), ORIGIN, 0.0); Particle_System_add(ps, part); } @@ -65,14 +100,11 @@ } -void +int8_t create(Context_t *ctx) { - if (ctx->input == NULL) { - options |= BEQ_DISABLED; - } else { - ps = Particle_System_new(PS_NOLIMIT); - } + ps = Particle_System_new(PS_NOLIMIT); + return 1; } @@ -85,6 +117,16 @@ } +void +on_switch_on(Context_t *ctx) +{ + /* Initialize parameters */ + pos_factor = 2.5; + vel_factor = 0.1; + ttl_factor = 1.0; +} + + void run(Context_t *ctx) { diff -Nru lebiniou-3.31/plugins/stable/main/delay_pp/Makefile.am lebiniou-3.40/plugins/stable/main/delay_pp/Makefile.am --- lebiniou-3.31/plugins/stable/main/delay_pp/Makefile.am 2019-02-02 00:30:10.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/delay_pp/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -2,5 +2,6 @@ plugin_PROGRAMS = delay_pp.so delay_pp_so_SOURCES = delay_pp.c -delay_pp_so_LDFLAGS = @PLUGIN_LDFLAGS@ -delay_pp_so_CFLAGS = @PLUGIN_CFLAGS@ +delay_pp_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +delay_pp_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +delay_pp_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/delay_pp/Makefile.in lebiniou-3.40/plugins/stable/main/delay_pp/Makefile.in --- lebiniou-3.31/plugins/stable/main/delay_pp/Makefile.in 2019-04-14 11:52:31.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/delay_pp/Makefile.in 2020-01-23 13:57:16.000000000 +0000 @@ -104,7 +104,7 @@ PROGRAMS = $(plugin_PROGRAMS) am_delay_pp_so_OBJECTS = delay_pp_so-delay_pp.$(OBJEXT) delay_pp_so_OBJECTS = $(am_delay_pp_so_OBJECTS) -delay_pp_so_LDADD = $(LDADD) +delay_pp_so_DEPENDENCIES = delay_pp_so_LINK = $(CCLD) $(delay_pp_so_CFLAGS) $(CFLAGS) \ $(delay_pp_so_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -216,6 +216,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -243,6 +245,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -257,7 +260,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -319,8 +325,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/main/delay_pp delay_pp_so_SOURCES = delay_pp.c -delay_pp_so_LDFLAGS = @PLUGIN_LDFLAGS@ -delay_pp_so_CFLAGS = @PLUGIN_CFLAGS@ +delay_pp_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +delay_pp_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +delay_pp_so_LDADD = @PLUGIN_LDADD@ all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/main/delay_ps/delay_ps.c lebiniou-3.40/plugins/stable/main/delay_ps/delay_ps.c --- lebiniou-3.31/plugins/stable/main/delay_ps/delay_ps.c 2019-04-13 13:36:48.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/delay_ps/delay_ps.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -20,11 +20,12 @@ #include "context.h" #include "spline.h" #include "particles.h" -#include "../include/delay.h" +#include "delay.h" // #define PARTICLES u_long id = 1547656272; +uint32_t version = 0; u_long options = BE_SFX3D #ifdef PARTICLES |BEQ_PARTICLES @@ -87,16 +88,14 @@ #endif -void +int8_t create(Context_t *ctx) { - if (ctx->input == NULL) { - options |= BEQ_DISABLED; - } else { #ifdef PARTICLES - ps = Particle_System_new(PS_NOLIMIT); + ps = Particle_System_new(PS_NOLIMIT); #endif - } + + return 1; } diff -Nru lebiniou-3.31/plugins/stable/main/delay_ps/Makefile.am lebiniou-3.40/plugins/stable/main/delay_ps/Makefile.am --- lebiniou-3.31/plugins/stable/main/delay_ps/Makefile.am 2019-02-02 00:30:11.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/delay_ps/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -2,5 +2,6 @@ plugin_PROGRAMS = delay_ps.so delay_ps_so_SOURCES = delay_ps.c -delay_ps_so_LDFLAGS = @PLUGIN_LDFLAGS@ -delay_ps_so_CFLAGS = @PLUGIN_CFLAGS@ +delay_ps_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +delay_ps_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +delay_ps_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/delay_ps/Makefile.in lebiniou-3.40/plugins/stable/main/delay_ps/Makefile.in --- lebiniou-3.31/plugins/stable/main/delay_ps/Makefile.in 2019-04-14 11:52:31.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/delay_ps/Makefile.in 2020-01-23 13:57:16.000000000 +0000 @@ -104,7 +104,7 @@ PROGRAMS = $(plugin_PROGRAMS) am_delay_ps_so_OBJECTS = delay_ps_so-delay_ps.$(OBJEXT) delay_ps_so_OBJECTS = $(am_delay_ps_so_OBJECTS) -delay_ps_so_LDADD = $(LDADD) +delay_ps_so_DEPENDENCIES = delay_ps_so_LINK = $(CCLD) $(delay_ps_so_CFLAGS) $(CFLAGS) \ $(delay_ps_so_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -216,6 +216,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -243,6 +245,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -257,7 +260,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -319,8 +325,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/main/delay_ps delay_ps_so_SOURCES = delay_ps.c -delay_ps_so_LDFLAGS = @PLUGIN_LDFLAGS@ -delay_ps_so_CFLAGS = @PLUGIN_CFLAGS@ +delay_ps_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +delay_ps_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +delay_ps_so_LDADD = @PLUGIN_LDADD@ all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/main/delayS_ls/delayS_ls.c lebiniou-3.40/plugins/stable/main/delayS_ls/delayS_ls.c --- lebiniou-3.31/plugins/stable/main/delayS_ls/delayS_ls.c 2019-04-13 13:36:48.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/delayS_ls/delayS_ls.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -20,11 +20,12 @@ #include "context.h" #include "spline.h" #include "particles.h" -#include "../include/delay.h" +#include "delay.h" // #define PARTICLES u_long id = 1547466099; +uint32_t version = 0; u_long options = BE_SFX3D #ifdef PARTICLES |BEQ_PARTICLES @@ -96,16 +97,14 @@ #endif -void +int8_t create(Context_t *ctx) { - if (ctx->input == NULL) { - options |= BEQ_DISABLED; - } else { #ifdef PARTICLES - ps = Particle_System_new(PS_NOLIMIT); + ps = Particle_System_new(PS_NOLIMIT); #endif - } + + return 1; } diff -Nru lebiniou-3.31/plugins/stable/main/delayS_ls/Makefile.am lebiniou-3.40/plugins/stable/main/delayS_ls/Makefile.am --- lebiniou-3.31/plugins/stable/main/delayS_ls/Makefile.am 2019-02-02 00:30:10.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/delayS_ls/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -2,5 +2,6 @@ plugin_PROGRAMS = delayS_ls.so delayS_ls_so_SOURCES = delayS_ls.c -delayS_ls_so_LDFLAGS = @PLUGIN_LDFLAGS@ -delayS_ls_so_CFLAGS = @PLUGIN_CFLAGS@ +delayS_ls_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +delayS_ls_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +delayS_ls_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/delayS_ls/Makefile.in lebiniou-3.40/plugins/stable/main/delayS_ls/Makefile.in --- lebiniou-3.31/plugins/stable/main/delayS_ls/Makefile.in 2019-04-14 11:52:31.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/delayS_ls/Makefile.in 2020-01-23 13:57:16.000000000 +0000 @@ -104,7 +104,7 @@ PROGRAMS = $(plugin_PROGRAMS) am_delayS_ls_so_OBJECTS = delayS_ls_so-delayS_ls.$(OBJEXT) delayS_ls_so_OBJECTS = $(am_delayS_ls_so_OBJECTS) -delayS_ls_so_LDADD = $(LDADD) +delayS_ls_so_DEPENDENCIES = delayS_ls_so_LINK = $(CCLD) $(delayS_ls_so_CFLAGS) $(CFLAGS) \ $(delayS_ls_so_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -216,6 +216,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -243,6 +245,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -257,7 +260,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -319,8 +325,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/main/delayS_ls delayS_ls_so_SOURCES = delayS_ls.c -delayS_ls_so_LDFLAGS = @PLUGIN_LDFLAGS@ -delayS_ls_so_CFLAGS = @PLUGIN_CFLAGS@ +delayS_ls_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +delayS_ls_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +delayS_ls_so_LDADD = @PLUGIN_LDADD@ all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/main/delayS_lsp/delayS_lsp.c lebiniou-3.40/plugins/stable/main/delayS_lsp/delayS_lsp.c --- lebiniou-3.31/plugins/stable/main/delayS_lsp/delayS_lsp.c 2019-04-13 13:36:48.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/delayS_lsp/delayS_lsp.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -20,9 +20,10 @@ #include "context.h" #include "spline.h" #include "particles.h" -#include "../include/delay.h" +#include "delay.h" u_long id = 1547584147; +uint32_t version = 0; u_long options = BE_SFX3D|BEQ_PARTICLES; u_long mode = OVERLAY; char desc[] = "Stereo phase-space reconstruction with spline and particles"; @@ -82,14 +83,12 @@ } -void +int8_t create(Context_t *ctx) { - if (ctx->input == NULL) { - options |= BEQ_DISABLED; - } else { - ps = Particle_System_new(PS_NOLIMIT); - } + ps = Particle_System_new(PS_NOLIMIT); + + return 1; } diff -Nru lebiniou-3.31/plugins/stable/main/delayS_lsp/Makefile.am lebiniou-3.40/plugins/stable/main/delayS_lsp/Makefile.am --- lebiniou-3.31/plugins/stable/main/delayS_lsp/Makefile.am 2019-02-02 00:30:10.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/delayS_lsp/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -2,5 +2,6 @@ plugin_PROGRAMS = delayS_lsp.so delayS_lsp_so_SOURCES = delayS_lsp.c -delayS_lsp_so_LDFLAGS = @PLUGIN_LDFLAGS@ -delayS_lsp_so_CFLAGS = @PLUGIN_CFLAGS@ +delayS_lsp_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +delayS_lsp_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +delayS_lsp_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/delayS_lsp/Makefile.in lebiniou-3.40/plugins/stable/main/delayS_lsp/Makefile.in --- lebiniou-3.31/plugins/stable/main/delayS_lsp/Makefile.in 2019-04-14 11:52:31.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/delayS_lsp/Makefile.in 2020-01-23 13:57:16.000000000 +0000 @@ -104,7 +104,7 @@ PROGRAMS = $(plugin_PROGRAMS) am_delayS_lsp_so_OBJECTS = delayS_lsp_so-delayS_lsp.$(OBJEXT) delayS_lsp_so_OBJECTS = $(am_delayS_lsp_so_OBJECTS) -delayS_lsp_so_LDADD = $(LDADD) +delayS_lsp_so_DEPENDENCIES = delayS_lsp_so_LINK = $(CCLD) $(delayS_lsp_so_CFLAGS) $(CFLAGS) \ $(delayS_lsp_so_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -216,6 +216,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -243,6 +245,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -257,7 +260,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -319,8 +325,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/main/delayS_lsp delayS_lsp_so_SOURCES = delayS_lsp.c -delayS_lsp_so_LDFLAGS = @PLUGIN_LDFLAGS@ -delayS_lsp_so_CFLAGS = @PLUGIN_CFLAGS@ +delayS_lsp_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +delayS_lsp_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +delayS_lsp_so_LDADD = @PLUGIN_LDADD@ all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/main/drops/drops.c lebiniou-3.40/plugins/stable/main/drops/drops.c --- lebiniou-3.31/plugins/stable/main/drops/drops.c 2019-04-05 20:39:14.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/drops/drops.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -21,6 +21,7 @@ u_long id = 1075754710; +uint32_t version = 0; u_long options = BE_GFX; u_long mode = OVERLAY; char desc[] = "Falling drops"; @@ -49,7 +50,7 @@ static u_long ndrops = 0; -void +int8_t create(Context_t *ctx) { u_long d; @@ -66,6 +67,8 @@ } active_drops = 0; + + return 1; } diff -Nru lebiniou-3.31/plugins/stable/main/drops/Makefile.am lebiniou-3.40/plugins/stable/main/drops/Makefile.am --- lebiniou-3.31/plugins/stable/main/drops/Makefile.am 2018-11-27 13:50:08.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/drops/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -2,5 +2,6 @@ plugin_PROGRAMS = drops.so drops_so_SOURCES = drops.c -drops_so_LDFLAGS = @PLUGIN_LDFLAGS@ -drops_so_CFLAGS = @PLUGIN_CFLAGS@ +drops_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +drops_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +drops_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/drops/Makefile.in lebiniou-3.40/plugins/stable/main/drops/Makefile.in --- lebiniou-3.31/plugins/stable/main/drops/Makefile.in 2019-04-14 11:52:31.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/drops/Makefile.in 2020-01-23 13:57:16.000000000 +0000 @@ -104,7 +104,7 @@ PROGRAMS = $(plugin_PROGRAMS) am_drops_so_OBJECTS = drops_so-drops.$(OBJEXT) drops_so_OBJECTS = $(am_drops_so_OBJECTS) -drops_so_LDADD = $(LDADD) +drops_so_DEPENDENCIES = drops_so_LINK = $(CCLD) $(drops_so_CFLAGS) $(CFLAGS) \ $(drops_so_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -216,6 +216,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -243,6 +245,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -257,7 +260,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -319,8 +325,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/main/drops drops_so_SOURCES = drops.c -drops_so_LDFLAGS = @PLUGIN_LDFLAGS@ -drops_so_CFLAGS = @PLUGIN_CFLAGS@ +drops_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +drops_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +drops_so_LDADD = @PLUGIN_LDADD@ all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/main/edge/edge.c lebiniou-3.40/plugins/stable/main/edge/edge.c --- lebiniou-3.31/plugins/stable/main/edge/edge.c 2019-04-05 20:39:14.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/edge/edge.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -21,6 +21,7 @@ u_long id = 949845873; +uint32_t version = 0; u_long options = BE_LENS; char dname[] = "Edge-detect"; char desc[] = "Edge-detection filter"; diff -Nru lebiniou-3.31/plugins/stable/main/edge/Makefile.am lebiniou-3.40/plugins/stable/main/edge/Makefile.am --- lebiniou-3.31/plugins/stable/main/edge/Makefile.am 2018-11-27 13:50:08.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/edge/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -2,5 +2,6 @@ plugin_PROGRAMS = edge.so edge_so_SOURCES = edge.c -edge_so_LDFLAGS = @PLUGIN_LDFLAGS@ -edge_so_CFLAGS = @PLUGIN_CFLAGS@ +edge_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +edge_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +edge_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/edge/Makefile.in lebiniou-3.40/plugins/stable/main/edge/Makefile.in --- lebiniou-3.31/plugins/stable/main/edge/Makefile.in 2019-04-14 11:52:31.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/edge/Makefile.in 2020-01-23 13:57:16.000000000 +0000 @@ -104,7 +104,7 @@ PROGRAMS = $(plugin_PROGRAMS) am_edge_so_OBJECTS = edge_so-edge.$(OBJEXT) edge_so_OBJECTS = $(am_edge_so_OBJECTS) -edge_so_LDADD = $(LDADD) +edge_so_DEPENDENCIES = edge_so_LINK = $(CCLD) $(edge_so_CFLAGS) $(CFLAGS) $(edge_so_LDFLAGS) \ $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -216,6 +216,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -243,6 +245,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -257,7 +260,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -319,8 +325,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/main/edge edge_so_SOURCES = edge.c -edge_so_LDFLAGS = @PLUGIN_LDFLAGS@ -edge_so_CFLAGS = @PLUGIN_CFLAGS@ +edge_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +edge_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +edge_so_LDADD = @PLUGIN_LDADD@ all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/main/emboss/emboss.c lebiniou-3.40/plugins/stable/main/emboss/emboss.c --- lebiniou-3.31/plugins/stable/main/emboss/emboss.c 2019-04-05 20:39:14.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/emboss/emboss.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -21,6 +21,7 @@ u_long id = 949846112; +uint32_t version = 0; u_long options = BE_LENS; char desc[] = "Emboss filter"; diff -Nru lebiniou-3.31/plugins/stable/main/emboss/Makefile.am lebiniou-3.40/plugins/stable/main/emboss/Makefile.am --- lebiniou-3.31/plugins/stable/main/emboss/Makefile.am 2018-11-27 13:50:08.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/emboss/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -2,5 +2,6 @@ plugin_PROGRAMS = emboss.so emboss_so_SOURCES = emboss.c -emboss_so_LDFLAGS = @PLUGIN_LDFLAGS@ -emboss_so_CFLAGS = @PLUGIN_CFLAGS@ +emboss_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +emboss_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +emboss_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/emboss/Makefile.in lebiniou-3.40/plugins/stable/main/emboss/Makefile.in --- lebiniou-3.31/plugins/stable/main/emboss/Makefile.in 2019-04-14 11:52:32.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/emboss/Makefile.in 2020-01-23 13:57:16.000000000 +0000 @@ -104,7 +104,7 @@ PROGRAMS = $(plugin_PROGRAMS) am_emboss_so_OBJECTS = emboss_so-emboss.$(OBJEXT) emboss_so_OBJECTS = $(am_emboss_so_OBJECTS) -emboss_so_LDADD = $(LDADD) +emboss_so_DEPENDENCIES = emboss_so_LINK = $(CCLD) $(emboss_so_CFLAGS) $(CFLAGS) \ $(emboss_so_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -216,6 +216,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -243,6 +245,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -257,7 +260,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -319,8 +325,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/main/emboss emboss_so_SOURCES = emboss.c -emboss_so_LDFLAGS = @PLUGIN_LDFLAGS@ -emboss_so_CFLAGS = @PLUGIN_CFLAGS@ +emboss_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +emboss_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +emboss_so_LDADD = @PLUGIN_LDADD@ all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/main/fadeout/fadeout.c lebiniou-3.40/plugins/stable/main/fadeout/fadeout.c --- lebiniou-3.31/plugins/stable/main/fadeout/fadeout.c 1970-01-01 00:00:00.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/fadeout/fadeout.c 2020-01-22 18:33:57.000000000 +0000 @@ -0,0 +1,96 @@ +/* + * Copyright 1994-2020 Olivier Girondel + * + * This file is part of lebiniou. + * + * lebiniou 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 of the License, or + * (at your option) any later version. + * + * lebiniou 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 lebiniou. If not, see . + */ + +#include "context.h" +#include "images.h" + +/* + * "Fade previous sequence" splash effect + * + * on_init: Store a copy of last sequence / current buffer + * + * Then on each run, mix the buffer at random with current, + * and decrease pixels from the copy. + * + * This splash will run for 64 frames. + */ + +u_long id = 1557758631; +uint32_t version = 0; +u_long options = BEQ_SPLASH|BEQ_FIRST; +char desc[] = "Fade previous sequence"; + + +static Pixel_t splashing = 64; +static Buffer8_t *last = NULL; + + +void +on_switch_on(Context_t *ctx) +{ + splashing = 64; + Buffer8_copy(active_buffer(ctx), last); +} + + +int8_t +create(Context_t *ctx) +{ + last = Buffer8_new(); + + return 1; +} + + +void +destroy(Context_t *ctx) +{ + Buffer8_delete(last); +} + + +static void +splash2() +{ + uint32_t i; + Pixel_t *p = last->buffer; + + for (i = 0; i < BUFFSIZE; i++, p++) { + if (*p >= 20) { + *p *= 0.6; + } else { + if (*p >= 1) { + (*p)--; + } + } + } + splashing--; +} + + +void +run(Context_t *ctx) +{ + if (splashing) { + splash2(); + Buffer8_t *buffs[2] = { active_buffer(ctx), last }; + Context_mix_buffers(ctx, buffs); + } + Buffer8_copy(active_buffer(ctx), passive_buffer(ctx)); +} diff -Nru lebiniou-3.31/plugins/stable/main/fadeout/Makefile.am lebiniou-3.40/plugins/stable/main/fadeout/Makefile.am --- lebiniou-3.31/plugins/stable/main/fadeout/Makefile.am 1970-01-01 00:00:00.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/fadeout/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -0,0 +1,7 @@ +plugindir = @libdir@/lebiniou/plugins/main/fadeout +plugin_PROGRAMS = fadeout.so + +fadeout_so_SOURCES = fadeout.c +fadeout_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +fadeout_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +fadeout_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/fadeout/Makefile.in lebiniou-3.40/plugins/stable/main/fadeout/Makefile.in --- lebiniou-3.31/plugins/stable/main/fadeout/Makefile.in 1970-01-01 00:00:00.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/fadeout/Makefile.in 2020-01-23 13:57:16.000000000 +0000 @@ -0,0 +1,665 @@ +# Makefile.in generated by automake 1.16.1 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994-2018 Free Software Foundation, Inc. + +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +VPATH = @srcdir@ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +target_triplet = @target@ +plugin_PROGRAMS = fadeout.so$(EXEEXT) +subdir = plugins/stable/main/fadeout +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +am__installdirs = "$(DESTDIR)$(plugindir)" +PROGRAMS = $(plugin_PROGRAMS) +am_fadeout_so_OBJECTS = fadeout_so-fadeout.$(OBJEXT) +fadeout_so_OBJECTS = $(am_fadeout_so_OBJECTS) +fadeout_so_DEPENDENCIES = +fadeout_so_LINK = $(CCLD) $(fadeout_so_CFLAGS) $(CFLAGS) \ + $(fadeout_so_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) +depcomp = $(SHELL) $(top_srcdir)/depcomp +am__maybe_remake_depfiles = depfiles +am__depfiles_remade = ./$(DEPDIR)/fadeout_so-fadeout.Po +am__mv = mv -f +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = +CCLD = $(CC) +LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = +SOURCES = $(fadeout_so_SOURCES) +DIST_SOURCES = $(fadeout_so_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +ALSA_CFLAGS = @ALSA_CFLAGS@ +ALSA_LIBS = @ALSA_LIBS@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AVUTIL_CFLAGS = @AVUTIL_CFLAGS@ +AVUTIL_LIBS = @AVUTIL_LIBS@ +AWK = @AWK@ +BINIOU_VERSION = @BINIOU_VERSION@ +CACA_CFLAGS = @CACA_CFLAGS@ +CACA_LIBS = @CACA_LIBS@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DPKG_BUILDFLAGS_CHECK = @DPKG_BUILDFLAGS_CHECK@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +ESD_CFLAGS = @ESD_CFLAGS@ +ESD_LIBS = @ESD_LIBS@ +EXEEXT = @EXEEXT@ +FFTW3_CFLAGS = @FFTW3_CFLAGS@ +FFTW3_LIBS = @FFTW3_LIBS@ +FT2_CFLAGS = @FT2_CFLAGS@ +FT2_LIBS = @FT2_LIBS@ +GETOPT_LONG_LIBS = @GETOPT_LONG_LIBS@ +GLIB_CFLAGS = @GLIB_CFLAGS@ +GLIB_LIBS = @GLIB_LIBS@ +GLU_CFLAGS = @GLU_CFLAGS@ +GLU_LIBS = @GLU_LIBS@ +GREP = @GREP@ +INPUT_PLUGINS = @INPUT_PLUGINS@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +JACK_CFLAGS = @JACK_CFLAGS@ +JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ +LDFLAGS = @LDFLAGS@ +LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ +LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ +LEBINIOU_SCHEMES_FILE = @LEBINIOU_SCHEMES_FILE@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ +MagickWand_CFLAGS = @MagickWand_CFLAGS@ +MagickWand_LIBS = @MagickWand_LIBS@ +OBJEXT = @OBJEXT@ +OSD_FONT = @OSD_FONT@ +OSD_PTSIZE = @OSD_PTSIZE@ +OUTPUT_PLUGINS = @OUTPUT_PLUGINS@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ +PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ +PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ +PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ +PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ +SDL2_CFLAGS = @SDL2_CFLAGS@ +SDL2_LIBS = @SDL2_LIBS@ +SDL2_ttf_CFLAGS = @SDL2_ttf_CFLAGS@ +SDL2_ttf_LIBS = @SDL2_ttf_LIBS@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +SNDFILE_CFLAGS = @SNDFILE_CFLAGS@ +SNDFILE_LIBS = @SNDFILE_LIBS@ +STRIP = @STRIP@ +SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ +SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ +VERSION = @VERSION@ +XML2_CFLAGS = @XML2_CFLAGS@ +XML2_LIBS = @XML2_LIBS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_CC = @ac_ct_CC@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +have_pandoc = @have_pandoc@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +runstatedir = @runstatedir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target = @target@ +target_alias = @target_alias@ +target_cpu = @target_cpu@ +target_os = @target_os@ +target_vendor = @target_vendor@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +plugindir = @libdir@/lebiniou/plugins/main/fadeout +fadeout_so_SOURCES = fadeout.c +fadeout_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +fadeout_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +fadeout_so_LDADD = @PLUGIN_LDADD@ +all: all-am + +.SUFFIXES: +.SUFFIXES: .c .o .obj +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign plugins/stable/main/fadeout/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --foreign plugins/stable/main/fadeout/Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): +install-pluginPROGRAMS: $(plugin_PROGRAMS) + @$(NORMAL_INSTALL) + @list='$(plugin_PROGRAMS)'; test -n "$(plugindir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \ + fi; \ + for p in $$list; do echo "$$p $$p"; done | \ + sed 's/$(EXEEXT)$$//' | \ + while read p p1; do if test -f $$p \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ + done | \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ + -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ + sed 'N;N;N;s,\n, ,g' | \ + $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ + { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ + if ($$2 == $$4) files[d] = files[d] " " $$1; \ + else { print "f", $$3 "/" $$4, $$1; } } \ + END { for (d in files) print "f", d, files[d] }' | \ + while read type dir files; do \ + if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ + test -z "$$files" || { \ + echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(plugindir)$$dir'"; \ + $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(plugindir)$$dir" || exit $$?; \ + } \ + ; done + +uninstall-pluginPROGRAMS: + @$(NORMAL_UNINSTALL) + @list='$(plugin_PROGRAMS)'; test -n "$(plugindir)" || list=; \ + files=`for p in $$list; do echo "$$p"; done | \ + sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ + -e 's/$$/$(EXEEXT)/' \ + `; \ + test -n "$$list" || exit 0; \ + echo " ( cd '$(DESTDIR)$(plugindir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(plugindir)" && rm -f $$files + +clean-pluginPROGRAMS: + -test -z "$(plugin_PROGRAMS)" || rm -f $(plugin_PROGRAMS) + +fadeout.so$(EXEEXT): $(fadeout_so_OBJECTS) $(fadeout_so_DEPENDENCIES) $(EXTRA_fadeout_so_DEPENDENCIES) + @rm -f fadeout.so$(EXEEXT) + $(AM_V_CCLD)$(fadeout_so_LINK) $(fadeout_so_OBJECTS) $(fadeout_so_LDADD) $(LIBS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fadeout_so-fadeout.Po@am__quote@ # am--include-marker + +$(am__depfiles_remade): + @$(MKDIR_P) $(@D) + @echo '# dummy' >$@-t && $(am__mv) $@-t $@ + +am--depfiles: $(am__depfiles_remade) + +.c.o: +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< + +.c.obj: +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + +fadeout_so-fadeout.o: fadeout.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fadeout_so_CFLAGS) $(CFLAGS) -MT fadeout_so-fadeout.o -MD -MP -MF $(DEPDIR)/fadeout_so-fadeout.Tpo -c -o fadeout_so-fadeout.o `test -f 'fadeout.c' || echo '$(srcdir)/'`fadeout.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/fadeout_so-fadeout.Tpo $(DEPDIR)/fadeout_so-fadeout.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='fadeout.c' object='fadeout_so-fadeout.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fadeout_so_CFLAGS) $(CFLAGS) -c -o fadeout_so-fadeout.o `test -f 'fadeout.c' || echo '$(srcdir)/'`fadeout.c + +fadeout_so-fadeout.obj: fadeout.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fadeout_so_CFLAGS) $(CFLAGS) -MT fadeout_so-fadeout.obj -MD -MP -MF $(DEPDIR)/fadeout_so-fadeout.Tpo -c -o fadeout_so-fadeout.obj `if test -f 'fadeout.c'; then $(CYGPATH_W) 'fadeout.c'; else $(CYGPATH_W) '$(srcdir)/fadeout.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/fadeout_so-fadeout.Tpo $(DEPDIR)/fadeout_so-fadeout.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='fadeout.c' object='fadeout_so-fadeout.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fadeout_so_CFLAGS) $(CFLAGS) -c -o fadeout_so-fadeout.obj `if test -f 'fadeout.c'; then $(CYGPATH_W) 'fadeout.c'; else $(CYGPATH_W) '$(srcdir)/fadeout.c'; fi` + +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags + +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + set x; \ + here=`pwd`; \ + $(am__define_uniq_tagged_files); \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ + fi +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ + test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(PROGRAMS) +installdirs: + for dir in "$(DESTDIR)$(plugindir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-pluginPROGRAMS mostlyclean-am + +distclean: distclean-am + -rm -f ./$(DEPDIR)/fadeout_so-fadeout.Po + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-tags + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: install-pluginPROGRAMS + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f ./$(DEPDIR)/fadeout_so-fadeout.Po + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-compile mostlyclean-generic + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-pluginPROGRAMS + +.MAKE: install-am install-strip + +.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \ + clean-generic clean-pluginPROGRAMS cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-pluginPROGRAMS install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \ + ps ps-am tags tags-am uninstall uninstall-am \ + uninstall-pluginPROGRAMS + +.PRECIOUS: Makefile + + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -Nru lebiniou-3.31/plugins/stable/main/faders/faders.c lebiniou-3.40/plugins/stable/main/faders/faders.c --- lebiniou-3.31/plugins/stable/main/faders/faders.c 2019-04-05 20:39:14.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/faders/faders.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -21,6 +21,7 @@ u_long id = 1180546912; +uint32_t version = 0; u_long options = BE_GFX|BEQ_FIRST; u_long mode = OVERLAY; char desc[] = "Cellular automaton"; @@ -44,12 +45,14 @@ } -void +int8_t create(Context_t *ctx) { game = Buffer8_new(); game2 = Buffer8_new(); randomize(game); + + return 1; } @@ -104,20 +107,20 @@ Pixel_t new; switch (old) { - case 0: - /* dead cell, becomes alive ? */ - new = firing(i, j) ? 255 : 0; - break; - - case 255: - /* firing cell, keeps firing ? */ - new = firing(i, j) ? 255 : 254; - break; - - default: - /* cell decays */ - new = old - 2; - break; + case 0: + /* dead cell, becomes alive ? */ + new = firing(i, j) ? 255 : 0; + break; + + case 255: + /* firing cell, keeps firing ? */ + new = firing(i, j) ? 255 : 254; + break; + + default: + /* cell decays */ + new = old - 2; + break; } set_pixel_nc(game2, i, j, new); diff -Nru lebiniou-3.31/plugins/stable/main/faders/Makefile.am lebiniou-3.40/plugins/stable/main/faders/Makefile.am --- lebiniou-3.31/plugins/stable/main/faders/Makefile.am 2018-11-27 13:50:08.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/faders/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -2,5 +2,6 @@ plugin_PROGRAMS = faders.so faders_so_SOURCES = faders.c -faders_so_LDFLAGS = @PLUGIN_LDFLAGS@ -faders_so_CFLAGS = @PLUGIN_CFLAGS@ +faders_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +faders_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +faders_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/faders/Makefile.in lebiniou-3.40/plugins/stable/main/faders/Makefile.in --- lebiniou-3.31/plugins/stable/main/faders/Makefile.in 2019-04-14 11:52:32.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/faders/Makefile.in 2020-01-23 13:57:16.000000000 +0000 @@ -104,7 +104,7 @@ PROGRAMS = $(plugin_PROGRAMS) am_faders_so_OBJECTS = faders_so-faders.$(OBJEXT) faders_so_OBJECTS = $(am_faders_so_OBJECTS) -faders_so_LDADD = $(LDADD) +faders_so_DEPENDENCIES = faders_so_LINK = $(CCLD) $(faders_so_CFLAGS) $(CFLAGS) \ $(faders_so_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -216,6 +216,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -243,6 +245,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -257,7 +260,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -319,8 +325,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/main/faders faders_so_SOURCES = faders.c -faders_so_LDFLAGS = @PLUGIN_LDFLAGS@ -faders_so_CFLAGS = @PLUGIN_CFLAGS@ +faders_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +faders_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +faders_so_LDADD = @PLUGIN_LDADD@ all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/main/flow/flow.c lebiniou-3.40/plugins/stable/main/flow/flow.c --- lebiniou-3.31/plugins/stable/main/flow/flow.c 2019-04-05 20:39:14.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/flow/flow.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -108,9 +108,11 @@ /* Adapted for Le Biniou by */ #include "context.h" +#include "parameters.h" u_long id = 1069709528; /* it's pseudo-3d */ +uint32_t version = 0; u_long options = BE_GFX; u_long mode = OVERLAY; char desc[] = "Flow effect"; @@ -132,16 +134,16 @@ #define BMIN(a,b)((a)<(b)?(a):(b)) #define BCOUNT 256 -#define NCOL 255 +#define NCOL 255 #define MAXRAND 2147483648.0 /* Macros */ #define IX(C) ((C) * sp->beecount + sp->cnsegs[(C)]) -#define B(t,b) (*(sp->p + (t) + (b) * sp->taillen)) -#define X(t,b) B((t),(b)).x -#define Y(t,b) B((t),(b)).y -#define Z(t,b) B((t),(b)).z -#define balance_rand(v) ((lrand48()/MAXRAND*(v))-((v)/2)) /* random around 0 */ +#define B(t,b) (*(sp->p + (t) + (b) * sp->taillen)) +#define X(t,b) B((t),(b)).x +#define Y(t,b) B((t),(b)).y +#define Z(t,b) B((t),(b)).z +#define balance_rand(v) ((lrand48()/MAXRAND*(v))-((v)/2)) /* random around 0 */ #define SCALE_X(A) (WIDTH/2+WIDTH/sp->size*(A)) #define SCALE_Y(A) (HEIGHT/2+HEIGHT/sp->size*(A)) #define LOST_IN_SPACE (sp->size * 10) @@ -151,16 +153,67 @@ /* #define MRAND(x) (b_rand_int_range(0, x)) */ /* #define RAND(x) (b_rand_int_range(0, x)) */ +#define NB_FLOW 8 + +static void fill_flow_struct(); + +enum Mode { MODE_SELECTED = 0, MODE_RANDOM, MODE_NB } Mode_e; +const char *mode_list[MODE_NB] = { "Selected", "Random" }; + +/* parameters */ +static enum Mode flow_mode = MODE_RANDOM; +static int flow_id = 0; + +json_t * +get_parameters() +{ + json_t *params = json_object(); + plugin_parameters_add_string_list(params, BPP_MODE, MODE_NB, mode_list, flow_mode); + plugin_parameters_add_int(params, BPP_FLOW_ID, flow_id, -1, 1); + + return params; +} + + +void +set_parameters(const json_t *in_parameters) +{ + int reload = 0; + reload |= plugin_parameter_parse_int_range(in_parameters, BPP_FLOW_ID, &flow_id, 0, NB_FLOW-1) & PLUGIN_PARAMETER_CHANGED; + + int mode_idx = 0; + if (plugin_parameter_parse_string_list_as_int_range(in_parameters, BPP_MODE, MODE_NB, mode_list, &mode_idx, 0, MODE_NB-1)) { + flow_mode = (enum Mode)mode_idx; + reload = 1; + } + + if (reload) { + if (flow_mode == MODE_SELECTED) { + fill_flow_struct(); + } + } +} + + +json_t * +parameters(const json_t *in_parameters) +{ + set_parameters(in_parameters); + + return get_parameters(); +} + + typedef struct { int count; double size; int taillen; - int beecount; /* number of bees */ - Line_t *csegs; /* bee lines */ + int beecount; /* number of bees */ + Line_t *csegs; /* bee lines */ int *cnsegs; double step; - dvector centre; /* centre */ + dvector centre; /* centre */ struct { double depth; double height; @@ -239,7 +292,7 @@ } #define deallocate(p,t) {free(p); p=(t*)NULL; } -#define allocate(p,t,s) if ((p=malloc(sizeof(t)*s))==NULL) \ +#define allocate(p,t,s) if ((p=malloc(sizeof(t)*s))==NULL) \ {free_flow(sp);return;} @@ -252,26 +305,14 @@ } -void -on_switch_on(Context_t *ctx) +static void +fill_flow_struct() { flowstruct *sp; int b; double beemult = 1 ; dvector range; - int rand; - - /* valgrind relou test */ - rand = NRAND(8); - b_timer_start(changeme); - - /* - if (flows == NULL) { - if ((flows = xcalloc(1,sizeof(flowstruct))) == NULL) - return; - } - */ sp = &flow; sp->count = 0; sp->tumble.theta = balance_rand(M_PI); @@ -290,109 +331,109 @@ sp->taillen = MINTRAIL; } - switch (rand) { - case 0: - sp->view.depth = 10; - sp->view.height = 0.2; - beemult = 3; - /* fallthrough */ - case 1: - sp->ODE = Lorenz; - sp->step = 0.02; - sp->size = 60; - sp->centre.x = 0; - sp->centre.y = 0; - sp->centre.z = 24; - range.x = 5; - range.y = 5; - range.z = 1; - sp->par.a = 10 + balance_rand(5); - sp->par.b = 28 + balance_rand(5); - sp->par.c = 2 + balance_rand(1); - break; - case 2: - sp->view.depth = 10; - sp->view.height = 0.1; - beemult = 4; - /* fallthrough */ - case 3: - sp->ODE = Rossler; - sp->step = 0.05; - sp->size = 24; - sp->centre.x = 0; - sp->centre.y = 0; - sp->centre.z = 3; - range.x = 6; - range.y = 6; - range.z = 5; - sp->par.a = 2 + balance_rand(1); - sp->par.b = 0.2 + balance_rand(0.1); - sp->par.c = 0.2 + balance_rand(0.1); - break; - case 4: - sp->view.depth = 10; - sp->view.height = 0.1; - beemult = 3; - /* fallthrough */ - case 5: - sp->ODE = RosslerCone; - sp->step = 0.05; - sp->size = 24; - sp->centre.x = 0; - sp->centre.y = 0; - sp->centre.z = 3; - range.x = 6; - range.y = 6; - range.z = 6; - sp->par.a = 2; - sp->par.b = 0.2; - sp->par.c = 0.331 + balance_rand(0.01); - break; - case 6: - sp->ODE = Birkhoff; - sp->step = 0.04; - sp->size = 2.6; - sp->centre.x = 0; - sp->centre.y = 0; - sp->centre.z = 0; - range.x = 3; - range.y = 4; - range.z = 0; - sp->par.a = 10 + balance_rand(5); - sp->par.b = 0.35 + balance_rand(0.25); - sp->par.c = 1.57; - sp->tumble.theta = 0; - sp->tumble.phi = 0; - sp->tumble.dtheta = 0; - sp->tumble.dphi = 0; - break; - case 7: - default: - sp->ODE = Duffing; - sp->step = 0.02; - sp->size = 30; - sp->centre.x = 0; - sp->centre.y = 0; - sp->centre.z = 0; - range.x = 20; - range.y = 20; - range.z = 0; - sp->par.a = 0.2 + balance_rand(0.1); - sp->par.b = 27.0 + balance_rand(3.0); - sp->par.c = 1.33; - sp->tumble.theta = 0; - sp->tumble.phi = 0; - sp->tumble.dtheta = -NRAND(2)*sp->par.c*sp->step; - sp->tumble.dphi = 0; - beemult = 0.5; - break; + switch (flow_id) { + case 0: + sp->view.depth = 10; + sp->view.height = 0.2; + beemult = 3; + /* fallthrough */ + case 1: + sp->ODE = Lorenz; + sp->step = 0.02; + sp->size = 60; + sp->centre.x = 0; + sp->centre.y = 0; + sp->centre.z = 24; + range.x = 5; + range.y = 5; + range.z = 1; + sp->par.a = 10 + balance_rand(5); + sp->par.b = 28 + balance_rand(5); + sp->par.c = 2 + balance_rand(1); + break; + case 2: + sp->view.depth = 10; + sp->view.height = 0.1; + beemult = 4; + /* fallthrough */ + case 3: + sp->ODE = Rossler; + sp->step = 0.05; + sp->size = 24; + sp->centre.x = 0; + sp->centre.y = 0; + sp->centre.z = 3; + range.x = 6; + range.y = 6; + range.z = 5; + sp->par.a = 2 + balance_rand(1); + sp->par.b = 0.2 + balance_rand(0.1); + sp->par.c = 0.2 + balance_rand(0.1); + break; + case 4: + sp->view.depth = 10; + sp->view.height = 0.1; + beemult = 3; + /* fallthrough */ + case 5: + sp->ODE = RosslerCone; + sp->step = 0.05; + sp->size = 24; + sp->centre.x = 0; + sp->centre.y = 0; + sp->centre.z = 3; + range.x = 6; + range.y = 6; + range.z = 6; + sp->par.a = 2; + sp->par.b = 0.2; + sp->par.c = 0.331 + balance_rand(0.01); + break; + case 6: + sp->ODE = Birkhoff; + sp->step = 0.04; + sp->size = 2.6; + sp->centre.x = 0; + sp->centre.y = 0; + sp->centre.z = 0; + range.x = 3; + range.y = 4; + range.z = 0; + sp->par.a = 10 + balance_rand(5); + sp->par.b = 0.35 + balance_rand(0.25); + sp->par.c = 1.57; + sp->tumble.theta = 0; + sp->tumble.phi = 0; + sp->tumble.dtheta = 0; + sp->tumble.dphi = 0; + break; + case 7: + default: + sp->ODE = Duffing; + sp->step = 0.02; + sp->size = 30; + sp->centre.x = 0; + sp->centre.y = 0; + sp->centre.z = 0; + range.x = 20; + range.y = 20; + range.z = 0; + sp->par.a = 0.2 + balance_rand(0.1); + sp->par.b = 27.0 + balance_rand(3.0); + sp->par.c = 1.33; + sp->tumble.theta = 0; + sp->tumble.phi = 0; + sp->tumble.dtheta = -NRAND(2)*sp->par.c*sp->step; + sp->tumble.dphi = 0; + beemult = 0.5; + break; } if (sp) { free_flow(sp); /* beecount changes with beemult */ } sp->beecount = (int) (beemult * BCOUNT); - if (sp->beecount < 0) { /* random variations */ + if (sp->beecount < 0) { /* random variations */ sp->beecount = NRAND(-sp->beecount) + 1; /* Minimum 1 */ } @@ -404,22 +445,31 @@ } /* Initialize point positions, velocities, etc. */ - for (b = 0; b < sp->beecount; b++) { X(1, b) = X(0, b) = balance_rand(range.x); Y(1, b) = Y(0, b) = balance_rand(range.y); Z(1, b) = Z(0, b) = balance_rand(range.z); } - - /* printf("+++ flow::on_switch_on() done\n"); */ } void +on_switch_on(Context_t *ctx) +{ + flow_id = NRAND(NB_FLOW); + fill_flow_struct(); + + b_timer_start(changeme); +} + + +int8_t create(Context_t *ctx) { changeme = b_timer_new(); on_switch_on(ctx); + + return 1; } @@ -470,7 +520,6 @@ M[2][0]= 0; M[2][1]= 0; M[2][2]= 0; - } for (col = 0; col < NCOL; col++) { @@ -485,7 +534,7 @@ fabs(Z(0, b)) > ((sp->tumble.dphi!=0 || sp->tumble.phi!=0)?LOST_IN_SPACE:LOST_IN_TIME)) { if(sp->view.depth && b==0) { /* lost camera - reset */ - create(ctx); + (void)create(ctx); return; } continue; @@ -627,7 +676,7 @@ if(++sp->count > 512)*/ ++sp->count; - if (b_timer_elapsed(changeme) > 30) { + if (flow_mode == MODE_RANDOM && b_timer_elapsed(changeme) > 30) { on_switch_on(ctx); } } diff -Nru lebiniou-3.31/plugins/stable/main/flow/Makefile.am lebiniou-3.40/plugins/stable/main/flow/Makefile.am --- lebiniou-3.31/plugins/stable/main/flow/Makefile.am 2018-11-27 13:50:08.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/flow/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -2,5 +2,6 @@ plugin_PROGRAMS = flow.so flow_so_SOURCES = flow.c -flow_so_LDFLAGS = @PLUGIN_LDFLAGS@ -flow_so_CFLAGS = @PLUGIN_CFLAGS@ +flow_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +flow_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +flow_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/flow/Makefile.in lebiniou-3.40/plugins/stable/main/flow/Makefile.in --- lebiniou-3.31/plugins/stable/main/flow/Makefile.in 2019-04-14 11:52:32.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/flow/Makefile.in 2020-01-23 13:57:16.000000000 +0000 @@ -104,7 +104,7 @@ PROGRAMS = $(plugin_PROGRAMS) am_flow_so_OBJECTS = flow_so-flow.$(OBJEXT) flow_so_OBJECTS = $(am_flow_so_OBJECTS) -flow_so_LDADD = $(LDADD) +flow_so_DEPENDENCIES = flow_so_LINK = $(CCLD) $(flow_so_CFLAGS) $(CFLAGS) $(flow_so_LDFLAGS) \ $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -216,6 +216,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -243,6 +245,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -257,7 +260,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -319,8 +325,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/main/flow flow_so_SOURCES = flow.c -flow_so_LDFLAGS = @PLUGIN_LDFLAGS@ -flow_so_CFLAGS = @PLUGIN_CFLAGS@ +flow_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +flow_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +flow_so_LDADD = @PLUGIN_LDADD@ all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/main/foo/foo.c lebiniou-3.40/plugins/stable/main/foo/foo.c --- lebiniou-3.31/plugins/stable/main/foo/foo.c 2019-04-05 20:39:14.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/foo/foo.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -29,8 +29,6 @@ * */ -/* end blabla intro */ - /* You first need to include this file */ #include "context.h" @@ -41,35 +39,45 @@ * command in the shell */ u_long id = 944338581; -u_long options = BE_GFX \ - | BEQ_UNIQUE \ - | BEQ_NORANDOM; +/* options */ +uint32_t version = 0; +u_long options = BE_SFX2D|BE_GFX|BEQ_UNIQUE; +/* default layer mode */ u_long mode = OVERLAY; +/* display name in the OSD */ char dname[] = "The foo plugin"; +/* description for the OSD when plugin is selected */ char desc[] = "Basic/demo plugin"; static u_short x, y; -void +// you don't have to define this function if unneeded +int8_t create(Context_t *ctx) { + // here goes the code when the plugin is loaded x = CENTERX; y = CENTERY; + + // return 1 on success, 0 if the plugin failed to initialize + return 1; } +// you don't have to define this function if unneeded void destroy(Context_t *ctx) { - + // here goes the code when the plugin is unloaded } +// the main plugin function void run(Context_t *ctx) { @@ -77,18 +85,15 @@ u_short steps, s; Buffer8_t *dst; - if (ctx->input == NULL) { - return; - } - steps = (u_short)(drand48() * 100); dst = passive_buffer(ctx); Buffer8_clear(dst); + // make sure to lock/unlock the input mutex if the plugin uses audio buffers pthread_mutex_lock(&ctx->input->mutex); - if (drand48() < .5) + if (drand48() < .5) { for (s = 0; s < steps; s++) { Pixel_t c = ctx->input->data_u[A_MONO][idx] * 255; @@ -104,7 +109,8 @@ if (++idx == ctx->input->size) { idx = 0; } - } else + } + } else { for (s = 0; s < steps; s++) { Pixel_t c = ctx->input->data_u[A_MONO][idx] * 255; @@ -121,6 +127,7 @@ idx = 0; } } + } pthread_mutex_unlock(&ctx->input->mutex); } diff -Nru lebiniou-3.31/plugins/stable/main/foo/Makefile.am lebiniou-3.40/plugins/stable/main/foo/Makefile.am --- lebiniou-3.31/plugins/stable/main/foo/Makefile.am 2018-11-27 13:50:08.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/foo/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -2,5 +2,6 @@ plugin_PROGRAMS = foo.so foo_so_SOURCES = foo.c -foo_so_LDFLAGS = @PLUGIN_LDFLAGS@ -foo_so_CFLAGS = @PLUGIN_CFLAGS@ +foo_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +foo_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +foo_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/foo/Makefile.in lebiniou-3.40/plugins/stable/main/foo/Makefile.in --- lebiniou-3.31/plugins/stable/main/foo/Makefile.in 2019-04-14 11:52:32.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/foo/Makefile.in 2020-01-23 13:57:16.000000000 +0000 @@ -104,7 +104,7 @@ PROGRAMS = $(plugin_PROGRAMS) am_foo_so_OBJECTS = foo_so-foo.$(OBJEXT) foo_so_OBJECTS = $(am_foo_so_OBJECTS) -foo_so_LDADD = $(LDADD) +foo_so_DEPENDENCIES = foo_so_LINK = $(CCLD) $(foo_so_CFLAGS) $(CFLAGS) $(foo_so_LDFLAGS) \ $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -216,6 +216,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -243,6 +245,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -257,7 +260,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -319,8 +325,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/main/foo foo_so_SOURCES = foo.c -foo_so_LDFLAGS = @PLUGIN_LDFLAGS@ -foo_so_CFLAGS = @PLUGIN_CFLAGS@ +foo_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +foo_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +foo_so_LDADD = @PLUGIN_LDADD@ all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/main/galaxy/galaxy.c lebiniou-3.40/plugins/stable/main/galaxy/galaxy.c --- lebiniou-3.31/plugins/stable/main/galaxy/galaxy.c 2019-04-05 20:39:14.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/galaxy/galaxy.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -20,6 +20,7 @@ #include "context.h" u_long id = 947190672; +uint32_t version = 0; u_long options = BE_GFX; u_long mode = OVERLAY; char desc[] = "Galaxy effect"; @@ -28,11 +29,11 @@ /* Compatibility with the xlockmore RNG API (note that the xlockmore hacks never expect negative numbers.) */ -#define LRAND() ((long) (random() & 0x7fffffff)) -#define NRAND(n) ((int) (LRAND() % (n))) -#define MAXRAND (2147483648.0) /* unsigned 1<<31 as a float */ -#define SRAND(n) /* already seeded by screenhack.c */ -#define NUMCOLORS 256 +#define LRAND() ((long) (random() & 0x7fffffff)) +#define NRAND(n) ((int) (LRAND() % (n))) +#define MAXRAND (2147483648.0) /* unsigned 1<<31 as a float */ +#define SRAND(n) /* already seeded by screenhack.c */ +#define NUMCOLORS 256 /* Originally done by Uli Siegmund on Amiga * for EGS in Cluster @@ -118,8 +119,7 @@ #define COLORBASE 16 /* Colors for stars start here */ -#define COLORSTEP (NUMCOLORS/COLORBASE) /* NUMCOLORS / COLORBASE colors - per galaxy */ +#define COLORSTEP (NUMCOLORS/COLORBASE) /* NUMCOLORS / COLORBASE colors per galaxy */ typedef struct { @@ -148,10 +148,8 @@ int f_hititerations; /* # iterations before restart */ int step; /* */ #if 0 - double rot_y; /* rotation of eye around center of universe, around - y-axis*/ - double rot_x; /* rotation of eye around center of universe, around - x-axis */ + double rot_y; /* rotation of eye around center of universe, around y-axis */ + double rot_x; /* rotation of eye around center of universe, around x-axis */ #endif } unistruct; @@ -289,7 +287,7 @@ } -void +int8_t create(Context_t *ctx) { unistruct *gp; @@ -307,6 +305,8 @@ gp->midx = HWIDTH; gp->midy = HHEIGHT; startover(/*mi*/); + + return 1; } diff -Nru lebiniou-3.31/plugins/stable/main/galaxy/Makefile.am lebiniou-3.40/plugins/stable/main/galaxy/Makefile.am --- lebiniou-3.31/plugins/stable/main/galaxy/Makefile.am 2018-11-27 13:50:08.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/galaxy/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -2,5 +2,6 @@ plugin_PROGRAMS = galaxy.so galaxy_so_SOURCES = galaxy.c -galaxy_so_LDFLAGS = @PLUGIN_LDFLAGS@ -galaxy_so_CFLAGS = @PLUGIN_CFLAGS@ +galaxy_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +galaxy_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +galaxy_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/galaxy/Makefile.in lebiniou-3.40/plugins/stable/main/galaxy/Makefile.in --- lebiniou-3.31/plugins/stable/main/galaxy/Makefile.in 2019-04-14 11:52:32.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/galaxy/Makefile.in 2020-01-23 13:57:16.000000000 +0000 @@ -104,7 +104,7 @@ PROGRAMS = $(plugin_PROGRAMS) am_galaxy_so_OBJECTS = galaxy_so-galaxy.$(OBJEXT) galaxy_so_OBJECTS = $(am_galaxy_so_OBJECTS) -galaxy_so_LDADD = $(LDADD) +galaxy_so_DEPENDENCIES = galaxy_so_LINK = $(CCLD) $(galaxy_so_CFLAGS) $(CFLAGS) \ $(galaxy_so_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -216,6 +216,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -243,6 +245,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -257,7 +260,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -319,8 +325,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/main/galaxy galaxy_so_SOURCES = galaxy.c -galaxy_so_LDFLAGS = @PLUGIN_LDFLAGS@ -galaxy_so_CFLAGS = @PLUGIN_CFLAGS@ +galaxy_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +galaxy_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +galaxy_so_LDADD = @PLUGIN_LDADD@ all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/main/GLCube/GLCube.c lebiniou-3.40/plugins/stable/main/GLCube/GLCube.c --- lebiniou-3.31/plugins/stable/main/GLCube/GLCube.c 2019-04-05 20:39:14.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/GLCube/GLCube.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -22,6 +22,7 @@ u_long id = 1328382269; +uint32_t version = 0; u_long options = BE_GFX; u_long mode = OVERLAY; @@ -30,21 +31,21 @@ static u_char faces[6]; -#define NORMAL(X) do { \ - glEnable(GL_COLOR_LOGIC_OP); \ - glLogicOp(GL_COPY); \ - glBegin(GL_QUADS); \ - X; \ - glDisable(GL_COLOR_LOGIC_OP); \ - glEnd(); \ +#define NORMAL(X) do { \ + glEnable(GL_COLOR_LOGIC_OP); \ + glLogicOp(GL_COPY); \ + glBegin(GL_QUADS); \ + X; \ + glDisable(GL_COLOR_LOGIC_OP); \ + glEnd(); \ } while(0) -#define INVERT(X) do { \ - glEnable(GL_COLOR_LOGIC_OP); \ - glLogicOp(GL_COPY_INVERTED); \ - glBegin(GL_QUADS); \ - X; \ - glDisable(GL_COLOR_LOGIC_OP); \ - glEnd(); \ +#define INVERT(X) do { \ + glEnable(GL_COLOR_LOGIC_OP); \ + glLogicOp(GL_COPY_INVERTED); \ + glBegin(GL_QUADS); \ + X; \ + glDisable(GL_COLOR_LOGIC_OP); \ + glEnd(); \ } while(0) @@ -68,7 +69,7 @@ #define coucou(X) face(ctx, X) -void +int8_t create(Context_t *ctx) { int e, v; @@ -82,12 +83,8 @@ } else { CUBE[e][v] *= 1.15; /* FIXME empirical tuning */ } -} - -void -destroy(Context_t *ctx) -{ + return 1; } @@ -173,85 +170,85 @@ face(Context_t *ctx, const char f) { switch (f) { - case 0: // front face - get_texture(ctx, ACTIVE_BUFFER, 1); - NORMAL( - t1(); CE(8); - t2(); CE(5); - t3(); CE(6); - t4(); CE(7)); - break; - - case 1: // back face - get_texture(ctx, ACTIVE_BUFFER, 1); - INVERT( - t4(); CE(2); - t3(); CE(1); - t2(); CE(4); - t1(); CE(3)); - break; + case 0: // front face + get_texture(ctx, ACTIVE_BUFFER, 1); + NORMAL( + t1(); CE(8); + t2(); CE(5); + t3(); CE(6); + t4(); CE(7)); + break; - case 2: // left face + case 1: // back face + get_texture(ctx, ACTIVE_BUFFER, 1); + INVERT( + t4(); CE(2); + t3(); CE(1); + t2(); CE(4); + t1(); CE(3)); + break; + + case 2: // left face #ifdef WITH_WEBCAM - get_texture(ctx, (ctx->webcams >= 2) ? 1 : 0, 0); + get_texture(ctx, (ctx->webcams >= 2) ? 1 : 0, 0); #else - get_texture(ctx, 0, 0); + get_texture(ctx, 0, 0); #endif - NORMAL( - t4(); CE(3); - t3(); CE(4); - t2(); CE(5); - t1(); CE(8)); - break; - - case 3: // right face - get_texture(ctx, 0, 0); - if ( + NORMAL( + t4(); CE(3); + t3(); CE(4); + t2(); CE(5); + t1(); CE(8)); + break; + + case 3: // right face + get_texture(ctx, 0, 0); + if ( #ifdef WITH_WEBCAM - ctx->webcams > 1 + ctx->webcams > 1 #else - 1 + 1 #endif - ) { - if (1) - NORMAL( + ) { + if (1) + NORMAL( + t1(); CE(7); + t2(); CE(6); + t3(); CE(1); + t4(); CE(2)); + } else { + INVERT( t1(); CE(7); t2(); CE(6); t3(); CE(1); t4(); CE(2)); - } else { - INVERT( - t1(); CE(7); - t2(); CE(6); - t3(); CE(1); - t4(); CE(2)); - } - break; - - case 4: // up face - NORMAL({}); - break; - t1(); - CE(5); - t2(); - CE(4); - t3(); - CE(1); - t4(); - CE(6); - break; + } + break; + + case 4: // up face + NORMAL({}); + break; + t1(); + CE(5); + t2(); + CE(4); + t3(); + CE(1); + t4(); + CE(6); + break; #if 0 - case 5: // bottom face - t1(); - CE(3); - t2(); - CE(8); - t3(); - CE(7); - t4(); - CE(2); - break; + case 5: // bottom face + t1(); + CE(3); + t2(); + CE(8); + t3(); + CE(7); + t4(); + CE(2); + break; #endif } } diff -Nru lebiniou-3.31/plugins/stable/main/GLCube/Makefile.am lebiniou-3.40/plugins/stable/main/GLCube/Makefile.am --- lebiniou-3.31/plugins/stable/main/GLCube/Makefile.am 2018-11-27 13:50:08.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/GLCube/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -2,5 +2,6 @@ plugin_PROGRAMS = GLCube.so GLCube_so_SOURCES = GLCube.c -GLCube_so_LDFLAGS = @PLUGIN_LDFLAGS@ -GLCube_so_CFLAGS = @PLUGIN_CFLAGS@ +GLCube_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +GLCube_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +GLCube_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/GLCube/Makefile.in lebiniou-3.40/plugins/stable/main/GLCube/Makefile.in --- lebiniou-3.31/plugins/stable/main/GLCube/Makefile.in 2019-04-14 11:52:29.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/GLCube/Makefile.in 2020-01-23 13:57:14.000000000 +0000 @@ -104,7 +104,7 @@ PROGRAMS = $(plugin_PROGRAMS) am_GLCube_so_OBJECTS = GLCube_so-GLCube.$(OBJEXT) GLCube_so_OBJECTS = $(am_GLCube_so_OBJECTS) -GLCube_so_LDADD = $(LDADD) +GLCube_so_DEPENDENCIES = GLCube_so_LINK = $(CCLD) $(GLCube_so_CFLAGS) $(CFLAGS) \ $(GLCube_so_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -216,6 +216,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -243,6 +245,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -257,7 +260,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -319,8 +325,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/main/GLCube GLCube_so_SOURCES = GLCube.c -GLCube_so_LDFLAGS = @PLUGIN_LDFLAGS@ -GLCube_so_CFLAGS = @PLUGIN_CFLAGS@ +GLCube_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +GLCube_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +GLCube_so_LDADD = @PLUGIN_LDADD@ all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/main/hodge/hodge.c lebiniou-3.40/plugins/stable/main/hodge/hodge.c --- lebiniou-3.31/plugins/stable/main/hodge/hodge.c 2019-04-05 20:39:14.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/hodge/hodge.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -21,6 +21,7 @@ u_long id = 1184941398; +uint32_t version = 0; u_long options = BE_DISPLACE|BE_LENS; char dname[] = "Hodge"; u_long mode = XOR; @@ -41,11 +42,13 @@ static u_char initialized = 0; -void +int8_t create(Context_t *ctx) { game[0] = Buffer8_new(); game[1] = Buffer8_new(); + + return 1; } diff -Nru lebiniou-3.31/plugins/stable/main/hodge/Makefile.am lebiniou-3.40/plugins/stable/main/hodge/Makefile.am --- lebiniou-3.31/plugins/stable/main/hodge/Makefile.am 2018-11-27 13:50:08.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/hodge/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -2,5 +2,6 @@ plugin_PROGRAMS = hodge.so hodge_so_SOURCES = hodge.c -hodge_so_LDFLAGS = @PLUGIN_LDFLAGS@ -hodge_so_CFLAGS = @PLUGIN_CFLAGS@ +hodge_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +hodge_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +hodge_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/hodge/Makefile.in lebiniou-3.40/plugins/stable/main/hodge/Makefile.in --- lebiniou-3.31/plugins/stable/main/hodge/Makefile.in 2019-04-14 11:52:32.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/hodge/Makefile.in 2020-01-23 13:57:16.000000000 +0000 @@ -104,7 +104,7 @@ PROGRAMS = $(plugin_PROGRAMS) am_hodge_so_OBJECTS = hodge_so-hodge.$(OBJEXT) hodge_so_OBJECTS = $(am_hodge_so_OBJECTS) -hodge_so_LDADD = $(LDADD) +hodge_so_DEPENDENCIES = hodge_so_LINK = $(CCLD) $(hodge_so_CFLAGS) $(CFLAGS) \ $(hodge_so_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -216,6 +216,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -243,6 +245,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -257,7 +260,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -319,8 +325,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/main/hodge hodge_so_SOURCES = hodge.c -hodge_so_LDFLAGS = @PLUGIN_LDFLAGS@ -hodge_so_CFLAGS = @PLUGIN_CFLAGS@ +hodge_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +hodge_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +hodge_so_LDADD = @PLUGIN_LDADD@ all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/main/iColrot/iColrot.c lebiniou-3.40/plugins/stable/main/iColrot/iColrot.c --- lebiniou-3.31/plugins/stable/main/iColrot/iColrot.c 1970-01-01 00:00:00.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/iColrot/iColrot.c 2020-01-22 18:33:57.000000000 +0000 @@ -0,0 +1,74 @@ +/* + * Copyright 1994-2020 Olivier Girondel + * Copyright 2019-2020 Tavasti + * + * This file is part of lebiniou. + * + * lebiniou 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 of the License, or + * (at your option) any later version. + * + * lebiniou 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 lebiniou. If not, see . + */ + +/* Colrot, Color Rotation + + basic idea of plugin: Show only part of the colors from image, + and scroll thru colors. Not visible colors are transparent, + showing stuff happening under. Using lens mode. + + This plugin is 'normal', pretty agressive version of Colrot +*/ + + +#include "context.h" +#include "images.h" + +#define MASK_SIZE 15 /* what size of chunks colorspace is divided */ +#define COLORCOUNT 5 /* how many colors are visible in each chunk */ + +u_long id = 1553340853; +uint32_t version = 0; +u_long options = BE_GFX|BE_LENS|BEQ_IMAGE; +u_long mode = OVERLAY; +char desc[] = "Show image scrolling colors"; + +static Pixel_t min1 = 0, max1 = COLORCOUNT; + + +void +run(Context_t *ctx) +{ + u_long k; + Pixel_t *src = ctx->imgf->cur->buff->buffer; + Pixel_t *dst = passive_buffer(ctx)->buffer; + + for (k = 0; k < BUFFSIZE; k++, src++) { + if ( /* max1 is bigger than min, show values between them */ + ((max1 > min1) && + ((*src & MASK_SIZE) > min1) && ((*src & MASK_SIZE) < max1)) || + /* max is rotated over, show values below max or above min */ + ((max1 < min1) && + (((*src & MASK_SIZE)> min1) || ((*src & MASK_SIZE) < max1)))) { + dst[k] = *src; + } else { + dst[k] = 0; + } + } + + min1++; + max1++; + if (min1 > MASK_SIZE) { + min1 = 0; + } + if (max1 > MASK_SIZE) { + max1 = 0; + } +} diff -Nru lebiniou-3.31/plugins/stable/main/iColrot/Makefile.am lebiniou-3.40/plugins/stable/main/iColrot/Makefile.am --- lebiniou-3.31/plugins/stable/main/iColrot/Makefile.am 1970-01-01 00:00:00.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/iColrot/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -0,0 +1,7 @@ +plugindir = @libdir@/lebiniou/plugins/main/iColrot +plugin_PROGRAMS = iColrot.so + +iColrot_so_SOURCES = iColrot.c +iColrot_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +iColrot_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +iColrot_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/iColrot/Makefile.in lebiniou-3.40/plugins/stable/main/iColrot/Makefile.in --- lebiniou-3.31/plugins/stable/main/iColrot/Makefile.in 1970-01-01 00:00:00.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/iColrot/Makefile.in 2020-01-23 13:57:16.000000000 +0000 @@ -0,0 +1,665 @@ +# Makefile.in generated by automake 1.16.1 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994-2018 Free Software Foundation, Inc. + +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +VPATH = @srcdir@ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +target_triplet = @target@ +plugin_PROGRAMS = iColrot.so$(EXEEXT) +subdir = plugins/stable/main/iColrot +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +am__installdirs = "$(DESTDIR)$(plugindir)" +PROGRAMS = $(plugin_PROGRAMS) +am_iColrot_so_OBJECTS = iColrot_so-iColrot.$(OBJEXT) +iColrot_so_OBJECTS = $(am_iColrot_so_OBJECTS) +iColrot_so_DEPENDENCIES = +iColrot_so_LINK = $(CCLD) $(iColrot_so_CFLAGS) $(CFLAGS) \ + $(iColrot_so_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) +depcomp = $(SHELL) $(top_srcdir)/depcomp +am__maybe_remake_depfiles = depfiles +am__depfiles_remade = ./$(DEPDIR)/iColrot_so-iColrot.Po +am__mv = mv -f +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = +CCLD = $(CC) +LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = +SOURCES = $(iColrot_so_SOURCES) +DIST_SOURCES = $(iColrot_so_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +ALSA_CFLAGS = @ALSA_CFLAGS@ +ALSA_LIBS = @ALSA_LIBS@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AVUTIL_CFLAGS = @AVUTIL_CFLAGS@ +AVUTIL_LIBS = @AVUTIL_LIBS@ +AWK = @AWK@ +BINIOU_VERSION = @BINIOU_VERSION@ +CACA_CFLAGS = @CACA_CFLAGS@ +CACA_LIBS = @CACA_LIBS@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DPKG_BUILDFLAGS_CHECK = @DPKG_BUILDFLAGS_CHECK@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +ESD_CFLAGS = @ESD_CFLAGS@ +ESD_LIBS = @ESD_LIBS@ +EXEEXT = @EXEEXT@ +FFTW3_CFLAGS = @FFTW3_CFLAGS@ +FFTW3_LIBS = @FFTW3_LIBS@ +FT2_CFLAGS = @FT2_CFLAGS@ +FT2_LIBS = @FT2_LIBS@ +GETOPT_LONG_LIBS = @GETOPT_LONG_LIBS@ +GLIB_CFLAGS = @GLIB_CFLAGS@ +GLIB_LIBS = @GLIB_LIBS@ +GLU_CFLAGS = @GLU_CFLAGS@ +GLU_LIBS = @GLU_LIBS@ +GREP = @GREP@ +INPUT_PLUGINS = @INPUT_PLUGINS@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +JACK_CFLAGS = @JACK_CFLAGS@ +JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ +LDFLAGS = @LDFLAGS@ +LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ +LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ +LEBINIOU_SCHEMES_FILE = @LEBINIOU_SCHEMES_FILE@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ +MagickWand_CFLAGS = @MagickWand_CFLAGS@ +MagickWand_LIBS = @MagickWand_LIBS@ +OBJEXT = @OBJEXT@ +OSD_FONT = @OSD_FONT@ +OSD_PTSIZE = @OSD_PTSIZE@ +OUTPUT_PLUGINS = @OUTPUT_PLUGINS@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ +PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ +PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ +PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ +PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ +SDL2_CFLAGS = @SDL2_CFLAGS@ +SDL2_LIBS = @SDL2_LIBS@ +SDL2_ttf_CFLAGS = @SDL2_ttf_CFLAGS@ +SDL2_ttf_LIBS = @SDL2_ttf_LIBS@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +SNDFILE_CFLAGS = @SNDFILE_CFLAGS@ +SNDFILE_LIBS = @SNDFILE_LIBS@ +STRIP = @STRIP@ +SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ +SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ +VERSION = @VERSION@ +XML2_CFLAGS = @XML2_CFLAGS@ +XML2_LIBS = @XML2_LIBS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_CC = @ac_ct_CC@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +have_pandoc = @have_pandoc@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +runstatedir = @runstatedir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target = @target@ +target_alias = @target_alias@ +target_cpu = @target_cpu@ +target_os = @target_os@ +target_vendor = @target_vendor@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +plugindir = @libdir@/lebiniou/plugins/main/iColrot +iColrot_so_SOURCES = iColrot.c +iColrot_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +iColrot_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +iColrot_so_LDADD = @PLUGIN_LDADD@ +all: all-am + +.SUFFIXES: +.SUFFIXES: .c .o .obj +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign plugins/stable/main/iColrot/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --foreign plugins/stable/main/iColrot/Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): +install-pluginPROGRAMS: $(plugin_PROGRAMS) + @$(NORMAL_INSTALL) + @list='$(plugin_PROGRAMS)'; test -n "$(plugindir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \ + fi; \ + for p in $$list; do echo "$$p $$p"; done | \ + sed 's/$(EXEEXT)$$//' | \ + while read p p1; do if test -f $$p \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ + done | \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ + -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ + sed 'N;N;N;s,\n, ,g' | \ + $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ + { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ + if ($$2 == $$4) files[d] = files[d] " " $$1; \ + else { print "f", $$3 "/" $$4, $$1; } } \ + END { for (d in files) print "f", d, files[d] }' | \ + while read type dir files; do \ + if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ + test -z "$$files" || { \ + echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(plugindir)$$dir'"; \ + $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(plugindir)$$dir" || exit $$?; \ + } \ + ; done + +uninstall-pluginPROGRAMS: + @$(NORMAL_UNINSTALL) + @list='$(plugin_PROGRAMS)'; test -n "$(plugindir)" || list=; \ + files=`for p in $$list; do echo "$$p"; done | \ + sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ + -e 's/$$/$(EXEEXT)/' \ + `; \ + test -n "$$list" || exit 0; \ + echo " ( cd '$(DESTDIR)$(plugindir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(plugindir)" && rm -f $$files + +clean-pluginPROGRAMS: + -test -z "$(plugin_PROGRAMS)" || rm -f $(plugin_PROGRAMS) + +iColrot.so$(EXEEXT): $(iColrot_so_OBJECTS) $(iColrot_so_DEPENDENCIES) $(EXTRA_iColrot_so_DEPENDENCIES) + @rm -f iColrot.so$(EXEEXT) + $(AM_V_CCLD)$(iColrot_so_LINK) $(iColrot_so_OBJECTS) $(iColrot_so_LDADD) $(LIBS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/iColrot_so-iColrot.Po@am__quote@ # am--include-marker + +$(am__depfiles_remade): + @$(MKDIR_P) $(@D) + @echo '# dummy' >$@-t && $(am__mv) $@-t $@ + +am--depfiles: $(am__depfiles_remade) + +.c.o: +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< + +.c.obj: +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + +iColrot_so-iColrot.o: iColrot.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(iColrot_so_CFLAGS) $(CFLAGS) -MT iColrot_so-iColrot.o -MD -MP -MF $(DEPDIR)/iColrot_so-iColrot.Tpo -c -o iColrot_so-iColrot.o `test -f 'iColrot.c' || echo '$(srcdir)/'`iColrot.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/iColrot_so-iColrot.Tpo $(DEPDIR)/iColrot_so-iColrot.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='iColrot.c' object='iColrot_so-iColrot.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(iColrot_so_CFLAGS) $(CFLAGS) -c -o iColrot_so-iColrot.o `test -f 'iColrot.c' || echo '$(srcdir)/'`iColrot.c + +iColrot_so-iColrot.obj: iColrot.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(iColrot_so_CFLAGS) $(CFLAGS) -MT iColrot_so-iColrot.obj -MD -MP -MF $(DEPDIR)/iColrot_so-iColrot.Tpo -c -o iColrot_so-iColrot.obj `if test -f 'iColrot.c'; then $(CYGPATH_W) 'iColrot.c'; else $(CYGPATH_W) '$(srcdir)/iColrot.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/iColrot_so-iColrot.Tpo $(DEPDIR)/iColrot_so-iColrot.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='iColrot.c' object='iColrot_so-iColrot.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(iColrot_so_CFLAGS) $(CFLAGS) -c -o iColrot_so-iColrot.obj `if test -f 'iColrot.c'; then $(CYGPATH_W) 'iColrot.c'; else $(CYGPATH_W) '$(srcdir)/iColrot.c'; fi` + +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags + +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + set x; \ + here=`pwd`; \ + $(am__define_uniq_tagged_files); \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ + fi +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ + test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(PROGRAMS) +installdirs: + for dir in "$(DESTDIR)$(plugindir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-pluginPROGRAMS mostlyclean-am + +distclean: distclean-am + -rm -f ./$(DEPDIR)/iColrot_so-iColrot.Po + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-tags + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: install-pluginPROGRAMS + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f ./$(DEPDIR)/iColrot_so-iColrot.Po + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-compile mostlyclean-generic + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-pluginPROGRAMS + +.MAKE: install-am install-strip + +.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \ + clean-generic clean-pluginPROGRAMS cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-pluginPROGRAMS install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \ + ps ps-am tags tags-am uninstall uninstall-am \ + uninstall-pluginPROGRAMS + +.PRECIOUS: Makefile + + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -Nru lebiniou-3.31/plugins/stable/main/iColrotbeat/iColrotbeat.c lebiniou-3.40/plugins/stable/main/iColrotbeat/iColrotbeat.c --- lebiniou-3.31/plugins/stable/main/iColrotbeat/iColrotbeat.c 1970-01-01 00:00:00.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/iColrotbeat/iColrotbeat.c 2020-01-22 18:33:57.000000000 +0000 @@ -0,0 +1,107 @@ +/* + * Copyright 1994-2020 Olivier Girondel + * Copyright 2019-2020 Tavasti + * + * This file is part of lebiniou. + * + * lebiniou 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 of the License, or + * (at your option) any later version. + * + * lebiniou 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 lebiniou. If not, see . + */ + +/* Colrot, Color Rotation + + basic idea of plugin: Show only part of the colors from image, + and scroll thru colors. Not visible colors are transparent, + showing stuff happening under. Using lens mode. + + This plugin is beat version which is scrolling colors only at the beat. + With higher volume, more bigger scroll. + + At the beat also more colors are visible, giving stronger feedabck to beat +*/ + + + +#include "context.h" +#include "images.h" + +#define MASK_SIZE 63 /* what size of chunks colorspace is divided */ +#define COLORCOUNT 10 /* how many colors are visible in each chunk */ + +#define CURVE_VOL_MIN 0.05 /* Minimum volume we start changing curve */ +#define CURVE_VOL_STEP 0.1 /* Volume amount we step on curve */ +#define CURVE_VOL_MULT 1.7 /* multiplier on each step */ +#define CURVE_DIVISOR 4 /* value we are finally dividing increment */ +#define MAX_INCREMENT 9 /* maximum value of increment */ +#define INC_MULT_TO_COUNT 5 /* multiplier from increment to added colors */ +#define INIT_INCREMENT 2 /* initial increment on beat. Algorithm works if + floor(INIT_INC * CURVE_VOL_STEP) > INIT_INC */ + +u_long id = 1553341827; +uint32_t version = 0; +u_long options = BE_GFX|BE_SFX2D|BE_LENS|BEQ_IMAGE; +u_long mode = OVERLAY; +char desc[] = "Show image scrolling colors on beat"; + +static Pixel_t min1 = 0, max1 = COLORCOUNT; + + +void +run(Context_t *ctx) +{ + /* increment calculation */ + int increment = INIT_INCREMENT; + if (ctx->input->on_beat) { + double peak; + for (peak = ctx->input->curpeak; peak > CURVE_VOL_MIN; peak -= CURVE_VOL_STEP) { + increment *= CURVE_VOL_MULT; + } + } else { + increment = 0; /* no progression outside beat */ + } + increment = increment / CURVE_DIVISOR; + if (increment > MAX_INCREMENT) { + increment = MAX_INCREMENT; + } + int prevmax = max1; + /* To show more colors on beat we raise max1 on this run, but return after */ + max1 += increment * INC_MULT_TO_COUNT; + if (max1 > MASK_SIZE) { + max1 = max1 - MASK_SIZE; + } + + u_long k; + Pixel_t *src = ctx->imgf->cur->buff->buffer; + Pixel_t *dst = passive_buffer(ctx)->buffer; + for (k = 0; k < BUFFSIZE; k++, src++) { + if ( /* max1 is bigger than min, show values between them */ + ((max1 > min1) && + ((*src & MASK_SIZE) > min1) && ((*src & MASK_SIZE) < max1)) || + /* max is rotated over, show values below max or above min */ + ((max1 < min1) && + (((*src & MASK_SIZE)> min1) || ((*src & MASK_SIZE) < max1)))) { + dst[k] = *src; + } else { + dst[k] = 0; + } + } + /* restore max1 to previous, and add increment */ + max1 = prevmax + increment; + if (max1 > MASK_SIZE) { + max1 -= MASK_SIZE ; + } + min1 += increment; + if (min1 > MASK_SIZE) { + min1 -= MASK_SIZE; + } +} diff -Nru lebiniou-3.31/plugins/stable/main/iColrotbeat/Makefile.am lebiniou-3.40/plugins/stable/main/iColrotbeat/Makefile.am --- lebiniou-3.31/plugins/stable/main/iColrotbeat/Makefile.am 1970-01-01 00:00:00.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/iColrotbeat/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -0,0 +1,7 @@ +plugindir = @libdir@/lebiniou/plugins/main/iColrotbeat +plugin_PROGRAMS = iColrotbeat.so + +iColrotbeat_so_SOURCES = iColrotbeat.c +iColrotbeat_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +iColrotbeat_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +iColrotbeat_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/iColrotbeat/Makefile.in lebiniou-3.40/plugins/stable/main/iColrotbeat/Makefile.in --- lebiniou-3.31/plugins/stable/main/iColrotbeat/Makefile.in 1970-01-01 00:00:00.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/iColrotbeat/Makefile.in 2020-01-23 13:57:16.000000000 +0000 @@ -0,0 +1,665 @@ +# Makefile.in generated by automake 1.16.1 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994-2018 Free Software Foundation, Inc. + +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +VPATH = @srcdir@ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +target_triplet = @target@ +plugin_PROGRAMS = iColrotbeat.so$(EXEEXT) +subdir = plugins/stable/main/iColrotbeat +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +am__installdirs = "$(DESTDIR)$(plugindir)" +PROGRAMS = $(plugin_PROGRAMS) +am_iColrotbeat_so_OBJECTS = iColrotbeat_so-iColrotbeat.$(OBJEXT) +iColrotbeat_so_OBJECTS = $(am_iColrotbeat_so_OBJECTS) +iColrotbeat_so_DEPENDENCIES = +iColrotbeat_so_LINK = $(CCLD) $(iColrotbeat_so_CFLAGS) $(CFLAGS) \ + $(iColrotbeat_so_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) +depcomp = $(SHELL) $(top_srcdir)/depcomp +am__maybe_remake_depfiles = depfiles +am__depfiles_remade = ./$(DEPDIR)/iColrotbeat_so-iColrotbeat.Po +am__mv = mv -f +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = +CCLD = $(CC) +LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = +SOURCES = $(iColrotbeat_so_SOURCES) +DIST_SOURCES = $(iColrotbeat_so_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +ALSA_CFLAGS = @ALSA_CFLAGS@ +ALSA_LIBS = @ALSA_LIBS@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AVUTIL_CFLAGS = @AVUTIL_CFLAGS@ +AVUTIL_LIBS = @AVUTIL_LIBS@ +AWK = @AWK@ +BINIOU_VERSION = @BINIOU_VERSION@ +CACA_CFLAGS = @CACA_CFLAGS@ +CACA_LIBS = @CACA_LIBS@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DPKG_BUILDFLAGS_CHECK = @DPKG_BUILDFLAGS_CHECK@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +ESD_CFLAGS = @ESD_CFLAGS@ +ESD_LIBS = @ESD_LIBS@ +EXEEXT = @EXEEXT@ +FFTW3_CFLAGS = @FFTW3_CFLAGS@ +FFTW3_LIBS = @FFTW3_LIBS@ +FT2_CFLAGS = @FT2_CFLAGS@ +FT2_LIBS = @FT2_LIBS@ +GETOPT_LONG_LIBS = @GETOPT_LONG_LIBS@ +GLIB_CFLAGS = @GLIB_CFLAGS@ +GLIB_LIBS = @GLIB_LIBS@ +GLU_CFLAGS = @GLU_CFLAGS@ +GLU_LIBS = @GLU_LIBS@ +GREP = @GREP@ +INPUT_PLUGINS = @INPUT_PLUGINS@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +JACK_CFLAGS = @JACK_CFLAGS@ +JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ +LDFLAGS = @LDFLAGS@ +LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ +LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ +LEBINIOU_SCHEMES_FILE = @LEBINIOU_SCHEMES_FILE@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ +MagickWand_CFLAGS = @MagickWand_CFLAGS@ +MagickWand_LIBS = @MagickWand_LIBS@ +OBJEXT = @OBJEXT@ +OSD_FONT = @OSD_FONT@ +OSD_PTSIZE = @OSD_PTSIZE@ +OUTPUT_PLUGINS = @OUTPUT_PLUGINS@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ +PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ +PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ +PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ +PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ +SDL2_CFLAGS = @SDL2_CFLAGS@ +SDL2_LIBS = @SDL2_LIBS@ +SDL2_ttf_CFLAGS = @SDL2_ttf_CFLAGS@ +SDL2_ttf_LIBS = @SDL2_ttf_LIBS@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +SNDFILE_CFLAGS = @SNDFILE_CFLAGS@ +SNDFILE_LIBS = @SNDFILE_LIBS@ +STRIP = @STRIP@ +SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ +SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ +VERSION = @VERSION@ +XML2_CFLAGS = @XML2_CFLAGS@ +XML2_LIBS = @XML2_LIBS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_CC = @ac_ct_CC@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +have_pandoc = @have_pandoc@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +runstatedir = @runstatedir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target = @target@ +target_alias = @target_alias@ +target_cpu = @target_cpu@ +target_os = @target_os@ +target_vendor = @target_vendor@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +plugindir = @libdir@/lebiniou/plugins/main/iColrotbeat +iColrotbeat_so_SOURCES = iColrotbeat.c +iColrotbeat_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +iColrotbeat_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +iColrotbeat_so_LDADD = @PLUGIN_LDADD@ +all: all-am + +.SUFFIXES: +.SUFFIXES: .c .o .obj +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign plugins/stable/main/iColrotbeat/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --foreign plugins/stable/main/iColrotbeat/Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): +install-pluginPROGRAMS: $(plugin_PROGRAMS) + @$(NORMAL_INSTALL) + @list='$(plugin_PROGRAMS)'; test -n "$(plugindir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \ + fi; \ + for p in $$list; do echo "$$p $$p"; done | \ + sed 's/$(EXEEXT)$$//' | \ + while read p p1; do if test -f $$p \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ + done | \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ + -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ + sed 'N;N;N;s,\n, ,g' | \ + $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ + { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ + if ($$2 == $$4) files[d] = files[d] " " $$1; \ + else { print "f", $$3 "/" $$4, $$1; } } \ + END { for (d in files) print "f", d, files[d] }' | \ + while read type dir files; do \ + if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ + test -z "$$files" || { \ + echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(plugindir)$$dir'"; \ + $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(plugindir)$$dir" || exit $$?; \ + } \ + ; done + +uninstall-pluginPROGRAMS: + @$(NORMAL_UNINSTALL) + @list='$(plugin_PROGRAMS)'; test -n "$(plugindir)" || list=; \ + files=`for p in $$list; do echo "$$p"; done | \ + sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ + -e 's/$$/$(EXEEXT)/' \ + `; \ + test -n "$$list" || exit 0; \ + echo " ( cd '$(DESTDIR)$(plugindir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(plugindir)" && rm -f $$files + +clean-pluginPROGRAMS: + -test -z "$(plugin_PROGRAMS)" || rm -f $(plugin_PROGRAMS) + +iColrotbeat.so$(EXEEXT): $(iColrotbeat_so_OBJECTS) $(iColrotbeat_so_DEPENDENCIES) $(EXTRA_iColrotbeat_so_DEPENDENCIES) + @rm -f iColrotbeat.so$(EXEEXT) + $(AM_V_CCLD)$(iColrotbeat_so_LINK) $(iColrotbeat_so_OBJECTS) $(iColrotbeat_so_LDADD) $(LIBS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/iColrotbeat_so-iColrotbeat.Po@am__quote@ # am--include-marker + +$(am__depfiles_remade): + @$(MKDIR_P) $(@D) + @echo '# dummy' >$@-t && $(am__mv) $@-t $@ + +am--depfiles: $(am__depfiles_remade) + +.c.o: +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< + +.c.obj: +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + +iColrotbeat_so-iColrotbeat.o: iColrotbeat.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(iColrotbeat_so_CFLAGS) $(CFLAGS) -MT iColrotbeat_so-iColrotbeat.o -MD -MP -MF $(DEPDIR)/iColrotbeat_so-iColrotbeat.Tpo -c -o iColrotbeat_so-iColrotbeat.o `test -f 'iColrotbeat.c' || echo '$(srcdir)/'`iColrotbeat.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/iColrotbeat_so-iColrotbeat.Tpo $(DEPDIR)/iColrotbeat_so-iColrotbeat.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='iColrotbeat.c' object='iColrotbeat_so-iColrotbeat.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(iColrotbeat_so_CFLAGS) $(CFLAGS) -c -o iColrotbeat_so-iColrotbeat.o `test -f 'iColrotbeat.c' || echo '$(srcdir)/'`iColrotbeat.c + +iColrotbeat_so-iColrotbeat.obj: iColrotbeat.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(iColrotbeat_so_CFLAGS) $(CFLAGS) -MT iColrotbeat_so-iColrotbeat.obj -MD -MP -MF $(DEPDIR)/iColrotbeat_so-iColrotbeat.Tpo -c -o iColrotbeat_so-iColrotbeat.obj `if test -f 'iColrotbeat.c'; then $(CYGPATH_W) 'iColrotbeat.c'; else $(CYGPATH_W) '$(srcdir)/iColrotbeat.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/iColrotbeat_so-iColrotbeat.Tpo $(DEPDIR)/iColrotbeat_so-iColrotbeat.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='iColrotbeat.c' object='iColrotbeat_so-iColrotbeat.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(iColrotbeat_so_CFLAGS) $(CFLAGS) -c -o iColrotbeat_so-iColrotbeat.obj `if test -f 'iColrotbeat.c'; then $(CYGPATH_W) 'iColrotbeat.c'; else $(CYGPATH_W) '$(srcdir)/iColrotbeat.c'; fi` + +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags + +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + set x; \ + here=`pwd`; \ + $(am__define_uniq_tagged_files); \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ + fi +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ + test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(PROGRAMS) +installdirs: + for dir in "$(DESTDIR)$(plugindir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-pluginPROGRAMS mostlyclean-am + +distclean: distclean-am + -rm -f ./$(DEPDIR)/iColrotbeat_so-iColrotbeat.Po + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-tags + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: install-pluginPROGRAMS + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f ./$(DEPDIR)/iColrotbeat_so-iColrotbeat.Po + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-compile mostlyclean-generic + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-pluginPROGRAMS + +.MAKE: install-am install-strip + +.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \ + clean-generic clean-pluginPROGRAMS cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-pluginPROGRAMS install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \ + ps ps-am tags tags-am uninstall uninstall-am \ + uninstall-pluginPROGRAMS + +.PRECIOUS: Makefile + + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -Nru lebiniou-3.31/plugins/stable/main/iColrotslow/iColrotslow.c lebiniou-3.40/plugins/stable/main/iColrotslow/iColrotslow.c --- lebiniou-3.31/plugins/stable/main/iColrotslow/iColrotslow.c 1970-01-01 00:00:00.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/iColrotslow/iColrotslow.c 2020-01-22 18:33:57.000000000 +0000 @@ -0,0 +1,77 @@ +/* + * Copyright 1994-2020 Olivier Girondel + * Copyright 2019-2020 Tavasti + * + * This file is part of lebiniou. + * + * lebiniou 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 of the License, or + * (at your option) any later version. + * + * lebiniou 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 lebiniou. If not, see . + */ + +/* Colrot, Color Rotation + + basic idea of plugin: Show only part of the colors from image, + and scroll thru colors. Not visible colors are transparent, + showing stuff happening under. Using lens mode. + + This plugin is slow version of plugin +*/ + +#include "context.h" +#include "images.h" + +#define MASK_SIZE 63 /* what size of chunks colorspace is divided */ +#define COLORCOUNT 28 /* how many colors are visible in each chunk */ +#define INTERVAL 2 /* How often (in loop count) we rotate color values */ + +u_long id = 1553341808; +uint32_t version = 0; +u_long options = BE_GFX|BE_LENS|BEQ_IMAGE; +u_long mode = OVERLAY; +char desc[] = "Show image scrolling colors"; + +static Pixel_t min1 = 0, max1 = COLORCOUNT; + + +void +run(Context_t *ctx) +{ + static int loopc = 0; + u_long k; + Pixel_t *src = ctx->imgf->cur->buff->buffer; + Pixel_t *dst = passive_buffer(ctx)->buffer; + + for (k = 0; k < BUFFSIZE; k++, src++) { + if ( /* max1 is bigger than min, show values between them */ + ((max1 > min1) && + ((*src & MASK_SIZE) > min1) && ((*src & MASK_SIZE) < max1)) || + /* max is rotated over, show values below max or above min */ + ((max1 < min1) && + (((*src & MASK_SIZE)> min1) || ((*src & MASK_SIZE) < max1)))) { + dst[k] = *src; + } else { + dst[k] = 0; + } + } + if (loopc++ > INTERVAL) { + loopc = 0; + min1++; + max1++; + if (min1 > MASK_SIZE) { + min1 = 0; + } + if (max1 > MASK_SIZE) { + max1 = 0; + } + } +} diff -Nru lebiniou-3.31/plugins/stable/main/iColrotslow/Makefile.am lebiniou-3.40/plugins/stable/main/iColrotslow/Makefile.am --- lebiniou-3.31/plugins/stable/main/iColrotslow/Makefile.am 1970-01-01 00:00:00.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/iColrotslow/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -0,0 +1,7 @@ +plugindir = @libdir@/lebiniou/plugins/main/iColrotslow +plugin_PROGRAMS = iColrotslow.so + +iColrotslow_so_SOURCES = iColrotslow.c +iColrotslow_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +iColrotslow_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +iColrotslow_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/iColrotslow/Makefile.in lebiniou-3.40/plugins/stable/main/iColrotslow/Makefile.in --- lebiniou-3.31/plugins/stable/main/iColrotslow/Makefile.in 1970-01-01 00:00:00.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/iColrotslow/Makefile.in 2020-01-23 13:57:16.000000000 +0000 @@ -0,0 +1,665 @@ +# Makefile.in generated by automake 1.16.1 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994-2018 Free Software Foundation, Inc. + +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +VPATH = @srcdir@ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +target_triplet = @target@ +plugin_PROGRAMS = iColrotslow.so$(EXEEXT) +subdir = plugins/stable/main/iColrotslow +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +am__installdirs = "$(DESTDIR)$(plugindir)" +PROGRAMS = $(plugin_PROGRAMS) +am_iColrotslow_so_OBJECTS = iColrotslow_so-iColrotslow.$(OBJEXT) +iColrotslow_so_OBJECTS = $(am_iColrotslow_so_OBJECTS) +iColrotslow_so_DEPENDENCIES = +iColrotslow_so_LINK = $(CCLD) $(iColrotslow_so_CFLAGS) $(CFLAGS) \ + $(iColrotslow_so_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) +depcomp = $(SHELL) $(top_srcdir)/depcomp +am__maybe_remake_depfiles = depfiles +am__depfiles_remade = ./$(DEPDIR)/iColrotslow_so-iColrotslow.Po +am__mv = mv -f +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = +CCLD = $(CC) +LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = +SOURCES = $(iColrotslow_so_SOURCES) +DIST_SOURCES = $(iColrotslow_so_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +ALSA_CFLAGS = @ALSA_CFLAGS@ +ALSA_LIBS = @ALSA_LIBS@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AVUTIL_CFLAGS = @AVUTIL_CFLAGS@ +AVUTIL_LIBS = @AVUTIL_LIBS@ +AWK = @AWK@ +BINIOU_VERSION = @BINIOU_VERSION@ +CACA_CFLAGS = @CACA_CFLAGS@ +CACA_LIBS = @CACA_LIBS@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DPKG_BUILDFLAGS_CHECK = @DPKG_BUILDFLAGS_CHECK@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +ESD_CFLAGS = @ESD_CFLAGS@ +ESD_LIBS = @ESD_LIBS@ +EXEEXT = @EXEEXT@ +FFTW3_CFLAGS = @FFTW3_CFLAGS@ +FFTW3_LIBS = @FFTW3_LIBS@ +FT2_CFLAGS = @FT2_CFLAGS@ +FT2_LIBS = @FT2_LIBS@ +GETOPT_LONG_LIBS = @GETOPT_LONG_LIBS@ +GLIB_CFLAGS = @GLIB_CFLAGS@ +GLIB_LIBS = @GLIB_LIBS@ +GLU_CFLAGS = @GLU_CFLAGS@ +GLU_LIBS = @GLU_LIBS@ +GREP = @GREP@ +INPUT_PLUGINS = @INPUT_PLUGINS@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +JACK_CFLAGS = @JACK_CFLAGS@ +JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ +LDFLAGS = @LDFLAGS@ +LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ +LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ +LEBINIOU_SCHEMES_FILE = @LEBINIOU_SCHEMES_FILE@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ +MagickWand_CFLAGS = @MagickWand_CFLAGS@ +MagickWand_LIBS = @MagickWand_LIBS@ +OBJEXT = @OBJEXT@ +OSD_FONT = @OSD_FONT@ +OSD_PTSIZE = @OSD_PTSIZE@ +OUTPUT_PLUGINS = @OUTPUT_PLUGINS@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ +PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ +PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ +PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ +PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ +SDL2_CFLAGS = @SDL2_CFLAGS@ +SDL2_LIBS = @SDL2_LIBS@ +SDL2_ttf_CFLAGS = @SDL2_ttf_CFLAGS@ +SDL2_ttf_LIBS = @SDL2_ttf_LIBS@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +SNDFILE_CFLAGS = @SNDFILE_CFLAGS@ +SNDFILE_LIBS = @SNDFILE_LIBS@ +STRIP = @STRIP@ +SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ +SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ +VERSION = @VERSION@ +XML2_CFLAGS = @XML2_CFLAGS@ +XML2_LIBS = @XML2_LIBS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_CC = @ac_ct_CC@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +have_pandoc = @have_pandoc@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +runstatedir = @runstatedir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target = @target@ +target_alias = @target_alias@ +target_cpu = @target_cpu@ +target_os = @target_os@ +target_vendor = @target_vendor@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +plugindir = @libdir@/lebiniou/plugins/main/iColrotslow +iColrotslow_so_SOURCES = iColrotslow.c +iColrotslow_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +iColrotslow_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +iColrotslow_so_LDADD = @PLUGIN_LDADD@ +all: all-am + +.SUFFIXES: +.SUFFIXES: .c .o .obj +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign plugins/stable/main/iColrotslow/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --foreign plugins/stable/main/iColrotslow/Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): +install-pluginPROGRAMS: $(plugin_PROGRAMS) + @$(NORMAL_INSTALL) + @list='$(plugin_PROGRAMS)'; test -n "$(plugindir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \ + fi; \ + for p in $$list; do echo "$$p $$p"; done | \ + sed 's/$(EXEEXT)$$//' | \ + while read p p1; do if test -f $$p \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ + done | \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ + -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ + sed 'N;N;N;s,\n, ,g' | \ + $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ + { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ + if ($$2 == $$4) files[d] = files[d] " " $$1; \ + else { print "f", $$3 "/" $$4, $$1; } } \ + END { for (d in files) print "f", d, files[d] }' | \ + while read type dir files; do \ + if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ + test -z "$$files" || { \ + echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(plugindir)$$dir'"; \ + $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(plugindir)$$dir" || exit $$?; \ + } \ + ; done + +uninstall-pluginPROGRAMS: + @$(NORMAL_UNINSTALL) + @list='$(plugin_PROGRAMS)'; test -n "$(plugindir)" || list=; \ + files=`for p in $$list; do echo "$$p"; done | \ + sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ + -e 's/$$/$(EXEEXT)/' \ + `; \ + test -n "$$list" || exit 0; \ + echo " ( cd '$(DESTDIR)$(plugindir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(plugindir)" && rm -f $$files + +clean-pluginPROGRAMS: + -test -z "$(plugin_PROGRAMS)" || rm -f $(plugin_PROGRAMS) + +iColrotslow.so$(EXEEXT): $(iColrotslow_so_OBJECTS) $(iColrotslow_so_DEPENDENCIES) $(EXTRA_iColrotslow_so_DEPENDENCIES) + @rm -f iColrotslow.so$(EXEEXT) + $(AM_V_CCLD)$(iColrotslow_so_LINK) $(iColrotslow_so_OBJECTS) $(iColrotslow_so_LDADD) $(LIBS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/iColrotslow_so-iColrotslow.Po@am__quote@ # am--include-marker + +$(am__depfiles_remade): + @$(MKDIR_P) $(@D) + @echo '# dummy' >$@-t && $(am__mv) $@-t $@ + +am--depfiles: $(am__depfiles_remade) + +.c.o: +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< + +.c.obj: +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + +iColrotslow_so-iColrotslow.o: iColrotslow.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(iColrotslow_so_CFLAGS) $(CFLAGS) -MT iColrotslow_so-iColrotslow.o -MD -MP -MF $(DEPDIR)/iColrotslow_so-iColrotslow.Tpo -c -o iColrotslow_so-iColrotslow.o `test -f 'iColrotslow.c' || echo '$(srcdir)/'`iColrotslow.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/iColrotslow_so-iColrotslow.Tpo $(DEPDIR)/iColrotslow_so-iColrotslow.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='iColrotslow.c' object='iColrotslow_so-iColrotslow.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(iColrotslow_so_CFLAGS) $(CFLAGS) -c -o iColrotslow_so-iColrotslow.o `test -f 'iColrotslow.c' || echo '$(srcdir)/'`iColrotslow.c + +iColrotslow_so-iColrotslow.obj: iColrotslow.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(iColrotslow_so_CFLAGS) $(CFLAGS) -MT iColrotslow_so-iColrotslow.obj -MD -MP -MF $(DEPDIR)/iColrotslow_so-iColrotslow.Tpo -c -o iColrotslow_so-iColrotslow.obj `if test -f 'iColrotslow.c'; then $(CYGPATH_W) 'iColrotslow.c'; else $(CYGPATH_W) '$(srcdir)/iColrotslow.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/iColrotslow_so-iColrotslow.Tpo $(DEPDIR)/iColrotslow_so-iColrotslow.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='iColrotslow.c' object='iColrotslow_so-iColrotslow.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(iColrotslow_so_CFLAGS) $(CFLAGS) -c -o iColrotslow_so-iColrotslow.obj `if test -f 'iColrotslow.c'; then $(CYGPATH_W) 'iColrotslow.c'; else $(CYGPATH_W) '$(srcdir)/iColrotslow.c'; fi` + +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags + +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + set x; \ + here=`pwd`; \ + $(am__define_uniq_tagged_files); \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ + fi +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ + test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(PROGRAMS) +installdirs: + for dir in "$(DESTDIR)$(plugindir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-pluginPROGRAMS mostlyclean-am + +distclean: distclean-am + -rm -f ./$(DEPDIR)/iColrotslow_so-iColrotslow.Po + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-tags + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: install-pluginPROGRAMS + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f ./$(DEPDIR)/iColrotslow_so-iColrotslow.Po + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-compile mostlyclean-generic + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-pluginPROGRAMS + +.MAKE: install-am install-strip + +.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \ + clean-generic clean-pluginPROGRAMS cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-pluginPROGRAMS install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \ + ps ps-am tags tags-am uninstall uninstall-am \ + uninstall-pluginPROGRAMS + +.PRECIOUS: Makefile + + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -Nru lebiniou-3.31/plugins/stable/main/iDissolve/iDissolve.c lebiniou-3.40/plugins/stable/main/iDissolve/iDissolve.c --- lebiniou-3.31/plugins/stable/main/iDissolve/iDissolve.c 2019-04-05 20:39:14.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/iDissolve/iDissolve.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,6 +1,6 @@ /* - * Copyright 1994-2019 Olivier Girondel - * Copyright 2019 Tavasti + * Copyright 1994-2020 Olivier Girondel + * Copyright 2019-2020 Tavasti * * This file is part of lebiniou. * @@ -26,21 +26,13 @@ #include "images.h" u_long id = 1550933228; +uint32_t version = 0; u_long options = BE_GFX|BEQ_IMAGE; u_long mode = NORMAL; char desc[] = "Show images smoothly"; void -create(Context_t *ctx) -{ - if (images == NULL) { - options |= BEQ_DISABLED; - } -} - - -void run(Context_t *ctx) { Buffer8_t *dst = passive_buffer(ctx); diff -Nru lebiniou-3.31/plugins/stable/main/iDissolve/Makefile.am lebiniou-3.40/plugins/stable/main/iDissolve/Makefile.am --- lebiniou-3.31/plugins/stable/main/iDissolve/Makefile.am 2019-04-05 20:39:14.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/iDissolve/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -2,5 +2,6 @@ plugin_PROGRAMS = iDissolve.so iDissolve_so_SOURCES = iDissolve.c -iDissolve_so_LDFLAGS = @PLUGIN_LDFLAGS@ -iDissolve_so_CFLAGS = @PLUGIN_CFLAGS@ +iDissolve_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +iDissolve_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +iDissolve_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/iDissolve/Makefile.in lebiniou-3.40/plugins/stable/main/iDissolve/Makefile.in --- lebiniou-3.31/plugins/stable/main/iDissolve/Makefile.in 2019-04-14 11:52:32.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/iDissolve/Makefile.in 2020-01-23 13:57:16.000000000 +0000 @@ -104,7 +104,7 @@ PROGRAMS = $(plugin_PROGRAMS) am_iDissolve_so_OBJECTS = iDissolve_so-iDissolve.$(OBJEXT) iDissolve_so_OBJECTS = $(am_iDissolve_so_OBJECTS) -iDissolve_so_LDADD = $(LDADD) +iDissolve_so_DEPENDENCIES = iDissolve_so_LINK = $(CCLD) $(iDissolve_so_CFLAGS) $(CFLAGS) \ $(iDissolve_so_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -216,6 +216,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -243,6 +245,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -257,7 +260,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -319,8 +325,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/main/iDissolve iDissolve_so_SOURCES = iDissolve.c -iDissolve_so_LDFLAGS = @PLUGIN_LDFLAGS@ -iDissolve_so_CFLAGS = @PLUGIN_CFLAGS@ +iDissolve_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +iDissolve_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +iDissolve_so_LDADD = @PLUGIN_LDADD@ all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/main/imagedrop/imagedrop.c lebiniou-3.40/plugins/stable/main/imagedrop/imagedrop.c --- lebiniou-3.31/plugins/stable/main/imagedrop/imagedrop.c 1970-01-01 00:00:00.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/imagedrop/imagedrop.c 2020-01-22 18:33:57.000000000 +0000 @@ -0,0 +1,202 @@ +/* + * Copyright 1994-2020 Olivier Girondel + * Copyright 2019-2020 Tavasti + * + * This file is part of lebiniou. + * + * lebiniou 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 of the License, or + * (at your option) any later version. + * + * lebiniou 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 lebiniou. If not, see . + */ + +/* + * Idea: drops that wash away existing picture, and reveal new behind it + */ + +#include "context.h" +#include "images.h" + +#define DROPCOUNT 20 /* how many drops there can be same time progressing */ +#define INITIAL_WAIT_MAX 2 /* max wait before first drop */ +#define WAIT_MIN 2 /* minimum wait between drops */ +#define WAIT_MAX 18 /* max wait between drops */ +#define DROPSIZE_MIN (WIDTH/14.0) /* minimum radius of drop */ +#define DROPSIZE_MAX (WIDTH/5.0) /* maximum radius of drop */ +#define HAZY_RADIUS 20.0 /* how many pixels on outer ring are hazy */ +#define HAZY_RATIO 23.0 /* 1/x probability hazy pixel to get drawn */ +#define PROG_RATIO 0.09 /* how big ratio of diameter progress in one round */ +#define INCR_RATIO 0.3 /* Ratio how much color value is changed */ +#define READY_TOL 0.65 /* difference to target regarded as ready */ + + +u_long id = 1556217225; +uint32_t version = 0; +u_long options = BE_GFX|BEQ_IMAGE; +char desc[] = "Image drops"; + +typedef struct Drop_s { + int x; + int y; + double target; /* target radius */ + double current; /* current radius */ + int incr; /* color increment / decrement value */ +} Drop_t; + +static Drop_t drops[DROPCOUNT]; +static short *mask = NULL; +static int next_drop; /* counter how many rounds before next drop */ + + +int8_t +create(Context_t *ctx) +{ + mask = xmalloc(sizeof(short) * BUFFSIZE); + + return 1; +} + + +void +destroy(Context_t *ctx) +{ + xfree(mask); +} + + +void +on_switch_on(Context_t *ctx) +{ + u_long i; + /* clear drops */ + for (i = 0; i < DROPCOUNT ; i++) { + drops[i].x = -1; + } + next_drop = b_rand_int_range(0, INITIAL_WAIT_MAX); + /* initialize mask */ + for (i = 0; i < BUFFSIZE ; i++) { + mask[i] = -1; + } +} + + +/* helper function for marking affected pixels of circle to mask */ +static void +mark_circle_range(int x, int y, double r, short mark, short *mbuff) +{ + assert(mask != NULL); + + /* calculate bounding box of circle */ + int left = x - r; + left = (left < 0) ? 0 : left; + int right = x + r; + right = (right >= WIDTH) ? WIDTH - 1 : right; + int top = y - r; + top = (top < 0) ? 0 : top; + int bottom = y + r; + bottom = (bottom >= HEIGHT) ? HEIGHT - 1 : bottom; + + /* we handle distances as squared to speed up things, + no need to calculate sqrt for every pixel */ + double distsq = r * r; /* outer ring which is hazy*/ + double distsq2 = (r - HAZY_RADIUS) * (r - HAZY_RADIUS); /* inner ring */ + int i,j; + /* loop thru bounding box, and check if pixel is in circle */ + for (i = top; i <= bottom; i++) { + for (j = left ; j <= right; j++) { + int dx = j - x; + int dy = i - y; + if (((dx * dx) + (dy * dy)) < distsq) { + if (((dx * dx) + (dy * dy)) < distsq2) { + mbuff[i * WIDTH + j] = mark; + } else if (b_rand_int_range(0, HAZY_RATIO) == 0) { + /* hazy pixel */ + mbuff[i * WIDTH + j] = mark; + } else { + /* outside circle */ + mbuff[i * WIDTH + j] = -1; + } + } + } + } +} + +void +run(Context_t *ctx) +{ + static uint32_t imageid = 0; /* we store image id so that we can disable + drops when image changes */ + u_long i; + if (ctx->imgf->dst->id != imageid) { /* image change detected */ + imageid = ctx->imgf->dst->id; + /* mark all drops unused */ + for (i = 0; i < DROPCOUNT; i++) { + drops[i].x = -1; + drops[i].target = 1.0; + drops[i].current = 1.0; + } + next_drop = 0; /* get one new drop immediately */ + } + + /* Grow existing drops, and release fully grown drops for next use */ + for (i = 0; i < DROPCOUNT; i++) { + if (drops[i].x > -1) { /* in use */ + if ((drops[i].current + READY_TOL) < drops[i].target) { + drops[i].current += (drops[i].target - drops[i].current) * PROG_RATIO; + drops[i].incr = (drops[i].target - drops[i].current) * INCR_RATIO; + if (drops[i].incr < 1.0) { + drops[i].incr = 1.0; /* values less that 1 won't have any effect */ + } + /* mark area where this drop affects this round */ + mark_circle_range(drops[i].x, drops[i].y, drops[i].current, i, mask); + } else { + /* this drop is done */ + mark_circle_range(drops[i].x, drops[i].y, drops[i].target, -1, mask); + drops[i].x = -1; + } + } + } + + /* start checking if we need and can add new drop */ + if (--next_drop <= 0) { /* time to add drop if there is room in struct */ + for (i = 0; i < DROPCOUNT; i++) { + if (drops[i].x == -1) { /* free entry */ + /* new random drop */ + drops[i].x = b_rand_int_range(0, WIDTH); + drops[i].y = b_rand_int_range(0, HEIGHT); + drops[i].target = b_rand_double_range(DROPSIZE_MIN, DROPSIZE_MAX); + drops[i].current = drops[i].target * PROG_RATIO ; + drops[i].incr = drops[i].target; + next_drop = b_rand_int_range(WAIT_MIN, WAIT_MAX); + /* mark area where this drop affects this round */ + mark_circle_range(drops[i].x, drops[i].y, drops[i].current, i, mask); + break; + } + } + } + /* actual picture handling */ + const Pixel_t *src = active_buffer(ctx)->buffer; + Pixel_t *dst = passive_buffer(ctx)->buffer; + + for (i = 0; i < BUFFSIZE; i++) { + Pixel_t col = src[i]; + if (mask[i] >= 0) { + if (col > ctx->imgf->cur->buff->buffer[i]) { + col = ((col - drops[mask[i]].incr) > ctx->imgf->cur->buff->buffer[i]) ? + col - drops[mask[i]].incr : ctx->imgf->cur->buff->buffer[i]; + } else if (col < ctx->imgf->cur->buff->buffer[i]) { + col = (col < (ctx->imgf->cur->buff->buffer[i] - drops[mask[i]].incr)) ? + col + drops[mask[i]].incr : ctx->imgf->cur->buff->buffer[i]; + } + } + *dst++ = col; + } +} diff -Nru lebiniou-3.31/plugins/stable/main/imagedrop/Makefile.am lebiniou-3.40/plugins/stable/main/imagedrop/Makefile.am --- lebiniou-3.31/plugins/stable/main/imagedrop/Makefile.am 1970-01-01 00:00:00.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/imagedrop/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -0,0 +1,7 @@ +plugindir = @libdir@/lebiniou/plugins/main/imagedrop +plugin_PROGRAMS = imagedrop.so + +imagedrop_so_SOURCES = imagedrop.c +imagedrop_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +imagedrop_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +imagedrop_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/imagedrop/Makefile.in lebiniou-3.40/plugins/stable/main/imagedrop/Makefile.in --- lebiniou-3.31/plugins/stable/main/imagedrop/Makefile.in 1970-01-01 00:00:00.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/imagedrop/Makefile.in 2020-01-23 13:57:17.000000000 +0000 @@ -0,0 +1,665 @@ +# Makefile.in generated by automake 1.16.1 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994-2018 Free Software Foundation, Inc. + +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +VPATH = @srcdir@ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +target_triplet = @target@ +plugin_PROGRAMS = imagedrop.so$(EXEEXT) +subdir = plugins/stable/main/imagedrop +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +am__installdirs = "$(DESTDIR)$(plugindir)" +PROGRAMS = $(plugin_PROGRAMS) +am_imagedrop_so_OBJECTS = imagedrop_so-imagedrop.$(OBJEXT) +imagedrop_so_OBJECTS = $(am_imagedrop_so_OBJECTS) +imagedrop_so_DEPENDENCIES = +imagedrop_so_LINK = $(CCLD) $(imagedrop_so_CFLAGS) $(CFLAGS) \ + $(imagedrop_so_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) +depcomp = $(SHELL) $(top_srcdir)/depcomp +am__maybe_remake_depfiles = depfiles +am__depfiles_remade = ./$(DEPDIR)/imagedrop_so-imagedrop.Po +am__mv = mv -f +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = +CCLD = $(CC) +LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = +SOURCES = $(imagedrop_so_SOURCES) +DIST_SOURCES = $(imagedrop_so_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +ALSA_CFLAGS = @ALSA_CFLAGS@ +ALSA_LIBS = @ALSA_LIBS@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AVUTIL_CFLAGS = @AVUTIL_CFLAGS@ +AVUTIL_LIBS = @AVUTIL_LIBS@ +AWK = @AWK@ +BINIOU_VERSION = @BINIOU_VERSION@ +CACA_CFLAGS = @CACA_CFLAGS@ +CACA_LIBS = @CACA_LIBS@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DPKG_BUILDFLAGS_CHECK = @DPKG_BUILDFLAGS_CHECK@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +ESD_CFLAGS = @ESD_CFLAGS@ +ESD_LIBS = @ESD_LIBS@ +EXEEXT = @EXEEXT@ +FFTW3_CFLAGS = @FFTW3_CFLAGS@ +FFTW3_LIBS = @FFTW3_LIBS@ +FT2_CFLAGS = @FT2_CFLAGS@ +FT2_LIBS = @FT2_LIBS@ +GETOPT_LONG_LIBS = @GETOPT_LONG_LIBS@ +GLIB_CFLAGS = @GLIB_CFLAGS@ +GLIB_LIBS = @GLIB_LIBS@ +GLU_CFLAGS = @GLU_CFLAGS@ +GLU_LIBS = @GLU_LIBS@ +GREP = @GREP@ +INPUT_PLUGINS = @INPUT_PLUGINS@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +JACK_CFLAGS = @JACK_CFLAGS@ +JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ +LDFLAGS = @LDFLAGS@ +LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ +LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ +LEBINIOU_SCHEMES_FILE = @LEBINIOU_SCHEMES_FILE@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ +MagickWand_CFLAGS = @MagickWand_CFLAGS@ +MagickWand_LIBS = @MagickWand_LIBS@ +OBJEXT = @OBJEXT@ +OSD_FONT = @OSD_FONT@ +OSD_PTSIZE = @OSD_PTSIZE@ +OUTPUT_PLUGINS = @OUTPUT_PLUGINS@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ +PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ +PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ +PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ +PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ +SDL2_CFLAGS = @SDL2_CFLAGS@ +SDL2_LIBS = @SDL2_LIBS@ +SDL2_ttf_CFLAGS = @SDL2_ttf_CFLAGS@ +SDL2_ttf_LIBS = @SDL2_ttf_LIBS@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +SNDFILE_CFLAGS = @SNDFILE_CFLAGS@ +SNDFILE_LIBS = @SNDFILE_LIBS@ +STRIP = @STRIP@ +SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ +SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ +VERSION = @VERSION@ +XML2_CFLAGS = @XML2_CFLAGS@ +XML2_LIBS = @XML2_LIBS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_CC = @ac_ct_CC@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +have_pandoc = @have_pandoc@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +runstatedir = @runstatedir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target = @target@ +target_alias = @target_alias@ +target_cpu = @target_cpu@ +target_os = @target_os@ +target_vendor = @target_vendor@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +plugindir = @libdir@/lebiniou/plugins/main/imagedrop +imagedrop_so_SOURCES = imagedrop.c +imagedrop_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +imagedrop_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +imagedrop_so_LDADD = @PLUGIN_LDADD@ +all: all-am + +.SUFFIXES: +.SUFFIXES: .c .o .obj +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign plugins/stable/main/imagedrop/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --foreign plugins/stable/main/imagedrop/Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): +install-pluginPROGRAMS: $(plugin_PROGRAMS) + @$(NORMAL_INSTALL) + @list='$(plugin_PROGRAMS)'; test -n "$(plugindir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \ + fi; \ + for p in $$list; do echo "$$p $$p"; done | \ + sed 's/$(EXEEXT)$$//' | \ + while read p p1; do if test -f $$p \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ + done | \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ + -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ + sed 'N;N;N;s,\n, ,g' | \ + $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ + { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ + if ($$2 == $$4) files[d] = files[d] " " $$1; \ + else { print "f", $$3 "/" $$4, $$1; } } \ + END { for (d in files) print "f", d, files[d] }' | \ + while read type dir files; do \ + if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ + test -z "$$files" || { \ + echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(plugindir)$$dir'"; \ + $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(plugindir)$$dir" || exit $$?; \ + } \ + ; done + +uninstall-pluginPROGRAMS: + @$(NORMAL_UNINSTALL) + @list='$(plugin_PROGRAMS)'; test -n "$(plugindir)" || list=; \ + files=`for p in $$list; do echo "$$p"; done | \ + sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ + -e 's/$$/$(EXEEXT)/' \ + `; \ + test -n "$$list" || exit 0; \ + echo " ( cd '$(DESTDIR)$(plugindir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(plugindir)" && rm -f $$files + +clean-pluginPROGRAMS: + -test -z "$(plugin_PROGRAMS)" || rm -f $(plugin_PROGRAMS) + +imagedrop.so$(EXEEXT): $(imagedrop_so_OBJECTS) $(imagedrop_so_DEPENDENCIES) $(EXTRA_imagedrop_so_DEPENDENCIES) + @rm -f imagedrop.so$(EXEEXT) + $(AM_V_CCLD)$(imagedrop_so_LINK) $(imagedrop_so_OBJECTS) $(imagedrop_so_LDADD) $(LIBS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imagedrop_so-imagedrop.Po@am__quote@ # am--include-marker + +$(am__depfiles_remade): + @$(MKDIR_P) $(@D) + @echo '# dummy' >$@-t && $(am__mv) $@-t $@ + +am--depfiles: $(am__depfiles_remade) + +.c.o: +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< + +.c.obj: +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + +imagedrop_so-imagedrop.o: imagedrop.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(imagedrop_so_CFLAGS) $(CFLAGS) -MT imagedrop_so-imagedrop.o -MD -MP -MF $(DEPDIR)/imagedrop_so-imagedrop.Tpo -c -o imagedrop_so-imagedrop.o `test -f 'imagedrop.c' || echo '$(srcdir)/'`imagedrop.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/imagedrop_so-imagedrop.Tpo $(DEPDIR)/imagedrop_so-imagedrop.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='imagedrop.c' object='imagedrop_so-imagedrop.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(imagedrop_so_CFLAGS) $(CFLAGS) -c -o imagedrop_so-imagedrop.o `test -f 'imagedrop.c' || echo '$(srcdir)/'`imagedrop.c + +imagedrop_so-imagedrop.obj: imagedrop.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(imagedrop_so_CFLAGS) $(CFLAGS) -MT imagedrop_so-imagedrop.obj -MD -MP -MF $(DEPDIR)/imagedrop_so-imagedrop.Tpo -c -o imagedrop_so-imagedrop.obj `if test -f 'imagedrop.c'; then $(CYGPATH_W) 'imagedrop.c'; else $(CYGPATH_W) '$(srcdir)/imagedrop.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/imagedrop_so-imagedrop.Tpo $(DEPDIR)/imagedrop_so-imagedrop.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='imagedrop.c' object='imagedrop_so-imagedrop.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(imagedrop_so_CFLAGS) $(CFLAGS) -c -o imagedrop_so-imagedrop.obj `if test -f 'imagedrop.c'; then $(CYGPATH_W) 'imagedrop.c'; else $(CYGPATH_W) '$(srcdir)/imagedrop.c'; fi` + +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags + +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + set x; \ + here=`pwd`; \ + $(am__define_uniq_tagged_files); \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ + fi +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ + test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(PROGRAMS) +installdirs: + for dir in "$(DESTDIR)$(plugindir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-pluginPROGRAMS mostlyclean-am + +distclean: distclean-am + -rm -f ./$(DEPDIR)/imagedrop_so-imagedrop.Po + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-tags + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: install-pluginPROGRAMS + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f ./$(DEPDIR)/imagedrop_so-imagedrop.Po + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-compile mostlyclean-generic + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-pluginPROGRAMS + +.MAKE: install-am install-strip + +.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \ + clean-generic clean-pluginPROGRAMS cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-pluginPROGRAMS install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \ + ps ps-am tags tags-am uninstall uninstall-am \ + uninstall-pluginPROGRAMS + +.PRECIOUS: Makefile + + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -Nru lebiniou-3.31/plugins/stable/main/include/blur.h lebiniou-3.40/plugins/stable/main/include/blur.h --- lebiniou-3.31/plugins/stable/main/include/blur.h 1970-01-01 00:00:00.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/include/blur.h 2020-01-23 13:56:18.000000000 +0000 @@ -0,0 +1,55 @@ +/* + * Copyright 1994-2019 Olivier Girondel + * Copyright 2019 Laurent Marsac + * + * This file is part of lebiniou. + * + * lebiniou 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 of the License, or + * (at your option) any later version. + * + * lebiniou 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 lebiniou. If not, see . + */ + +#ifndef __BLUR_H +#define __BLUR_H + +static enum BorderMode border_mode; + +json_t * +get_parameters() +{ + json_t *params = json_object(); + plugin_parameters_add_string_list(params, BPP_BORDER_MODE, BM_NB, border_list, border_mode); + + return params; +} + + +void +set_parameters(const json_t *in_parameters) +{ + int border_mode_idx = 0; + if (plugin_parameter_parse_string_list_as_int_range(in_parameters, BPP_BORDER_MODE, BM_NB, border_list, &border_mode_idx, 0, BM_NB-1)) { + border_mode = (enum BorderMode)border_mode_idx; + } +} + + +json_t * +parameters(json_t *in_parameters) +{ + set_parameters(in_parameters); + + return get_parameters(); +} + + +#endif /* __BLUR_H */ diff -Nru lebiniou-3.31/plugins/stable/main/include/delay.h lebiniou-3.40/plugins/stable/main/include/delay.h --- lebiniou-3.31/plugins/stable/main/include/delay.h 2019-02-02 00:30:11.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/include/delay.h 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -20,6 +20,8 @@ #ifndef __DELAY_H #define __DELAY_H +#include "parameters.h" + // to separate left and right channels #define DELAY_XOFFSET 0.5 diff -Nru lebiniou-3.31/plugins/stable/main/include/gum.h lebiniou-3.40/plugins/stable/main/include/gum.h --- lebiniou-3.31/plugins/stable/main/include/gum.h 1970-01-01 00:00:00.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/include/gum.h 2020-01-23 13:56:18.000000000 +0000 @@ -0,0 +1,51 @@ +/* + * Copyright 1994-2019 Olivier Girondel + * Copyright 2019 Laurent Marsac + * + * This file is part of lebiniou. + * + * lebiniou 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 of the License, or + * (at your option) any later version. + * + * lebiniou 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 lebiniou. If not, see . + */ + +#ifndef __GUM_H +#define __GUM_H + +static float volume_scale = 0; + +json_t * +get_parameters() +{ + json_t *params = json_object(); + plugin_parameters_add_double(params, BPP_VOLUME_SCALE, volume_scale, -0.01, 0.01); + + return params; +} + + +void +set_parameters(const json_t *in_parameters) +{ + plugin_parameter_parse_float_range(in_parameters, BPP_VOLUME_SCALE, &volume_scale, 0, 1); +} + + +json_t * +parameters(json_t *in_parameters) +{ + set_parameters(in_parameters); + + return get_parameters(); +} + +#endif /* __GUM_H */ diff -Nru lebiniou-3.31/plugins/stable/main/include/infinity.h lebiniou-3.40/plugins/stable/main/include/infinity.h --- lebiniou-3.31/plugins/stable/main/include/infinity.h 2019-04-05 20:39:14.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/include/infinity.h 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -20,6 +20,7 @@ #ifndef __INFINITY_H #define __INFINITY_H +#include "parameters.h" typedef struct { gfloat x,y; @@ -38,7 +39,7 @@ typedef struct { u_char nb_fct; - void (*new)(struct Context_s *); /* constructor */ + void (*new)(struct Context_s *); /* constructor */ t_complex (*fct)(t_complex, guint32, gint32, gint32); vector_field_t *vector_field; } VectorField_t; diff -Nru lebiniou-3.31/plugins/stable/main/include/parameters.h lebiniou-3.40/plugins/stable/main/include/parameters.h --- lebiniou-3.31/plugins/stable/main/include/parameters.h 1970-01-01 00:00:00.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/include/parameters.h 2020-01-23 13:56:18.000000000 +0000 @@ -0,0 +1,51 @@ +/* + * Copyright 1994-2019 Olivier Girondel + * + * This file is part of lebiniou. + * + * lebiniou 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 of the License, or + * (at your option) any later version. + * + * lebiniou 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 lebiniou. If not, see . + */ + +#ifndef __BINIOU_PLUGIN_PARAMETERS_H +#define __BINIOU_PLUGIN_PARAMETERS_H + +#define BPP_BORDER_MODE "border_mode" +#define BPP_BORDER_X "border_x" +#define BPP_BORDER_Y "border_y" +#define BPP_COLOR_FACTOR "color_factor" +#define BPP_DECAY "decay" +#define BPP_DELAY "delay" +#define BPP_EFFECT "effect" +#define BPP_FLOW_ID "flow_id" +#define BPP_LENGTH "length" +#define BPP_LENGTH_MIN "length_min" +#define BPP_LENGTH_MAX "length_max" +#define BPP_MODE "mode" +#define BPP_MOVE_FACTOR "move_factor" +#define BPP_NB_MIN_ROTORS "nb_min_rotors" +#define BPP_NB_SPHERES "nb_spheres" +#define BPP_P_FACTOR "p_factor" +#define BPP_POS_FACTOR "pos_factor" +#define BPP_PROBA_VISIBLE "proba_visible" +#define BPP_RADIUS_FACTOR "radius_factor" +#define BPP_SCALE "scale" +#define BPP_SENSITIVITY "sensitivity" +#define BPP_SPECTRUM_ID_FACTOR "spectrum_id_factor" +#define BPP_SPEED "speed" +#define BPP_SPEED_FACTOR "speed_factor" +#define BPP_TTL_FACTOR "ttl_factor" +#define BPP_VEL_FACTOR "vel_factor" +#define BPP_VOLUME_SCALE "volume_scale" + +#endif /* __BINIOU_PLUGIN_PARAMETERS_H */ diff -Nru lebiniou-3.31/plugins/stable/main/include/shaker.h lebiniou-3.40/plugins/stable/main/include/shaker.h --- lebiniou-3.31/plugins/stable/main/include/shaker.h 2019-04-05 20:39:14.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/include/shaker.h 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -20,8 +20,39 @@ #ifndef __SHAKER_H #define __SHAKER_H +#include "parameters.h" + #define SOUND_DISTURB_K 127 + +static float volume_scale = 0; + +json_t * +get_parameters() +{ + json_t *params = json_object(); + plugin_parameters_add_double(params, BPP_VOLUME_SCALE, volume_scale, -0.01, 0.01); + + return params; +} + + +void +set_parameters(const json_t *in_parameters) +{ + plugin_parameter_parse_float_range(in_parameters, BPP_VOLUME_SCALE, &volume_scale, 0, 100); +} + + +json_t * +parameters(const json_t *in_parameters) +{ + set_parameters(in_parameters); + + return get_parameters(); +} + + static inline void check_width(short *value) { diff -Nru lebiniou-3.31/plugins/stable/main/include/spectrum.h lebiniou-3.40/plugins/stable/main/include/spectrum.h --- lebiniou-3.31/plugins/stable/main/include/spectrum.h 2019-04-05 20:39:14.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/include/spectrum.h 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -20,6 +20,35 @@ #ifndef __SPECTRUM_H #define __SPECTRUM_H +#include "parameters.h" + +static float volume_scale = 0; + +json_t * +get_parameters() +{ + json_t *params = json_object(); + plugin_parameters_add_double(params, BPP_VOLUME_SCALE, volume_scale, -0.01, 0.01); + + return params; +} + + +void +set_parameters(const json_t *in_parameters) +{ + plugin_parameter_parse_float_range(in_parameters, BPP_VOLUME_SCALE, &volume_scale, 0, 100); +} + + +json_t * +parameters(json_t *in_parameters) +{ + set_parameters(in_parameters); + + return get_parameters(); +} + static inline u_short float_to_ushort(float x, u_short minval, u_short maxval) diff -Nru lebiniou-3.31/plugins/stable/main/infinity/infinity.c lebiniou-3.40/plugins/stable/main/infinity/infinity.c --- lebiniou-3.31/plugins/stable/main/infinity/infinity.c 2019-04-05 20:39:14.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/infinity/infinity.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -18,10 +18,11 @@ */ #include "context.h" -#include "../include/infinity.h" +#include "infinity.h" u_long id = 1188927899; +uint32_t version = 0; u_long options = BE_DISPLACE; char dname[] = "Infinity"; char desc[] = "Infinity effect"; @@ -35,6 +36,56 @@ */ #define NB_FCT 6 +static BTimer_t *timer = NULL; + +enum Mode { MODE_SELECTED = 0, MODE_RANDOM, MODE_NB } Mode_e; +const char *mode_list[MODE_NB] = { "Selected", "Random" }; + +/* parameters */ +static enum Mode mode = MODE_RANDOM; +static int effect = 0; +static int delay = 5; + + +json_t * +get_parameters() +{ + json_t *params = json_object(); + plugin_parameters_add_string_list(params, BPP_MODE, MODE_NB, mode_list, mode); + plugin_parameters_add_int(params, BPP_EFFECT, effect, -1, 1); + + return params; +} + + +void +set_parameters(const json_t *in_parameters) +{ + int reload = 0; + reload |= plugin_parameter_parse_int_range(in_parameters, BPP_EFFECT, &effect, 0, NB_FCT-1) & PLUGIN_PARAMETER_CHANGED; + int restart = 0; + restart |= plugin_parameter_parse_int_range(in_parameters, BPP_DELAY, &delay, 1, 60) & PLUGIN_PARAMETER_CHANGED; + + int mode_idx = 0; + if (plugin_parameter_parse_string_list_as_int_range(in_parameters, BPP_MODE, MODE_NB, mode_list, &mode_idx, 0, MODE_NB-1)) { + mode = (enum Mode)mode_idx; + reload = 1; + } + + if (restart) { + b_timer_restart(timer); + } +} + + +json_t * +parameters(const json_t *in_parameters) +{ + set_parameters(in_parameters); + + return get_parameters(); +} + static t_complex fct(t_complex a, guint32 n, gint32 p1, gint32 p2) /* p1 et p2:0-4 */ @@ -50,103 +101,94 @@ a.y -= HHEIGHT; switch (n) { - case 0: - an = 0.025*(p1-2)+0.002; - co = cosf(an); - si = sinf(an); - circle_size = HEIGHT*0.25; - speed = (gfloat)2000+p2*500; - b.x = (co*a.x-si*a.y); - b.y = (si*a.x+co*a.y); - fact = -(sqrtf(b.x*b.x+b.y*b.y)-circle_size)/speed+1; - b.x = (b.x*fact); - b.y = (b.y*fact); - break; - - case 1: - an = 0.015*(p1-2)+0.002; - co = cosf(an); - si = sinf(an); - circle_size = HEIGHT*0.45; - speed = (gfloat)4000+p2*1000; - b.x = (co*a.x-si*a.y); - b.y = (si*a.x+co*a.y); - fact = (sqrtf(b.x*b.x+b.y*b.y)-circle_size)/speed+1; - b.x = (b.x*fact); - b.y = (b.y*fact); - break; - - case 2: - an = 0.002; - co = cosf(an); - si = sinf(an); - circle_size = HEIGHT*0.25; - speed = (gfloat)400+p2*100; - b.x = (co*a.x-si*a.y); - b.y = (si*a.x+co*a.y); - fact = -(sqrtf(b.x*b.x+b.y*b.y)-circle_size)/speed+1; - b.x = (b.x*fact); - b.y = (b.y*fact); - break; - - case 3: - an = (sinf(sqrtf(a.x*a.x+a.y*a.y)/20)/20)+0.002; - co = cosf(an); - si = sinf(an); - circle_size = HEIGHT*0.25; - speed = (gfloat)4000; - b.x = (co*a.x-si*a.y); - b.y = (si*a.x+co*a.y); - fact = -(sqrtf(b.x*b.x+b.y*b.y)-circle_size)/speed+1; - b.x = (b.x*fact); - b.y = (b.y*fact); - break; - - case 4: - an = 0.002; - co = cosf(an); - si = sinf(an); - circle_size = HEIGHT*0.25; - speed = sinf(sqrtf(a.x*a.x+a.y*a.y)/5)*3000+4000; - b.x = (co*a.x-si*a.y); - b.y = (si*a.x+co*a.y); - fact = -(sqrtf(b.x*b.x+b.y*b.y)-circle_size)/speed+1; - b.x = (b.x*fact); - b.y = (b.y*fact); - break; - - case 5: - an = 0.002; - co = cosf(an); - si = sinf(an); - circle_size = HEIGHT*0.25; - fact = 1+cosf(atanf(a.x/(a.y+0.00001))*6)*0.02; - b.x = (co*a.x-si*a.y); - b.y = (si*a.x+co*a.y); - b.x = (b.x*fact); - b.y = (b.y*fact); - break; - - default: - b.x = 0.0; - b.y = 0.0; + case 0: + an = 0.025*(p1-2)+0.002; + co = cosf(an); + si = sinf(an); + circle_size = HEIGHT*0.25; + speed = (gfloat)2000+p2*500; + b.x = (co*a.x-si*a.y); + b.y = (si*a.x+co*a.y); + fact = -(sqrtf(b.x*b.x+b.y*b.y)-circle_size)/speed+1; + b.x = (b.x*fact); + b.y = (b.y*fact); + break; + + case 1: + an = 0.015*(p1-2)+0.002; + co = cosf(an); + si = sinf(an); + circle_size = HEIGHT*0.45; + speed = (gfloat)4000+p2*1000; + b.x = (co*a.x-si*a.y); + b.y = (si*a.x+co*a.y); + fact = (sqrtf(b.x*b.x+b.y*b.y)-circle_size)/speed+1; + b.x = (b.x*fact); + b.y = (b.y*fact); + break; + + case 2: + an = 0.002; + co = cosf(an); + si = sinf(an); + circle_size = HEIGHT*0.25; + speed = (gfloat)400+p2*100; + b.x = (co*a.x-si*a.y); + b.y = (si*a.x+co*a.y); + fact = -(sqrtf(b.x*b.x+b.y*b.y)-circle_size)/speed+1; + b.x = (b.x*fact); + b.y = (b.y*fact); + break; + + case 3: + an = (sinf(sqrtf(a.x*a.x+a.y*a.y)/20)/20)+0.002; + co = cosf(an); + si = sinf(an); + circle_size = HEIGHT*0.25; + speed = (gfloat)4000; + b.x = (co*a.x-si*a.y); + b.y = (si*a.x+co*a.y); + fact = -(sqrtf(b.x*b.x+b.y*b.y)-circle_size)/speed+1; + b.x = (b.x*fact); + b.y = (b.y*fact); + break; + + case 4: + an = 0.002; + co = cosf(an); + si = sinf(an); + circle_size = HEIGHT*0.25; + speed = sinf(sqrtf(a.x*a.x+a.y*a.y)/5)*3000+4000; + b.x = (co*a.x-si*a.y); + b.y = (si*a.x+co*a.y); + fact = -(sqrtf(b.x*b.x+b.y*b.y)-circle_size)/speed+1; + b.x = (b.x*fact); + b.y = (b.y*fact); + break; + + case 5: + an = 0.002; + co = cosf(an); + si = sinf(an); + circle_size = HEIGHT*0.25; + fact = 1+cosf(atanf(a.x/(a.y+0.00001))*6)*0.02; + b.x = (co*a.x-si*a.y); + b.y = (si*a.x+co*a.y); + b.x = (b.x*fact); + b.y = (b.y*fact); + break; + + default: + b.x = 0.0; + b.y = 0.0; } b.x += HWIDTH; b.y += HHEIGHT; - if (b.x < 0.0 ) { - b.x = 0.0; - } - if (b.y < 0.0) { - b.y = 0.0; - } - if (b.x > (gfloat)MAXX) { - b.x = (gfloat)MAXX; - } - if (b.y > (gfloat)MAXY) { - b.y = (gfloat)MAXY; - } + /* because infinity access pixels at (b.x + 1, b.y + 1) */ + b.x = MIN( MAX(b.x, 0), MAXX-1); + b.y = MIN( MAX(b.y, 0), MAXY-1); return b; } @@ -154,17 +196,21 @@ /* Biniou plugin callbacks */ static u_char num_effect = 0; -static BTimer_t *timer = NULL; static Shuffler_t *shuffler = NULL; static VectorField_t *vf = NULL; -void +int8_t create(Context_t *ctx) { vf = VectorField_new(NB_FCT, &fct); timer = b_timer_new(); shuffler = Shuffler_new(NB_FCT); + + mode = MODE_RANDOM; + effect = 0; + + return 1; } @@ -188,11 +234,13 @@ void run(Context_t *ctx) { - /* printf("oOo %s:%d: effect= %d\n", __FILE__, __LINE__, num_effect); */ + if (mode == MODE_SELECTED) { + num_effect = effect; + } + VectorField_run(vf, ctx, num_effect); - /* TODO remove hardcoded 5 seconds delay */ - if (b_timer_elapsed(timer) > 5) { + if ((mode == MODE_RANDOM) && (b_timer_elapsed(timer) > delay)) { on_switch_on(ctx); } } diff -Nru lebiniou-3.31/plugins/stable/main/infinity/Makefile.am lebiniou-3.40/plugins/stable/main/infinity/Makefile.am --- lebiniou-3.31/plugins/stable/main/infinity/Makefile.am 2018-11-27 13:50:08.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/infinity/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -2,5 +2,6 @@ plugin_PROGRAMS = infinity.so infinity_so_SOURCES = infinity.c -infinity_so_LDFLAGS = @PLUGIN_LDFLAGS@ -infinity_so_CFLAGS = @PLUGIN_CFLAGS@ +infinity_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +infinity_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +infinity_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/infinity/Makefile.in lebiniou-3.40/plugins/stable/main/infinity/Makefile.in --- lebiniou-3.31/plugins/stable/main/infinity/Makefile.in 2019-04-14 11:52:32.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/infinity/Makefile.in 2020-01-23 13:57:17.000000000 +0000 @@ -104,7 +104,7 @@ PROGRAMS = $(plugin_PROGRAMS) am_infinity_so_OBJECTS = infinity_so-infinity.$(OBJEXT) infinity_so_OBJECTS = $(am_infinity_so_OBJECTS) -infinity_so_LDADD = $(LDADD) +infinity_so_DEPENDENCIES = infinity_so_LINK = $(CCLD) $(infinity_so_CFLAGS) $(CFLAGS) \ $(infinity_so_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -216,6 +216,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -243,6 +245,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -257,7 +260,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -319,8 +325,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/main/infinity infinity_so_SOURCES = infinity.c -infinity_so_LDFLAGS = @PLUGIN_LDFLAGS@ -infinity_so_CFLAGS = @PLUGIN_CFLAGS@ +infinity_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +infinity_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +infinity_so_LDADD = @PLUGIN_LDADD@ all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/main/iPulse/iPulse.c lebiniou-3.40/plugins/stable/main/iPulse/iPulse.c --- lebiniou-3.31/plugins/stable/main/iPulse/iPulse.c 2019-04-05 20:39:14.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/iPulse/iPulse.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -19,9 +19,11 @@ #include "context.h" #include "images.h" +#include "parameters.h" u_long id = 1216566743; +uint32_t version = 0; u_long options = BE_GFX|BE_SFX2D|BEQ_IMAGE; u_long mode = OVERLAY; char desc[] = "Pulse pictures"; @@ -31,19 +33,40 @@ static const Image8_t *pic = NULL; +static float volume_scale = 0; + +json_t * +get_parameters() +{ + json_t *params = json_object(); + plugin_parameters_add_double(params, BPP_VOLUME_SCALE, volume_scale, -0.01, 0.01); + + return params; +} + void -create(Context_t *ctx) +set_parameters(const json_t *in_parameters) { - if ((ctx->input == NULL) || (images == NULL)) { - options |= BEQ_DISABLED; - } + plugin_parameter_parse_float_range(in_parameters, BPP_VOLUME_SCALE, &volume_scale, 0, 100); +} + + +json_t * +parameters(const json_t *in_parameters) +{ + set_parameters(in_parameters); + + return get_parameters(); } void on_switch_on(Context_t *ctx) { + /* Initialize parameters */ + volume_scale = 1; + pic = Images_random(images); } @@ -57,7 +80,7 @@ u_long p, k; img = pic->buff; - volume = Input_get_volume(ctx->input); + volume = Input_get_volume(ctx->input) * volume_scale; //volume = expf(volume)/expf(1.0); // printf("Vol= %f\n", volume); p = (u_long)(volume * BUFFSIZE * 1); diff -Nru lebiniou-3.31/plugins/stable/main/iPulse/Makefile.am lebiniou-3.40/plugins/stable/main/iPulse/Makefile.am --- lebiniou-3.31/plugins/stable/main/iPulse/Makefile.am 2018-11-27 13:50:08.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/iPulse/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -2,5 +2,6 @@ plugin_PROGRAMS = iPulse.so iPulse_so_SOURCES = iPulse.c -iPulse_so_LDFLAGS = @PLUGIN_LDFLAGS@ -iPulse_so_CFLAGS = @PLUGIN_CFLAGS@ +iPulse_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +iPulse_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +iPulse_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/iPulse/Makefile.in lebiniou-3.40/plugins/stable/main/iPulse/Makefile.in --- lebiniou-3.31/plugins/stable/main/iPulse/Makefile.in 2019-04-14 11:52:32.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/iPulse/Makefile.in 2020-01-23 13:57:16.000000000 +0000 @@ -104,7 +104,7 @@ PROGRAMS = $(plugin_PROGRAMS) am_iPulse_so_OBJECTS = iPulse_so-iPulse.$(OBJEXT) iPulse_so_OBJECTS = $(am_iPulse_so_OBJECTS) -iPulse_so_LDADD = $(LDADD) +iPulse_so_DEPENDENCIES = iPulse_so_LINK = $(CCLD) $(iPulse_so_CFLAGS) $(CFLAGS) \ $(iPulse_so_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -216,6 +216,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -243,6 +245,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -257,7 +260,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -319,8 +325,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/main/iPulse iPulse_so_SOURCES = iPulse.c -iPulse_so_LDFLAGS = @PLUGIN_LDFLAGS@ -iPulse_so_CFLAGS = @PLUGIN_CFLAGS@ +iPulse_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +iPulse_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +iPulse_so_LDADD = @PLUGIN_LDADD@ all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/main/iPulse2/iPulse2.c lebiniou-3.40/plugins/stable/main/iPulse2/iPulse2.c --- lebiniou-3.31/plugins/stable/main/iPulse2/iPulse2.c 2019-04-13 13:36:48.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/iPulse2/iPulse2.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,6 +1,6 @@ /* - * Copyright 1994-2019 Olivier Girondel - * Copyright 2019 Tavasti + * Copyright 1994-2020 Olivier Girondel + * Copyright 2019-2020 Tavasti * * This file is part of lebiniou. * @@ -29,6 +29,7 @@ #define CURVE_VOL_MULT 1.55 /* multiplier on count on one step */ u_long id = 1546524847; +uint32_t version = 0; u_long options = BE_GFX|BE_SFX2D|BEQ_IMAGE; u_long mode = NORMAL; char desc[] = "Show image colors on beat"; @@ -36,15 +37,6 @@ void -create(Context_t *ctx) -{ - if ((images == NULL) || (ctx->input == NULL)) { - options |= BEQ_DISABLED; - } -} - - -void on_switch_on(Context_t *ctx) { colorsel = b_rand_int_range(0, COLORCLASSES); diff -Nru lebiniou-3.31/plugins/stable/main/iPulse2/Makefile.am lebiniou-3.40/plugins/stable/main/iPulse2/Makefile.am --- lebiniou-3.31/plugins/stable/main/iPulse2/Makefile.am 2019-04-05 20:39:14.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/iPulse2/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -2,5 +2,6 @@ plugin_PROGRAMS = iPulse2.so iPulse2_so_SOURCES = iPulse2.c -iPulse2_so_LDFLAGS = @PLUGIN_LDFLAGS@ -iPulse2_so_CFLAGS = @PLUGIN_CFLAGS@ +iPulse2_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +iPulse2_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +iPulse2_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/iPulse2/Makefile.in lebiniou-3.40/plugins/stable/main/iPulse2/Makefile.in --- lebiniou-3.31/plugins/stable/main/iPulse2/Makefile.in 2019-04-14 11:52:32.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/iPulse2/Makefile.in 2020-01-23 13:57:16.000000000 +0000 @@ -104,7 +104,7 @@ PROGRAMS = $(plugin_PROGRAMS) am_iPulse2_so_OBJECTS = iPulse2_so-iPulse2.$(OBJEXT) iPulse2_so_OBJECTS = $(am_iPulse2_so_OBJECTS) -iPulse2_so_LDADD = $(LDADD) +iPulse2_so_DEPENDENCIES = iPulse2_so_LINK = $(CCLD) $(iPulse2_so_CFLAGS) $(CFLAGS) \ $(iPulse2_so_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -216,6 +216,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -243,6 +245,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -257,7 +260,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -319,8 +325,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/main/iPulse2 iPulse2_so_SOURCES = iPulse2.c -iPulse2_so_LDFLAGS = @PLUGIN_LDFLAGS@ -iPulse2_so_CFLAGS = @PLUGIN_CFLAGS@ +iPulse2_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +iPulse2_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +iPulse2_so_LDADD = @PLUGIN_LDADD@ all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/main/iPulse3/iPulse3.c lebiniou-3.40/plugins/stable/main/iPulse3/iPulse3.c --- lebiniou-3.31/plugins/stable/main/iPulse3/iPulse3.c 2019-04-13 13:36:48.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/iPulse3/iPulse3.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,6 +1,6 @@ /* - * Copyright 1994-2019 Olivier Girondel - * Copyright 2019 Tavasti + * Copyright 1994-2020 Olivier Girondel + * Copyright 2019-2020 Tavasti * * This file is part of lebiniou. * @@ -29,6 +29,7 @@ #define CURVE_VOL_MULT 1.35 /* multiplier on count on one step */ u_long id = 1546957332; +uint32_t version = 0; u_long options = BE_GFX|BE_SFX2D|BEQ_IMAGE; u_long mode = NORMAL; char desc[] = "Show image colors on beat"; @@ -36,15 +37,6 @@ void -create(Context_t *ctx) -{ - if ((images == NULL) || (ctx->input == NULL)) { - options |= BEQ_DISABLED; - } -} - - -void on_switch_on(Context_t *ctx) { colorsel = 0; @@ -81,7 +73,7 @@ if (col > (MAXCOLOR - colorsel - colorcount)) { if (dst->buffer[k] < col) { dst->buffer[k] = (col > (dst->buffer[k] + colorcount)) ? - (dst->buffer[k] + colorcount) : col; + (dst->buffer[k] + colorcount) : col; } } } diff -Nru lebiniou-3.31/plugins/stable/main/iPulse3/Makefile.am lebiniou-3.40/plugins/stable/main/iPulse3/Makefile.am --- lebiniou-3.31/plugins/stable/main/iPulse3/Makefile.am 2019-04-05 20:39:14.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/iPulse3/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -2,5 +2,6 @@ plugin_PROGRAMS = iPulse3.so iPulse3_so_SOURCES = iPulse3.c -iPulse3_so_LDFLAGS = @PLUGIN_LDFLAGS@ -iPulse3_so_CFLAGS = @PLUGIN_CFLAGS@ +iPulse3_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +iPulse3_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +iPulse3_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/iPulse3/Makefile.in lebiniou-3.40/plugins/stable/main/iPulse3/Makefile.in --- lebiniou-3.31/plugins/stable/main/iPulse3/Makefile.in 2019-04-14 11:52:32.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/iPulse3/Makefile.in 2020-01-23 13:57:16.000000000 +0000 @@ -104,7 +104,7 @@ PROGRAMS = $(plugin_PROGRAMS) am_iPulse3_so_OBJECTS = iPulse3_so-iPulse3.$(OBJEXT) iPulse3_so_OBJECTS = $(am_iPulse3_so_OBJECTS) -iPulse3_so_LDADD = $(LDADD) +iPulse3_so_DEPENDENCIES = iPulse3_so_LINK = $(CCLD) $(iPulse3_so_CFLAGS) $(CFLAGS) \ $(iPulse3_so_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -216,6 +216,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -243,6 +245,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -257,7 +260,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -319,8 +325,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/main/iPulse3 iPulse3_so_SOURCES = iPulse3.c -iPulse3_so_LDFLAGS = @PLUGIN_LDFLAGS@ -iPulse3_so_CFLAGS = @PLUGIN_CFLAGS@ +iPulse3_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +iPulse3_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +iPulse3_so_LDADD = @PLUGIN_LDADD@ all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/main/iPulse4/iPulse4.c lebiniou-3.40/plugins/stable/main/iPulse4/iPulse4.c --- lebiniou-3.31/plugins/stable/main/iPulse4/iPulse4.c 2019-04-13 13:36:49.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/iPulse4/iPulse4.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,6 +1,6 @@ /* - * Copyright 1994-2019 Olivier Girondel - * Copyright 2019 Tavasti + * Copyright 1994-2020 Olivier Girondel + * Copyright 2019-2020 Tavasti * * This file is part of lebiniou. * @@ -30,21 +30,13 @@ static u_char pattern[PATTERNSIZE]; u_long id = 1546957355; +uint32_t version = 0; u_long options = BE_GFX|BE_SFX2D|BEQ_IMAGE; u_long mode = NORMAL; char desc[] = "Show image colors on beat"; void -create(Context_t *ctx) -{ - if ((images == NULL) || (ctx->input == NULL)) { - options |= BEQ_DISABLED; - } -} - - -void on_switch_on(Context_t *ctx) { int i; diff -Nru lebiniou-3.31/plugins/stable/main/iPulse4/Makefile.am lebiniou-3.40/plugins/stable/main/iPulse4/Makefile.am --- lebiniou-3.31/plugins/stable/main/iPulse4/Makefile.am 2019-04-05 20:39:14.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/iPulse4/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -2,5 +2,6 @@ plugin_PROGRAMS = iPulse4.so iPulse4_so_SOURCES = iPulse4.c -iPulse4_so_LDFLAGS = @PLUGIN_LDFLAGS@ -iPulse4_so_CFLAGS = @PLUGIN_CFLAGS@ +iPulse4_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +iPulse4_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +iPulse4_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/iPulse4/Makefile.in lebiniou-3.40/plugins/stable/main/iPulse4/Makefile.in --- lebiniou-3.31/plugins/stable/main/iPulse4/Makefile.in 2019-04-14 11:52:32.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/iPulse4/Makefile.in 2020-01-23 13:57:17.000000000 +0000 @@ -104,7 +104,7 @@ PROGRAMS = $(plugin_PROGRAMS) am_iPulse4_so_OBJECTS = iPulse4_so-iPulse4.$(OBJEXT) iPulse4_so_OBJECTS = $(am_iPulse4_so_OBJECTS) -iPulse4_so_LDADD = $(LDADD) +iPulse4_so_DEPENDENCIES = iPulse4_so_LINK = $(CCLD) $(iPulse4_so_CFLAGS) $(CFLAGS) \ $(iPulse4_so_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -216,6 +216,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -243,6 +245,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -257,7 +260,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -319,8 +325,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/main/iPulse4 iPulse4_so_SOURCES = iPulse4.c -iPulse4_so_LDFLAGS = @PLUGIN_LDFLAGS@ -iPulse4_so_CFLAGS = @PLUGIN_CFLAGS@ +iPulse4_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +iPulse4_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +iPulse4_so_LDADD = @PLUGIN_LDADD@ all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/main/isquares/isquares.c lebiniou-3.40/plugins/stable/main/isquares/isquares.c --- lebiniou-3.31/plugins/stable/main/isquares/isquares.c 2019-04-05 20:39:14.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/isquares/isquares.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -22,6 +22,7 @@ u_long id = 1090876849; +uint32_t version = 0; u_long options = BE_GFX|BEQ_IMAGE; u_long mode = NORMAL; char desc[] = "Random image squares"; @@ -32,15 +33,6 @@ void -create(Context_t *ctx) -{ - if (images == NULL) { - options |= BEQ_DISABLED; - } -} - - -void run(Context_t *ctx) { int s; @@ -57,8 +49,7 @@ for (j = 0; j < SQUARE_SIZE; j++) for (i = 0; i < SQUARE_SIZE; i++) - set_pixel_nc(dst, - sx+i, sy+j, - get_pixel_nc(ctx->imgf->cur->buff, sx+i, sy+j)); + set_pixel_nc(dst, sx+i, sy+j, + get_pixel_nc(ctx->imgf->cur->buff, sx+i, sy+j)); } } diff -Nru lebiniou-3.31/plugins/stable/main/isquares/Makefile.am lebiniou-3.40/plugins/stable/main/isquares/Makefile.am --- lebiniou-3.31/plugins/stable/main/isquares/Makefile.am 2018-11-27 13:50:08.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/isquares/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -2,5 +2,6 @@ plugin_PROGRAMS = isquares.so isquares_so_SOURCES = isquares.c -isquares_so_LDFLAGS = @PLUGIN_LDFLAGS@ -isquares_so_CFLAGS = @PLUGIN_CFLAGS@ +isquares_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +isquares_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +isquares_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/isquares/Makefile.in lebiniou-3.40/plugins/stable/main/isquares/Makefile.in --- lebiniou-3.31/plugins/stable/main/isquares/Makefile.in 2019-04-14 11:52:32.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/isquares/Makefile.in 2020-01-23 13:57:17.000000000 +0000 @@ -104,7 +104,7 @@ PROGRAMS = $(plugin_PROGRAMS) am_isquares_so_OBJECTS = isquares_so-isquares.$(OBJEXT) isquares_so_OBJECTS = $(am_isquares_so_OBJECTS) -isquares_so_LDADD = $(LDADD) +isquares_so_DEPENDENCIES = isquares_so_LINK = $(CCLD) $(isquares_so_CFLAGS) $(CFLAGS) \ $(isquares_so_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -216,6 +216,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -243,6 +245,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -257,7 +260,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -319,8 +325,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/main/isquares isquares_so_SOURCES = isquares.c -isquares_so_LDFLAGS = @PLUGIN_LDFLAGS@ -isquares_so_CFLAGS = @PLUGIN_CFLAGS@ +isquares_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +isquares_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +isquares_so_LDADD = @PLUGIN_LDADD@ all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/main/isquaresbeat/isquaresbeat.c lebiniou-3.40/plugins/stable/main/isquaresbeat/isquaresbeat.c --- lebiniou-3.31/plugins/stable/main/isquaresbeat/isquaresbeat.c 2019-04-05 20:39:14.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/isquaresbeat/isquaresbeat.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,6 +1,6 @@ /* - * Copyright 1994-2019 Olivier Girondel - * Copyright 2019 Tavasti + * Copyright 1994-2020 Olivier Girondel + * Copyright 2019-2020 Tavasti * * This file is part of lebiniou. * @@ -29,21 +29,13 @@ #define SQUARES_MAX 70 u_long id = 1552167091; +uint32_t version = 0; u_long options = BE_GFX|BE_SFX2D|BEQ_IMAGE; u_long mode = NORMAL; char desc[] = "Random image squares in beat"; void -create(Context_t *ctx) -{ - if ((ctx->input == NULL) || (images == NULL)) { - options |= BEQ_DISABLED; - } -} - - -void run(Context_t *ctx) { int s; @@ -51,7 +43,7 @@ if (ctx->input->on_beat) { maxsq = SQUARES_PER_TURN_BEAT + - SQUARES_PER_TURN_POWER_COEFF * ctx->input->peakpower; + SQUARES_PER_TURN_POWER_COEFF * ctx->input->peakpower; } else { maxsq = SQUARES_PER_TURN_DEFAULT; } @@ -72,9 +64,8 @@ for (j = 0; j < SQUARE_SIZE; j++) { for (i = 0; i < SQUARE_SIZE; i++) { - set_pixel_nc(dst, - sx+i, sy+j, - get_pixel_nc(ctx->imgf->cur->buff, sx+i, sy+j)); + set_pixel_nc(dst, sx+i, sy+j, + get_pixel_nc(ctx->imgf->cur->buff, sx+i, sy+j)); } } } diff -Nru lebiniou-3.31/plugins/stable/main/isquaresbeat/Makefile.am lebiniou-3.40/plugins/stable/main/isquaresbeat/Makefile.am --- lebiniou-3.31/plugins/stable/main/isquaresbeat/Makefile.am 2019-04-05 20:39:14.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/isquaresbeat/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -2,5 +2,6 @@ plugin_PROGRAMS = isquaresbeat.so isquaresbeat_so_SOURCES = isquaresbeat.c -isquaresbeat_so_LDFLAGS = @PLUGIN_LDFLAGS@ -isquaresbeat_so_CFLAGS = @PLUGIN_CFLAGS@ +isquaresbeat_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +isquaresbeat_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +isquaresbeat_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/isquaresbeat/Makefile.in lebiniou-3.40/plugins/stable/main/isquaresbeat/Makefile.in --- lebiniou-3.31/plugins/stable/main/isquaresbeat/Makefile.in 2019-04-14 11:52:32.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/isquaresbeat/Makefile.in 2020-01-23 13:57:17.000000000 +0000 @@ -104,7 +104,7 @@ PROGRAMS = $(plugin_PROGRAMS) am_isquaresbeat_so_OBJECTS = isquaresbeat_so-isquaresbeat.$(OBJEXT) isquaresbeat_so_OBJECTS = $(am_isquaresbeat_so_OBJECTS) -isquaresbeat_so_LDADD = $(LDADD) +isquaresbeat_so_DEPENDENCIES = isquaresbeat_so_LINK = $(CCLD) $(isquaresbeat_so_CFLAGS) $(CFLAGS) \ $(isquaresbeat_so_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -216,6 +216,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -243,6 +245,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -257,7 +260,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -319,8 +325,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/main/isquaresbeat isquaresbeat_so_SOURCES = isquaresbeat.c -isquaresbeat_so_LDFLAGS = @PLUGIN_LDFLAGS@ -isquaresbeat_so_CFLAGS = @PLUGIN_CFLAGS@ +isquaresbeat_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +isquaresbeat_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +isquaresbeat_so_LDADD = @PLUGIN_LDADD@ all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/main/kaleid2/kaleid2.c lebiniou-3.40/plugins/stable/main/kaleid2/kaleid2.c --- lebiniou-3.31/plugins/stable/main/kaleid2/kaleid2.c 2019-03-01 11:47:48.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/kaleid2/kaleid2.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -21,6 +21,7 @@ u_long id = 949844284; +uint32_t version = 0; u_long options = BE_LENS; char desc[] = "Kaleidoscope effect"; diff -Nru lebiniou-3.31/plugins/stable/main/kaleid2/Makefile.am lebiniou-3.40/plugins/stable/main/kaleid2/Makefile.am --- lebiniou-3.31/plugins/stable/main/kaleid2/Makefile.am 2018-11-27 13:50:08.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/kaleid2/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -2,5 +2,6 @@ plugin_PROGRAMS = kaleid2.so kaleid2_so_SOURCES = kaleid2.c -kaleid2_so_LDFLAGS = @PLUGIN_LDFLAGS@ -kaleid2_so_CFLAGS = @PLUGIN_CFLAGS@ +kaleid2_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +kaleid2_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +kaleid2_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/kaleid2/Makefile.in lebiniou-3.40/plugins/stable/main/kaleid2/Makefile.in --- lebiniou-3.31/plugins/stable/main/kaleid2/Makefile.in 2019-04-14 11:52:32.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/kaleid2/Makefile.in 2020-01-23 13:57:17.000000000 +0000 @@ -104,7 +104,7 @@ PROGRAMS = $(plugin_PROGRAMS) am_kaleid2_so_OBJECTS = kaleid2_so-kaleid2.$(OBJEXT) kaleid2_so_OBJECTS = $(am_kaleid2_so_OBJECTS) -kaleid2_so_LDADD = $(LDADD) +kaleid2_so_DEPENDENCIES = kaleid2_so_LINK = $(CCLD) $(kaleid2_so_CFLAGS) $(CFLAGS) \ $(kaleid2_so_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -216,6 +216,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -243,6 +245,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -257,7 +260,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -319,8 +325,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/main/kaleid2 kaleid2_so_SOURCES = kaleid2.c -kaleid2_so_LDFLAGS = @PLUGIN_LDFLAGS@ -kaleid2_so_CFLAGS = @PLUGIN_CFLAGS@ +kaleid2_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +kaleid2_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +kaleid2_so_LDADD = @PLUGIN_LDADD@ all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/main/life/life.c lebiniou-3.40/plugins/stable/main/life/life.c --- lebiniou-3.31/plugins/stable/main/life/life.c 2019-04-05 20:39:14.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/life/life.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -21,7 +21,8 @@ u_long id = 1077223395; -u_long options = BE_GFX|BEQ_UNIQUE|BEQ_NORANDOM; +uint32_t version = 0; +u_long options = BE_GFX|BEQ_UNIQUE; char desc[] = "Cellular automaton"; @@ -37,15 +38,15 @@ u_char count = 0; /* C macros are sooo handy */ -#define LIFE(dx, dy) { \ - short xdx, ydy; \ - xdx = dx; \ - ydy = dy; \ - if (xdx < 0) xdx = MAXX; \ - else if (xdx > MAXX) xdx = 0; \ - if (ydy < 0) ydy = MAXY; \ - else if (ydy > MAXY) ydy = 0; \ - if (get_pixel_nc(src, xdx, ydy)) count++; \ +#define LIFE(dx, dy) { \ + short xdx, ydy; \ + xdx = dx; \ + ydy = dy; \ + if (xdx < 0) xdx = MAXX; \ + else if (xdx > MAXX) xdx = 0; \ + if (ydy < 0) ydy = MAXY; \ + else if (ydy > MAXY) ydy = 0; \ + if (get_pixel_nc(src, xdx, ydy)) count++; \ } LIFE(i-1, j-1); diff -Nru lebiniou-3.31/plugins/stable/main/life/Makefile.am lebiniou-3.40/plugins/stable/main/life/Makefile.am --- lebiniou-3.31/plugins/stable/main/life/Makefile.am 2018-11-27 13:50:08.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/life/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -2,5 +2,6 @@ plugin_PROGRAMS = life.so life_so_SOURCES = life.c -life_so_LDFLAGS = @PLUGIN_LDFLAGS@ -life_so_CFLAGS = @PLUGIN_CFLAGS@ +life_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +life_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +life_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/life/Makefile.in lebiniou-3.40/plugins/stable/main/life/Makefile.in --- lebiniou-3.31/plugins/stable/main/life/Makefile.in 2019-04-14 11:52:32.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/life/Makefile.in 2020-01-23 13:57:17.000000000 +0000 @@ -104,7 +104,7 @@ PROGRAMS = $(plugin_PROGRAMS) am_life_so_OBJECTS = life_so-life.$(OBJEXT) life_so_OBJECTS = $(am_life_so_OBJECTS) -life_so_LDADD = $(LDADD) +life_so_DEPENDENCIES = life_so_LINK = $(CCLD) $(life_so_CFLAGS) $(CFLAGS) $(life_so_LDFLAGS) \ $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -216,6 +216,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -243,6 +245,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -257,7 +260,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -319,8 +325,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/main/life life_so_SOURCES = life.c -life_so_LDFLAGS = @PLUGIN_LDFLAGS@ -life_so_CFLAGS = @PLUGIN_CFLAGS@ +life_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +life_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +life_so_LDADD = @PLUGIN_LDADD@ all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/main/Makefile.am lebiniou-3.40/plugins/stable/main/Makefile.am --- lebiniou-3.31/plugins/stable/main/Makefile.am 2019-04-14 00:36:15.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/Makefile.am 2020-01-22 18:33:57.000000000 +0000 @@ -1,9 +1,14 @@ EXTRA_DIST = include/shaker.h \ - include/infinity.h \ + include/blur.h \ include/delay.h \ + include/gum.h \ + include/infinity.h \ + include/parameters.h \ + include/shaker.h \ include/spectrum.h SUBDIRS = \ + aciddrop \ aurora \ bassline \ blur1 \ @@ -38,6 +43,7 @@ drops \ edge \ emboss \ + fadeout \ faders \ flow \ foo \ @@ -49,11 +55,13 @@ melt \ mosaic \ nspiral \ + paintdrop \ poincare \ polaroscillo \ roscillo \ ripple \ rotors \ + rotors_freq \ rp \ scroll_bt \ scroll_lr \ @@ -61,6 +69,8 @@ scroll_tb \ sin1oscillo \ sin2oscillo \ + snake \ + snake_oscillo \ swarm \ taquin \ touw_eiffel \ @@ -112,10 +122,15 @@ voiceprint \ pulse +# Image plugins SUBDIRS += \ iDissolve \ + imagedrop \ isquares \ isquaresbeat \ + iColrot \ + iColrotbeat \ + iColrotslow \ iPulse \ iPulse2 \ iPulse3 \ @@ -138,6 +153,9 @@ tv_diff3 \ tv_diff4 \ tv_diffbeat \ + tv_colrot \ + tv_colrotslow \ + tv_colrotbeat \ zmonitor endif diff -Nru lebiniou-3.31/plugins/stable/main/Makefile.in lebiniou-3.40/plugins/stable/main/Makefile.in --- lebiniou-3.31/plugins/stable/main/Makefile.in 2019-04-14 11:52:29.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/Makefile.in 2020-01-23 13:57:14.000000000 +0000 @@ -108,6 +108,9 @@ @EXTRA_WEBCAM_TRUE@ tv_diff3 \ @EXTRA_WEBCAM_TRUE@ tv_diff4 \ @EXTRA_WEBCAM_TRUE@ tv_diffbeat \ +@EXTRA_WEBCAM_TRUE@ tv_colrot \ +@EXTRA_WEBCAM_TRUE@ tv_colrotslow \ +@EXTRA_WEBCAM_TRUE@ tv_colrotbeat \ @EXTRA_WEBCAM_TRUE@ zmonitor @EXTRA_OPENGL_TRUE@am__append_3 = GLCube @@ -176,25 +179,27 @@ done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags -DIST_SUBDIRS = aurora bassline blur1 blur2 blur3 blur4 blur5 blur6 \ - blur7 blur8 cirrus cirrus2 clear color_cycle critters crp \ - cth_bighalfwheel cth_hurricane cth_smoke cth_space_in \ +DIST_SUBDIRS = aciddrop aurora bassline blur1 blur2 blur3 blur4 blur5 \ + blur6 blur7 blur8 cirrus cirrus2 clear color_cycle critters \ + crp cth_bighalfwheel cth_hurricane cth_smoke cth_space_in \ cth_space_out cth_spiral cth_xroller cth_yroller delay_l \ delay_ls delay_p delay_pp delay_ps delayS_ls delayS_lsp drops \ - edge emboss faders flow foo galaxy hodge infinity kaleid2 life \ - melt mosaic nspiral poincare polaroscillo roscillo ripple \ - rotors rp scroll_bt scroll_lr scroll_rl scroll_tb sin1oscillo \ - sin2oscillo swarm taquin touw_eiffel tunnel venus video warp \ + edge emboss fadeout faders flow foo galaxy hodge infinity \ + kaleid2 life melt mosaic nspiral paintdrop poincare \ + polaroscillo roscillo ripple rotors rotors_freq rp scroll_bt \ + scroll_lr scroll_rl scroll_tb sin1oscillo sin2oscillo snake \ + snake_oscillo swarm taquin touw_eiffel tunnel venus video warp \ xgum xmirror_bottom xmirror_top xoscillo xoscillo_s xshaker \ xwave ygum ymirror_left ymirror_right yoscillo yoscillo_s \ yshaker ywave zblur1 zblur1mist zblur1slow zblur1beat zblur2 \ zbroken zebu1 zreflector zspirals delay2 delay3 \ of_archimedean_spiral_3d of_spiral speaker spectrum spectrumSh \ - spectrumSv voiceprint pulse iDissolve isquares isquaresbeat \ - iPulse iPulse2 iPulse3 iPulse4 splash xscanline yscanline \ - tv_webcam tv_quark tv_streak tv_1d tv_nervous tv_predator \ - tv_fire tv_diff tv_diff2 tv_diff3 tv_diff4 tv_diffbeat \ - zmonitor GLCube test_beat_detection + spectrumSv voiceprint pulse iDissolve imagedrop isquares \ + isquaresbeat iColrot iColrotbeat iColrotslow iPulse iPulse2 \ + iPulse3 iPulse4 splash xscanline yscanline tv_webcam tv_quark \ + tv_streak tv_1d tv_nervous tv_predator tv_fire tv_diff \ + tv_diff2 tv_diff3 tv_diff4 tv_diffbeat tv_colrot tv_colrotslow \ + tv_colrotbeat zmonitor GLCube test_beat_detection am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ @@ -270,6 +275,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -297,6 +304,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -311,7 +319,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -372,29 +383,37 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ EXTRA_DIST = include/shaker.h \ - include/infinity.h \ + include/blur.h \ include/delay.h \ + include/gum.h \ + include/infinity.h \ + include/parameters.h \ + include/shaker.h \ include/spectrum.h # FFTW plugins -SUBDIRS = aurora bassline blur1 blur2 blur3 blur4 blur5 blur6 blur7 \ - blur8 cirrus cirrus2 clear color_cycle critters crp \ + +# Image plugins +SUBDIRS = aciddrop aurora bassline blur1 blur2 blur3 blur4 blur5 blur6 \ + blur7 blur8 cirrus cirrus2 clear color_cycle critters crp \ cth_bighalfwheel cth_hurricane cth_smoke cth_space_in \ cth_space_out cth_spiral cth_xroller cth_yroller delay_l \ delay_ls delay_p delay_pp delay_ps delayS_ls delayS_lsp drops \ - edge emboss faders flow foo galaxy hodge infinity kaleid2 life \ - melt mosaic nspiral poincare polaroscillo roscillo ripple \ - rotors rp scroll_bt scroll_lr scroll_rl scroll_tb sin1oscillo \ - sin2oscillo swarm taquin touw_eiffel tunnel venus video warp \ + edge emboss fadeout faders flow foo galaxy hodge infinity \ + kaleid2 life melt mosaic nspiral paintdrop poincare \ + polaroscillo roscillo ripple rotors rotors_freq rp scroll_bt \ + scroll_lr scroll_rl scroll_tb sin1oscillo sin2oscillo snake \ + snake_oscillo swarm taquin touw_eiffel tunnel venus video warp \ xgum xmirror_bottom xmirror_top xoscillo xoscillo_s xshaker \ xwave ygum ymirror_left ymirror_right yoscillo yoscillo_s \ yshaker ywave zblur1 zblur1mist zblur1slow zblur1beat zblur2 \ zbroken zebu1 zreflector zspirals $(am__append_1) \ of_archimedean_spiral_3d of_spiral speaker spectrum spectrumSh \ - spectrumSv voiceprint pulse iDissolve isquares isquaresbeat \ - iPulse iPulse2 iPulse3 iPulse4 splash xscanline yscanline \ - $(am__append_2) $(am__append_3) $(am__append_4) + spectrumSv voiceprint pulse iDissolve imagedrop isquares \ + isquaresbeat iColrot iColrotbeat iColrotslow iPulse iPulse2 \ + iPulse3 iPulse4 splash xscanline yscanline $(am__append_2) \ + $(am__append_3) $(am__append_4) all: all-recursive .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/main/melt/Makefile.am lebiniou-3.40/plugins/stable/main/melt/Makefile.am --- lebiniou-3.31/plugins/stable/main/melt/Makefile.am 2018-11-27 13:50:08.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/melt/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -2,5 +2,6 @@ plugin_PROGRAMS = melt.so melt_so_SOURCES = melt.c -melt_so_LDFLAGS = @PLUGIN_LDFLAGS@ -melt_so_CFLAGS = @PLUGIN_CFLAGS@ +melt_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +melt_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +melt_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/melt/Makefile.in lebiniou-3.40/plugins/stable/main/melt/Makefile.in --- lebiniou-3.31/plugins/stable/main/melt/Makefile.in 2019-04-14 11:52:32.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/melt/Makefile.in 2020-01-23 13:57:17.000000000 +0000 @@ -104,7 +104,7 @@ PROGRAMS = $(plugin_PROGRAMS) am_melt_so_OBJECTS = melt_so-melt.$(OBJEXT) melt_so_OBJECTS = $(am_melt_so_OBJECTS) -melt_so_LDADD = $(LDADD) +melt_so_DEPENDENCIES = melt_so_LINK = $(CCLD) $(melt_so_CFLAGS) $(CFLAGS) $(melt_so_LDFLAGS) \ $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -216,6 +216,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -243,6 +245,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -257,7 +260,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -319,8 +325,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/main/melt melt_so_SOURCES = melt.c -melt_so_LDFLAGS = @PLUGIN_LDFLAGS@ -melt_so_CFLAGS = @PLUGIN_CFLAGS@ +melt_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +melt_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +melt_so_LDADD = @PLUGIN_LDADD@ all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/main/melt/melt.c lebiniou-3.40/plugins/stable/main/melt/melt.c --- lebiniou-3.31/plugins/stable/main/melt/melt.c 2019-04-05 20:39:14.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/melt/melt.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -18,13 +18,55 @@ */ #include "context.h" +#include "parameters.h" u_long id = 1178827232; +uint32_t version = 0; u_long options = BE_DISPLACE; char desc[] = "Melt effect"; +static int speed = 0; +static float color_factor = 0; + +json_t * +get_parameters() +{ + json_t *params = json_object(); + plugin_parameters_add_int(params, BPP_SPEED, speed, -1, 1); + plugin_parameters_add_double(params, BPP_COLOR_FACTOR, color_factor, -0.01, 0.01); + + return params; +} + + +void +set_parameters(const json_t *in_parameters) +{ + plugin_parameter_parse_int_range(in_parameters, BPP_SPEED, &speed, -7, 7); + plugin_parameter_parse_float_range(in_parameters, BPP_COLOR_FACTOR, &color_factor, 0, 1); +} + + +json_t * +parameters(const json_t *in_parameters) +{ + set_parameters(in_parameters); + + return get_parameters(); +} + + +void +on_switch_on(Context_t *ctx) +{ + /* Initialize parameters */ + speed = 3; + color_factor = 0.5; +} + + void run(Context_t *ctx) { @@ -33,22 +75,43 @@ int x, y; - for (x = 0; x < WIDTH; x++) { - set_pixel_nc(dst, x, 0, get_pixel_nc(src, x, 0)); - } - - for (y = 1; y < HEIGHT; y++) { + if (speed < 0) { for (x = 0; x < WIDTH; x++) { - Pixel_t c = get_pixel_nc(src, x, y); - int y2 = y - (c >> 5); + set_pixel_nc(dst, x, HEIGHT-1, get_pixel_nc(src, x, HEIGHT-1)); + } - if (y2 < 0) { - y2 = 0; + for (y = HEIGHT-2; y > 0; y--) { + for (x = 0; x < WIDTH; x++) { + Pixel_t c = get_pixel_nc(src, x, y); + int y2 = y + (c >> (8+speed)); + + if (y2 > HEIGHT-1) { + y2 = HEIGHT-1; + } + + set_pixel_nc(dst, x, y, c * color_factor); + set_pixel_nc(dst, x, y2, c); } + } + } else { + for (x = 0; x < WIDTH; x++) { + set_pixel_nc(dst, x, 0, get_pixel_nc(src, x, 0)); + } - set_pixel_nc(dst, x, y, c/2); - set_pixel_nc(dst, x, y2, c); + for (y = 1; y < HEIGHT; y++) { + for (x = 0; x < WIDTH; x++) { + Pixel_t c = get_pixel_nc(src, x, y); + int y2 = y - (c >> (8-speed)); + + if (y2 < 0) { + y2 = 0; + } + + set_pixel_nc(dst, x, y, c * color_factor); + set_pixel_nc(dst, x, y2, c); + } } } + h_line_nc(dst, MAXY, 0, MAXX, 0); } diff -Nru lebiniou-3.31/plugins/stable/main/mosaic/Makefile.am lebiniou-3.40/plugins/stable/main/mosaic/Makefile.am --- lebiniou-3.31/plugins/stable/main/mosaic/Makefile.am 2018-11-27 13:50:08.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/mosaic/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -2,5 +2,6 @@ plugin_PROGRAMS = mosaic.so mosaic_so_SOURCES = mosaic.c -mosaic_so_LDFLAGS = @PLUGIN_LDFLAGS@ -mosaic_so_CFLAGS = @PLUGIN_CFLAGS@ +mosaic_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +mosaic_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +mosaic_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/mosaic/Makefile.in lebiniou-3.40/plugins/stable/main/mosaic/Makefile.in --- lebiniou-3.31/plugins/stable/main/mosaic/Makefile.in 2019-04-14 11:52:32.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/mosaic/Makefile.in 2020-01-23 13:57:17.000000000 +0000 @@ -104,7 +104,7 @@ PROGRAMS = $(plugin_PROGRAMS) am_mosaic_so_OBJECTS = mosaic_so-mosaic.$(OBJEXT) mosaic_so_OBJECTS = $(am_mosaic_so_OBJECTS) -mosaic_so_LDADD = $(LDADD) +mosaic_so_DEPENDENCIES = mosaic_so_LINK = $(CCLD) $(mosaic_so_CFLAGS) $(CFLAGS) \ $(mosaic_so_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -216,6 +216,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -243,6 +245,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -257,7 +260,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -319,8 +325,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/main/mosaic mosaic_so_SOURCES = mosaic.c -mosaic_so_LDFLAGS = @PLUGIN_LDFLAGS@ -mosaic_so_CFLAGS = @PLUGIN_CFLAGS@ +mosaic_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +mosaic_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +mosaic_so_LDADD = @PLUGIN_LDADD@ all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/main/mosaic/mosaic.c lebiniou-3.40/plugins/stable/main/mosaic/mosaic.c --- lebiniou-3.31/plugins/stable/main/mosaic/mosaic.c 2019-04-05 20:39:14.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/mosaic/mosaic.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -21,6 +21,7 @@ u_long id = 1169583898; +uint32_t version = 0; u_long options = BE_LENS; char desc[] = "Mosaic effect"; @@ -69,14 +70,15 @@ } -void +int8_t create(Context_t *ctx) { if (ok(ctx)) { on_switch_on(ctx); + return 1; } else { VERBOSE(printf("[!] mosaic: non-standard screen size, disabling plugin.\n")); - options |= BEQ_DISABLED; + return 0; } } diff -Nru lebiniou-3.31/plugins/stable/main/nspiral/Makefile.am lebiniou-3.40/plugins/stable/main/nspiral/Makefile.am --- lebiniou-3.31/plugins/stable/main/nspiral/Makefile.am 2018-11-27 13:50:08.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/nspiral/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -2,5 +2,6 @@ plugin_PROGRAMS = nspiral.so nspiral_so_SOURCES = nspiral.c -nspiral_so_LDFLAGS = @PLUGIN_LDFLAGS@ -nspiral_so_CFLAGS = @PLUGIN_CFLAGS@ +nspiral_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +nspiral_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +nspiral_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/nspiral/Makefile.in lebiniou-3.40/plugins/stable/main/nspiral/Makefile.in --- lebiniou-3.31/plugins/stable/main/nspiral/Makefile.in 2019-04-14 11:52:32.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/nspiral/Makefile.in 2020-01-23 13:57:17.000000000 +0000 @@ -104,7 +104,7 @@ PROGRAMS = $(plugin_PROGRAMS) am_nspiral_so_OBJECTS = nspiral_so-nspiral.$(OBJEXT) nspiral_so_OBJECTS = $(am_nspiral_so_OBJECTS) -nspiral_so_LDADD = $(LDADD) +nspiral_so_DEPENDENCIES = nspiral_so_LINK = $(CCLD) $(nspiral_so_CFLAGS) $(CFLAGS) \ $(nspiral_so_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -216,6 +216,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -243,6 +245,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -257,7 +260,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -319,8 +325,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/main/nspiral nspiral_so_SOURCES = nspiral.c -nspiral_so_LDFLAGS = @PLUGIN_LDFLAGS@ -nspiral_so_CFLAGS = @PLUGIN_CFLAGS@ +nspiral_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +nspiral_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +nspiral_so_LDADD = @PLUGIN_LDADD@ all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/main/nspiral/nspiral.c lebiniou-3.40/plugins/stable/main/nspiral/nspiral.c --- lebiniou-3.31/plugins/stable/main/nspiral/nspiral.c 2019-04-05 20:39:14.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/nspiral/nspiral.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -21,6 +21,7 @@ u_long id = 1167487171; +uint32_t version = 0; u_long options = BE_WARP|BE_LENS; char desc[] = "Nested spirals filter"; @@ -66,13 +67,15 @@ } -void +int8_t create(Context_t *ctx) { map = xcalloc(BUFFSIZE, sizeof(u_long)); init(0, 0, +1, +1, MAXSCREEN-2, MINSCREEN-2, 2, 0); init(MAXX, MAXY, -1, -1, MAXSCREEN-2, MINSCREEN-2, 2, 1); + + return 1; } diff -Nru lebiniou-3.31/plugins/stable/main/of_archimedean_spiral_3d/Makefile.am lebiniou-3.40/plugins/stable/main/of_archimedean_spiral_3d/Makefile.am --- lebiniou-3.31/plugins/stable/main/of_archimedean_spiral_3d/Makefile.am 2018-11-27 13:50:08.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/of_archimedean_spiral_3d/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -2,5 +2,6 @@ plugin_PROGRAMS = of_archimedean_spiral_3d.so of_archimedean_spiral_3d_so_SOURCES = of_archimedean_spiral_3d.c -of_archimedean_spiral_3d_so_LDFLAGS = @PLUGIN_LDFLAGS@ -of_archimedean_spiral_3d_so_CFLAGS = @PLUGIN_CFLAGS@ +of_archimedean_spiral_3d_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +of_archimedean_spiral_3d_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +of_archimedean_spiral_3d_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/of_archimedean_spiral_3d/Makefile.in lebiniou-3.40/plugins/stable/main/of_archimedean_spiral_3d/Makefile.in --- lebiniou-3.31/plugins/stable/main/of_archimedean_spiral_3d/Makefile.in 2019-04-14 11:52:33.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/of_archimedean_spiral_3d/Makefile.in 2020-01-23 13:57:17.000000000 +0000 @@ -105,7 +105,7 @@ am_of_archimedean_spiral_3d_so_OBJECTS = of_archimedean_spiral_3d_so-of_archimedean_spiral_3d.$(OBJEXT) of_archimedean_spiral_3d_so_OBJECTS = \ $(am_of_archimedean_spiral_3d_so_OBJECTS) -of_archimedean_spiral_3d_so_LDADD = $(LDADD) +of_archimedean_spiral_3d_so_DEPENDENCIES = of_archimedean_spiral_3d_so_LINK = $(CCLD) \ $(of_archimedean_spiral_3d_so_CFLAGS) $(CFLAGS) \ $(of_archimedean_spiral_3d_so_LDFLAGS) $(LDFLAGS) -o $@ @@ -218,6 +218,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -245,6 +247,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -259,7 +262,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -321,8 +327,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/main/of_archimedean_spiral_3d of_archimedean_spiral_3d_so_SOURCES = of_archimedean_spiral_3d.c -of_archimedean_spiral_3d_so_LDFLAGS = @PLUGIN_LDFLAGS@ -of_archimedean_spiral_3d_so_CFLAGS = @PLUGIN_CFLAGS@ +of_archimedean_spiral_3d_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +of_archimedean_spiral_3d_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +of_archimedean_spiral_3d_so_LDADD = @PLUGIN_LDADD@ all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/main/of_archimedean_spiral_3d/of_archimedean_spiral_3d.c lebiniou-3.40/plugins/stable/main/of_archimedean_spiral_3d/of_archimedean_spiral_3d.c --- lebiniou-3.31/plugins/stable/main/of_archimedean_spiral_3d/of_archimedean_spiral_3d.c 2019-04-13 13:36:49.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/of_archimedean_spiral_3d/of_archimedean_spiral_3d.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -18,20 +18,48 @@ */ #include "context.h" +#include "parameters.h" u_long id = 1073678364; +uint32_t version = 0; u_long options = BE_SFX3D|BEQ_NORANDOM; char dname[] = "OF A-Spiral"; u_long mode = OVERLAY; char desc[] = "3D Archimedean spiral"; +static float volume_scale = 0; + +json_t * +get_parameters() +{ + json_t *params = json_object(); + plugin_parameters_add_double(params, BPP_VOLUME_SCALE, volume_scale, -0.01, 0.01); + + return params; +} + + +void +set_parameters(const json_t *in_parameters) +{ + plugin_parameter_parse_float_range(in_parameters, BPP_VOLUME_SCALE, &volume_scale, 0, 1); +} + + +json_t * +parameters(const json_t *in_parameters) +{ + set_parameters(in_parameters); + + return get_parameters(); +} + void -create(Context_t *ctx) +on_switch_on(Context_t *ctx) { - if (ctx->input == NULL) { - options |= BEQ_DISABLED; - } + /* Initialize parameters */ + volume_scale = 1; } @@ -43,7 +71,7 @@ Buffer8_clear(dst); - float random = Input_get_volume(ctx->input); + float random = Input_get_volume(ctx->input) * volume_scale; for (t = 0 ; t < 8 * M_PI ; t += 0.1) { Point3d_t P; diff -Nru lebiniou-3.31/plugins/stable/main/of_spiral/Makefile.am lebiniou-3.40/plugins/stable/main/of_spiral/Makefile.am --- lebiniou-3.31/plugins/stable/main/of_spiral/Makefile.am 2018-11-27 13:50:08.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/of_spiral/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -2,5 +2,6 @@ plugin_PROGRAMS = of_spiral.so of_spiral_so_SOURCES = of_spiral.c -of_spiral_so_LDFLAGS = @PLUGIN_LDFLAGS@ -of_spiral_so_CFLAGS = @PLUGIN_CFLAGS@ +of_spiral_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +of_spiral_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +of_spiral_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/of_spiral/Makefile.in lebiniou-3.40/plugins/stable/main/of_spiral/Makefile.in --- lebiniou-3.31/plugins/stable/main/of_spiral/Makefile.in 2019-04-14 11:52:33.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/of_spiral/Makefile.in 2020-01-23 13:57:17.000000000 +0000 @@ -104,7 +104,7 @@ PROGRAMS = $(plugin_PROGRAMS) am_of_spiral_so_OBJECTS = of_spiral_so-of_spiral.$(OBJEXT) of_spiral_so_OBJECTS = $(am_of_spiral_so_OBJECTS) -of_spiral_so_LDADD = $(LDADD) +of_spiral_so_DEPENDENCIES = of_spiral_so_LINK = $(CCLD) $(of_spiral_so_CFLAGS) $(CFLAGS) \ $(of_spiral_so_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -216,6 +216,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -243,6 +245,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -257,7 +260,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -319,8 +325,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/main/of_spiral of_spiral_so_SOURCES = of_spiral.c -of_spiral_so_LDFLAGS = @PLUGIN_LDFLAGS@ -of_spiral_so_CFLAGS = @PLUGIN_CFLAGS@ +of_spiral_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +of_spiral_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +of_spiral_so_LDADD = @PLUGIN_LDADD@ all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/main/of_spiral/of_spiral.c lebiniou-3.40/plugins/stable/main/of_spiral/of_spiral.c --- lebiniou-3.31/plugins/stable/main/of_spiral/of_spiral.c 2019-04-05 20:39:14.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/of_spiral/of_spiral.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -18,20 +18,48 @@ */ #include "context.h" +#include "parameters.h" u_long id = 1057526835; +uint32_t version = 0; u_long options = BE_SFX2D; char dname[] = "OF Spiral"; u_long mode = OVERLAY; char desc[] = "Pulsing spiral"; +static float volume_scale = 0; + +json_t * +get_parameters() +{ + json_t *params = json_object(); + plugin_parameters_add_double(params, BPP_VOLUME_SCALE, volume_scale, -0.01, 0.01); + + return params; +} + + +void +set_parameters(const json_t *in_parameters) +{ + plugin_parameter_parse_float_range(in_parameters, BPP_VOLUME_SCALE, &volume_scale, 0, 1); +} + + +json_t * +parameters(const json_t *in_parameters) +{ + set_parameters(in_parameters); + + return get_parameters(); +} + void -create(Context_t *ctx) +on_switch_on(Context_t *ctx) { - if (ctx->input == NULL) { - options |= BEQ_DISABLED; - } + /* Initialize parameters */ + volume_scale = 1; } @@ -45,14 +73,14 @@ Buffer8_clear(dst); - x1 = Input_get_volume(ctx->input) * WIDTH; /* Nb de pts par droite */ + x1 = Input_get_volume(ctx->input) * WIDTH * volume_scale; /* Nb de pts par droite */ x2 = 0.3 + ctx->input->data[A_MONO][((int)x1 % ctx->input->size)]; for (i = 0; i < WIDTH; i++) { - theta = i / 20.0; /* Rotation angle */ + theta = i / 20.0; /* Rotation angle */ - r = expf(theta*x2); /* Distance from axis */ - d = 0.33 * r; /* Radius relative to r (involute/evolute) */ + r = expf(theta*x2); /* Distance from axis */ + d = 0.33 * r; /* Radius relative to r (involute/evolute) */ /* For ornament, add a periodic function to d */ for (j = 0; j < 30; j++) { phi = 2.0 * M_PI *j / x3; diff -Nru lebiniou-3.31/plugins/stable/main/paintdrop/Makefile.am lebiniou-3.40/plugins/stable/main/paintdrop/Makefile.am --- lebiniou-3.31/plugins/stable/main/paintdrop/Makefile.am 1970-01-01 00:00:00.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/paintdrop/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -0,0 +1,7 @@ +plugindir = @libdir@/lebiniou/plugins/main/paintdrop +plugin_PROGRAMS = paintdrop.so + +paintdrop_so_SOURCES = paintdrop.c +paintdrop_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +paintdrop_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +paintdrop_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/paintdrop/Makefile.in lebiniou-3.40/plugins/stable/main/paintdrop/Makefile.in --- lebiniou-3.31/plugins/stable/main/paintdrop/Makefile.in 1970-01-01 00:00:00.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/paintdrop/Makefile.in 2020-01-23 13:57:17.000000000 +0000 @@ -0,0 +1,665 @@ +# Makefile.in generated by automake 1.16.1 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994-2018 Free Software Foundation, Inc. + +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +VPATH = @srcdir@ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +target_triplet = @target@ +plugin_PROGRAMS = paintdrop.so$(EXEEXT) +subdir = plugins/stable/main/paintdrop +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +am__installdirs = "$(DESTDIR)$(plugindir)" +PROGRAMS = $(plugin_PROGRAMS) +am_paintdrop_so_OBJECTS = paintdrop_so-paintdrop.$(OBJEXT) +paintdrop_so_OBJECTS = $(am_paintdrop_so_OBJECTS) +paintdrop_so_DEPENDENCIES = +paintdrop_so_LINK = $(CCLD) $(paintdrop_so_CFLAGS) $(CFLAGS) \ + $(paintdrop_so_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) +depcomp = $(SHELL) $(top_srcdir)/depcomp +am__maybe_remake_depfiles = depfiles +am__depfiles_remade = ./$(DEPDIR)/paintdrop_so-paintdrop.Po +am__mv = mv -f +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = +CCLD = $(CC) +LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = +SOURCES = $(paintdrop_so_SOURCES) +DIST_SOURCES = $(paintdrop_so_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +ALSA_CFLAGS = @ALSA_CFLAGS@ +ALSA_LIBS = @ALSA_LIBS@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AVUTIL_CFLAGS = @AVUTIL_CFLAGS@ +AVUTIL_LIBS = @AVUTIL_LIBS@ +AWK = @AWK@ +BINIOU_VERSION = @BINIOU_VERSION@ +CACA_CFLAGS = @CACA_CFLAGS@ +CACA_LIBS = @CACA_LIBS@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DPKG_BUILDFLAGS_CHECK = @DPKG_BUILDFLAGS_CHECK@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +ESD_CFLAGS = @ESD_CFLAGS@ +ESD_LIBS = @ESD_LIBS@ +EXEEXT = @EXEEXT@ +FFTW3_CFLAGS = @FFTW3_CFLAGS@ +FFTW3_LIBS = @FFTW3_LIBS@ +FT2_CFLAGS = @FT2_CFLAGS@ +FT2_LIBS = @FT2_LIBS@ +GETOPT_LONG_LIBS = @GETOPT_LONG_LIBS@ +GLIB_CFLAGS = @GLIB_CFLAGS@ +GLIB_LIBS = @GLIB_LIBS@ +GLU_CFLAGS = @GLU_CFLAGS@ +GLU_LIBS = @GLU_LIBS@ +GREP = @GREP@ +INPUT_PLUGINS = @INPUT_PLUGINS@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +JACK_CFLAGS = @JACK_CFLAGS@ +JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ +LDFLAGS = @LDFLAGS@ +LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ +LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ +LEBINIOU_SCHEMES_FILE = @LEBINIOU_SCHEMES_FILE@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ +MagickWand_CFLAGS = @MagickWand_CFLAGS@ +MagickWand_LIBS = @MagickWand_LIBS@ +OBJEXT = @OBJEXT@ +OSD_FONT = @OSD_FONT@ +OSD_PTSIZE = @OSD_PTSIZE@ +OUTPUT_PLUGINS = @OUTPUT_PLUGINS@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ +PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ +PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ +PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ +PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ +SDL2_CFLAGS = @SDL2_CFLAGS@ +SDL2_LIBS = @SDL2_LIBS@ +SDL2_ttf_CFLAGS = @SDL2_ttf_CFLAGS@ +SDL2_ttf_LIBS = @SDL2_ttf_LIBS@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +SNDFILE_CFLAGS = @SNDFILE_CFLAGS@ +SNDFILE_LIBS = @SNDFILE_LIBS@ +STRIP = @STRIP@ +SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ +SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ +VERSION = @VERSION@ +XML2_CFLAGS = @XML2_CFLAGS@ +XML2_LIBS = @XML2_LIBS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_CC = @ac_ct_CC@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +have_pandoc = @have_pandoc@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +runstatedir = @runstatedir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target = @target@ +target_alias = @target_alias@ +target_cpu = @target_cpu@ +target_os = @target_os@ +target_vendor = @target_vendor@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +plugindir = @libdir@/lebiniou/plugins/main/paintdrop +paintdrop_so_SOURCES = paintdrop.c +paintdrop_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +paintdrop_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +paintdrop_so_LDADD = @PLUGIN_LDADD@ +all: all-am + +.SUFFIXES: +.SUFFIXES: .c .o .obj +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign plugins/stable/main/paintdrop/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --foreign plugins/stable/main/paintdrop/Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): +install-pluginPROGRAMS: $(plugin_PROGRAMS) + @$(NORMAL_INSTALL) + @list='$(plugin_PROGRAMS)'; test -n "$(plugindir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \ + fi; \ + for p in $$list; do echo "$$p $$p"; done | \ + sed 's/$(EXEEXT)$$//' | \ + while read p p1; do if test -f $$p \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ + done | \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ + -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ + sed 'N;N;N;s,\n, ,g' | \ + $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ + { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ + if ($$2 == $$4) files[d] = files[d] " " $$1; \ + else { print "f", $$3 "/" $$4, $$1; } } \ + END { for (d in files) print "f", d, files[d] }' | \ + while read type dir files; do \ + if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ + test -z "$$files" || { \ + echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(plugindir)$$dir'"; \ + $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(plugindir)$$dir" || exit $$?; \ + } \ + ; done + +uninstall-pluginPROGRAMS: + @$(NORMAL_UNINSTALL) + @list='$(plugin_PROGRAMS)'; test -n "$(plugindir)" || list=; \ + files=`for p in $$list; do echo "$$p"; done | \ + sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ + -e 's/$$/$(EXEEXT)/' \ + `; \ + test -n "$$list" || exit 0; \ + echo " ( cd '$(DESTDIR)$(plugindir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(plugindir)" && rm -f $$files + +clean-pluginPROGRAMS: + -test -z "$(plugin_PROGRAMS)" || rm -f $(plugin_PROGRAMS) + +paintdrop.so$(EXEEXT): $(paintdrop_so_OBJECTS) $(paintdrop_so_DEPENDENCIES) $(EXTRA_paintdrop_so_DEPENDENCIES) + @rm -f paintdrop.so$(EXEEXT) + $(AM_V_CCLD)$(paintdrop_so_LINK) $(paintdrop_so_OBJECTS) $(paintdrop_so_LDADD) $(LIBS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/paintdrop_so-paintdrop.Po@am__quote@ # am--include-marker + +$(am__depfiles_remade): + @$(MKDIR_P) $(@D) + @echo '# dummy' >$@-t && $(am__mv) $@-t $@ + +am--depfiles: $(am__depfiles_remade) + +.c.o: +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< + +.c.obj: +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + +paintdrop_so-paintdrop.o: paintdrop.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(paintdrop_so_CFLAGS) $(CFLAGS) -MT paintdrop_so-paintdrop.o -MD -MP -MF $(DEPDIR)/paintdrop_so-paintdrop.Tpo -c -o paintdrop_so-paintdrop.o `test -f 'paintdrop.c' || echo '$(srcdir)/'`paintdrop.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/paintdrop_so-paintdrop.Tpo $(DEPDIR)/paintdrop_so-paintdrop.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='paintdrop.c' object='paintdrop_so-paintdrop.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(paintdrop_so_CFLAGS) $(CFLAGS) -c -o paintdrop_so-paintdrop.o `test -f 'paintdrop.c' || echo '$(srcdir)/'`paintdrop.c + +paintdrop_so-paintdrop.obj: paintdrop.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(paintdrop_so_CFLAGS) $(CFLAGS) -MT paintdrop_so-paintdrop.obj -MD -MP -MF $(DEPDIR)/paintdrop_so-paintdrop.Tpo -c -o paintdrop_so-paintdrop.obj `if test -f 'paintdrop.c'; then $(CYGPATH_W) 'paintdrop.c'; else $(CYGPATH_W) '$(srcdir)/paintdrop.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/paintdrop_so-paintdrop.Tpo $(DEPDIR)/paintdrop_so-paintdrop.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='paintdrop.c' object='paintdrop_so-paintdrop.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(paintdrop_so_CFLAGS) $(CFLAGS) -c -o paintdrop_so-paintdrop.obj `if test -f 'paintdrop.c'; then $(CYGPATH_W) 'paintdrop.c'; else $(CYGPATH_W) '$(srcdir)/paintdrop.c'; fi` + +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags + +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + set x; \ + here=`pwd`; \ + $(am__define_uniq_tagged_files); \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ + fi +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ + test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(PROGRAMS) +installdirs: + for dir in "$(DESTDIR)$(plugindir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-pluginPROGRAMS mostlyclean-am + +distclean: distclean-am + -rm -f ./$(DEPDIR)/paintdrop_so-paintdrop.Po + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-tags + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: install-pluginPROGRAMS + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f ./$(DEPDIR)/paintdrop_so-paintdrop.Po + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-compile mostlyclean-generic + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-pluginPROGRAMS + +.MAKE: install-am install-strip + +.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \ + clean-generic clean-pluginPROGRAMS cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-pluginPROGRAMS install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \ + ps ps-am tags tags-am uninstall uninstall-am \ + uninstall-pluginPROGRAMS + +.PRECIOUS: Makefile + + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -Nru lebiniou-3.31/plugins/stable/main/paintdrop/paintdrop.c lebiniou-3.40/plugins/stable/main/paintdrop/paintdrop.c --- lebiniou-3.31/plugins/stable/main/paintdrop/paintdrop.c 1970-01-01 00:00:00.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/paintdrop/paintdrop.c 2020-01-22 18:33:57.000000000 +0000 @@ -0,0 +1,179 @@ +/* + * Copyright 1994-2020 Olivier Girondel + * Copyright 2019-2020 Tavasti + * + * This file is part of lebiniou. + * + * lebiniou 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 of the License, or + * (at your option) any later version. + * + * lebiniou 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 lebiniou. If not, see . + */ + +/* + * Idea: Drops of paint on picture. + */ + +#include "context.h" + +#define DROPCOUNT 30 /* how many drops there can be same time progressing */ +#define INITIAL_WAIT_MAX 5 /* max wait before first drop */ +#define WAIT_MIN 1 /* minimum wait between drops */ +#define WAIT_MAX 11 /* max wait between drops */ +#define DROPSIZE_MIN (WIDTH/30.0) /* minimum radius of drop */ +#define DROPSIZE_MAX (WIDTH/17.0) /* maximum radius of drop */ +#define HAZY_RADIUS 3.0 /* how many pixels on outer ring are hazy */ +#define HAZY_RATIO 10.0 /* 1/x probability hazy pixel hazy to get drawn */ +#define PROG_RATIO 0.21 /* how big ratio of diameter progress in one round */ +#define READY_TOL 0.3 /* difference to target regarded as ready */ + + +u_long id = 1558717656; +uint32_t version = 0; +u_long options = BE_GFX; +char desc[] = "Color drops"; + +typedef struct Drop_s { + int x; + int y; + Pixel_t color; /* target color */ + double target; /* target radius */ + double current; /* current radius */ +} Drop_t; + +static Drop_t drops[DROPCOUNT]; +static short *mask = NULL; +static int next_drop; /* counter how many rounds before next drop */ + + +int8_t +create(Context_t *ctx) +{ + mask = xmalloc(sizeof(short) * BUFFSIZE); + + return 1; +} + + +void +destroy(Context_t *ctx) +{ + xfree(mask); +} + + +void +on_switch_on(Context_t *ctx) +{ + u_long i; + /* Mark all drops as free */ + for (i = 0; i < DROPCOUNT ; i++) { + drops[i].x = -1; + } + next_drop = b_rand_int_range(0, INITIAL_WAIT_MAX); + /* initiallize mask */ + for (i = 0; i < BUFFSIZE ; i++) { + mask[i] = -1; + } +} + + +/* helper function for marking affected pixels of circle to mask */ +static void +mark_circle_range(int x, int y, double r, short mark, short *mbuff) +{ + assert(mask != NULL); + + /* calculate bounding box of circle */ + int left = x - r; + left = (left < 0) ? 0 : left; + int right = x + r; + right = (right >= WIDTH) ? WIDTH - 1 : right; + int top = y - r; + top = (top < 0) ? 0 : top; + int bottom = y + r; + bottom = (bottom >= HEIGHT) ? HEIGHT - 1 : bottom; + + /* we handle distances as squared to speed up things, + no need to calculate sqrt for every pixel */ + double distsq = r * r; /* outer ring which is hazy*/ + double distsq2 = (r - HAZY_RADIUS) * (r - HAZY_RADIUS); /* inner ring */ + int i,j; + /* loop thru bounding box, and check if pixel is in circle */ + for (i = top; i <= bottom; i++) { + for (j = left ; j <= right; j++) { + int dx = j - x; + int dy = i - y; + if (((dx * dx) + (dy * dy)) < distsq) { + if (((dx * dx) + (dy * dy)) < distsq2) { + mbuff[i * WIDTH + j] = mark; + } else if (b_rand_int_range(0, HAZY_RATIO) == 0) { + /* hazy pixels */ + mbuff[i * WIDTH + j] = mark; + } else { + /* outside circle */ + mbuff[i * WIDTH + j] = -1; + } + } + } + } +} + + +void +run(Context_t *ctx) +{ + u_long i; + /* Grow existing drops, and release fully grown drops for next use */ + for (i = 0; i < DROPCOUNT; i++) { + if (drops[i].x > -1) { /* in use */ + if ((drops[i].current + READY_TOL) < drops[i].target) { + drops[i].current += (drops[i].target - drops[i].current) * PROG_RATIO; + /* mark area where this drop affects this round */ + mark_circle_range(drops[i].x, drops[i].y, drops[i].current, i, mask); + } else { + /* this drop is done */ + mark_circle_range(drops[i].x, drops[i].y,drops[i].current, -1, mask); + drops[i].x = -1; + } + } + } + + /* start checking if we need and can add new drop */ + if (--next_drop <= 0) { + /* time to add drop if there is room in struct */ + for (i = 0; i < DROPCOUNT; i++) { + if (drops[i].x == -1) { /* free entry */ + /* new random drop */ + drops[i].x = b_rand_int_range(0, WIDTH); + drops[i].y = b_rand_int_range(0, HEIGHT); + drops[i].color = b_rand_int_range(0, PIXEL_MAXVAL); + drops[i].target = b_rand_double_range(DROPSIZE_MIN, DROPSIZE_MAX); + drops[i].current = drops[i].target * PROG_RATIO ; + next_drop = b_rand_int_range(WAIT_MIN, WAIT_MAX); + /* mark area where this drop affects this round */ + mark_circle_range(drops[i].x, drops[i].y, drops[i].current, i, mask); + break; + } + } + } + /* actual picture handling */ + const Pixel_t *src = active_buffer(ctx)->buffer; + Pixel_t *dst = passive_buffer(ctx)->buffer; + + for (i = 0; i < BUFFSIZE; i++) { + Pixel_t col = src[i]; + if (mask[i] >= 0) { + col = drops[mask[i]].color; + } + *dst++ = col; + } +} diff -Nru lebiniou-3.31/plugins/stable/main/poincare/Makefile.am lebiniou-3.40/plugins/stable/main/poincare/Makefile.am --- lebiniou-3.31/plugins/stable/main/poincare/Makefile.am 2018-11-27 13:50:08.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/poincare/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -2,5 +2,6 @@ plugin_PROGRAMS = poincare.so poincare_so_SOURCES = poincare.c -poincare_so_LDFLAGS = @PLUGIN_LDFLAGS@ -poincare_so_CFLAGS = @PLUGIN_CFLAGS@ +poincare_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +poincare_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +poincare_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/poincare/Makefile.in lebiniou-3.40/plugins/stable/main/poincare/Makefile.in --- lebiniou-3.31/plugins/stable/main/poincare/Makefile.in 2019-04-14 11:52:33.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/poincare/Makefile.in 2020-01-23 13:57:17.000000000 +0000 @@ -104,7 +104,7 @@ PROGRAMS = $(plugin_PROGRAMS) am_poincare_so_OBJECTS = poincare_so-poincare.$(OBJEXT) poincare_so_OBJECTS = $(am_poincare_so_OBJECTS) -poincare_so_LDADD = $(LDADD) +poincare_so_DEPENDENCIES = poincare_so_LINK = $(CCLD) $(poincare_so_CFLAGS) $(CFLAGS) \ $(poincare_so_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -216,6 +216,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -243,6 +245,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -257,7 +260,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -319,8 +325,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/main/poincare poincare_so_SOURCES = poincare.c -poincare_so_LDFLAGS = @PLUGIN_LDFLAGS@ -poincare_so_CFLAGS = @PLUGIN_CFLAGS@ +poincare_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +poincare_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +poincare_so_LDADD = @PLUGIN_LDADD@ all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/main/poincare/poincare.c lebiniou-3.40/plugins/stable/main/poincare/poincare.c --- lebiniou-3.31/plugins/stable/main/poincare/poincare.c 2019-04-05 20:39:14.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/poincare/poincare.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -21,6 +21,7 @@ u_long id = 947430864; +uint32_t version = 0; u_long options = BEQ_NORANDOM; char desc[] = "Poincare effect"; diff -Nru lebiniou-3.31/plugins/stable/main/polaroscillo/Makefile.am lebiniou-3.40/plugins/stable/main/polaroscillo/Makefile.am --- lebiniou-3.31/plugins/stable/main/polaroscillo/Makefile.am 2018-11-27 13:50:08.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/polaroscillo/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -2,5 +2,6 @@ plugin_PROGRAMS = polaroscillo.so polaroscillo_so_SOURCES = polaroscillo.c -polaroscillo_so_LDFLAGS = @PLUGIN_LDFLAGS@ -polaroscillo_so_CFLAGS = @PLUGIN_CFLAGS@ +polaroscillo_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +polaroscillo_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +polaroscillo_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/polaroscillo/Makefile.in lebiniou-3.40/plugins/stable/main/polaroscillo/Makefile.in --- lebiniou-3.31/plugins/stable/main/polaroscillo/Makefile.in 2019-04-14 11:52:33.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/polaroscillo/Makefile.in 2020-01-23 13:57:17.000000000 +0000 @@ -104,7 +104,7 @@ PROGRAMS = $(plugin_PROGRAMS) am_polaroscillo_so_OBJECTS = polaroscillo_so-polaroscillo.$(OBJEXT) polaroscillo_so_OBJECTS = $(am_polaroscillo_so_OBJECTS) -polaroscillo_so_LDADD = $(LDADD) +polaroscillo_so_DEPENDENCIES = polaroscillo_so_LINK = $(CCLD) $(polaroscillo_so_CFLAGS) $(CFLAGS) \ $(polaroscillo_so_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -216,6 +216,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -243,6 +245,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -257,7 +260,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -319,8 +325,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/main/polaroscillo polaroscillo_so_SOURCES = polaroscillo.c -polaroscillo_so_LDFLAGS = @PLUGIN_LDFLAGS@ -polaroscillo_so_CFLAGS = @PLUGIN_CFLAGS@ +polaroscillo_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +polaroscillo_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +polaroscillo_so_LDADD = @PLUGIN_LDADD@ all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/main/polaroscillo/polaroscillo.c lebiniou-3.40/plugins/stable/main/polaroscillo/polaroscillo.c --- lebiniou-3.31/plugins/stable/main/polaroscillo/polaroscillo.c 2019-04-05 20:39:14.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/polaroscillo/polaroscillo.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -18,9 +18,11 @@ */ #include "oscillo.h" +#include "parameters.h" u_long id = 946482114; +uint32_t version = 0; u_long options = BE_SFX2D; u_long mode = OVERLAY; char desc[] = "Draw an oscillo in a radar way"; @@ -32,7 +34,34 @@ static float polar_theta, polar_inc_theta; static u_short polar_radius; static float polar_length; -static int connect = 1; +static int polaroscillo_connect = 1; + +static float volume_scale = 0; + +json_t * +get_parameters() +{ + json_t *params = json_object(); + plugin_parameters_add_double(params, BPP_VOLUME_SCALE, volume_scale, -0.01, 0.01); + + return params; +} + + +void +set_parameters(const json_t *in_parameters) +{ + plugin_parameter_parse_float_range(in_parameters, BPP_VOLUME_SCALE, &volume_scale, 0, 100); +} + + +json_t * +parameters(const json_t *in_parameters) +{ + set_parameters(in_parameters); + + return get_parameters(); +} void @@ -45,7 +74,7 @@ P->origin = last_polar; - t.v_j_factor = MAXY/4 * 0.85; + t.v_j_factor = MAXY/4 * volume_scale; polar_inc_theta = 2. * M_PI * polar_length / (float)(input->size); @@ -68,26 +97,24 @@ } -void +int8_t create(Context_t *ctx) { - if (ctx->input == NULL) { - options |= BEQ_DISABLED; - } else { - P = Porteuse_new(ctx->input->size, A_MONO); - - polar_theta = 0.0; - polar_inc_theta = 0.01; - polar_length = 0.666; - polar_radius = HMAXY*2.0/3.0; + P = Porteuse_new(ctx->input->size, A_MONO); - last_polar.x = CENTERX + polar_radius * cos (polar_theta); - last_polar.y = CENTERY + polar_radius * sin (polar_theta); + polar_theta = 0.0; + polar_inc_theta = 0.01; + polar_length = 0.666; + polar_radius = HMAXY*2.0/3.0; - polar_theta += polar_inc_theta; + last_polar.x = CENTERX + polar_radius * cos (polar_theta); + last_polar.y = CENTERY + polar_radius * sin (polar_theta); - init(ctx->input); - } + polar_theta += polar_inc_theta; + + init(ctx->input); + + return 1; } @@ -101,9 +128,17 @@ void +on_switch_on(Context_t *ctx) +{ + /* Initialize parameters */ + volume_scale = 0.85; +} + + +void run(Context_t *ctx) { Buffer8_clear(passive_buffer(ctx)); - Porteuse_draw(P, ctx, connect); + Porteuse_draw(P, ctx, polaroscillo_connect); init(ctx->input); } diff -Nru lebiniou-3.31/plugins/stable/main/pulse/Makefile.am lebiniou-3.40/plugins/stable/main/pulse/Makefile.am --- lebiniou-3.31/plugins/stable/main/pulse/Makefile.am 2018-11-27 13:50:08.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/pulse/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -2,5 +2,6 @@ plugin_PROGRAMS = pulse.so pulse_so_SOURCES = pulse.c -pulse_so_LDFLAGS = @PLUGIN_LDFLAGS@ -pulse_so_CFLAGS = @PLUGIN_CFLAGS@ +pulse_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +pulse_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +pulse_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/pulse/Makefile.in lebiniou-3.40/plugins/stable/main/pulse/Makefile.in --- lebiniou-3.31/plugins/stable/main/pulse/Makefile.in 2019-04-14 11:52:33.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/pulse/Makefile.in 2020-01-23 13:57:17.000000000 +0000 @@ -104,7 +104,7 @@ PROGRAMS = $(plugin_PROGRAMS) am_pulse_so_OBJECTS = pulse_so-pulse.$(OBJEXT) pulse_so_OBJECTS = $(am_pulse_so_OBJECTS) -pulse_so_LDADD = $(LDADD) +pulse_so_DEPENDENCIES = pulse_so_LINK = $(CCLD) $(pulse_so_CFLAGS) $(CFLAGS) \ $(pulse_so_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -216,6 +216,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -243,6 +245,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -257,7 +260,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -319,8 +325,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/main/pulse pulse_so_SOURCES = pulse.c -pulse_so_LDFLAGS = @PLUGIN_LDFLAGS@ -pulse_so_CFLAGS = @PLUGIN_CFLAGS@ +pulse_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +pulse_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +pulse_so_LDADD = @PLUGIN_LDADD@ all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/main/pulse/pulse.c lebiniou-3.40/plugins/stable/main/pulse/pulse.c --- lebiniou-3.31/plugins/stable/main/pulse/pulse.c 2019-04-05 20:39:14.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/pulse/pulse.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -21,6 +21,7 @@ u_long id = 948557759; +uint32_t version = 0; u_long options = BEQ_COLORMAP; u_long mode = NONE; char desc[] = "Pulse the colormap"; @@ -40,15 +41,6 @@ void -create(Context_t *ctx) -{ - if (ctx->input == NULL) { - options |= BEQ_DISABLED; - } -} - - -void run(Context_t *ctx) { static short last_beat = -1; @@ -67,9 +59,9 @@ for (i = 1; i <= L; i++) //somme += ctx->input->spectrum_log_norme[A_MONO][i]; - { - somme += ctx->input->spectrum[A_MONO][i]; - } + { + somme += ctx->input->spectrum[A_MONO][i]; + } somme /= L; /* FIXME */ @@ -112,11 +104,11 @@ for ( ; ((i < 256) && (val > 0)); (i++, l -= K)) { ctx->cf->cur->colors[i].col.r = - PMIN((u_short)(ctx->cf->dst->colors[i].col.r + l), (u_short)(255)); + PMIN((u_short)(ctx->cf->dst->colors[i].col.r + l), (u_short)(255)); ctx->cf->cur->colors[i].col.g = - PMIN((u_short)(ctx->cf->dst->colors[i].col.g + l), (u_short)(255)); + PMIN((u_short)(ctx->cf->dst->colors[i].col.g + l), (u_short)(255)); ctx->cf->cur->colors[i].col.b = - PMIN((u_short)(ctx->cf->dst->colors[i].col.b + l), (u_short)(255)); + PMIN((u_short)(ctx->cf->dst->colors[i].col.b + l), (u_short)(255)); } for ( ; i < 256; i++) { diff -Nru lebiniou-3.31/plugins/stable/main/ripple/Makefile.am lebiniou-3.40/plugins/stable/main/ripple/Makefile.am --- lebiniou-3.31/plugins/stable/main/ripple/Makefile.am 2018-11-27 13:50:08.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/ripple/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -2,5 +2,6 @@ plugin_PROGRAMS = ripple.so ripple_so_SOURCES = ripple.c -ripple_so_LDFLAGS = @PLUGIN_LDFLAGS@ -ripple_so_CFLAGS = @PLUGIN_CFLAGS@ +ripple_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +ripple_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +ripple_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/ripple/Makefile.in lebiniou-3.40/plugins/stable/main/ripple/Makefile.in --- lebiniou-3.31/plugins/stable/main/ripple/Makefile.in 2019-04-14 11:52:33.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/ripple/Makefile.in 2020-01-23 13:57:17.000000000 +0000 @@ -104,7 +104,7 @@ PROGRAMS = $(plugin_PROGRAMS) am_ripple_so_OBJECTS = ripple_so-ripple.$(OBJEXT) ripple_so_OBJECTS = $(am_ripple_so_OBJECTS) -ripple_so_LDADD = $(LDADD) +ripple_so_DEPENDENCIES = ripple_so_LINK = $(CCLD) $(ripple_so_CFLAGS) $(CFLAGS) \ $(ripple_so_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -216,6 +216,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -243,6 +245,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -257,7 +260,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -319,8 +325,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/main/ripple ripple_so_SOURCES = ripple.c -ripple_so_LDFLAGS = @PLUGIN_LDFLAGS@ -ripple_so_CFLAGS = @PLUGIN_CFLAGS@ +ripple_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +ripple_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +ripple_so_LDADD = @PLUGIN_LDADD@ all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/main/ripple/ripple.c lebiniou-3.40/plugins/stable/main/ripple/ripple.c --- lebiniou-3.31/plugins/stable/main/ripple/ripple.c 2019-04-05 20:39:14.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/ripple/ripple.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,6 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel + * Copyright 2019-2020 Laurent Marsac * * This file is part of lebiniou. * @@ -19,22 +20,46 @@ #include "context.h" - u_long id = 957202985; -u_long options = BE_WARP|BE_LENS; +uint32_t version = 0; +u_long options = BE_WARP | BE_LENS; char desc[] = "Ripple effect"; -/* - * FIXME precompute the tables at startup - * or when parameters will change --oliv3 - */ +#define RIPPLE_SIZE_MAX 50 + +static float *ripple = NULL; + + +int8_t +create(Context_t *ctx) +{ + ripple = xcalloc(RIPPLE_SIZE_MAX * HEIGHT * WIDTH, sizeof(float)); + + const float s = sqrtf((WIDTH * WIDTH) + (HEIGHT * HEIGHT)); + + for (int n = 0; n < RIPPLE_SIZE_MAX; n++) + for (int j = -HHEIGHT; j < HHEIGHT; j++) + for (int i = -HWIDTH; i < HWIDTH; i++) { + float dist = sqrtf((i * i) + (j * j)); + float sd = sinf(dist * M_PI * n / s); + ripple[n * HEIGHT * WIDTH + (j + HHEIGHT) * WIDTH + (i + HWIDTH)] = sd; + } + + return 1; +} + + +void +destroy(Context_t *ctx) +{ + xfree(ripple); +} void run(Context_t *ctx) { short j, i; - const float s = sqrtf((WIDTH * WIDTH) + (HEIGHT * HEIGHT)); const float zoom_fact = 0.9; const float ripple_fact = 0.1; static u_short ripple_size = 8; @@ -47,13 +72,11 @@ Buffer8_clear_border(src); for (j = -HHEIGHT; j < HHEIGHT; j++) { - for (i = -HWIDTH; i < HWIDTH; i++) { - float dist = sqrtf((i*i) + (j*j)), sd; - int si=0, sj=0; + for (i = -HWIDTH; i < HWIDTH; i++) { - dist *= M_PI * ripple_size / s; - sd = sinf(dist); + int si = 0, sj = 0; + float sd = ripple[ripple_size * HEIGHT * WIDTH + (j + HHEIGHT) * WIDTH + (i + HWIDTH)]; si = (int)(di * (zoom_fact + (ripple_fact * sd))); sj = (int)(dj * (zoom_fact + (ripple_fact * sd))); diff -Nru lebiniou-3.31/plugins/stable/main/roscillo/Makefile.am lebiniou-3.40/plugins/stable/main/roscillo/Makefile.am --- lebiniou-3.31/plugins/stable/main/roscillo/Makefile.am 2018-11-27 13:50:08.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/roscillo/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -2,5 +2,6 @@ plugin_PROGRAMS = roscillo.so roscillo_so_SOURCES = roscillo.c -roscillo_so_LDFLAGS = @PLUGIN_LDFLAGS@ -roscillo_so_CFLAGS = @PLUGIN_CFLAGS@ +roscillo_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +roscillo_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +roscillo_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/roscillo/Makefile.in lebiniou-3.40/plugins/stable/main/roscillo/Makefile.in --- lebiniou-3.31/plugins/stable/main/roscillo/Makefile.in 2019-04-14 11:52:33.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/roscillo/Makefile.in 2020-01-23 13:57:17.000000000 +0000 @@ -104,7 +104,7 @@ PROGRAMS = $(plugin_PROGRAMS) am_roscillo_so_OBJECTS = roscillo_so-roscillo.$(OBJEXT) roscillo_so_OBJECTS = $(am_roscillo_so_OBJECTS) -roscillo_so_LDADD = $(LDADD) +roscillo_so_DEPENDENCIES = roscillo_so_LINK = $(CCLD) $(roscillo_so_CFLAGS) $(CFLAGS) \ $(roscillo_so_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -216,6 +216,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -243,6 +245,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -257,7 +260,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -319,8 +325,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/main/roscillo roscillo_so_SOURCES = roscillo.c -roscillo_so_LDFLAGS = @PLUGIN_LDFLAGS@ -roscillo_so_CFLAGS = @PLUGIN_CFLAGS@ +roscillo_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +roscillo_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +roscillo_so_LDADD = @PLUGIN_LDADD@ all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/main/roscillo/roscillo.c lebiniou-3.40/plugins/stable/main/roscillo/roscillo.c --- lebiniou-3.31/plugins/stable/main/roscillo/roscillo.c 2019-04-05 20:39:14.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/roscillo/roscillo.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -18,9 +18,11 @@ */ #include "oscillo.h" +#include "parameters.h" u_long id = 946482109; +uint32_t version = 0; u_long options = BE_SFX2D; u_long mode = OVERLAY; char desc[] = "Rotating oscilloscope"; @@ -32,7 +34,37 @@ #define RADIUS (HMINSCREEN * 0.85) static float alpha = 0.0; -static int connect = 1; +static int roscillo_connect = 1; + +static float volume_scale = 0; +static float speed = 0; + +json_t * +get_parameters() +{ + json_t *params = json_object(); + plugin_parameters_add_double(params, BPP_VOLUME_SCALE, volume_scale, -0.01, 0.01); + plugin_parameters_add_double(params, BPP_SPEED, speed, -0.2, 0.2); + + return params; +} + + +void +set_parameters(const json_t *in_parameters) +{ + plugin_parameter_parse_float_range(in_parameters, BPP_VOLUME_SCALE, &volume_scale, 0, 100); + plugin_parameter_parse_float_range(in_parameters, BPP_SPEED, &speed, -100, 100); +} + + +json_t * +parameters(const json_t *in_parameters) +{ + set_parameters(in_parameters); + + return get_parameters(); +} static void @@ -46,7 +78,7 @@ P->origin.x = CENTERX - RADIUS * cos (alpha); P->origin.y = CENTERY - RADIUS * sin (alpha); - t.v_j_factor = HMAXY * 0.85; + t.v_j_factor = HMAXY * volume_scale; t.v_i.x = (2.0 / (float)(P->size - 1) * (float)RADIUS) * cos (alpha); t.v_i.y = (2.0 / (float)(P->size - 1) * (float)RADIUS) * sin (alpha); @@ -58,15 +90,13 @@ } -void +int8_t create(Context_t *ctx) { - if (ctx->input == NULL) { - options |= BEQ_DISABLED; - } else { - P = Porteuse_new(ctx->input->size, A_MONO); - init (); - } + P = Porteuse_new(ctx->input->size, A_MONO); + init (); + + return 1; } @@ -82,6 +112,9 @@ void on_switch_on(Context_t *ctx) { + /* Initialize parameters */ + volume_scale = 0.85; + speed = 1; /* connect = b_rand_boolean(); */ } @@ -90,10 +123,10 @@ run(Context_t *ctx) { Buffer8_clear(passive_buffer(ctx)); - Porteuse_draw(P, ctx, connect); + Porteuse_draw(P, ctx, roscillo_connect); /* FIXME hardcoded */ - alpha += 0.005; + alpha += 0.005 * speed; if (alpha > 2*M_PI) { alpha -= 2*M_PI; diff -Nru lebiniou-3.31/plugins/stable/main/rotors/Makefile.am lebiniou-3.40/plugins/stable/main/rotors/Makefile.am --- lebiniou-3.31/plugins/stable/main/rotors/Makefile.am 2018-11-27 13:50:08.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/rotors/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -2,5 +2,6 @@ plugin_PROGRAMS = rotors.so rotors_so_SOURCES = rotors.c -rotors_so_LDFLAGS = @PLUGIN_LDFLAGS@ -rotors_so_CFLAGS = @PLUGIN_CFLAGS@ +rotors_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +rotors_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +rotors_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/rotors/Makefile.in lebiniou-3.40/plugins/stable/main/rotors/Makefile.in --- lebiniou-3.31/plugins/stable/main/rotors/Makefile.in 2019-04-14 11:52:33.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/rotors/Makefile.in 2020-01-23 13:57:17.000000000 +0000 @@ -104,7 +104,7 @@ PROGRAMS = $(plugin_PROGRAMS) am_rotors_so_OBJECTS = rotors_so-rotors.$(OBJEXT) rotors_so_OBJECTS = $(am_rotors_so_OBJECTS) -rotors_so_LDADD = $(LDADD) +rotors_so_DEPENDENCIES = rotors_so_LINK = $(CCLD) $(rotors_so_CFLAGS) $(CFLAGS) \ $(rotors_so_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -216,6 +216,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -243,6 +245,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -257,7 +260,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -319,8 +325,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/main/rotors rotors_so_SOURCES = rotors.c -rotors_so_LDFLAGS = @PLUGIN_LDFLAGS@ -rotors_so_CFLAGS = @PLUGIN_CFLAGS@ +rotors_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +rotors_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +rotors_so_LDADD = @PLUGIN_LDADD@ all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/main/rotors/rotors.c lebiniou-3.40/plugins/stable/main/rotors/rotors.c --- lebiniou-3.31/plugins/stable/main/rotors/rotors.c 2019-04-05 20:39:14.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/rotors/rotors.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -24,8 +24,10 @@ */ #include "context.h" +#include "parameters.h" u_long id = 949178536; +uint32_t version = 0; u_long options = BE_GFX; u_long mode = OVERLAY; char desc[] = "Rotors effect"; @@ -56,7 +58,7 @@ static _Complex float ci; static float min_rnd_factor, max_rnd_factor; -static u_short length, nb_rotors, min_color, max_color; +static u_short nb_rotors, min_color, max_color; static float freq_base_moy, freq_base_ect; static float freq_var_moy, freq_var_ect; static float ampl_var_moy, ampl_var_ect; @@ -66,6 +68,50 @@ static Rotor tab[MAX_ROTORS]; static float time_step; +static int nb_min_rotors = 0; +static int length = 0; +static float speed = 0; +static float scale = 0; + +static void post_init(); + +json_t * +get_parameters() +{ + json_t *params = json_object(); + plugin_parameters_add_int(params, BPP_NB_MIN_ROTORS, nb_min_rotors, -1, 1); + plugin_parameters_add_double(params, BPP_PROBA_VISIBLE, proba_visible, -0.01, 0.01); + plugin_parameters_add_int(params, BPP_LENGTH, length, -10, 10); + plugin_parameters_add_double(params, BPP_SPEED, speed, -0.01, 0.01); + plugin_parameters_add_double(params, BPP_SCALE, scale, -0.01, 0.01); + + return params; +} + + +void +set_parameters(const json_t *in_parameters) +{ + int reload = 0; + reload |= plugin_parameter_parse_int_range(in_parameters, BPP_NB_MIN_ROTORS, &nb_min_rotors, 0, 1) & PLUGIN_PARAMETER_CHANGED; + reload |= plugin_parameter_parse_float_range(in_parameters, BPP_PROBA_VISIBLE, &proba_visible, 0, 1) & PLUGIN_PARAMETER_CHANGED; + plugin_parameter_parse_int_range(in_parameters, BPP_LENGTH, &length, 10, 1000); + plugin_parameter_parse_float_range(in_parameters, BPP_SPEED, &speed, -10, 10); + reload |= plugin_parameter_parse_float_range(in_parameters, BPP_SCALE, &scale, 0, 2) & PLUGIN_PARAMETER_CHANGED; + + if (reload) { + post_init(); + } +} + + +json_t * +parameters(const json_t *in_parameters) +{ + set_parameters(in_parameters); + + return get_parameters(); +} /* note: this is _NOT_ a perfect binary-tree, * ie a node might have 1 or 2 sons @@ -143,7 +189,7 @@ build() { build_rotor_tree(); - init_rotor_tree(tab, MINSCREEN); + init_rotor_tree(tab, scale * MINSCREEN); } @@ -172,7 +218,7 @@ static inline Pixel_t -couleur() +color() { float d = drand48() * (max_color - min_color) + min_color; return (Pixel_t)d; @@ -194,6 +240,21 @@ } } VERBOSE(printf(" done\n")); + + /* Setting at least 1 rotor, if asked */ + if (nb_min_rotors == 1) { + uint8_t n_visible = 0; + for (i = 7; i < MAX_ROTORS; i++) + if (tab[i].visible) { + n_visible++; + } + + if (n_visible == 0) { + uint8_t v = b_rand_int_range(7, MAX_ROTORS-1); + VERBOSE(printf("set %d visible\n", v)); + tab[v].visible = 1; + } + } } @@ -203,7 +264,7 @@ int i; for (i = 0; i < nb_rotors; i++) { - tab[i].coul = couleur(); + tab[i].coul = color(); tab[i].freq = norm_freq_base(); tab[i].freq_var = norm_freq(); tab[i].ampl_var = norm_ampl(); @@ -215,14 +276,13 @@ } -void +int8_t create(Context_t *ctx) { ci = cexp(I*M_PI/2); /* printf("Rotors: %f+%f*i\n", creal(ci), cimag(ci)); */ nb_rotors = 16; - length = 200; min_color = 200; max_color = 250; min_rnd_factor = 0.3; @@ -237,6 +297,8 @@ time_step = 0.00001; post_init(); + + return 1; } @@ -247,8 +309,7 @@ float f, arg, alpha; _Complex float pos_rel; - f = rotor->freq - * exp(rotor->ampl_var * cos(2 * M_PI * rotor->freq_var * rotor_time)); + f = rotor->freq * exp(rotor->ampl_var * cos(2 * M_PI * rotor->freq_var * rotor_time)); arg = f * rotor_time; arg -= (long)(arg); alpha = 2 * M_PI * arg; @@ -279,7 +340,6 @@ short x, y; x = (short)(creal(tab[i].centre) + CENTERX); y = (short)(cimag(tab[i].centre) + CENTERY); - /* printf ("x= %d\ty= %d\n", x, y);*/ #if 1 set_pixel(dst, x, y, tab[i].coul); @@ -297,7 +357,7 @@ Buffer8_clear(passive_buffer(ctx)); for (i = 0; i < length; i++) { - rotor_time += time_step; + rotor_time += time_step * speed; refresh(tab); display(ctx); } @@ -326,5 +386,10 @@ void on_switch_on(Context_t *ctx) { + nb_min_rotors = 1; + proba_visible = 0.33; + length = 200; + speed = 1; + scale = 1; post_init(); } diff -Nru lebiniou-3.31/plugins/stable/main/rotors_freq/Makefile.am lebiniou-3.40/plugins/stable/main/rotors_freq/Makefile.am --- lebiniou-3.31/plugins/stable/main/rotors_freq/Makefile.am 1970-01-01 00:00:00.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/rotors_freq/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -0,0 +1,7 @@ +plugindir = @libdir@/lebiniou/plugins/main/rotors_freq +plugin_PROGRAMS = rotors_freq.so + +rotors_freq_so_SOURCES = rotors_freq.c +rotors_freq_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +rotors_freq_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +rotors_freq_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/rotors_freq/Makefile.in lebiniou-3.40/plugins/stable/main/rotors_freq/Makefile.in --- lebiniou-3.31/plugins/stable/main/rotors_freq/Makefile.in 1970-01-01 00:00:00.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/rotors_freq/Makefile.in 2020-01-23 13:57:17.000000000 +0000 @@ -0,0 +1,665 @@ +# Makefile.in generated by automake 1.16.1 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994-2018 Free Software Foundation, Inc. + +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +VPATH = @srcdir@ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +target_triplet = @target@ +plugin_PROGRAMS = rotors_freq.so$(EXEEXT) +subdir = plugins/stable/main/rotors_freq +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +am__installdirs = "$(DESTDIR)$(plugindir)" +PROGRAMS = $(plugin_PROGRAMS) +am_rotors_freq_so_OBJECTS = rotors_freq_so-rotors_freq.$(OBJEXT) +rotors_freq_so_OBJECTS = $(am_rotors_freq_so_OBJECTS) +rotors_freq_so_DEPENDENCIES = +rotors_freq_so_LINK = $(CCLD) $(rotors_freq_so_CFLAGS) $(CFLAGS) \ + $(rotors_freq_so_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) +depcomp = $(SHELL) $(top_srcdir)/depcomp +am__maybe_remake_depfiles = depfiles +am__depfiles_remade = ./$(DEPDIR)/rotors_freq_so-rotors_freq.Po +am__mv = mv -f +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = +CCLD = $(CC) +LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = +SOURCES = $(rotors_freq_so_SOURCES) +DIST_SOURCES = $(rotors_freq_so_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +ALSA_CFLAGS = @ALSA_CFLAGS@ +ALSA_LIBS = @ALSA_LIBS@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AVUTIL_CFLAGS = @AVUTIL_CFLAGS@ +AVUTIL_LIBS = @AVUTIL_LIBS@ +AWK = @AWK@ +BINIOU_VERSION = @BINIOU_VERSION@ +CACA_CFLAGS = @CACA_CFLAGS@ +CACA_LIBS = @CACA_LIBS@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DPKG_BUILDFLAGS_CHECK = @DPKG_BUILDFLAGS_CHECK@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +ESD_CFLAGS = @ESD_CFLAGS@ +ESD_LIBS = @ESD_LIBS@ +EXEEXT = @EXEEXT@ +FFTW3_CFLAGS = @FFTW3_CFLAGS@ +FFTW3_LIBS = @FFTW3_LIBS@ +FT2_CFLAGS = @FT2_CFLAGS@ +FT2_LIBS = @FT2_LIBS@ +GETOPT_LONG_LIBS = @GETOPT_LONG_LIBS@ +GLIB_CFLAGS = @GLIB_CFLAGS@ +GLIB_LIBS = @GLIB_LIBS@ +GLU_CFLAGS = @GLU_CFLAGS@ +GLU_LIBS = @GLU_LIBS@ +GREP = @GREP@ +INPUT_PLUGINS = @INPUT_PLUGINS@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +JACK_CFLAGS = @JACK_CFLAGS@ +JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ +LDFLAGS = @LDFLAGS@ +LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ +LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ +LEBINIOU_SCHEMES_FILE = @LEBINIOU_SCHEMES_FILE@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ +MagickWand_CFLAGS = @MagickWand_CFLAGS@ +MagickWand_LIBS = @MagickWand_LIBS@ +OBJEXT = @OBJEXT@ +OSD_FONT = @OSD_FONT@ +OSD_PTSIZE = @OSD_PTSIZE@ +OUTPUT_PLUGINS = @OUTPUT_PLUGINS@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ +PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ +PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ +PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ +PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ +SDL2_CFLAGS = @SDL2_CFLAGS@ +SDL2_LIBS = @SDL2_LIBS@ +SDL2_ttf_CFLAGS = @SDL2_ttf_CFLAGS@ +SDL2_ttf_LIBS = @SDL2_ttf_LIBS@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +SNDFILE_CFLAGS = @SNDFILE_CFLAGS@ +SNDFILE_LIBS = @SNDFILE_LIBS@ +STRIP = @STRIP@ +SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ +SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ +VERSION = @VERSION@ +XML2_CFLAGS = @XML2_CFLAGS@ +XML2_LIBS = @XML2_LIBS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_CC = @ac_ct_CC@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +have_pandoc = @have_pandoc@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +runstatedir = @runstatedir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target = @target@ +target_alias = @target_alias@ +target_cpu = @target_cpu@ +target_os = @target_os@ +target_vendor = @target_vendor@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +plugindir = @libdir@/lebiniou/plugins/main/rotors_freq +rotors_freq_so_SOURCES = rotors_freq.c +rotors_freq_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +rotors_freq_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +rotors_freq_so_LDADD = @PLUGIN_LDADD@ +all: all-am + +.SUFFIXES: +.SUFFIXES: .c .o .obj +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign plugins/stable/main/rotors_freq/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --foreign plugins/stable/main/rotors_freq/Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): +install-pluginPROGRAMS: $(plugin_PROGRAMS) + @$(NORMAL_INSTALL) + @list='$(plugin_PROGRAMS)'; test -n "$(plugindir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \ + fi; \ + for p in $$list; do echo "$$p $$p"; done | \ + sed 's/$(EXEEXT)$$//' | \ + while read p p1; do if test -f $$p \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ + done | \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ + -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ + sed 'N;N;N;s,\n, ,g' | \ + $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ + { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ + if ($$2 == $$4) files[d] = files[d] " " $$1; \ + else { print "f", $$3 "/" $$4, $$1; } } \ + END { for (d in files) print "f", d, files[d] }' | \ + while read type dir files; do \ + if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ + test -z "$$files" || { \ + echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(plugindir)$$dir'"; \ + $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(plugindir)$$dir" || exit $$?; \ + } \ + ; done + +uninstall-pluginPROGRAMS: + @$(NORMAL_UNINSTALL) + @list='$(plugin_PROGRAMS)'; test -n "$(plugindir)" || list=; \ + files=`for p in $$list; do echo "$$p"; done | \ + sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ + -e 's/$$/$(EXEEXT)/' \ + `; \ + test -n "$$list" || exit 0; \ + echo " ( cd '$(DESTDIR)$(plugindir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(plugindir)" && rm -f $$files + +clean-pluginPROGRAMS: + -test -z "$(plugin_PROGRAMS)" || rm -f $(plugin_PROGRAMS) + +rotors_freq.so$(EXEEXT): $(rotors_freq_so_OBJECTS) $(rotors_freq_so_DEPENDENCIES) $(EXTRA_rotors_freq_so_DEPENDENCIES) + @rm -f rotors_freq.so$(EXEEXT) + $(AM_V_CCLD)$(rotors_freq_so_LINK) $(rotors_freq_so_OBJECTS) $(rotors_freq_so_LDADD) $(LIBS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rotors_freq_so-rotors_freq.Po@am__quote@ # am--include-marker + +$(am__depfiles_remade): + @$(MKDIR_P) $(@D) + @echo '# dummy' >$@-t && $(am__mv) $@-t $@ + +am--depfiles: $(am__depfiles_remade) + +.c.o: +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< + +.c.obj: +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + +rotors_freq_so-rotors_freq.o: rotors_freq.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rotors_freq_so_CFLAGS) $(CFLAGS) -MT rotors_freq_so-rotors_freq.o -MD -MP -MF $(DEPDIR)/rotors_freq_so-rotors_freq.Tpo -c -o rotors_freq_so-rotors_freq.o `test -f 'rotors_freq.c' || echo '$(srcdir)/'`rotors_freq.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/rotors_freq_so-rotors_freq.Tpo $(DEPDIR)/rotors_freq_so-rotors_freq.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='rotors_freq.c' object='rotors_freq_so-rotors_freq.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rotors_freq_so_CFLAGS) $(CFLAGS) -c -o rotors_freq_so-rotors_freq.o `test -f 'rotors_freq.c' || echo '$(srcdir)/'`rotors_freq.c + +rotors_freq_so-rotors_freq.obj: rotors_freq.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rotors_freq_so_CFLAGS) $(CFLAGS) -MT rotors_freq_so-rotors_freq.obj -MD -MP -MF $(DEPDIR)/rotors_freq_so-rotors_freq.Tpo -c -o rotors_freq_so-rotors_freq.obj `if test -f 'rotors_freq.c'; then $(CYGPATH_W) 'rotors_freq.c'; else $(CYGPATH_W) '$(srcdir)/rotors_freq.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/rotors_freq_so-rotors_freq.Tpo $(DEPDIR)/rotors_freq_so-rotors_freq.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='rotors_freq.c' object='rotors_freq_so-rotors_freq.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rotors_freq_so_CFLAGS) $(CFLAGS) -c -o rotors_freq_so-rotors_freq.obj `if test -f 'rotors_freq.c'; then $(CYGPATH_W) 'rotors_freq.c'; else $(CYGPATH_W) '$(srcdir)/rotors_freq.c'; fi` + +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags + +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + set x; \ + here=`pwd`; \ + $(am__define_uniq_tagged_files); \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ + fi +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ + test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(PROGRAMS) +installdirs: + for dir in "$(DESTDIR)$(plugindir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-pluginPROGRAMS mostlyclean-am + +distclean: distclean-am + -rm -f ./$(DEPDIR)/rotors_freq_so-rotors_freq.Po + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-tags + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: install-pluginPROGRAMS + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f ./$(DEPDIR)/rotors_freq_so-rotors_freq.Po + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-compile mostlyclean-generic + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-pluginPROGRAMS + +.MAKE: install-am install-strip + +.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \ + clean-generic clean-pluginPROGRAMS cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-pluginPROGRAMS install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \ + ps ps-am tags tags-am uninstall uninstall-am \ + uninstall-pluginPROGRAMS + +.PRECIOUS: Makefile + + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -Nru lebiniou-3.31/plugins/stable/main/rotors_freq/rotors_freq.c lebiniou-3.40/plugins/stable/main/rotors_freq/rotors_freq.c --- lebiniou-3.31/plugins/stable/main/rotors_freq/rotors_freq.c 1970-01-01 00:00:00.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/rotors_freq/rotors_freq.c 2020-01-22 18:33:57.000000000 +0000 @@ -0,0 +1,395 @@ +/* + * Copyright 1994-2020 Olivier Girondel + * Copyright 2019-2020 Laurent Marsac + * + * This file is part of lebiniou. + * + * lebiniou 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 of the License, or + * (at your option) any later version. + * + * lebiniou 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 lebiniou. If not, see . + */ + +/* + * This plugin based on rotors, plus length depending on frequency + */ + +#include "context.h" +#include "parameters.h" + +u_long id = 1567343672; +uint32_t version = 0; +u_long options = BE_GFX | BE_SFX2D; +u_long mode = OVERLAY; +char dname[] = "Rotors freq"; +char desc[] = "Rotors effect depending on frequency"; + + +#define MAX_ROTORS 16 + +typedef struct Rotor { + struct Rotor *fg, *fd; + _Complex float centre; + float rayon, freq, freq_var, ampl_var, freq_coul; + u_char visible; + Pixel_t coul; +} Rotor; + + +static _Complex float ci; +static float min_rnd_factor, max_rnd_factor; +static u_short nb_rotors, min_color, max_color; +static float freq_base_moy, freq_base_ect; +static float freq_var_moy, freq_var_ect; +static float ampl_var_moy, ampl_var_ect; +static float proba_visible, rotor_time; +static int max_prof; + +static Rotor tab[MAX_ROTORS]; +static float time_step; + +static int nb_min_rotors = 0; +static float length_min = 0; +static float length_max = 0; +static float spectrum_id_factor = 0; +static float speed = 0; +static float scale = 0; + +static void post_init(); + +json_t * +get_parameters() +{ + json_t *params = json_object(); + plugin_parameters_add_int(params, BPP_NB_MIN_ROTORS, nb_min_rotors, -1, 1); + plugin_parameters_add_double(params, BPP_PROBA_VISIBLE, proba_visible, -0.01, 0.01); + plugin_parameters_add_double(params, BPP_LENGTH_MIN, length_min, -0.01, 0.01); + plugin_parameters_add_double(params, BPP_LENGTH_MAX, length_max, -0.01, 0.01); + plugin_parameters_add_double(params, BPP_SPECTRUM_ID_FACTOR, spectrum_id_factor, -0.01, 0.01); + plugin_parameters_add_double(params, BPP_SPEED, speed, -0.01, 0.01); + plugin_parameters_add_double(params, BPP_SCALE, scale, -0.01, 0.01); + + return params; +} + + +void +set_parameters(const json_t *in_parameters) +{ + int reload = 0; + reload |= plugin_parameter_parse_int_range(in_parameters, BPP_NB_MIN_ROTORS, &nb_min_rotors, 0, 1) & PLUGIN_PARAMETER_CHANGED; + reload |= plugin_parameter_parse_float_range(in_parameters, BPP_PROBA_VISIBLE, &proba_visible, 0, 1) & PLUGIN_PARAMETER_CHANGED; + + float __length_min = length_min, __length_max = length_max; + plugin_parameter_parse_float_range(in_parameters, BPP_LENGTH_MIN, &__length_min, 0.01, 0.2); + plugin_parameter_parse_float_range(in_parameters, BPP_LENGTH_MAX, &__length_max, 0.02, 10); + if (__length_min <= __length_max) { + length_min = __length_min; + length_max = __length_max; + } + + plugin_parameter_parse_float_range(in_parameters, BPP_SPECTRUM_ID_FACTOR, &spectrum_id_factor, 0, 20); + plugin_parameter_parse_float_range(in_parameters, BPP_SPEED, &speed, -10, 10); + reload |= plugin_parameter_parse_float_range(in_parameters, BPP_SCALE, &scale, 0, 2) & PLUGIN_PARAMETER_CHANGED; + + if (reload) { + post_init(); + } +} + + +json_t * +parameters(const json_t *in_parameters) +{ + set_parameters(in_parameters); + + return get_parameters(); +} + +/* note: this is _NOT_ a perfect binary-tree, + * ie a node might have 1 or 2 sons + */ +static int +prof_rotor_tree(Rotor *rotor) +{ + int pg, pd; + + if (rotor == NULL) { + return 0; + } + + pg = prof_rotor_tree(rotor->fg); + pd = prof_rotor_tree(rotor->fd); + + return 1 + ((pg > pd) ? pg : pd); +} + + +static void +build_rotor_tree() +{ + int i; + int *arite; + + for (i = 0; i < nb_rotors; i++) { + tab[i].fg = tab[i].fd = NULL; + } + + arite = xcalloc(nb_rotors, sizeof(int)); + arite[0] = 2; + + for (i = 1; i < nb_rotors; i++) { + /* Tirage au sort du pere a la roulette */ + int hasard = (int)(drand48 () * i), j = 0; + + while ((j < i) && (hasard >= 0)) { + hasard -= arite[j]; + j++; + } + j--; + + /* Le resultat de la roulette est dans 'j' */ + arite[j]--; + if (tab[j].fg == NULL) { + tab[j].fg = tab + i; + } else if (tab[j].fd == NULL) { + tab[j].fd = tab + i; + } + arite[i] = 2; + } + + xfree(arite); + max_prof = prof_rotor_tree(tab); +} + + +static void +init_rotor_tree(Rotor *rotor, float max_ray) +{ + int prof = prof_rotor_tree(rotor); + + rotor->rayon = (drand48() * (max_rnd_factor - min_rnd_factor) + min_rnd_factor) * (float)max_ray / (float)prof; + if (rotor->fg != NULL) { + init_rotor_tree(rotor->fg, max_ray - rotor->rayon); + } + if (rotor->fd != NULL) { + init_rotor_tree(rotor->fd, max_ray - rotor->rayon); + } +} + + +static void +build() +{ + build_rotor_tree(); + init_rotor_tree(tab, scale * MINSCREEN); +} + + +static inline float +norm_freq() +{ + float d = (float)(drand48() * 2.0 - 1.0); + return freq_var_moy + freq_var_ect * d; +} + + +static inline float +norm_ampl() +{ + float d = (float)(drand48() * 2.0 - 1.0); + return ampl_var_moy + ampl_var_ect * d; +} + + +static inline float +norm_freq_base() +{ + float d = (float)(drand48() * 2.0 - 1.0); + return freq_base_moy + freq_base_ect * d; +} + + +static inline Pixel_t +color() +{ + float d = drand48() * (max_color - min_color) + min_color; + return (Pixel_t)d; +} + + +static void +set_random_visible() +{ + int i; + + VERBOSE(printf("[r] Building rotors: ")); + for (i = 0; i < nb_rotors; i++) { + tab[i].visible = (drand48() <= proba_visible); + if (tab[i].visible) { + VERBOSE(printf("+")); + } else { + VERBOSE(printf("-")); + } + } + VERBOSE(printf(" done\n")); + + /* Setting at least 1 rotor, if asked */ + if (nb_min_rotors == 1) { + uint8_t n_visible = 0; + for (i = 7; i < MAX_ROTORS; i++) + if (tab[i].visible) { + n_visible++; + } + + if (n_visible == 0) { + uint8_t v = b_rand_int_range(7, MAX_ROTORS-1); + VERBOSE(printf("set %d visible\n", v)); + tab[v].visible = 1; + } + } +} + + +static void +post_init() +{ + int i; + + for (i = 0; i < nb_rotors; i++) { + tab[i].coul = color(); + tab[i].freq = norm_freq_base(); + tab[i].freq_var = norm_freq(); + tab[i].ampl_var = norm_ampl(); + } + set_random_visible(); + + rotor_time = 0; + build(); +} + + +int8_t +create(Context_t *ctx) +{ + ci = cexp(I*M_PI/2); + /* printf("Rotors: %f+%f*i\n", creal(ci), cimag(ci)); */ + + nb_rotors = 16; + min_color = 200; + max_color = 250; + min_rnd_factor = 0.3; + max_rnd_factor = 2; + freq_base_moy = 0; + freq_base_ect = 70; + freq_var_moy = 0.6; + freq_var_ect = 0.005; + ampl_var_moy = 0; + ampl_var_ect = 0.1; + proba_visible = 0.333; + time_step = 0.00001; + + post_init(); + + return 1; +} + + +static void +refresh(Rotor *rotor) +{ + if ((rotor->fg != NULL) || (rotor->fd != NULL)) { + float f, arg, alpha; + _Complex float pos_rel; + + f = rotor->freq * exp(rotor->ampl_var * cos(2 * M_PI * rotor->freq_var * rotor_time)); + arg = f * rotor_time; + arg -= (long)(arg); + alpha = 2 * M_PI * arg; + + pos_rel = rotor->rayon * cexp(ci * alpha); + + if (rotor->fg != NULL) { + rotor->fg->centre = rotor->centre + pos_rel; + refresh(rotor->fg); + } + if (rotor->fd != NULL) { + rotor->fd->centre = rotor->centre - pos_rel; + refresh(rotor->fd); + } + } +} + + +static void +display(Context_t *ctx) +{ + u_short i; + Buffer8_t *dst = passive_buffer(ctx); + + for (i = 7; i < MAX_ROTORS; i++) + /* pas la racine ni les 2 premiers niveaux -> 1+2+4 rotors non affiches */ + if (tab[i].visible) { + short x, y; + x = (short)(creal(tab[i].centre) + CENTERX); + y = (short)(cimag(tab[i].centre) + CENTERY); + +#if 1 + set_pixel(dst, x, y, tab[i].coul); +#else /* testing neg_pixel, if it's nice we can cleanup tab[i].coul etc */ + neg_pixel(dst, x, y); +#endif + } +} + +void +run(Context_t *ctx) +{ + uint16_t original_fft_size = 513; /* FFT size used when below parameters were set */ + u_short length_min_px = round(length_min * WIDTH); + u_short length_max_px = round(length_max * WIDTH); + double spectrum_low_treshold_factor = 0.1; /* spectrum value higher than this treshold will be used, between 0 and 1 */ + + pthread_mutex_lock(&ctx->input->mutex); + + u_short average_freq_id = compute_avg_freq_id(ctx->input, spectrum_low_treshold_factor); + + /* scale average frequency id depending of input->spectrum_size */ + average_freq_id = round((double)average_freq_id * (double)original_fft_size / (double)ctx->input->spectrum_size); + + /* compute length based on average frequency */ + uint16_t length = length_max_px - MIN(average_freq_id * spectrum_id_factor, length_max_px); + length = MAX(MIN(length, length_max_px), length_min_px); + + pthread_mutex_unlock(&ctx->input->mutex); + + Buffer8_clear(passive_buffer(ctx)); + + for (uint16_t i = 0; i < length; i++) { + rotor_time += time_step * speed; + refresh(tab); + display(ctx); + } +} + + +void +on_switch_on(Context_t *ctx) +{ + nb_min_rotors = 1; + proba_visible = 0.33; + length_min = 0.01; + length_max = 0.2; + spectrum_id_factor = 8; + speed = 1; + scale = 1; + post_init(); +} diff -Nru lebiniou-3.31/plugins/stable/main/rp/Makefile.am lebiniou-3.40/plugins/stable/main/rp/Makefile.am --- lebiniou-3.31/plugins/stable/main/rp/Makefile.am 2018-11-27 13:50:08.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/rp/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -2,5 +2,6 @@ plugin_PROGRAMS = rp.so rp_so_SOURCES = rp.c -rp_so_LDFLAGS = @PLUGIN_LDFLAGS@ -rp_so_CFLAGS = @PLUGIN_CFLAGS@ +rp_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +rp_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +rp_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/rp/Makefile.in lebiniou-3.40/plugins/stable/main/rp/Makefile.in --- lebiniou-3.31/plugins/stable/main/rp/Makefile.in 2019-04-14 11:52:33.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/rp/Makefile.in 2020-01-23 13:57:17.000000000 +0000 @@ -104,7 +104,7 @@ PROGRAMS = $(plugin_PROGRAMS) am_rp_so_OBJECTS = rp_so-rp.$(OBJEXT) rp_so_OBJECTS = $(am_rp_so_OBJECTS) -rp_so_LDADD = $(LDADD) +rp_so_DEPENDENCIES = rp_so_LINK = $(CCLD) $(rp_so_CFLAGS) $(CFLAGS) $(rp_so_LDFLAGS) \ $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -216,6 +216,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -243,6 +245,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -257,7 +260,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -319,8 +325,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/main/rp rp_so_SOURCES = rp.c -rp_so_LDFLAGS = @PLUGIN_LDFLAGS@ -rp_so_CFLAGS = @PLUGIN_CFLAGS@ +rp_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +rp_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +rp_so_LDADD = @PLUGIN_LDADD@ all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/main/rp/rp.c lebiniou-3.40/plugins/stable/main/rp/rp.c --- lebiniou-3.31/plugins/stable/main/rp/rp.c 2019-04-05 20:39:14.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/rp/rp.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -20,6 +20,7 @@ #include "context.h" u_long id = 1088107667; +uint32_t version = 0; u_long options = BEQ_LAST; char dname[] = "Recurrence"; u_long mode = OVERLAY; @@ -69,15 +70,6 @@ void -create(Context_t *ctx) -{ - if (ctx->input == NULL) { - options |= BEQ_DISABLED; - } -} - - -void run(Context_t *ctx) { int ii, jj; @@ -89,21 +81,21 @@ for (jj = 0; jj < MINSCREEN; jj++) { int j = (int)((float)jj - / (float)MINSCREEN - * (float)(ctx->input->size-3.0)); + / (float)MINSCREEN + * (float)(ctx->input->size-3.0)); int last_i = -1; Pixel_t last_c = 0; for (ii = jj; ii < MINSCREEN; ii++) { Pixel_t c = last_c; int i = (int)((float)ii - / (float)MINSCREEN - * (float)(ctx->input->size-3.0)); + / (float)MINSCREEN + * (float)(ctx->input->size-3.0)); if (i != last_i) { - c = get_color(ctx->input, i, j); - last_i = i; - last_c = c; + c = get_color(ctx->input, i, j); + last_i = i; + last_c = c; } set_pixel_nc(dst, CENTERX-HMINSCREEN+ii+1, jj, c); diff -Nru lebiniou-3.31/plugins/stable/main/scroll_bt/Makefile.am lebiniou-3.40/plugins/stable/main/scroll_bt/Makefile.am --- lebiniou-3.31/plugins/stable/main/scroll_bt/Makefile.am 2018-11-27 13:50:08.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/scroll_bt/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -2,5 +2,6 @@ plugin_PROGRAMS = scroll_bt.so scroll_bt_so_SOURCES = scroll_bt.c -scroll_bt_so_LDFLAGS = @PLUGIN_LDFLAGS@ -scroll_bt_so_CFLAGS = @PLUGIN_CFLAGS@ +scroll_bt_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +scroll_bt_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +scroll_bt_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/scroll_bt/Makefile.in lebiniou-3.40/plugins/stable/main/scroll_bt/Makefile.in --- lebiniou-3.31/plugins/stable/main/scroll_bt/Makefile.in 2019-04-14 11:52:33.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/scroll_bt/Makefile.in 2020-01-23 13:57:17.000000000 +0000 @@ -104,7 +104,7 @@ PROGRAMS = $(plugin_PROGRAMS) am_scroll_bt_so_OBJECTS = scroll_bt_so-scroll_bt.$(OBJEXT) scroll_bt_so_OBJECTS = $(am_scroll_bt_so_OBJECTS) -scroll_bt_so_LDADD = $(LDADD) +scroll_bt_so_DEPENDENCIES = scroll_bt_so_LINK = $(CCLD) $(scroll_bt_so_CFLAGS) $(CFLAGS) \ $(scroll_bt_so_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -216,6 +216,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -243,6 +245,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -257,7 +260,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -319,8 +325,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/main/scroll_bt scroll_bt_so_SOURCES = scroll_bt.c -scroll_bt_so_LDFLAGS = @PLUGIN_LDFLAGS@ -scroll_bt_so_CFLAGS = @PLUGIN_CFLAGS@ +scroll_bt_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +scroll_bt_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +scroll_bt_so_LDADD = @PLUGIN_LDADD@ all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/main/scroll_bt/scroll_bt.c lebiniou-3.40/plugins/stable/main/scroll_bt/scroll_bt.c --- lebiniou-3.31/plugins/stable/main/scroll_bt/scroll_bt.c 2019-03-01 11:47:48.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/scroll_bt/scroll_bt.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -21,6 +21,7 @@ u_long id = 944684128; +uint32_t version = 0; u_long options = BE_SCROLL|BEQ_VER; char dname[] = "Scroll up"; char desc[] = "Scroll the screen upwards"; diff -Nru lebiniou-3.31/plugins/stable/main/scroll_lr/Makefile.am lebiniou-3.40/plugins/stable/main/scroll_lr/Makefile.am --- lebiniou-3.31/plugins/stable/main/scroll_lr/Makefile.am 2018-11-27 13:50:08.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/scroll_lr/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -2,5 +2,6 @@ plugin_PROGRAMS = scroll_lr.so scroll_lr_so_SOURCES = scroll_lr.c -scroll_lr_so_LDFLAGS = @PLUGIN_LDFLAGS@ -scroll_lr_so_CFLAGS = @PLUGIN_CFLAGS@ +scroll_lr_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +scroll_lr_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +scroll_lr_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/scroll_lr/Makefile.in lebiniou-3.40/plugins/stable/main/scroll_lr/Makefile.in --- lebiniou-3.31/plugins/stable/main/scroll_lr/Makefile.in 2019-04-14 11:52:33.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/scroll_lr/Makefile.in 2020-01-23 13:57:17.000000000 +0000 @@ -104,7 +104,7 @@ PROGRAMS = $(plugin_PROGRAMS) am_scroll_lr_so_OBJECTS = scroll_lr_so-scroll_lr.$(OBJEXT) scroll_lr_so_OBJECTS = $(am_scroll_lr_so_OBJECTS) -scroll_lr_so_LDADD = $(LDADD) +scroll_lr_so_DEPENDENCIES = scroll_lr_so_LINK = $(CCLD) $(scroll_lr_so_CFLAGS) $(CFLAGS) \ $(scroll_lr_so_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -216,6 +216,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -243,6 +245,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -257,7 +260,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -319,8 +325,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/main/scroll_lr scroll_lr_so_SOURCES = scroll_lr.c -scroll_lr_so_LDFLAGS = @PLUGIN_LDFLAGS@ -scroll_lr_so_CFLAGS = @PLUGIN_CFLAGS@ +scroll_lr_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +scroll_lr_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +scroll_lr_so_LDADD = @PLUGIN_LDADD@ all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/main/scroll_lr/scroll_lr.c lebiniou-3.40/plugins/stable/main/scroll_lr/scroll_lr.c --- lebiniou-3.31/plugins/stable/main/scroll_lr/scroll_lr.c 2019-03-01 11:47:47.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/scroll_lr/scroll_lr.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -21,6 +21,7 @@ u_long id = 944684127; +uint32_t version = 0; u_long options = BE_SCROLL|BEQ_HOR; char dname[] = "Scroll right"; char desc[] = "Scroll the screen rightwards"; diff -Nru lebiniou-3.31/plugins/stable/main/scroll_rl/Makefile.am lebiniou-3.40/plugins/stable/main/scroll_rl/Makefile.am --- lebiniou-3.31/plugins/stable/main/scroll_rl/Makefile.am 2018-11-27 13:50:08.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/scroll_rl/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -2,5 +2,6 @@ plugin_PROGRAMS = scroll_rl.so scroll_rl_so_SOURCES = scroll_rl.c -scroll_rl_so_LDFLAGS = @PLUGIN_LDFLAGS@ -scroll_rl_so_CFLAGS = @PLUGIN_CFLAGS@ +scroll_rl_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +scroll_rl_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +scroll_rl_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/scroll_rl/Makefile.in lebiniou-3.40/plugins/stable/main/scroll_rl/Makefile.in --- lebiniou-3.31/plugins/stable/main/scroll_rl/Makefile.in 2019-04-14 11:52:33.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/scroll_rl/Makefile.in 2020-01-23 13:57:17.000000000 +0000 @@ -104,7 +104,7 @@ PROGRAMS = $(plugin_PROGRAMS) am_scroll_rl_so_OBJECTS = scroll_rl_so-scroll_rl.$(OBJEXT) scroll_rl_so_OBJECTS = $(am_scroll_rl_so_OBJECTS) -scroll_rl_so_LDADD = $(LDADD) +scroll_rl_so_DEPENDENCIES = scroll_rl_so_LINK = $(CCLD) $(scroll_rl_so_CFLAGS) $(CFLAGS) \ $(scroll_rl_so_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -216,6 +216,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -243,6 +245,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -257,7 +260,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -319,8 +325,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/main/scroll_rl scroll_rl_so_SOURCES = scroll_rl.c -scroll_rl_so_LDFLAGS = @PLUGIN_LDFLAGS@ -scroll_rl_so_CFLAGS = @PLUGIN_CFLAGS@ +scroll_rl_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +scroll_rl_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +scroll_rl_so_LDADD = @PLUGIN_LDADD@ all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/main/scroll_rl/scroll_rl.c lebiniou-3.40/plugins/stable/main/scroll_rl/scroll_rl.c --- lebiniou-3.31/plugins/stable/main/scroll_rl/scroll_rl.c 2019-03-01 11:47:47.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/scroll_rl/scroll_rl.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -21,6 +21,7 @@ u_long id = 944684126; +uint32_t version = 0; u_long options = BE_SCROLL|BEQ_HOR; char dname[] = "Scroll left"; char desc[] = "Scroll the screen leftwards"; diff -Nru lebiniou-3.31/plugins/stable/main/scroll_tb/Makefile.am lebiniou-3.40/plugins/stable/main/scroll_tb/Makefile.am --- lebiniou-3.31/plugins/stable/main/scroll_tb/Makefile.am 2018-11-27 13:50:08.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/scroll_tb/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -2,5 +2,6 @@ plugin_PROGRAMS = scroll_tb.so scroll_tb_so_SOURCES = scroll_tb.c -scroll_tb_so_LDFLAGS = @PLUGIN_LDFLAGS@ -scroll_tb_so_CFLAGS = @PLUGIN_CFLAGS@ +scroll_tb_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +scroll_tb_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +scroll_tb_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/scroll_tb/Makefile.in lebiniou-3.40/plugins/stable/main/scroll_tb/Makefile.in --- lebiniou-3.31/plugins/stable/main/scroll_tb/Makefile.in 2019-04-14 11:52:33.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/scroll_tb/Makefile.in 2020-01-23 13:57:17.000000000 +0000 @@ -104,7 +104,7 @@ PROGRAMS = $(plugin_PROGRAMS) am_scroll_tb_so_OBJECTS = scroll_tb_so-scroll_tb.$(OBJEXT) scroll_tb_so_OBJECTS = $(am_scroll_tb_so_OBJECTS) -scroll_tb_so_LDADD = $(LDADD) +scroll_tb_so_DEPENDENCIES = scroll_tb_so_LINK = $(CCLD) $(scroll_tb_so_CFLAGS) $(CFLAGS) \ $(scroll_tb_so_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -216,6 +216,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -243,6 +245,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -257,7 +260,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -319,8 +325,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/main/scroll_tb scroll_tb_so_SOURCES = scroll_tb.c -scroll_tb_so_LDFLAGS = @PLUGIN_LDFLAGS@ -scroll_tb_so_CFLAGS = @PLUGIN_CFLAGS@ +scroll_tb_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +scroll_tb_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +scroll_tb_so_LDADD = @PLUGIN_LDADD@ all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/main/scroll_tb/scroll_tb.c lebiniou-3.40/plugins/stable/main/scroll_tb/scroll_tb.c --- lebiniou-3.31/plugins/stable/main/scroll_tb/scroll_tb.c 2019-03-01 11:47:48.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/scroll_tb/scroll_tb.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -21,6 +21,7 @@ u_long id = 944684129; +uint32_t version = 0; u_long options = BE_SCROLL|BEQ_VER; char dname[] = "Scroll down"; char desc[] = "Scroll the screen downwards"; diff -Nru lebiniou-3.31/plugins/stable/main/sin1oscillo/Makefile.am lebiniou-3.40/plugins/stable/main/sin1oscillo/Makefile.am --- lebiniou-3.31/plugins/stable/main/sin1oscillo/Makefile.am 2018-11-27 13:50:08.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/sin1oscillo/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -2,5 +2,6 @@ plugin_PROGRAMS = sin1oscillo.so sin1oscillo_so_SOURCES = sin1oscillo.c -sin1oscillo_so_LDFLAGS = @PLUGIN_LDFLAGS@ -sin1oscillo_so_CFLAGS = @PLUGIN_CFLAGS@ +sin1oscillo_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +sin1oscillo_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +sin1oscillo_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/sin1oscillo/Makefile.in lebiniou-3.40/plugins/stable/main/sin1oscillo/Makefile.in --- lebiniou-3.31/plugins/stable/main/sin1oscillo/Makefile.in 2019-04-14 11:52:33.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/sin1oscillo/Makefile.in 2020-01-23 13:57:17.000000000 +0000 @@ -104,7 +104,7 @@ PROGRAMS = $(plugin_PROGRAMS) am_sin1oscillo_so_OBJECTS = sin1oscillo_so-sin1oscillo.$(OBJEXT) sin1oscillo_so_OBJECTS = $(am_sin1oscillo_so_OBJECTS) -sin1oscillo_so_LDADD = $(LDADD) +sin1oscillo_so_DEPENDENCIES = sin1oscillo_so_LINK = $(CCLD) $(sin1oscillo_so_CFLAGS) $(CFLAGS) \ $(sin1oscillo_so_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -216,6 +216,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -243,6 +245,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -257,7 +260,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -319,8 +325,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/main/sin1oscillo sin1oscillo_so_SOURCES = sin1oscillo.c -sin1oscillo_so_LDFLAGS = @PLUGIN_LDFLAGS@ -sin1oscillo_so_CFLAGS = @PLUGIN_CFLAGS@ +sin1oscillo_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +sin1oscillo_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +sin1oscillo_so_LDADD = @PLUGIN_LDADD@ all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/main/sin1oscillo/sin1oscillo.c lebiniou-3.40/plugins/stable/main/sin1oscillo/sin1oscillo.c --- lebiniou-3.31/plugins/stable/main/sin1oscillo/sin1oscillo.c 2019-04-05 20:39:14.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/sin1oscillo/sin1oscillo.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -18,9 +18,11 @@ */ #include "oscillo.h" +#include "parameters.h" u_long id = 946482112; +uint32_t version = 0; u_long options = BE_SFX2D; u_long mode = OVERLAY; char desc[] = "Oscilloscope based on a sine-wave"; @@ -35,7 +37,34 @@ static float sin1_freq; /* initialized on create */ static float sin1_target_freq; /* initialized on create */ static float sin1_freq_inc; /* initialized on create */ -static int connect = 1; +static int sin1oscillo_connect = 1; + +static float volume_scale = 0; + +json_t * +get_parameters() +{ + json_t *params = json_object(); + plugin_parameters_add_double(params, BPP_VOLUME_SCALE, volume_scale, -0.01, 0.01); + + return params; +} + + +void +set_parameters(const json_t *in_parameters) +{ + plugin_parameter_parse_float_range(in_parameters, BPP_VOLUME_SCALE, &volume_scale, 0, 100); +} + + +json_t * +parameters(const json_t *in_parameters) +{ + set_parameters(in_parameters); + + return get_parameters(); +} static inline float @@ -86,7 +115,7 @@ P->origin.x = 1; P->origin.y = HMAXY; - t.v_j_factor = HMAXY / 2 * .85; + t.v_j_factor = HMAXY / 2 * volume_scale; for (i = 0; i < P->size-1; i++) { float ya = HMAXY + t.v_j_factor * sin(sin1_freq * (float)(i) / (float)(ctx->input->size - 1) + sin1_phi); @@ -103,18 +132,16 @@ } -void +int8_t create(Context_t *ctx) { - if (ctx->input == NULL) { - options |= BEQ_DISABLED; - } else { - P = Porteuse_new(ctx->input->size, A_MONO); - sin1_freq = sin1_freq_min; - sin1_target_freq = rnd_freq(); - sin1_freq_inc = drand48() / 10 + .01; - init(ctx); - } + P = Porteuse_new(ctx->input->size, A_MONO); + sin1_freq = sin1_freq_min; + sin1_target_freq = rnd_freq(); + sin1_freq_inc = drand48() / 10 + .01; + init(ctx); + + return 1; } @@ -130,6 +157,8 @@ void on_switch_on(Context_t *ctx) { + /* Initialize parameters */ + volume_scale = 0.85; /* connect = b_rand_boolean(); */ } @@ -138,7 +167,7 @@ run(Context_t *ctx) { Buffer8_clear(passive_buffer(ctx)); - Porteuse_draw(P, ctx, connect); + Porteuse_draw(P, ctx, sin1oscillo_connect); change_params(); init(ctx); } diff -Nru lebiniou-3.31/plugins/stable/main/sin2oscillo/Makefile.am lebiniou-3.40/plugins/stable/main/sin2oscillo/Makefile.am --- lebiniou-3.31/plugins/stable/main/sin2oscillo/Makefile.am 2018-11-27 13:50:08.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/sin2oscillo/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -2,5 +2,6 @@ plugin_PROGRAMS = sin2oscillo.so sin2oscillo_so_SOURCES = sin2oscillo.c -sin2oscillo_so_LDFLAGS = @PLUGIN_LDFLAGS@ -sin2oscillo_so_CFLAGS = @PLUGIN_CFLAGS@ +sin2oscillo_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +sin2oscillo_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +sin2oscillo_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/sin2oscillo/Makefile.in lebiniou-3.40/plugins/stable/main/sin2oscillo/Makefile.in --- lebiniou-3.31/plugins/stable/main/sin2oscillo/Makefile.in 2019-04-14 11:52:33.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/sin2oscillo/Makefile.in 2020-01-23 13:57:18.000000000 +0000 @@ -104,7 +104,7 @@ PROGRAMS = $(plugin_PROGRAMS) am_sin2oscillo_so_OBJECTS = sin2oscillo_so-sin2oscillo.$(OBJEXT) sin2oscillo_so_OBJECTS = $(am_sin2oscillo_so_OBJECTS) -sin2oscillo_so_LDADD = $(LDADD) +sin2oscillo_so_DEPENDENCIES = sin2oscillo_so_LINK = $(CCLD) $(sin2oscillo_so_CFLAGS) $(CFLAGS) \ $(sin2oscillo_so_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -216,6 +216,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -243,6 +245,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -257,7 +260,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -319,8 +325,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/main/sin2oscillo sin2oscillo_so_SOURCES = sin2oscillo.c -sin2oscillo_so_LDFLAGS = @PLUGIN_LDFLAGS@ -sin2oscillo_so_CFLAGS = @PLUGIN_CFLAGS@ +sin2oscillo_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +sin2oscillo_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +sin2oscillo_so_LDADD = @PLUGIN_LDADD@ all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/main/sin2oscillo/sin2oscillo.c lebiniou-3.40/plugins/stable/main/sin2oscillo/sin2oscillo.c --- lebiniou-3.31/plugins/stable/main/sin2oscillo/sin2oscillo.c 2019-04-05 20:39:15.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/sin2oscillo/sin2oscillo.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -18,9 +18,11 @@ */ #include "oscillo.h" +#include "parameters.h" u_long id = 946482113; +uint32_t version = 0; u_long options = BE_SFX2D; u_long mode = OVERLAY; char desc[] = "Oscilloscope based on a sine-wave"; @@ -35,7 +37,35 @@ static float sin2_freq; /* initialized on create */ static float sin2_target_freq; /* initialized on create */ static float sin2_freq_inc; /* initialized on create */ -static int connect = 1; +static int sin2oscillo_connect = 1; + + +static float volume_scale = 0; + +json_t * +get_parameters() +{ + json_t *params = json_object(); + plugin_parameters_add_double(params, BPP_VOLUME_SCALE, volume_scale, -0.01, 0.01); + + return params; +} + + +void +set_parameters(const json_t *in_parameters) +{ + plugin_parameter_parse_float_range(in_parameters, BPP_VOLUME_SCALE, &volume_scale, 0, 100); +} + + +json_t * +parameters(const json_t *in_parameters) +{ + set_parameters(in_parameters); + + return get_parameters(); +} static inline float @@ -85,7 +115,7 @@ P->origin.x = 1; P->origin.y = HMAXY; - t.v_j_factor = HMAXY / 2 * .85; + t.v_j_factor = HMAXY / 2 * volume_scale; for (i = 0; i < P->size; i++) { float y = (t.v_j_factor @@ -105,18 +135,16 @@ } -void +int8_t create(Context_t *ctx) { - if (ctx->input == NULL) { - options |= BEQ_DISABLED; - } else { - P = Porteuse_new(ctx->input->size, A_MONO); - sin2_freq = sin2_freq_min; - sin2_target_freq = rnd_freq(); - sin2_freq_inc = drand48() / 10 + .01; - init(ctx); - } + P = Porteuse_new(ctx->input->size, A_MONO); + sin2_freq = sin2_freq_min; + sin2_target_freq = rnd_freq(); + sin2_freq_inc = drand48() / 10 + .01; + init(ctx); + + return 1; } @@ -130,10 +158,18 @@ void +on_switch_on(Context_t *ctx) +{ + /* Initialize parameters */ + volume_scale = 0.85; +} + + +void run(Context_t *ctx) { Buffer8_clear(passive_buffer(ctx)); - Porteuse_draw(P, ctx, connect); + Porteuse_draw(P, ctx, sin2oscillo_connect); change_params(); init(ctx); } diff -Nru lebiniou-3.31/plugins/stable/main/snake/Makefile.am lebiniou-3.40/plugins/stable/main/snake/Makefile.am --- lebiniou-3.31/plugins/stable/main/snake/Makefile.am 1970-01-01 00:00:00.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/snake/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -0,0 +1,7 @@ +plugindir = @libdir@/lebiniou/plugins/main/snake +plugin_PROGRAMS = snake.so + +snake_so_SOURCES = snake.c +snake_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +snake_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +snake_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/snake/Makefile.in lebiniou-3.40/plugins/stable/main/snake/Makefile.in --- lebiniou-3.31/plugins/stable/main/snake/Makefile.in 1970-01-01 00:00:00.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/snake/Makefile.in 2020-01-23 13:57:18.000000000 +0000 @@ -0,0 +1,665 @@ +# Makefile.in generated by automake 1.16.1 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994-2018 Free Software Foundation, Inc. + +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +VPATH = @srcdir@ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +target_triplet = @target@ +plugin_PROGRAMS = snake.so$(EXEEXT) +subdir = plugins/stable/main/snake +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +am__installdirs = "$(DESTDIR)$(plugindir)" +PROGRAMS = $(plugin_PROGRAMS) +am_snake_so_OBJECTS = snake_so-snake.$(OBJEXT) +snake_so_OBJECTS = $(am_snake_so_OBJECTS) +snake_so_DEPENDENCIES = +snake_so_LINK = $(CCLD) $(snake_so_CFLAGS) $(CFLAGS) \ + $(snake_so_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) +depcomp = $(SHELL) $(top_srcdir)/depcomp +am__maybe_remake_depfiles = depfiles +am__depfiles_remade = ./$(DEPDIR)/snake_so-snake.Po +am__mv = mv -f +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = +CCLD = $(CC) +LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = +SOURCES = $(snake_so_SOURCES) +DIST_SOURCES = $(snake_so_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +ALSA_CFLAGS = @ALSA_CFLAGS@ +ALSA_LIBS = @ALSA_LIBS@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AVUTIL_CFLAGS = @AVUTIL_CFLAGS@ +AVUTIL_LIBS = @AVUTIL_LIBS@ +AWK = @AWK@ +BINIOU_VERSION = @BINIOU_VERSION@ +CACA_CFLAGS = @CACA_CFLAGS@ +CACA_LIBS = @CACA_LIBS@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DPKG_BUILDFLAGS_CHECK = @DPKG_BUILDFLAGS_CHECK@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +ESD_CFLAGS = @ESD_CFLAGS@ +ESD_LIBS = @ESD_LIBS@ +EXEEXT = @EXEEXT@ +FFTW3_CFLAGS = @FFTW3_CFLAGS@ +FFTW3_LIBS = @FFTW3_LIBS@ +FT2_CFLAGS = @FT2_CFLAGS@ +FT2_LIBS = @FT2_LIBS@ +GETOPT_LONG_LIBS = @GETOPT_LONG_LIBS@ +GLIB_CFLAGS = @GLIB_CFLAGS@ +GLIB_LIBS = @GLIB_LIBS@ +GLU_CFLAGS = @GLU_CFLAGS@ +GLU_LIBS = @GLU_LIBS@ +GREP = @GREP@ +INPUT_PLUGINS = @INPUT_PLUGINS@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +JACK_CFLAGS = @JACK_CFLAGS@ +JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ +LDFLAGS = @LDFLAGS@ +LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ +LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ +LEBINIOU_SCHEMES_FILE = @LEBINIOU_SCHEMES_FILE@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ +MagickWand_CFLAGS = @MagickWand_CFLAGS@ +MagickWand_LIBS = @MagickWand_LIBS@ +OBJEXT = @OBJEXT@ +OSD_FONT = @OSD_FONT@ +OSD_PTSIZE = @OSD_PTSIZE@ +OUTPUT_PLUGINS = @OUTPUT_PLUGINS@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ +PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ +PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ +PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ +PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ +SDL2_CFLAGS = @SDL2_CFLAGS@ +SDL2_LIBS = @SDL2_LIBS@ +SDL2_ttf_CFLAGS = @SDL2_ttf_CFLAGS@ +SDL2_ttf_LIBS = @SDL2_ttf_LIBS@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +SNDFILE_CFLAGS = @SNDFILE_CFLAGS@ +SNDFILE_LIBS = @SNDFILE_LIBS@ +STRIP = @STRIP@ +SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ +SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ +VERSION = @VERSION@ +XML2_CFLAGS = @XML2_CFLAGS@ +XML2_LIBS = @XML2_LIBS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_CC = @ac_ct_CC@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +have_pandoc = @have_pandoc@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +runstatedir = @runstatedir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target = @target@ +target_alias = @target_alias@ +target_cpu = @target_cpu@ +target_os = @target_os@ +target_vendor = @target_vendor@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +plugindir = @libdir@/lebiniou/plugins/main/snake +snake_so_SOURCES = snake.c +snake_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +snake_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +snake_so_LDADD = @PLUGIN_LDADD@ +all: all-am + +.SUFFIXES: +.SUFFIXES: .c .o .obj +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign plugins/stable/main/snake/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --foreign plugins/stable/main/snake/Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): +install-pluginPROGRAMS: $(plugin_PROGRAMS) + @$(NORMAL_INSTALL) + @list='$(plugin_PROGRAMS)'; test -n "$(plugindir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \ + fi; \ + for p in $$list; do echo "$$p $$p"; done | \ + sed 's/$(EXEEXT)$$//' | \ + while read p p1; do if test -f $$p \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ + done | \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ + -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ + sed 'N;N;N;s,\n, ,g' | \ + $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ + { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ + if ($$2 == $$4) files[d] = files[d] " " $$1; \ + else { print "f", $$3 "/" $$4, $$1; } } \ + END { for (d in files) print "f", d, files[d] }' | \ + while read type dir files; do \ + if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ + test -z "$$files" || { \ + echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(plugindir)$$dir'"; \ + $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(plugindir)$$dir" || exit $$?; \ + } \ + ; done + +uninstall-pluginPROGRAMS: + @$(NORMAL_UNINSTALL) + @list='$(plugin_PROGRAMS)'; test -n "$(plugindir)" || list=; \ + files=`for p in $$list; do echo "$$p"; done | \ + sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ + -e 's/$$/$(EXEEXT)/' \ + `; \ + test -n "$$list" || exit 0; \ + echo " ( cd '$(DESTDIR)$(plugindir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(plugindir)" && rm -f $$files + +clean-pluginPROGRAMS: + -test -z "$(plugin_PROGRAMS)" || rm -f $(plugin_PROGRAMS) + +snake.so$(EXEEXT): $(snake_so_OBJECTS) $(snake_so_DEPENDENCIES) $(EXTRA_snake_so_DEPENDENCIES) + @rm -f snake.so$(EXEEXT) + $(AM_V_CCLD)$(snake_so_LINK) $(snake_so_OBJECTS) $(snake_so_LDADD) $(LIBS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/snake_so-snake.Po@am__quote@ # am--include-marker + +$(am__depfiles_remade): + @$(MKDIR_P) $(@D) + @echo '# dummy' >$@-t && $(am__mv) $@-t $@ + +am--depfiles: $(am__depfiles_remade) + +.c.o: +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< + +.c.obj: +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + +snake_so-snake.o: snake.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(snake_so_CFLAGS) $(CFLAGS) -MT snake_so-snake.o -MD -MP -MF $(DEPDIR)/snake_so-snake.Tpo -c -o snake_so-snake.o `test -f 'snake.c' || echo '$(srcdir)/'`snake.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/snake_so-snake.Tpo $(DEPDIR)/snake_so-snake.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='snake.c' object='snake_so-snake.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(snake_so_CFLAGS) $(CFLAGS) -c -o snake_so-snake.o `test -f 'snake.c' || echo '$(srcdir)/'`snake.c + +snake_so-snake.obj: snake.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(snake_so_CFLAGS) $(CFLAGS) -MT snake_so-snake.obj -MD -MP -MF $(DEPDIR)/snake_so-snake.Tpo -c -o snake_so-snake.obj `if test -f 'snake.c'; then $(CYGPATH_W) 'snake.c'; else $(CYGPATH_W) '$(srcdir)/snake.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/snake_so-snake.Tpo $(DEPDIR)/snake_so-snake.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='snake.c' object='snake_so-snake.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(snake_so_CFLAGS) $(CFLAGS) -c -o snake_so-snake.obj `if test -f 'snake.c'; then $(CYGPATH_W) 'snake.c'; else $(CYGPATH_W) '$(srcdir)/snake.c'; fi` + +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags + +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + set x; \ + here=`pwd`; \ + $(am__define_uniq_tagged_files); \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ + fi +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ + test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(PROGRAMS) +installdirs: + for dir in "$(DESTDIR)$(plugindir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-pluginPROGRAMS mostlyclean-am + +distclean: distclean-am + -rm -f ./$(DEPDIR)/snake_so-snake.Po + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-tags + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: install-pluginPROGRAMS + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f ./$(DEPDIR)/snake_so-snake.Po + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-compile mostlyclean-generic + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-pluginPROGRAMS + +.MAKE: install-am install-strip + +.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \ + clean-generic clean-pluginPROGRAMS cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-pluginPROGRAMS install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \ + ps ps-am tags tags-am uninstall uninstall-am \ + uninstall-pluginPROGRAMS + +.PRECIOUS: Makefile + + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -Nru lebiniou-3.31/plugins/stable/main/snake/snake.c lebiniou-3.40/plugins/stable/main/snake/snake.c --- lebiniou-3.31/plugins/stable/main/snake/snake.c 1970-01-01 00:00:00.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/snake/snake.c 2020-01-22 18:33:57.000000000 +0000 @@ -0,0 +1,252 @@ +/* + * Copyright 1994-2020 Olivier Girondel + * Copyright 2019-2020 Laurent Marsac + * + * This file is part of lebiniou. + * + * lebiniou 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 of the License, or + * (at your option) any later version. + * + * lebiniou 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 lebiniou. If not, see . + */ + +/* + * This is an improvement of the original "foo" plugin + * - The snake is mainly traveling left to right and bottom to top + * - Its behaviour depends on the spectrum + * - Low frequency: longer and standard direction + * - High frequency: shorter and incleasingly chaotic direction and orientation + * + * - Color: linked to sound amplitude + */ + +#include "context.h" +#include "parameters.h" + +u_long id = 1555581982; + +uint32_t version = 0; +u_long options = BE_GFX|BEQ_UNIQUE|BE_SFX2D; + +u_long mode = OVERLAY; + +char dname[] = "snake"; +char desc[] = "Snake"; + +static u_short x = 0, y = 0; + +static int snake_mode = 0; +static float length_min = 0; /* minimum length of the snake, in pixels, scales with WIDTH */ +static float length_max = 0; /* maximum length of the snake, in pixels, scales with WIDTH */ +static float spectrum_id_factor = 0; +static float color_factor = 0; /* scaling of the computed color */ + +json_t * +get_parameters() +{ + json_t *params = json_object(); + plugin_parameters_add_int(params, BPP_MODE, snake_mode, -1, 1); + plugin_parameters_add_double(params, BPP_LENGTH_MIN, length_min, -0.01, 0.01); + plugin_parameters_add_double(params, BPP_LENGTH_MAX, length_max, -0.01, 0.01); + plugin_parameters_add_double(params, BPP_SPECTRUM_ID_FACTOR, spectrum_id_factor, -0.01, 0.01); + plugin_parameters_add_double(params, BPP_COLOR_FACTOR, color_factor, -0.01, 0.01); + + return params; +} + + +void +set_parameters(const json_t *in_parameters) +{ + plugin_parameter_parse_int_range(in_parameters, BPP_MODE, &snake_mode, 0, 2); + + float __length_min = length_min, __length_max = length_max; + plugin_parameter_parse_float_range(in_parameters, BPP_LENGTH_MIN, &__length_min, 0.01, 0.2); + plugin_parameter_parse_float_range(in_parameters, BPP_LENGTH_MAX, &__length_max, 0.02, 0.5); + if (__length_min <= __length_max) { + length_min = __length_min; + length_max = __length_max; + } + + plugin_parameter_parse_float_range(in_parameters, BPP_SPECTRUM_ID_FACTOR, &spectrum_id_factor, 0, 4); + plugin_parameter_parse_float_range(in_parameters, BPP_COLOR_FACTOR, &color_factor, 0, 5); +} + + +json_t * +parameters(const json_t *in_parameters) +{ + set_parameters(in_parameters); + + return get_parameters(); +} + + +void +on_switch_on(Context_t *ctx) +{ + /* Initialize parameters */ + snake_mode = 1; /* 0: direction changes at each run, 1: direction randomy changes, 2: also randomly changes orientation */ + length_min = 0.01; /* minimum length of the snake, between 0 and 1, 1 meaning WIDTH */ + length_max = 0.08; /* maximum length of the snake, between 0 and 1, 1 meaning WIDTH */ + spectrum_id_factor = 2; /* snake length will be length_max_px - average_frequency * spectrum_id_factor */ + color_factor = 3.0; /* scaling of the computed color */ +} + + +void +run(Context_t *ctx) +{ + Buffer8_t *dst = passive_buffer(ctx); + Buffer8_clear(dst); + + u_short original_fft_size = 513; /* FFT size used when below parameters were set */ + u_short length_min_px = round(length_min * WIDTH); /* minimum length of the snake, in pixels, scales with WIDTH */ + u_short length_max_px = round(length_max * WIDTH); /* maximum length of the snake, in pixels, scales with WIDTH */ + double spectrum_low_treshold_factor = 0.1; /* spectrum value higher than this treshold will be used, between 0 and 1 */ + u_short spectrum_id_orientation_factor = 40; /* smaller means changing orientation more often */ + + /* choose direction and increment mode */ + u_short mode = snake_mode; /* 0: direction changes at each run, 1: direction randomy changes, 2: also randomly changes orientation */ + u_short change_inc_on_hf = 1; /* 0: no change, 1: change orientation more often on high frequency */ + + pthread_mutex_lock(&ctx->input->mutex); + + u_short average_freq_id = compute_avg_freq_id(ctx->input, spectrum_low_treshold_factor); + + /* scale average frequency id depending of input->spectrum_size */ + average_freq_id = round((double)average_freq_id * (double)original_fft_size / (double)ctx->input->spectrum_size); + + /* compute snake length based on average frequency */ + u_short length = length_max_px - average_freq_id * spectrum_id_factor; + if (length < length_min_px) { + length = length_min_px; + } + if (length > length_max_px) { + length = length_max_px; + } + + static u_short dir = 0; /* direction: 0 is Y and 1 is X */ + short inc = 1; /* increment: 1 or -1 */ + + switch (mode) { + default: + case 0: + dir = !dir; + break; + + case 1: + dir = drand48() < .5; + break; + + /* random dir and inc */ + case 2: + dir = drand48() < .5; + inc = drand48() < .5 ? -1 : 1; + break; + } + + /* if set, change orientation on high frequency */ + static short inc_hf = 1; + if (change_inc_on_hf && (drand48() < average_freq_id / (double)spectrum_id_orientation_factor)) { + inc_hf = -inc_hf; + inc = inc_hf; + } + + /* avoid going back on previous path */ + static u_short last_dir = 0; + static u_short last_inc = -1; + if (last_dir == dir) { + inc = last_inc ; + } + last_dir = dir; + last_inc = inc; + + /* remove length bias due to different HEIGHT and WIDTH */ + if (!dir) { + length = (u_short)ceil((double)length * (double)HEIGHT / (double)WIDTH); + } + + double win_avg = 0.0; + /* approx */ + u_short win_overlap = ctx->input->size >> 1; + u_short win_size = floor((double)(ctx->input->size - win_overlap) / (double)length) + win_overlap; + + /* X direction */ + if (dir) { + if (y >= HEIGHT) { + y = 0; + } else if (y == 0) { + y = MAXY; + } + + for (u_short l = 0; l < length; l++) { + /* compute color */ + if (l == length-1) { + win_avg = compute_avg_abs(ctx->input->data[A_MONO], l*(win_size-win_overlap), ctx->input->size); + } else { + win_avg = compute_avg_abs(ctx->input->data[A_MONO], l*(win_size-win_overlap), l*(win_size-win_overlap)+win_size); + } + + win_avg = color_factor * win_avg ; + + if (win_avg > 1.0) { + win_avg = 1.0; + } + Pixel_t c = win_avg * PIXEL_MAXVAL; + + /* on border, go to the opposite border */ + if (x >= WIDTH) { + x = 0; + } else if (x == 0) { + x = MAXX; + } + + set_pixel_nc(dst, x, y, c); + x += inc; + } + } else { + /* Y direction */ + if (x >= WIDTH) { + x = 0; + } else if (x == 0) { + x = MAXX; + } + + for (u_short l = 0; l < length; l++) { + /* compute color */ + if (l == length-1) { + win_avg = compute_avg_abs(ctx->input->data[A_MONO], l*(win_size-win_overlap), ctx->input->size); + } else { + win_avg = compute_avg_abs(ctx->input->data[A_MONO], l*(win_size-win_overlap), l*(win_size-win_overlap)+win_size); + } + + win_avg = color_factor * win_avg; + + if (win_avg > 1.0) { + win_avg = 1.0 ; + } + Pixel_t c = win_avg * PIXEL_MAXVAL ; + + /* on border, go to the opposite border */ + if (y >= HEIGHT) { + y = 0; + } else if (y == 0) { + y = MAXY; + } + + set_pixel_nc(dst, x, y, c); + y += inc; + } + } + + pthread_mutex_unlock(&ctx->input->mutex); +} diff -Nru lebiniou-3.31/plugins/stable/main/snake_oscillo/Makefile.am lebiniou-3.40/plugins/stable/main/snake_oscillo/Makefile.am --- lebiniou-3.31/plugins/stable/main/snake_oscillo/Makefile.am 1970-01-01 00:00:00.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/snake_oscillo/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -0,0 +1,7 @@ +plugindir = @libdir@/lebiniou/plugins/main/snake_oscillo +plugin_PROGRAMS = snake_oscillo.so + +snake_oscillo_so_SOURCES = snake_oscillo.c +snake_oscillo_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +snake_oscillo_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +snake_oscillo_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/snake_oscillo/Makefile.in lebiniou-3.40/plugins/stable/main/snake_oscillo/Makefile.in --- lebiniou-3.31/plugins/stable/main/snake_oscillo/Makefile.in 1970-01-01 00:00:00.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/snake_oscillo/Makefile.in 2020-01-23 13:57:18.000000000 +0000 @@ -0,0 +1,666 @@ +# Makefile.in generated by automake 1.16.1 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994-2018 Free Software Foundation, Inc. + +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +VPATH = @srcdir@ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +target_triplet = @target@ +plugin_PROGRAMS = snake_oscillo.so$(EXEEXT) +subdir = plugins/stable/main/snake_oscillo +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +am__installdirs = "$(DESTDIR)$(plugindir)" +PROGRAMS = $(plugin_PROGRAMS) +am_snake_oscillo_so_OBJECTS = \ + snake_oscillo_so-snake_oscillo.$(OBJEXT) +snake_oscillo_so_OBJECTS = $(am_snake_oscillo_so_OBJECTS) +snake_oscillo_so_DEPENDENCIES = +snake_oscillo_so_LINK = $(CCLD) $(snake_oscillo_so_CFLAGS) $(CFLAGS) \ + $(snake_oscillo_so_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) +depcomp = $(SHELL) $(top_srcdir)/depcomp +am__maybe_remake_depfiles = depfiles +am__depfiles_remade = ./$(DEPDIR)/snake_oscillo_so-snake_oscillo.Po +am__mv = mv -f +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = +CCLD = $(CC) +LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = +SOURCES = $(snake_oscillo_so_SOURCES) +DIST_SOURCES = $(snake_oscillo_so_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +ALSA_CFLAGS = @ALSA_CFLAGS@ +ALSA_LIBS = @ALSA_LIBS@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AVUTIL_CFLAGS = @AVUTIL_CFLAGS@ +AVUTIL_LIBS = @AVUTIL_LIBS@ +AWK = @AWK@ +BINIOU_VERSION = @BINIOU_VERSION@ +CACA_CFLAGS = @CACA_CFLAGS@ +CACA_LIBS = @CACA_LIBS@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DPKG_BUILDFLAGS_CHECK = @DPKG_BUILDFLAGS_CHECK@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +ESD_CFLAGS = @ESD_CFLAGS@ +ESD_LIBS = @ESD_LIBS@ +EXEEXT = @EXEEXT@ +FFTW3_CFLAGS = @FFTW3_CFLAGS@ +FFTW3_LIBS = @FFTW3_LIBS@ +FT2_CFLAGS = @FT2_CFLAGS@ +FT2_LIBS = @FT2_LIBS@ +GETOPT_LONG_LIBS = @GETOPT_LONG_LIBS@ +GLIB_CFLAGS = @GLIB_CFLAGS@ +GLIB_LIBS = @GLIB_LIBS@ +GLU_CFLAGS = @GLU_CFLAGS@ +GLU_LIBS = @GLU_LIBS@ +GREP = @GREP@ +INPUT_PLUGINS = @INPUT_PLUGINS@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +JACK_CFLAGS = @JACK_CFLAGS@ +JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ +LDFLAGS = @LDFLAGS@ +LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ +LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ +LEBINIOU_SCHEMES_FILE = @LEBINIOU_SCHEMES_FILE@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ +MagickWand_CFLAGS = @MagickWand_CFLAGS@ +MagickWand_LIBS = @MagickWand_LIBS@ +OBJEXT = @OBJEXT@ +OSD_FONT = @OSD_FONT@ +OSD_PTSIZE = @OSD_PTSIZE@ +OUTPUT_PLUGINS = @OUTPUT_PLUGINS@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ +PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ +PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ +PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ +PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ +SDL2_CFLAGS = @SDL2_CFLAGS@ +SDL2_LIBS = @SDL2_LIBS@ +SDL2_ttf_CFLAGS = @SDL2_ttf_CFLAGS@ +SDL2_ttf_LIBS = @SDL2_ttf_LIBS@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +SNDFILE_CFLAGS = @SNDFILE_CFLAGS@ +SNDFILE_LIBS = @SNDFILE_LIBS@ +STRIP = @STRIP@ +SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ +SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ +VERSION = @VERSION@ +XML2_CFLAGS = @XML2_CFLAGS@ +XML2_LIBS = @XML2_LIBS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_CC = @ac_ct_CC@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +have_pandoc = @have_pandoc@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +runstatedir = @runstatedir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target = @target@ +target_alias = @target_alias@ +target_cpu = @target_cpu@ +target_os = @target_os@ +target_vendor = @target_vendor@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +plugindir = @libdir@/lebiniou/plugins/main/snake_oscillo +snake_oscillo_so_SOURCES = snake_oscillo.c +snake_oscillo_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +snake_oscillo_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +snake_oscillo_so_LDADD = @PLUGIN_LDADD@ +all: all-am + +.SUFFIXES: +.SUFFIXES: .c .o .obj +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign plugins/stable/main/snake_oscillo/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --foreign plugins/stable/main/snake_oscillo/Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): +install-pluginPROGRAMS: $(plugin_PROGRAMS) + @$(NORMAL_INSTALL) + @list='$(plugin_PROGRAMS)'; test -n "$(plugindir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \ + fi; \ + for p in $$list; do echo "$$p $$p"; done | \ + sed 's/$(EXEEXT)$$//' | \ + while read p p1; do if test -f $$p \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ + done | \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ + -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ + sed 'N;N;N;s,\n, ,g' | \ + $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ + { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ + if ($$2 == $$4) files[d] = files[d] " " $$1; \ + else { print "f", $$3 "/" $$4, $$1; } } \ + END { for (d in files) print "f", d, files[d] }' | \ + while read type dir files; do \ + if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ + test -z "$$files" || { \ + echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(plugindir)$$dir'"; \ + $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(plugindir)$$dir" || exit $$?; \ + } \ + ; done + +uninstall-pluginPROGRAMS: + @$(NORMAL_UNINSTALL) + @list='$(plugin_PROGRAMS)'; test -n "$(plugindir)" || list=; \ + files=`for p in $$list; do echo "$$p"; done | \ + sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ + -e 's/$$/$(EXEEXT)/' \ + `; \ + test -n "$$list" || exit 0; \ + echo " ( cd '$(DESTDIR)$(plugindir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(plugindir)" && rm -f $$files + +clean-pluginPROGRAMS: + -test -z "$(plugin_PROGRAMS)" || rm -f $(plugin_PROGRAMS) + +snake_oscillo.so$(EXEEXT): $(snake_oscillo_so_OBJECTS) $(snake_oscillo_so_DEPENDENCIES) $(EXTRA_snake_oscillo_so_DEPENDENCIES) + @rm -f snake_oscillo.so$(EXEEXT) + $(AM_V_CCLD)$(snake_oscillo_so_LINK) $(snake_oscillo_so_OBJECTS) $(snake_oscillo_so_LDADD) $(LIBS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/snake_oscillo_so-snake_oscillo.Po@am__quote@ # am--include-marker + +$(am__depfiles_remade): + @$(MKDIR_P) $(@D) + @echo '# dummy' >$@-t && $(am__mv) $@-t $@ + +am--depfiles: $(am__depfiles_remade) + +.c.o: +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< + +.c.obj: +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + +snake_oscillo_so-snake_oscillo.o: snake_oscillo.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(snake_oscillo_so_CFLAGS) $(CFLAGS) -MT snake_oscillo_so-snake_oscillo.o -MD -MP -MF $(DEPDIR)/snake_oscillo_so-snake_oscillo.Tpo -c -o snake_oscillo_so-snake_oscillo.o `test -f 'snake_oscillo.c' || echo '$(srcdir)/'`snake_oscillo.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/snake_oscillo_so-snake_oscillo.Tpo $(DEPDIR)/snake_oscillo_so-snake_oscillo.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='snake_oscillo.c' object='snake_oscillo_so-snake_oscillo.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(snake_oscillo_so_CFLAGS) $(CFLAGS) -c -o snake_oscillo_so-snake_oscillo.o `test -f 'snake_oscillo.c' || echo '$(srcdir)/'`snake_oscillo.c + +snake_oscillo_so-snake_oscillo.obj: snake_oscillo.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(snake_oscillo_so_CFLAGS) $(CFLAGS) -MT snake_oscillo_so-snake_oscillo.obj -MD -MP -MF $(DEPDIR)/snake_oscillo_so-snake_oscillo.Tpo -c -o snake_oscillo_so-snake_oscillo.obj `if test -f 'snake_oscillo.c'; then $(CYGPATH_W) 'snake_oscillo.c'; else $(CYGPATH_W) '$(srcdir)/snake_oscillo.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/snake_oscillo_so-snake_oscillo.Tpo $(DEPDIR)/snake_oscillo_so-snake_oscillo.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='snake_oscillo.c' object='snake_oscillo_so-snake_oscillo.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(snake_oscillo_so_CFLAGS) $(CFLAGS) -c -o snake_oscillo_so-snake_oscillo.obj `if test -f 'snake_oscillo.c'; then $(CYGPATH_W) 'snake_oscillo.c'; else $(CYGPATH_W) '$(srcdir)/snake_oscillo.c'; fi` + +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags + +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + set x; \ + here=`pwd`; \ + $(am__define_uniq_tagged_files); \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ + fi +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ + test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(PROGRAMS) +installdirs: + for dir in "$(DESTDIR)$(plugindir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-pluginPROGRAMS mostlyclean-am + +distclean: distclean-am + -rm -f ./$(DEPDIR)/snake_oscillo_so-snake_oscillo.Po + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-tags + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: install-pluginPROGRAMS + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f ./$(DEPDIR)/snake_oscillo_so-snake_oscillo.Po + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-compile mostlyclean-generic + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-pluginPROGRAMS + +.MAKE: install-am install-strip + +.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \ + clean-generic clean-pluginPROGRAMS cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-pluginPROGRAMS install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \ + ps ps-am tags tags-am uninstall uninstall-am \ + uninstall-pluginPROGRAMS + +.PRECIOUS: Makefile + + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -Nru lebiniou-3.31/plugins/stable/main/snake_oscillo/snake_oscillo.c lebiniou-3.40/plugins/stable/main/snake_oscillo/snake_oscillo.c --- lebiniou-3.31/plugins/stable/main/snake_oscillo/snake_oscillo.c 1970-01-01 00:00:00.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/snake_oscillo/snake_oscillo.c 2020-01-22 18:33:57.000000000 +0000 @@ -0,0 +1,290 @@ +/* + * Copyright 1994-2020 Olivier Girondel + * Copyright 2019-2020 Laurent Marsac + * + * This file is part of lebiniou. + * + * lebiniou 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 of the License, or + * (at your option) any later version. + * + * lebiniou 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 lebiniou. If not, see . + */ + +/* + * This is based on the "snake" plugin + * - The snake shape is not a line now, but is based on sound waveform + * + * - Color: linked to sound amplitude + */ + +#include "context.h" +#include "oscillo.h" +#include "parameters.h" + +static Porteuse_t *P = NULL; +static int snake_connect = 1; +u_short sgn_size = 0 ; + +u_long id = 1556272346; + +uint32_t version = 0; +u_long options = BE_GFX|BEQ_UNIQUE|BE_SFX2D; + +u_long mode = OVERLAY; + +char dname[] = "snake_oscillo"; +char desc[] = "Snake oscillo"; + + +static u_short x = 0, y = 0; + +static float volume_scale = 0; +static int snake_mode = 0; +static float length_min = 0; /* minimum length of the snake, in pixels, scales with WIDTH */ +static float length_max = 0; /* maximum length of the snake, in pixels, scales with WIDTH */ +static float spectrum_id_factor = 0; +static float color_factor = 0; /* scaling of the computed color */ + +json_t * +get_parameters() +{ + json_t *params = json_object(); + plugin_parameters_add_double(params, BPP_VOLUME_SCALE, volume_scale, -0.01, 0.01); + plugin_parameters_add_int(params, BPP_MODE, snake_mode, -1, 1); + plugin_parameters_add_double(params, BPP_LENGTH_MIN, length_min, -0.01, 0.01); + plugin_parameters_add_double(params, BPP_LENGTH_MAX, length_max, -0.01, 0.01); + plugin_parameters_add_double(params, BPP_SPECTRUM_ID_FACTOR, spectrum_id_factor, -0.01, 0.01); + plugin_parameters_add_double(params, BPP_COLOR_FACTOR, color_factor, -0.01, 0.01); + + return params; +} + + +void +set_parameters(const json_t *in_parameters) +{ + plugin_parameter_parse_float_range(in_parameters, BPP_VOLUME_SCALE, &volume_scale, 0, 100); + plugin_parameter_parse_int_range(in_parameters, BPP_MODE, &snake_mode, 0, 2); + + float __length_min = length_min, __length_max = length_max; + plugin_parameter_parse_float_range(in_parameters, BPP_LENGTH_MIN, &__length_min, 0.01, 0.2); + plugin_parameter_parse_float_range(in_parameters, BPP_LENGTH_MAX, &__length_max, 0.02, 0.5); + if (__length_min <= __length_max) { + length_min = __length_min; + length_max = __length_max; + } + + plugin_parameter_parse_float_range(in_parameters, BPP_SPECTRUM_ID_FACTOR, &spectrum_id_factor, 0, 4); + plugin_parameter_parse_float_range(in_parameters, BPP_COLOR_FACTOR, &color_factor, 0, 5); +} + + +json_t * +parameters(const json_t *in_parameters) +{ + set_parameters(in_parameters); + + return get_parameters(); +} + + +void +init_oscillo(Context_t *ctx, u_short x, u_short y, u_short length, u_short dir, short inc) +{ + double y_factor = 1.0; + double x_factor = 0.4; + + Porteuse_delete(P); + + u_short sgn_length = round(5.0f * (float)length); + if (sgn_length > sgn_size) { + sgn_length = sgn_size; + } + + P = Porteuse_new(sgn_length, A_MONO); + + // oscillo + u_short i = 0; + Transform_t t; + + memset(&t, 0, sizeof(t)); + + if (dir) { + t.v_j_factor = HMAXY * y_factor * volume_scale; + t.v_i.x = 1.0 / (float)(P->size - 1) * (float)length; + + if (inc < 0) { + x = x - length; + } + } else { + t.v_j_factor = HMAXX * x_factor * volume_scale; + t.v_i.y = 1.0 / (float)(P->size - 1) * (float)length; + + if (inc < 0) { + y = y - length; + } + } + + P->origin.x = x; + P->origin.y = y; + + double win_avg = 0.0; + double color_factor = 3.0; + /* approx */ + u_short win_overlap = ctx->input->size >> 1 ; + u_short win_size = floor((double)(ctx->input->size - win_overlap) / (double)P->size) + win_overlap; + + double tr = 0.1; + u_short r = floor((double)P->size * tr); + u_short factor_orig = t.v_j_factor; + + for (i = 0; i < P->size; i++) { + /* Use a tukey window for smoother join of successive segments */ + double tc ; + if (i < r/2) { + tc = cos(2*M_PI * (i - r/2) / r) / 2.0 + 0.5; + } else if (i > P->size - r/2) { + tc = cos(2*M_PI * (i - 1.0 + r/2) / r) / 2.0 + 0.5; + } else { + tc = 1.0; + } + + t.v_j_factor = floor((double)factor_orig * tc); + P->trans[i] = t; + + /* compute color */ + if (i == P->size-1) { + win_avg = compute_avg_abs(ctx->input->data[A_MONO], i*(win_size-win_overlap), ctx->input->size); + } else { + win_avg = compute_avg_abs(ctx->input->data[A_MONO], i*(win_size-win_overlap), i*(win_size-win_overlap)+win_size); + } + win_avg = color_factor * win_avg; + if (win_avg > 1.0) { + win_avg = 1.0; + } + P->color[i] = win_avg * PIXEL_MAXVAL; + } + + Porteuse_init_alpha(P); +} + + +int8_t +create(Context_t *ctx) +{ + sgn_size = ctx->input->size; + + return 1; +} + + +void +destroy(Context_t *ctx) +{ + Porteuse_delete(P); +} + + +void +on_switch_on(Context_t *ctx) +{ + /* Initialize parameters */ + volume_scale = 0.1; + snake_mode = 1; /* 0: direction changes at each run, 1: direction randomy changes, 2: also randomly changes orientation */ + length_min = 0.01; /* minimum length of the snake, between 0 and 1, 1 meaning WIDTH */ + length_max = 0.08; /* maximum length of the snake, between 0 and 1, 1 meaning WIDTH */ + spectrum_id_factor = 2; /* snake length will be length_max_px - average_frequency * spectrum_id_factor */ + color_factor = 3.0; /* scaling of the computed color */ +} + + +void +run(Context_t *ctx) +{ + Buffer8_t *dst = passive_buffer(ctx); + Buffer8_clear(dst); + + u_short original_fft_size = 513; /* FFT size used when below parameters were set */ + u_short length_min_px = round(length_min * WIDTH); /* minimum length of the snake, in pixels, scales with WIDTH */ + u_short length_max_px = round(length_max * WIDTH); /* maximum length of the snake, in pixels, scales with WIDTH */ + double spectrum_low_treshold_factor = 0.1; /* spectrum value higher than this treshold will be used, between 0 and 1 */ + u_short spectrum_id_orientation_factor = 40; /* smaller means changing orientation more often */ + + /* choose direction and increment mode */ + u_short change_inc_on_hf = 1; /* 0: no change, 1: change orientation more often on high frequency */ + + u_short average_freq_id = compute_avg_freq_id(ctx->input, spectrum_low_treshold_factor); + + /* scale average frequency id depending of input->spectrum_size */ + average_freq_id = round((double)average_freq_id * (double)original_fft_size / (double)ctx->input->spectrum_size); + + /* compute snake length based on average frequency */ + u_short length = length_max - average_freq_id * spectrum_id_factor; + if (length < length_min_px) { + length = length_min_px; + } + if (length > length_max_px) { + length = length_max_px; + } + + static u_short dir = 0; /* direction: 0 is Y and 1 is X */ + short inc = 1; /* increment: 1 or -1 */ + + switch (snake_mode) { + default: + case 0: + dir = !dir; + break; + + case 1: + dir = drand48() < .5; + break; + + /* random dir and inc */ + case 2: + dir = drand48() < .5; + inc = drand48() < .5 ? -1 : 1; + break; + } + + /* if set, change orientation on high frequency */ + static short inc_hf = 1; + if (change_inc_on_hf && (drand48() < average_freq_id / (double)spectrum_id_orientation_factor)) { + inc_hf = -inc_hf; + inc = inc_hf; + } + + /* avoid going back on previous path */ + static u_short last_dir = 0; + static u_short last_inc = -1; + if (last_dir == dir) { + inc = last_inc; + } + last_dir = dir; + last_inc = inc; + + /* remove length bias due to different HEIGHT and WIDTH */ + if (!dir) { + length = (u_short)ceil((double)length * (double)HEIGHT / (double)WIDTH); + } + + snake_connect = 1; + init_oscillo(ctx, x, y, length, dir, inc); + Porteuse_draw(P, ctx, snake_connect); + + /* X direction */ + if (dir) { + x = (x + inc * length) % WIDTH; + } else { + /* Y direction */ + y = (y + inc * length) % HEIGHT; + } +} diff -Nru lebiniou-3.31/plugins/stable/main/speaker/Makefile.am lebiniou-3.40/plugins/stable/main/speaker/Makefile.am --- lebiniou-3.31/plugins/stable/main/speaker/Makefile.am 2018-11-27 13:50:08.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/speaker/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -2,5 +2,6 @@ plugin_PROGRAMS = speaker.so speaker_so_SOURCES = speaker.c -speaker_so_LDFLAGS = @PLUGIN_LDFLAGS@ -speaker_so_CFLAGS = @PLUGIN_CFLAGS@ +speaker_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +speaker_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +speaker_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/speaker/Makefile.in lebiniou-3.40/plugins/stable/main/speaker/Makefile.in --- lebiniou-3.31/plugins/stable/main/speaker/Makefile.in 2019-04-14 11:52:33.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/speaker/Makefile.in 2020-01-23 13:57:18.000000000 +0000 @@ -104,7 +104,7 @@ PROGRAMS = $(plugin_PROGRAMS) am_speaker_so_OBJECTS = speaker_so-speaker.$(OBJEXT) speaker_so_OBJECTS = $(am_speaker_so_OBJECTS) -speaker_so_LDADD = $(LDADD) +speaker_so_DEPENDENCIES = speaker_so_LINK = $(CCLD) $(speaker_so_CFLAGS) $(CFLAGS) \ $(speaker_so_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -216,6 +216,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -243,6 +245,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -257,7 +260,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -319,8 +325,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/main/speaker speaker_so_SOURCES = speaker.c -speaker_so_LDFLAGS = @PLUGIN_LDFLAGS@ -speaker_so_CFLAGS = @PLUGIN_CFLAGS@ +speaker_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +speaker_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +speaker_so_LDADD = @PLUGIN_LDADD@ all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/main/speaker/speaker.c lebiniou-3.40/plugins/stable/main/speaker/speaker.c --- lebiniou-3.31/plugins/stable/main/speaker/speaker.c 2019-04-05 20:39:15.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/speaker/speaker.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -18,9 +18,11 @@ */ #include "context.h" -#include "../include/infinity.h" +#include "infinity.h" +#include "parameters.h" u_long id = 1190050161; +uint32_t version = 0; u_long options = BE_DISPLACE; char dname[] = "Speaker"; char desc[] = "Infinity effect which reacts to volume"; @@ -31,6 +33,34 @@ static VectorField_t *vf = NULL; +static float volume_scale = 0; + +json_t * +get_parameters() +{ + json_t *params = json_object(); + plugin_parameters_add_double(params, BPP_VOLUME_SCALE, volume_scale, -0.01, 0.01); + + return params; +} + + +void +set_parameters(const json_t *in_parameters) +{ + plugin_parameter_parse_float_range(in_parameters, BPP_VOLUME_SCALE, &volume_scale, 0, 100); +} + + +json_t * +parameters(const json_t *in_parameters) +{ + set_parameters(in_parameters); + + return get_parameters(); +} + + static t_complex fct(t_complex a, guint32 n, gint32 p1, gint32 p2) { @@ -62,29 +92,28 @@ b.x += HWIDTH; b.y += HHEIGHT; - if (b.x < 0.0 ) { - b.x = 0.0; - } else if (b.x > (float)MAXX) { - b.x = (float)MAXX; - } - if (b.y < 0.0) { - b.y = 0.0; - } else if (b.y > (float)MAXY) { - b.y = (float)MAXY; - } + /* because infinity access pixels at (b.x + 1, b.y + 1) */ + b.x = MIN( MAX(b.x, 0), MAXX-1); + b.y = MIN( MAX(b.y, 0), MAXY-1); return b; } void +on_switch_on(Context_t *ctx) +{ + /* Initialize parameters */ + volume_scale = 1; +} + + +int8_t create(Context_t *ctx) { - if (ctx->input == NULL) { - options |= BEQ_DISABLED; - } else { - vf = VectorField_new(NB_FCT, &fct); - } + vf = VectorField_new(NB_FCT, &fct); + + return 1; } @@ -100,7 +129,8 @@ void run(Context_t *ctx) { - u_char volume = volume = (u_char)(Input_get_volume(ctx->input) * 10); + /* volume must be between 0 and NB_FCT-1 */ + u_char volume = volume = (u_char)(Input_get_volume(ctx->input) * volume_scale * NB_FCT); if (volume >= NB_FCT) { volume = NB_FCT-1; diff -Nru lebiniou-3.31/plugins/stable/main/spectrum/Makefile.am lebiniou-3.40/plugins/stable/main/spectrum/Makefile.am --- lebiniou-3.31/plugins/stable/main/spectrum/Makefile.am 2018-11-27 13:50:08.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/spectrum/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -2,5 +2,6 @@ plugin_PROGRAMS = spectrum.so spectrum_so_SOURCES = spectrum.c -spectrum_so_LDFLAGS = @PLUGIN_LDFLAGS@ -spectrum_so_CFLAGS = @PLUGIN_CFLAGS@ +spectrum_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +spectrum_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +spectrum_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/spectrum/Makefile.in lebiniou-3.40/plugins/stable/main/spectrum/Makefile.in --- lebiniou-3.31/plugins/stable/main/spectrum/Makefile.in 2019-04-14 11:52:33.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/spectrum/Makefile.in 2020-01-23 13:57:18.000000000 +0000 @@ -104,7 +104,7 @@ PROGRAMS = $(plugin_PROGRAMS) am_spectrum_so_OBJECTS = spectrum_so-spectrum.$(OBJEXT) spectrum_so_OBJECTS = $(am_spectrum_so_OBJECTS) -spectrum_so_LDADD = $(LDADD) +spectrum_so_DEPENDENCIES = spectrum_so_LINK = $(CCLD) $(spectrum_so_CFLAGS) $(CFLAGS) \ $(spectrum_so_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -216,6 +216,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -243,6 +245,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -257,7 +260,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -319,8 +325,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/main/spectrum spectrum_so_SOURCES = spectrum.c -spectrum_so_LDFLAGS = @PLUGIN_LDFLAGS@ -spectrum_so_CFLAGS = @PLUGIN_CFLAGS@ +spectrum_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +spectrum_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +spectrum_so_LDADD = @PLUGIN_LDADD@ all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/main/spectrum/spectrum.c lebiniou-3.40/plugins/stable/main/spectrum/spectrum.c --- lebiniou-3.31/plugins/stable/main/spectrum/spectrum.c 2019-04-05 20:39:15.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/spectrum/spectrum.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -18,10 +18,11 @@ */ #include "context.h" -#include "../include/spectrum.h" +#include "spectrum.h" u_long id = 1051738767; +uint32_t version = 0; u_long options = BE_SFX2D; u_long mode = OVERLAY; char desc[] = "Display the spectrum"; @@ -31,23 +32,29 @@ void +on_switch_on(Context_t *ctx) +{ + /* Initialize parameters */ + volume_scale = 1; +} + + +int8_t create(Context_t *ctx) { - if (ctx->input == NULL) { - options |= BEQ_DISABLED; - } else { - u_short k; - float da_log; - - v_start = xcalloc(ctx->input->spectrum_size, sizeof(u_short)); - v_end = xcalloc(ctx->input->spectrum_size, sizeof(u_short)); - - da_log = logf(ctx->input->spectrum_size - 1) / logf(10.0); - for (k = 1; k < ctx->input->spectrum_size; k++) { - v_start[k] = float_to_nearest_ushort( logf((float) k) / logf(10.0) / da_log * MAXX, 0, MAXX); - v_end[k] = float_to_nearest_ushort(log1p((float) k) / logf(10.0) / da_log * MAXX, 0, MAXX); /* log1p(x)=logf(x+1) */ - } + u_short k; + float da_log; + + v_start = xcalloc(ctx->input->spectrum_size, sizeof(u_short)); + v_end = xcalloc(ctx->input->spectrum_size, sizeof(u_short)); + + da_log = logf(ctx->input->spectrum_size - 1) / logf(10.0); + for (k = 1; k < ctx->input->spectrum_size; k++) { + v_start[k] = float_to_nearest_ushort( logf((float) k) / logf(10.0) / da_log * MAXX, 0, MAXX); + v_end[k] = float_to_nearest_ushort(log1p((float) k) / logf(10.0) / da_log * MAXX, 0, MAXX); /* log1p(x)=logf(x+1) */ } + + return 1; } @@ -72,7 +79,7 @@ for (i = 1; i < ctx->input->spectrum_size; i++) { u_short top, ye; - top = float_to_nearest_ushort(MAXY * ctx->input->spectrum_log[A_MONO][i], 0, MAXY); + top = float_to_nearest_ushort(MAXY * ctx->input->spectrum_log[A_MONO][i] * volume_scale, 0, MAXY); for (ye = 0; ye < top; ye++) { Pixel_t color = (Pixel_t)floor((float)ye / top * 255.0); h_line_nc(dst, ye, v_start[i], v_end[i], color); diff -Nru lebiniou-3.31/plugins/stable/main/spectrumSh/Makefile.am lebiniou-3.40/plugins/stable/main/spectrumSh/Makefile.am --- lebiniou-3.31/plugins/stable/main/spectrumSh/Makefile.am 2019-02-02 00:30:11.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/spectrumSh/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -2,5 +2,6 @@ plugin_PROGRAMS = spectrumSh.so spectrumSh_so_SOURCES = spectrumSh.c -spectrumSh_so_LDFLAGS = @PLUGIN_LDFLAGS@ -spectrumSh_so_CFLAGS = @PLUGIN_CFLAGS@ +spectrumSh_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +spectrumSh_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +spectrumSh_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/spectrumSh/Makefile.in lebiniou-3.40/plugins/stable/main/spectrumSh/Makefile.in --- lebiniou-3.31/plugins/stable/main/spectrumSh/Makefile.in 2019-04-14 11:52:33.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/spectrumSh/Makefile.in 2020-01-23 13:57:18.000000000 +0000 @@ -104,7 +104,7 @@ PROGRAMS = $(plugin_PROGRAMS) am_spectrumSh_so_OBJECTS = spectrumSh_so-spectrumSh.$(OBJEXT) spectrumSh_so_OBJECTS = $(am_spectrumSh_so_OBJECTS) -spectrumSh_so_LDADD = $(LDADD) +spectrumSh_so_DEPENDENCIES = spectrumSh_so_LINK = $(CCLD) $(spectrumSh_so_CFLAGS) $(CFLAGS) \ $(spectrumSh_so_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -216,6 +216,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -243,6 +245,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -257,7 +260,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -319,8 +325,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/main/spectrumSh spectrumSh_so_SOURCES = spectrumSh.c -spectrumSh_so_LDFLAGS = @PLUGIN_LDFLAGS@ -spectrumSh_so_CFLAGS = @PLUGIN_CFLAGS@ +spectrumSh_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +spectrumSh_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +spectrumSh_so_LDADD = @PLUGIN_LDADD@ all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/main/spectrumSh/spectrumSh.c lebiniou-3.40/plugins/stable/main/spectrumSh/spectrumSh.c --- lebiniou-3.31/plugins/stable/main/spectrumSh/spectrumSh.c 2019-04-05 20:39:15.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/spectrumSh/spectrumSh.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -18,10 +18,11 @@ */ #include "context.h" -#include "../include/spectrum.h" +#include "spectrum.h" u_long id = 1548533802; +uint32_t version = 0; u_long options = BE_SFX2D; u_long mode = OVERLAY; char desc[] = "Horizontal stereo spectrum"; @@ -31,23 +32,29 @@ void +on_switch_on(Context_t *ctx) +{ + /* Initialize parameters */ + volume_scale = 1; +} + + +int8_t create(Context_t *ctx) { - if (ctx->input == NULL) { - options |= BEQ_DISABLED; - } else { - u_short k; - float da_log; - - v_start = xcalloc(ctx->input->spectrum_size, sizeof(u_short)); - v_end = xcalloc(ctx->input->spectrum_size, sizeof(u_short)); - - da_log = logf(ctx->input->spectrum_size - 1) / logf(10.0); - for (k = 1; k < ctx->input->spectrum_size; k++) { - v_start[k] = float_to_nearest_ushort( logf((float)k) / logf(10.0) / da_log * MAXX, 0, MAXX); - v_end[k] = float_to_nearest_ushort(log1p((float)k) / logf(10.0) / da_log * MAXX, 0, MAXX); /* log1p(x)=logf(x+1) */ - } + u_short k; + float da_log; + + v_start = xcalloc(ctx->input->spectrum_size, sizeof(u_short)); + v_end = xcalloc(ctx->input->spectrum_size, sizeof(u_short)); + + da_log = logf(ctx->input->spectrum_size - 1) / logf(10.0); + for (k = 1; k < ctx->input->spectrum_size; k++) { + v_start[k] = float_to_nearest_ushort( logf((float)k) / logf(10.0) / da_log * MAXX, 0, MAXX); + v_end[k] = float_to_nearest_ushort(log1p((float)k) / logf(10.0) / da_log * MAXX, 0, MAXX); /* log1p(x)=logf(x+1) */ } + + return 1; } @@ -73,14 +80,14 @@ u_short top, ye; /* top => left channel */ - top = float_to_nearest_ushort(HHEIGHT * ctx->input->spectrum_log[A_LEFT][i], 0, HHEIGHT); + top = float_to_nearest_ushort(HHEIGHT * ctx->input->spectrum_log[A_LEFT][i] * volume_scale, 0, HHEIGHT); for (ye = 0; ye < top; ye++) { Pixel_t color = (Pixel_t)floor((float)ye / top * 255.0); h_line_nc(dst, HHEIGHT + ye, v_start[i], v_end[i], color); } /* bottom => right channel */ - top = float_to_nearest_ushort(HHEIGHT * ctx->input->spectrum_log[A_RIGHT][i], 0, HHEIGHT); + top = float_to_nearest_ushort(HHEIGHT * ctx->input->spectrum_log[A_RIGHT][i]* volume_scale, 0, HHEIGHT); for (ye = 0; ye < top; ye++) { Pixel_t color = (Pixel_t)floor((float)ye / top * 255.0); h_line_nc(dst, HHEIGHT - ye, v_start[i], v_end[i], color); diff -Nru lebiniou-3.31/plugins/stable/main/spectrumSv/Makefile.am lebiniou-3.40/plugins/stable/main/spectrumSv/Makefile.am --- lebiniou-3.31/plugins/stable/main/spectrumSv/Makefile.am 2019-02-02 00:30:11.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/spectrumSv/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -2,5 +2,6 @@ plugin_PROGRAMS = spectrumSv.so spectrumSv_so_SOURCES = spectrumSv.c -spectrumSv_so_LDFLAGS = @PLUGIN_LDFLAGS@ -spectrumSv_so_CFLAGS = @PLUGIN_CFLAGS@ +spectrumSv_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +spectrumSv_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +spectrumSv_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/spectrumSv/Makefile.in lebiniou-3.40/plugins/stable/main/spectrumSv/Makefile.in --- lebiniou-3.31/plugins/stable/main/spectrumSv/Makefile.in 2019-04-14 11:52:33.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/spectrumSv/Makefile.in 2020-01-23 13:57:18.000000000 +0000 @@ -104,7 +104,7 @@ PROGRAMS = $(plugin_PROGRAMS) am_spectrumSv_so_OBJECTS = spectrumSv_so-spectrumSv.$(OBJEXT) spectrumSv_so_OBJECTS = $(am_spectrumSv_so_OBJECTS) -spectrumSv_so_LDADD = $(LDADD) +spectrumSv_so_DEPENDENCIES = spectrumSv_so_LINK = $(CCLD) $(spectrumSv_so_CFLAGS) $(CFLAGS) \ $(spectrumSv_so_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -216,6 +216,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -243,6 +245,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -257,7 +260,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -319,8 +325,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/main/spectrumSv spectrumSv_so_SOURCES = spectrumSv.c -spectrumSv_so_LDFLAGS = @PLUGIN_LDFLAGS@ -spectrumSv_so_CFLAGS = @PLUGIN_CFLAGS@ +spectrumSv_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +spectrumSv_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +spectrumSv_so_LDADD = @PLUGIN_LDADD@ all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/main/spectrumSv/spectrumSv.c lebiniou-3.40/plugins/stable/main/spectrumSv/spectrumSv.c --- lebiniou-3.31/plugins/stable/main/spectrumSv/spectrumSv.c 2019-04-05 20:39:15.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/spectrumSv/spectrumSv.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -18,10 +18,11 @@ */ #include "context.h" -#include "../include/spectrum.h" +#include "spectrum.h" u_long id = 1548544772; +uint32_t version = 0; u_long options = BE_SFX2D; u_long mode = OVERLAY; char desc[] = "Vertical stereo spectrum"; @@ -31,23 +32,29 @@ void +on_switch_on(Context_t *ctx) +{ + /* Initialize parameters */ + volume_scale = 1; +} + + +int8_t create(Context_t *ctx) { - if (ctx->input == NULL) { - options |= BEQ_DISABLED; - } else { - u_short k; - float da_log; - - v_start = xcalloc(ctx->input->spectrum_size, sizeof(u_short)); - v_end = xcalloc(ctx->input->spectrum_size, sizeof(u_short)); - - da_log = logf(ctx->input->spectrum_size - 1) / logf(10.0); - for (k = 1; k < ctx->input->spectrum_size; k++) { - v_start[k] = float_to_nearest_ushort( logf((float)k) / logf(10.0) / da_log * MAXY, 0, MAXY); - v_end[k] = float_to_nearest_ushort(log1p((float)k) / logf(10.0) / da_log * MAXY, 0, MAXY); /* log1p(x)=logf(x+1) */ - } + u_short k; + float da_log; + + v_start = xcalloc(ctx->input->spectrum_size, sizeof(u_short)); + v_end = xcalloc(ctx->input->spectrum_size, sizeof(u_short)); + + da_log = logf(ctx->input->spectrum_size - 1) / logf(10.0); + for (k = 1; k < ctx->input->spectrum_size; k++) { + v_start[k] = float_to_nearest_ushort( logf((float)k) / logf(10.0) / da_log * MAXY, 0, MAXY); + v_end[k] = float_to_nearest_ushort(log1p((float)k) / logf(10.0) / da_log * MAXY, 0, MAXY); /* log1p(x)=logf(x+1) */ } + + return 1; } @@ -73,14 +80,14 @@ u_short top, xe; /* left => left channel */ - top = float_to_nearest_ushort(HWIDTH * ctx->input->spectrum_log[A_LEFT][i], 0, HWIDTH); + top = float_to_nearest_ushort(HWIDTH * ctx->input->spectrum_log[A_LEFT][i]* volume_scale, 0, HWIDTH); for (xe = 0; xe < top; xe++) { Pixel_t color = (Pixel_t)floor((float)xe / top * 255.0); v_line_nc(dst, HWIDTH + xe, v_start[i], v_end[i], color); } /* right => right channel */ - top = float_to_nearest_ushort(HWIDTH * ctx->input->spectrum_log[A_RIGHT][i], 0, HWIDTH); + top = float_to_nearest_ushort(HWIDTH * ctx->input->spectrum_log[A_RIGHT][i] * volume_scale, 0, HWIDTH); for (xe = 0; xe < top; xe++) { Pixel_t color = (Pixel_t)floor((float)xe / top * 255.0); v_line_nc(dst, HWIDTH - xe, v_start[i], v_end[i], color); diff -Nru lebiniou-3.31/plugins/stable/main/splash/Makefile.am lebiniou-3.40/plugins/stable/main/splash/Makefile.am --- lebiniou-3.31/plugins/stable/main/splash/Makefile.am 2018-11-27 13:50:08.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/splash/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -2,5 +2,6 @@ plugin_PROGRAMS = splash.so splash_so_SOURCES = splash.c -splash_so_LDFLAGS = @PLUGIN_LDFLAGS@ -splash_so_CFLAGS = @PLUGIN_CFLAGS@ +splash_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +splash_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +splash_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/splash/Makefile.in lebiniou-3.40/plugins/stable/main/splash/Makefile.in --- lebiniou-3.31/plugins/stable/main/splash/Makefile.in 2019-04-14 11:52:33.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/splash/Makefile.in 2020-01-23 13:57:18.000000000 +0000 @@ -104,7 +104,7 @@ PROGRAMS = $(plugin_PROGRAMS) am_splash_so_OBJECTS = splash_so-splash.$(OBJEXT) splash_so_OBJECTS = $(am_splash_so_OBJECTS) -splash_so_LDADD = $(LDADD) +splash_so_DEPENDENCIES = splash_so_LINK = $(CCLD) $(splash_so_CFLAGS) $(CFLAGS) \ $(splash_so_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -216,6 +216,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -243,6 +245,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -257,7 +260,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -319,8 +325,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/main/splash splash_so_SOURCES = splash.c -splash_so_LDFLAGS = @PLUGIN_LDFLAGS@ -splash_so_CFLAGS = @PLUGIN_CFLAGS@ +splash_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +splash_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +splash_so_LDADD = @PLUGIN_LDADD@ all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/main/splash/splash.c lebiniou-3.40/plugins/stable/main/splash/splash.c --- lebiniou-3.31/plugins/stable/main/splash/splash.c 2019-04-05 20:39:15.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/splash/splash.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -22,6 +22,7 @@ u_long id = 1070733064; +uint32_t version = 0; u_long options = BEQ_SPLASH|BEQ_FIRST|BEQ_IMAGE; char desc[] = "Splash screen effect"; @@ -42,7 +43,6 @@ { u_long i; - splashing = 1; for (i = 0; i < WIDTH; i++) { splash_map[i] = 0; } @@ -55,22 +55,19 @@ b_timer_start(step_splash_timer); b_timer_start(splash_timer); - splashing = 1; } -void +int8_t create(Context_t *ctx) { - if (images == NULL) { - options |= BEQ_DISABLED; - } else { - splash_map = xcalloc(BUFFSIZE, sizeof(u_long)); - dst_splash_map = xcalloc(BUFFSIZE, sizeof(u_long)); - step_splash_timer = b_timer_new(); - splash_timer = b_timer_new(); - } + splash_map = xcalloc(BUFFSIZE, sizeof(u_long)); + dst_splash_map = xcalloc(BUFFSIZE, sizeof(u_long)); + step_splash_timer = b_timer_new(); + splash_timer = b_timer_new(); + + return 1; } diff -Nru lebiniou-3.31/plugins/stable/main/swarm/Makefile.am lebiniou-3.40/plugins/stable/main/swarm/Makefile.am --- lebiniou-3.31/plugins/stable/main/swarm/Makefile.am 2018-11-27 13:50:08.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/swarm/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -2,5 +2,6 @@ plugin_PROGRAMS = swarm.so swarm_so_SOURCES = swarm.c -swarm_so_LDFLAGS = @PLUGIN_LDFLAGS@ -swarm_so_CFLAGS = @PLUGIN_CFLAGS@ +swarm_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +swarm_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +swarm_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/swarm/Makefile.in lebiniou-3.40/plugins/stable/main/swarm/Makefile.in --- lebiniou-3.31/plugins/stable/main/swarm/Makefile.in 2019-04-14 11:52:33.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/swarm/Makefile.in 2020-01-23 13:57:18.000000000 +0000 @@ -104,7 +104,7 @@ PROGRAMS = $(plugin_PROGRAMS) am_swarm_so_OBJECTS = swarm_so-swarm.$(OBJEXT) swarm_so_OBJECTS = $(am_swarm_so_OBJECTS) -swarm_so_LDADD = $(LDADD) +swarm_so_DEPENDENCIES = swarm_so_LINK = $(CCLD) $(swarm_so_CFLAGS) $(CFLAGS) \ $(swarm_so_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -216,6 +216,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -243,6 +245,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -257,7 +260,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -319,8 +325,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/main/swarm swarm_so_SOURCES = swarm.c -swarm_so_LDFLAGS = @PLUGIN_LDFLAGS@ -swarm_so_CFLAGS = @PLUGIN_CFLAGS@ +swarm_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +swarm_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +swarm_so_LDADD = @PLUGIN_LDADD@ all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/main/swarm/swarm.c lebiniou-3.40/plugins/stable/main/swarm/swarm.c --- lebiniou-3.31/plugins/stable/main/swarm/swarm.c 2019-04-05 20:39:15.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/swarm/swarm.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -45,33 +45,34 @@ u_long id = 1069699791; +uint32_t version = 0; u_long options = BE_GFX; u_long mode = OVERLAY; char desc[] = "Swarm effect"; -#define MINBEES 1 /* min number of bees */ -#define MINTRAIL 3 /* min number of time positions recorded */ -#define BEEACC 3 /* acceleration of bees */ -#define WASPACC 5 /* maximum acceleration of wasp */ -#define BEEVEL 17 /* maximum bee velocity */ -#define WASPVEL 15 /* maximum wasp velocity */ +#define MINBEES 1 /* min number of bees */ +#define MINTRAIL 3 /* min number of time positions recorded */ +#define BEEACC 3 /* acceleration of bees */ +#define WASPACC 5 /* maximum acceleration of wasp */ +#define BEEVEL 17 /* maximum bee velocity */ +#define WASPVEL 15 /* maximum wasp velocity */ #define NRAND(x) (b_rand_int_range(0, x)) /* Macros */ -#define X(t,b) (swarm.x[((t)*swarm.beecount+(b))]) -#define Y(t,b) (swarm.y[((t)*swarm.beecount+(b))]) -#define balance_rand(v) ((NRAND(v))-((v-1)/2)) /* random number around 0, input odd */ +#define X(t,b) (swarm.x[((t)*swarm.beecount+(b))]) +#define Y(t,b) (swarm.y[((t)*swarm.beecount+(b))]) +#define balance_rand(v) ((NRAND(v))-((v-1)/2)) /* random number around 0, input odd */ typedef struct { int pix; - int border; /* wasp won't go closer than this to the edge */ - int beecount; /* number of bees */ - Line_t *segs; /* bee lines */ - float *x, *y; /* bee positions x[time][bee#] */ - float *xv, *yv; /* bee velocities xv[bee#] */ + int border; /* wasp won't go closer than this to the edge */ + int beecount; /* number of bees */ + Line_t *segs; /* bee lines */ + float *x, *y; /* bee positions x[time][bee#] */ + float *xv, *yv; /* bee velocities xv[bee#] */ short wx[3]; short wy[3]; short wxv; @@ -85,7 +86,7 @@ static swarmstruct swarm; -void +int8_t create(Context_t *ctx) { int b, t; @@ -123,6 +124,8 @@ swarm.xv[b] = balance_rand(7); swarm.yv[b] = balance_rand(7); } + + return 1; } diff -Nru lebiniou-3.31/plugins/stable/main/taquin/Makefile.am lebiniou-3.40/plugins/stable/main/taquin/Makefile.am --- lebiniou-3.31/plugins/stable/main/taquin/Makefile.am 2018-11-27 13:50:08.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/taquin/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -2,5 +2,6 @@ plugin_PROGRAMS = taquin.so taquin_so_SOURCES = taquin.c -taquin_so_LDFLAGS = @PLUGIN_LDFLAGS@ -taquin_so_CFLAGS = @PLUGIN_CFLAGS@ +taquin_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +taquin_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +taquin_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/taquin/Makefile.in lebiniou-3.40/plugins/stable/main/taquin/Makefile.in --- lebiniou-3.31/plugins/stable/main/taquin/Makefile.in 2019-04-14 11:52:33.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/taquin/Makefile.in 2020-01-23 13:57:18.000000000 +0000 @@ -104,7 +104,7 @@ PROGRAMS = $(plugin_PROGRAMS) am_taquin_so_OBJECTS = taquin_so-taquin.$(OBJEXT) taquin_so_OBJECTS = $(am_taquin_so_OBJECTS) -taquin_so_LDADD = $(LDADD) +taquin_so_DEPENDENCIES = taquin_so_LINK = $(CCLD) $(taquin_so_CFLAGS) $(CFLAGS) \ $(taquin_so_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -216,6 +216,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -243,6 +245,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -257,7 +260,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -319,8 +325,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/main/taquin taquin_so_SOURCES = taquin.c -taquin_so_LDFLAGS = @PLUGIN_LDFLAGS@ -taquin_so_CFLAGS = @PLUGIN_CFLAGS@ +taquin_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +taquin_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +taquin_so_LDADD = @PLUGIN_LDADD@ all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/main/taquin/taquin.c lebiniou-3.40/plugins/stable/main/taquin/taquin.c --- lebiniou-3.31/plugins/stable/main/taquin/taquin.c 2019-04-05 20:39:15.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/taquin/taquin.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -21,6 +21,7 @@ u_long id = 970430119; +uint32_t version = 0; u_long options = BE_LENS; char dname[] = "Taquin"; char desc[] = "Taquin effect"; @@ -48,34 +49,12 @@ // #define TAQUIN_ASSERT // Define to crash with assertions -static inline void -disabled() -{ - options |= BEQ_DISABLED; -} - - -static inline int +static inline int8_t is_ok(const u_short size) { - int res; - - res = ((!(WIDTH % size)) && (!(HEIGHT % size))); + return ((!(WIDTH % size)) && (!(HEIGHT % size))); /* printf("[i] taquin: size= %d for %dx%d: %d, %d -> %d\n", size, WIDTH, HEIGHT, WIDTH%size, HEIGHT%size, res); */ - - if (!res) { - Shuffler_disable(shf, size); - } - - return res; -} - - -static inline u_short -get_size() -{ - return Shuffler_get(shf); } @@ -165,7 +144,7 @@ } -static inline void +static inline int8_t prepare(Shuffler_t *shf) { int i; @@ -174,20 +153,33 @@ for (i = 0; i < MIN_SIZE; i++) { Shuffler_disable(shf, i); } + + /* check other sizes are valid */ + for (i = MIN_SIZE; i < MAX_SIZE; i++) { + if (!is_ok(i)) { + Shuffler_disable(shf, i); + } + } + + return Shuffler_ok(shf); } -void +int8_t create(Context_t *ctx) { if ((WIDTH < 3 * MIN_SIZE) || (HEIGHT < 3 * MIN_SIZE)) { printf("[!] taquin: not enough space\n"); - disabled(); + return 0; } else { shf = Shuffler_new(MAX_SIZE); /* Shuffler_verbose(shf); */ - prepare(shf); - map = xcalloc(BUFFSIZE, sizeof(u_long)); + if (prepare(shf)) { + map = xcalloc(BUFFSIZE, sizeof(u_long)); + return 1; + } else { + return 0; + } } } @@ -344,21 +336,21 @@ slide() { switch (dir) { - case SLIDE_RL: - slide_rl(); - break; - case SLIDE_DT: - slide_dt(); - break; - case SLIDE_LR: - slide_lr(); - break; - case SLIDE_TD: - slide_td(); - break; - default: - xerror("T'as qu'un taquin"); - break; + case SLIDE_RL: + slide_rl(); + break; + case SLIDE_DT: + slide_dt(); + break; + case SLIDE_LR: + slide_lr(); + break; + case SLIDE_TD: + slide_td(); + break; + default: + xerror("T'as qu'un taquin"); + break; } } @@ -403,19 +395,12 @@ map[k] = k; } - do { - size = get_size(); - } while (!is_ok(size) && Shuffler_ok(shf)); - - if (!Shuffler_ok(shf)) { - printf("[!] %s: Could not find a suitable size, disabling plugin\n", __FILE__); - disabled(); - } else { - hole_x = (u_short)(drand48() * NX) * size; - hole_y = (u_short)(drand48() * NY) * size; - new_hole(); + size = Shuffler_get(shf); - init_grid(); - step = TAQUIN_MIN; - } + hole_x = (u_short)(drand48() * NX) * size; + hole_y = (u_short)(drand48() * NY) * size; + new_hole(); + + init_grid(); + step = TAQUIN_MIN; } diff -Nru lebiniou-3.31/plugins/stable/main/test_beat_detection/Makefile.am lebiniou-3.40/plugins/stable/main/test_beat_detection/Makefile.am --- lebiniou-3.31/plugins/stable/main/test_beat_detection/Makefile.am 2019-04-05 20:39:15.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/test_beat_detection/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -2,5 +2,6 @@ plugin_PROGRAMS = test_beat_detection.so test_beat_detection_so_SOURCES = test_beat_detection.c -test_beat_detection_so_LDFLAGS = @PLUGIN_LDFLAGS@ -test_beat_detection_so_CFLAGS = @PLUGIN_CFLAGS@ +test_beat_detection_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +test_beat_detection_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +test_beat_detection_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/test_beat_detection/Makefile.in lebiniou-3.40/plugins/stable/main/test_beat_detection/Makefile.in --- lebiniou-3.31/plugins/stable/main/test_beat_detection/Makefile.in 2019-04-14 11:52:33.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/test_beat_detection/Makefile.in 2020-01-23 13:57:18.000000000 +0000 @@ -105,7 +105,7 @@ am_test_beat_detection_so_OBJECTS = \ test_beat_detection_so-test_beat_detection.$(OBJEXT) test_beat_detection_so_OBJECTS = $(am_test_beat_detection_so_OBJECTS) -test_beat_detection_so_LDADD = $(LDADD) +test_beat_detection_so_DEPENDENCIES = test_beat_detection_so_LINK = $(CCLD) $(test_beat_detection_so_CFLAGS) \ $(CFLAGS) $(test_beat_detection_so_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -218,6 +218,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -245,6 +247,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -259,7 +262,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -321,8 +327,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/main/test_beat_detection test_beat_detection_so_SOURCES = test_beat_detection.c -test_beat_detection_so_LDFLAGS = @PLUGIN_LDFLAGS@ -test_beat_detection_so_CFLAGS = @PLUGIN_CFLAGS@ +test_beat_detection_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +test_beat_detection_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +test_beat_detection_so_LDADD = @PLUGIN_LDADD@ all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/main/test_beat_detection/test_beat_detection.c lebiniou-3.40/plugins/stable/main/test_beat_detection/test_beat_detection.c --- lebiniou-3.31/plugins/stable/main/test_beat_detection/test_beat_detection.c 2019-04-05 20:39:15.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/test_beat_detection/test_beat_detection.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -21,21 +21,13 @@ u_long id = 1550935904; +uint32_t version = 0; u_long options = BE_SFX2D|BEQ_NORANDOM; u_long mode = OVERLAY; char desc[] = "Test beat detection"; void -create(Context_t *ctx) -{ - if (ctx->input == NULL) { - options |= BEQ_DISABLED; - } -} - - -void run(Context_t *ctx) { Buffer8_t *src = active_buffer(ctx); diff -Nru lebiniou-3.31/plugins/stable/main/touw_eiffel/Makefile.am lebiniou-3.40/plugins/stable/main/touw_eiffel/Makefile.am --- lebiniou-3.31/plugins/stable/main/touw_eiffel/Makefile.am 2018-11-27 13:50:08.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/touw_eiffel/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -2,5 +2,6 @@ plugin_PROGRAMS = touw_eiffel.so touw_eiffel_so_SOURCES = touw_eiffel.c -touw_eiffel_so_LDFLAGS = @PLUGIN_LDFLAGS@ -touw_eiffel_so_CFLAGS = @PLUGIN_CFLAGS@ +touw_eiffel_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +touw_eiffel_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +touw_eiffel_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/touw_eiffel/Makefile.in lebiniou-3.40/plugins/stable/main/touw_eiffel/Makefile.in --- lebiniou-3.31/plugins/stable/main/touw_eiffel/Makefile.in 2019-04-14 11:52:33.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/touw_eiffel/Makefile.in 2020-01-23 13:57:18.000000000 +0000 @@ -104,7 +104,7 @@ PROGRAMS = $(plugin_PROGRAMS) am_touw_eiffel_so_OBJECTS = touw_eiffel_so-touw_eiffel.$(OBJEXT) touw_eiffel_so_OBJECTS = $(am_touw_eiffel_so_OBJECTS) -touw_eiffel_so_LDADD = $(LDADD) +touw_eiffel_so_DEPENDENCIES = touw_eiffel_so_LINK = $(CCLD) $(touw_eiffel_so_CFLAGS) $(CFLAGS) \ $(touw_eiffel_so_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -216,6 +216,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -243,6 +245,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -257,7 +260,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -319,8 +325,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/main/touw_eiffel touw_eiffel_so_SOURCES = touw_eiffel.c -touw_eiffel_so_LDFLAGS = @PLUGIN_LDFLAGS@ -touw_eiffel_so_CFLAGS = @PLUGIN_CFLAGS@ +touw_eiffel_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +touw_eiffel_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +touw_eiffel_so_LDADD = @PLUGIN_LDADD@ all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/main/touw_eiffel/touw_eiffel.c lebiniou-3.40/plugins/stable/main/touw_eiffel/touw_eiffel.c --- lebiniou-3.31/plugins/stable/main/touw_eiffel/touw_eiffel.c 2019-04-05 20:39:15.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/touw_eiffel/touw_eiffel.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -21,6 +21,7 @@ u_long id = 1165173455; +uint32_t version = 0; u_long options = BE_GFX; char dname[] = "Le Touw Eiffel"; u_long mode = OVERLAY; @@ -38,7 +39,7 @@ static GRand *rnd; -void +int8_t create(Context_t *ctx) { int x; @@ -55,6 +56,8 @@ rnd = g_rand_new(); VERBOSE(printf("[i] Ouh-ouuuh! \\o/ Le Touw Eiffel !!\n")); + + return 1; } diff -Nru lebiniou-3.31/plugins/stable/main/tunnel/Makefile.am lebiniou-3.40/plugins/stable/main/tunnel/Makefile.am --- lebiniou-3.31/plugins/stable/main/tunnel/Makefile.am 2018-11-27 13:50:08.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/tunnel/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -2,5 +2,6 @@ plugin_PROGRAMS = tunnel.so tunnel_so_SOURCES = tunnel.c -tunnel_so_LDFLAGS = @PLUGIN_LDFLAGS@ -tunnel_so_CFLAGS = @PLUGIN_CFLAGS@ +tunnel_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +tunnel_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +tunnel_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/tunnel/Makefile.in lebiniou-3.40/plugins/stable/main/tunnel/Makefile.in --- lebiniou-3.31/plugins/stable/main/tunnel/Makefile.in 2019-04-14 11:52:33.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/tunnel/Makefile.in 2020-01-23 13:57:18.000000000 +0000 @@ -104,7 +104,7 @@ PROGRAMS = $(plugin_PROGRAMS) am_tunnel_so_OBJECTS = tunnel_so-tunnel.$(OBJEXT) tunnel_so_OBJECTS = $(am_tunnel_so_OBJECTS) -tunnel_so_LDADD = $(LDADD) +tunnel_so_DEPENDENCIES = tunnel_so_LINK = $(CCLD) $(tunnel_so_CFLAGS) $(CFLAGS) \ $(tunnel_so_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -216,6 +216,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -243,6 +245,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -257,7 +260,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -319,8 +325,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/main/tunnel tunnel_so_SOURCES = tunnel.c -tunnel_so_LDFLAGS = @PLUGIN_LDFLAGS@ -tunnel_so_CFLAGS = @PLUGIN_CFLAGS@ +tunnel_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +tunnel_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +tunnel_so_LDADD = @PLUGIN_LDADD@ all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/main/tunnel/tunnel.c lebiniou-3.40/plugins/stable/main/tunnel/tunnel.c --- lebiniou-3.31/plugins/stable/main/tunnel/tunnel.c 2019-04-05 20:39:15.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/tunnel/tunnel.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -21,13 +21,14 @@ u_long id = 944746507; +uint32_t version = 0; u_long options = BE_WARP|BE_LENS; char desc[] = "Tunnel effect"; static u_long *tunnel; -void +int8_t create(Context_t *ctx) { u_short di, dj, start; @@ -52,6 +53,8 @@ (u_long)((u_short)((float)(di - start) / length * (float)HEIGHT) * WIDTH + ((float)(dj * 2) / HEIGHT) * WIDTH); } } + + return 1; } diff -Nru lebiniou-3.31/plugins/stable/main/tv_1d/Makefile.am lebiniou-3.40/plugins/stable/main/tv_1d/Makefile.am --- lebiniou-3.31/plugins/stable/main/tv_1d/Makefile.am 2018-11-27 13:50:08.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/tv_1d/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -2,5 +2,6 @@ plugin_PROGRAMS = tv_1d.so tv_1d_so_SOURCES = tv_1d.c -tv_1d_so_LDFLAGS = @PLUGIN_LDFLAGS@ -tv_1d_so_CFLAGS = @PLUGIN_CFLAGS@ +tv_1d_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +tv_1d_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +tv_1d_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/tv_1d/Makefile.in lebiniou-3.40/plugins/stable/main/tv_1d/Makefile.in --- lebiniou-3.31/plugins/stable/main/tv_1d/Makefile.in 2019-04-14 11:52:33.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/tv_1d/Makefile.in 2020-01-23 13:57:18.000000000 +0000 @@ -104,7 +104,7 @@ PROGRAMS = $(plugin_PROGRAMS) am_tv_1d_so_OBJECTS = tv_1d_so-tv_1d.$(OBJEXT) tv_1d_so_OBJECTS = $(am_tv_1d_so_OBJECTS) -tv_1d_so_LDADD = $(LDADD) +tv_1d_so_DEPENDENCIES = tv_1d_so_LINK = $(CCLD) $(tv_1d_so_CFLAGS) $(CFLAGS) \ $(tv_1d_so_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -216,6 +216,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -243,6 +245,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -257,7 +260,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -319,8 +325,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/main/tv_1d tv_1d_so_SOURCES = tv_1d.c -tv_1d_so_LDFLAGS = @PLUGIN_LDFLAGS@ -tv_1d_so_CFLAGS = @PLUGIN_CFLAGS@ +tv_1d_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +tv_1d_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +tv_1d_so_LDADD = @PLUGIN_LDADD@ all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/main/tv_1d/tv_1d.c lebiniou-3.40/plugins/stable/main/tv_1d/tv_1d.c --- lebiniou-3.31/plugins/stable/main/tv_1d/tv_1d.c 2019-04-05 20:39:15.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/tv_1d/tv_1d.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -21,6 +21,7 @@ u_long id = 1325105220; +uint32_t version = 0; u_long options = BE_GFX|BEQ_IMAGE|BEQ_MUTE_CAM|BEQ_NORANDOM; char desc[] = "1dTV plugin from the EffecTV project"; u_long mode = OVERLAY; @@ -30,15 +31,13 @@ static Pixel_t *linebuf = NULL; -void +int8_t create(Context_t *ctx) { - if (!ctx->webcams) { - options |= BEQ_DISABLED; - } else { - line = MAXY; - linebuf = xcalloc(WIDTH, sizeof(Pixel_t)); - } + line = MAXY; + linebuf = xcalloc(WIDTH, sizeof(Pixel_t)); + + return 1; } diff -Nru lebiniou-3.31/plugins/stable/main/tv_colrot/Makefile.am lebiniou-3.40/plugins/stable/main/tv_colrot/Makefile.am --- lebiniou-3.31/plugins/stable/main/tv_colrot/Makefile.am 1970-01-01 00:00:00.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/tv_colrot/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -0,0 +1,7 @@ +plugindir = @libdir@/lebiniou/plugins/main/tv_colrot +plugin_PROGRAMS = tv_colrot.so + +tv_colrot_so_SOURCES = tv_colrot.c +tv_colrot_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +tv_colrot_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +tv_colrot_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/tv_colrot/Makefile.in lebiniou-3.40/plugins/stable/main/tv_colrot/Makefile.in --- lebiniou-3.31/plugins/stable/main/tv_colrot/Makefile.in 1970-01-01 00:00:00.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/tv_colrot/Makefile.in 2020-01-23 13:57:18.000000000 +0000 @@ -0,0 +1,665 @@ +# Makefile.in generated by automake 1.16.1 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994-2018 Free Software Foundation, Inc. + +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +VPATH = @srcdir@ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +target_triplet = @target@ +plugin_PROGRAMS = tv_colrot.so$(EXEEXT) +subdir = plugins/stable/main/tv_colrot +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +am__installdirs = "$(DESTDIR)$(plugindir)" +PROGRAMS = $(plugin_PROGRAMS) +am_tv_colrot_so_OBJECTS = tv_colrot_so-tv_colrot.$(OBJEXT) +tv_colrot_so_OBJECTS = $(am_tv_colrot_so_OBJECTS) +tv_colrot_so_DEPENDENCIES = +tv_colrot_so_LINK = $(CCLD) $(tv_colrot_so_CFLAGS) $(CFLAGS) \ + $(tv_colrot_so_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) +depcomp = $(SHELL) $(top_srcdir)/depcomp +am__maybe_remake_depfiles = depfiles +am__depfiles_remade = ./$(DEPDIR)/tv_colrot_so-tv_colrot.Po +am__mv = mv -f +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = +CCLD = $(CC) +LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = +SOURCES = $(tv_colrot_so_SOURCES) +DIST_SOURCES = $(tv_colrot_so_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +ALSA_CFLAGS = @ALSA_CFLAGS@ +ALSA_LIBS = @ALSA_LIBS@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AVUTIL_CFLAGS = @AVUTIL_CFLAGS@ +AVUTIL_LIBS = @AVUTIL_LIBS@ +AWK = @AWK@ +BINIOU_VERSION = @BINIOU_VERSION@ +CACA_CFLAGS = @CACA_CFLAGS@ +CACA_LIBS = @CACA_LIBS@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DPKG_BUILDFLAGS_CHECK = @DPKG_BUILDFLAGS_CHECK@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +ESD_CFLAGS = @ESD_CFLAGS@ +ESD_LIBS = @ESD_LIBS@ +EXEEXT = @EXEEXT@ +FFTW3_CFLAGS = @FFTW3_CFLAGS@ +FFTW3_LIBS = @FFTW3_LIBS@ +FT2_CFLAGS = @FT2_CFLAGS@ +FT2_LIBS = @FT2_LIBS@ +GETOPT_LONG_LIBS = @GETOPT_LONG_LIBS@ +GLIB_CFLAGS = @GLIB_CFLAGS@ +GLIB_LIBS = @GLIB_LIBS@ +GLU_CFLAGS = @GLU_CFLAGS@ +GLU_LIBS = @GLU_LIBS@ +GREP = @GREP@ +INPUT_PLUGINS = @INPUT_PLUGINS@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +JACK_CFLAGS = @JACK_CFLAGS@ +JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ +LDFLAGS = @LDFLAGS@ +LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ +LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ +LEBINIOU_SCHEMES_FILE = @LEBINIOU_SCHEMES_FILE@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ +MagickWand_CFLAGS = @MagickWand_CFLAGS@ +MagickWand_LIBS = @MagickWand_LIBS@ +OBJEXT = @OBJEXT@ +OSD_FONT = @OSD_FONT@ +OSD_PTSIZE = @OSD_PTSIZE@ +OUTPUT_PLUGINS = @OUTPUT_PLUGINS@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ +PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ +PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ +PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ +PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ +SDL2_CFLAGS = @SDL2_CFLAGS@ +SDL2_LIBS = @SDL2_LIBS@ +SDL2_ttf_CFLAGS = @SDL2_ttf_CFLAGS@ +SDL2_ttf_LIBS = @SDL2_ttf_LIBS@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +SNDFILE_CFLAGS = @SNDFILE_CFLAGS@ +SNDFILE_LIBS = @SNDFILE_LIBS@ +STRIP = @STRIP@ +SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ +SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ +VERSION = @VERSION@ +XML2_CFLAGS = @XML2_CFLAGS@ +XML2_LIBS = @XML2_LIBS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_CC = @ac_ct_CC@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +have_pandoc = @have_pandoc@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +runstatedir = @runstatedir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target = @target@ +target_alias = @target_alias@ +target_cpu = @target_cpu@ +target_os = @target_os@ +target_vendor = @target_vendor@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +plugindir = @libdir@/lebiniou/plugins/main/tv_colrot +tv_colrot_so_SOURCES = tv_colrot.c +tv_colrot_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +tv_colrot_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +tv_colrot_so_LDADD = @PLUGIN_LDADD@ +all: all-am + +.SUFFIXES: +.SUFFIXES: .c .o .obj +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign plugins/stable/main/tv_colrot/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --foreign plugins/stable/main/tv_colrot/Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): +install-pluginPROGRAMS: $(plugin_PROGRAMS) + @$(NORMAL_INSTALL) + @list='$(plugin_PROGRAMS)'; test -n "$(plugindir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \ + fi; \ + for p in $$list; do echo "$$p $$p"; done | \ + sed 's/$(EXEEXT)$$//' | \ + while read p p1; do if test -f $$p \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ + done | \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ + -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ + sed 'N;N;N;s,\n, ,g' | \ + $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ + { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ + if ($$2 == $$4) files[d] = files[d] " " $$1; \ + else { print "f", $$3 "/" $$4, $$1; } } \ + END { for (d in files) print "f", d, files[d] }' | \ + while read type dir files; do \ + if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ + test -z "$$files" || { \ + echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(plugindir)$$dir'"; \ + $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(plugindir)$$dir" || exit $$?; \ + } \ + ; done + +uninstall-pluginPROGRAMS: + @$(NORMAL_UNINSTALL) + @list='$(plugin_PROGRAMS)'; test -n "$(plugindir)" || list=; \ + files=`for p in $$list; do echo "$$p"; done | \ + sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ + -e 's/$$/$(EXEEXT)/' \ + `; \ + test -n "$$list" || exit 0; \ + echo " ( cd '$(DESTDIR)$(plugindir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(plugindir)" && rm -f $$files + +clean-pluginPROGRAMS: + -test -z "$(plugin_PROGRAMS)" || rm -f $(plugin_PROGRAMS) + +tv_colrot.so$(EXEEXT): $(tv_colrot_so_OBJECTS) $(tv_colrot_so_DEPENDENCIES) $(EXTRA_tv_colrot_so_DEPENDENCIES) + @rm -f tv_colrot.so$(EXEEXT) + $(AM_V_CCLD)$(tv_colrot_so_LINK) $(tv_colrot_so_OBJECTS) $(tv_colrot_so_LDADD) $(LIBS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tv_colrot_so-tv_colrot.Po@am__quote@ # am--include-marker + +$(am__depfiles_remade): + @$(MKDIR_P) $(@D) + @echo '# dummy' >$@-t && $(am__mv) $@-t $@ + +am--depfiles: $(am__depfiles_remade) + +.c.o: +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< + +.c.obj: +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + +tv_colrot_so-tv_colrot.o: tv_colrot.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tv_colrot_so_CFLAGS) $(CFLAGS) -MT tv_colrot_so-tv_colrot.o -MD -MP -MF $(DEPDIR)/tv_colrot_so-tv_colrot.Tpo -c -o tv_colrot_so-tv_colrot.o `test -f 'tv_colrot.c' || echo '$(srcdir)/'`tv_colrot.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/tv_colrot_so-tv_colrot.Tpo $(DEPDIR)/tv_colrot_so-tv_colrot.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='tv_colrot.c' object='tv_colrot_so-tv_colrot.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tv_colrot_so_CFLAGS) $(CFLAGS) -c -o tv_colrot_so-tv_colrot.o `test -f 'tv_colrot.c' || echo '$(srcdir)/'`tv_colrot.c + +tv_colrot_so-tv_colrot.obj: tv_colrot.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tv_colrot_so_CFLAGS) $(CFLAGS) -MT tv_colrot_so-tv_colrot.obj -MD -MP -MF $(DEPDIR)/tv_colrot_so-tv_colrot.Tpo -c -o tv_colrot_so-tv_colrot.obj `if test -f 'tv_colrot.c'; then $(CYGPATH_W) 'tv_colrot.c'; else $(CYGPATH_W) '$(srcdir)/tv_colrot.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/tv_colrot_so-tv_colrot.Tpo $(DEPDIR)/tv_colrot_so-tv_colrot.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='tv_colrot.c' object='tv_colrot_so-tv_colrot.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tv_colrot_so_CFLAGS) $(CFLAGS) -c -o tv_colrot_so-tv_colrot.obj `if test -f 'tv_colrot.c'; then $(CYGPATH_W) 'tv_colrot.c'; else $(CYGPATH_W) '$(srcdir)/tv_colrot.c'; fi` + +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags + +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + set x; \ + here=`pwd`; \ + $(am__define_uniq_tagged_files); \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ + fi +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ + test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(PROGRAMS) +installdirs: + for dir in "$(DESTDIR)$(plugindir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-pluginPROGRAMS mostlyclean-am + +distclean: distclean-am + -rm -f ./$(DEPDIR)/tv_colrot_so-tv_colrot.Po + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-tags + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: install-pluginPROGRAMS + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f ./$(DEPDIR)/tv_colrot_so-tv_colrot.Po + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-compile mostlyclean-generic + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-pluginPROGRAMS + +.MAKE: install-am install-strip + +.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \ + clean-generic clean-pluginPROGRAMS cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-pluginPROGRAMS install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \ + ps ps-am tags tags-am uninstall uninstall-am \ + uninstall-pluginPROGRAMS + +.PRECIOUS: Makefile + + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -Nru lebiniou-3.31/plugins/stable/main/tv_colrot/tv_colrot.c lebiniou-3.40/plugins/stable/main/tv_colrot/tv_colrot.c --- lebiniou-3.31/plugins/stable/main/tv_colrot/tv_colrot.c 1970-01-01 00:00:00.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/tv_colrot/tv_colrot.c 2020-01-22 18:33:57.000000000 +0000 @@ -0,0 +1,75 @@ +/* + * Copyright 1994-2020 Olivier Girondel + * Copyright 2019-2020 Tavasti + * + * This file is part of lebiniou. + * + * lebiniou 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 of the License, or + * (at your option) any later version. + * + * lebiniou 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 lebiniou. If not, see . + */ + +/* Colrot, Color Rotation + + basic idea of plugin: Show only part of the colors from webcam video, + and scroll thru colors. Not visible colors are transparent, + showing stuff happening under. Using lens mode. + + This plugin is 'normal', pretty agressive version of Colrot +*/ + + +#include "context.h" + +#define MASK_SIZE 15 /* what size of chunks colorspace is divided */ +#define COLORCOUNT 5 /* how many colors are visible in each chunk */ + +u_long id = 1552405159; +uint32_t version = 0; +u_long options = BE_GFX|BE_LENS|BEQ_MUTE_CAM; +char desc[] = "Show webcam scrolling colors"; +u_long mode = OVERLAY; + +static Pixel_t min1= 0, max1 = COLORCOUNT; + + +void +run(Context_t *ctx) +{ + Pixel_t *src1, *start, *dst; + + dst = start = passive_buffer(ctx)->buffer; + + pthread_mutex_lock(&ctx->cam_mtx[ctx->cam]); + src1 = ctx->cam_save[ctx->cam][0]->buffer; + for (; dst < start + BUFFSIZE * sizeof(Pixel_t); src1++, dst++) { + if ( /* max1 is bigger than min, show values between them */ + ((max1 > min1) && + ((*src1 & MASK_SIZE) > min1) && ((*src1 & MASK_SIZE) < max1)) || + /* max is rotated over, show values below max or above min */ + ((max1 < min1) && + (((*src1 & MASK_SIZE)> min1) || ((*src1 & MASK_SIZE) < max1)))) { + *dst = *src1; + } else { + *dst = 0; + } + } + pthread_mutex_unlock(&ctx->cam_mtx[ctx->cam]); + min1++; + max1++; + if (min1 > MASK_SIZE) { + min1 = 0; + } + if (max1 > MASK_SIZE) { + max1 = 0; + } +} diff -Nru lebiniou-3.31/plugins/stable/main/tv_colrotbeat/Makefile.am lebiniou-3.40/plugins/stable/main/tv_colrotbeat/Makefile.am --- lebiniou-3.31/plugins/stable/main/tv_colrotbeat/Makefile.am 1970-01-01 00:00:00.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/tv_colrotbeat/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -0,0 +1,7 @@ +plugindir = @libdir@/lebiniou/plugins/main/tv_colrotbeat +plugin_PROGRAMS = tv_colrotbeat.so + +tv_colrotbeat_so_SOURCES = tv_colrotbeat.c +tv_colrotbeat_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +tv_colrotbeat_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +tv_colrotbeat_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/tv_colrotbeat/Makefile.in lebiniou-3.40/plugins/stable/main/tv_colrotbeat/Makefile.in --- lebiniou-3.31/plugins/stable/main/tv_colrotbeat/Makefile.in 1970-01-01 00:00:00.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/tv_colrotbeat/Makefile.in 2020-01-23 13:57:18.000000000 +0000 @@ -0,0 +1,666 @@ +# Makefile.in generated by automake 1.16.1 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994-2018 Free Software Foundation, Inc. + +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +VPATH = @srcdir@ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +target_triplet = @target@ +plugin_PROGRAMS = tv_colrotbeat.so$(EXEEXT) +subdir = plugins/stable/main/tv_colrotbeat +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +am__installdirs = "$(DESTDIR)$(plugindir)" +PROGRAMS = $(plugin_PROGRAMS) +am_tv_colrotbeat_so_OBJECTS = \ + tv_colrotbeat_so-tv_colrotbeat.$(OBJEXT) +tv_colrotbeat_so_OBJECTS = $(am_tv_colrotbeat_so_OBJECTS) +tv_colrotbeat_so_DEPENDENCIES = +tv_colrotbeat_so_LINK = $(CCLD) $(tv_colrotbeat_so_CFLAGS) $(CFLAGS) \ + $(tv_colrotbeat_so_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) +depcomp = $(SHELL) $(top_srcdir)/depcomp +am__maybe_remake_depfiles = depfiles +am__depfiles_remade = ./$(DEPDIR)/tv_colrotbeat_so-tv_colrotbeat.Po +am__mv = mv -f +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = +CCLD = $(CC) +LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = +SOURCES = $(tv_colrotbeat_so_SOURCES) +DIST_SOURCES = $(tv_colrotbeat_so_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +ALSA_CFLAGS = @ALSA_CFLAGS@ +ALSA_LIBS = @ALSA_LIBS@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AVUTIL_CFLAGS = @AVUTIL_CFLAGS@ +AVUTIL_LIBS = @AVUTIL_LIBS@ +AWK = @AWK@ +BINIOU_VERSION = @BINIOU_VERSION@ +CACA_CFLAGS = @CACA_CFLAGS@ +CACA_LIBS = @CACA_LIBS@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DPKG_BUILDFLAGS_CHECK = @DPKG_BUILDFLAGS_CHECK@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +ESD_CFLAGS = @ESD_CFLAGS@ +ESD_LIBS = @ESD_LIBS@ +EXEEXT = @EXEEXT@ +FFTW3_CFLAGS = @FFTW3_CFLAGS@ +FFTW3_LIBS = @FFTW3_LIBS@ +FT2_CFLAGS = @FT2_CFLAGS@ +FT2_LIBS = @FT2_LIBS@ +GETOPT_LONG_LIBS = @GETOPT_LONG_LIBS@ +GLIB_CFLAGS = @GLIB_CFLAGS@ +GLIB_LIBS = @GLIB_LIBS@ +GLU_CFLAGS = @GLU_CFLAGS@ +GLU_LIBS = @GLU_LIBS@ +GREP = @GREP@ +INPUT_PLUGINS = @INPUT_PLUGINS@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +JACK_CFLAGS = @JACK_CFLAGS@ +JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ +LDFLAGS = @LDFLAGS@ +LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ +LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ +LEBINIOU_SCHEMES_FILE = @LEBINIOU_SCHEMES_FILE@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ +MagickWand_CFLAGS = @MagickWand_CFLAGS@ +MagickWand_LIBS = @MagickWand_LIBS@ +OBJEXT = @OBJEXT@ +OSD_FONT = @OSD_FONT@ +OSD_PTSIZE = @OSD_PTSIZE@ +OUTPUT_PLUGINS = @OUTPUT_PLUGINS@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ +PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ +PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ +PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ +PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ +SDL2_CFLAGS = @SDL2_CFLAGS@ +SDL2_LIBS = @SDL2_LIBS@ +SDL2_ttf_CFLAGS = @SDL2_ttf_CFLAGS@ +SDL2_ttf_LIBS = @SDL2_ttf_LIBS@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +SNDFILE_CFLAGS = @SNDFILE_CFLAGS@ +SNDFILE_LIBS = @SNDFILE_LIBS@ +STRIP = @STRIP@ +SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ +SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ +VERSION = @VERSION@ +XML2_CFLAGS = @XML2_CFLAGS@ +XML2_LIBS = @XML2_LIBS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_CC = @ac_ct_CC@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +have_pandoc = @have_pandoc@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +runstatedir = @runstatedir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target = @target@ +target_alias = @target_alias@ +target_cpu = @target_cpu@ +target_os = @target_os@ +target_vendor = @target_vendor@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +plugindir = @libdir@/lebiniou/plugins/main/tv_colrotbeat +tv_colrotbeat_so_SOURCES = tv_colrotbeat.c +tv_colrotbeat_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +tv_colrotbeat_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +tv_colrotbeat_so_LDADD = @PLUGIN_LDADD@ +all: all-am + +.SUFFIXES: +.SUFFIXES: .c .o .obj +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign plugins/stable/main/tv_colrotbeat/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --foreign plugins/stable/main/tv_colrotbeat/Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): +install-pluginPROGRAMS: $(plugin_PROGRAMS) + @$(NORMAL_INSTALL) + @list='$(plugin_PROGRAMS)'; test -n "$(plugindir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \ + fi; \ + for p in $$list; do echo "$$p $$p"; done | \ + sed 's/$(EXEEXT)$$//' | \ + while read p p1; do if test -f $$p \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ + done | \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ + -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ + sed 'N;N;N;s,\n, ,g' | \ + $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ + { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ + if ($$2 == $$4) files[d] = files[d] " " $$1; \ + else { print "f", $$3 "/" $$4, $$1; } } \ + END { for (d in files) print "f", d, files[d] }' | \ + while read type dir files; do \ + if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ + test -z "$$files" || { \ + echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(plugindir)$$dir'"; \ + $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(plugindir)$$dir" || exit $$?; \ + } \ + ; done + +uninstall-pluginPROGRAMS: + @$(NORMAL_UNINSTALL) + @list='$(plugin_PROGRAMS)'; test -n "$(plugindir)" || list=; \ + files=`for p in $$list; do echo "$$p"; done | \ + sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ + -e 's/$$/$(EXEEXT)/' \ + `; \ + test -n "$$list" || exit 0; \ + echo " ( cd '$(DESTDIR)$(plugindir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(plugindir)" && rm -f $$files + +clean-pluginPROGRAMS: + -test -z "$(plugin_PROGRAMS)" || rm -f $(plugin_PROGRAMS) + +tv_colrotbeat.so$(EXEEXT): $(tv_colrotbeat_so_OBJECTS) $(tv_colrotbeat_so_DEPENDENCIES) $(EXTRA_tv_colrotbeat_so_DEPENDENCIES) + @rm -f tv_colrotbeat.so$(EXEEXT) + $(AM_V_CCLD)$(tv_colrotbeat_so_LINK) $(tv_colrotbeat_so_OBJECTS) $(tv_colrotbeat_so_LDADD) $(LIBS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tv_colrotbeat_so-tv_colrotbeat.Po@am__quote@ # am--include-marker + +$(am__depfiles_remade): + @$(MKDIR_P) $(@D) + @echo '# dummy' >$@-t && $(am__mv) $@-t $@ + +am--depfiles: $(am__depfiles_remade) + +.c.o: +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< + +.c.obj: +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + +tv_colrotbeat_so-tv_colrotbeat.o: tv_colrotbeat.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tv_colrotbeat_so_CFLAGS) $(CFLAGS) -MT tv_colrotbeat_so-tv_colrotbeat.o -MD -MP -MF $(DEPDIR)/tv_colrotbeat_so-tv_colrotbeat.Tpo -c -o tv_colrotbeat_so-tv_colrotbeat.o `test -f 'tv_colrotbeat.c' || echo '$(srcdir)/'`tv_colrotbeat.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/tv_colrotbeat_so-tv_colrotbeat.Tpo $(DEPDIR)/tv_colrotbeat_so-tv_colrotbeat.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='tv_colrotbeat.c' object='tv_colrotbeat_so-tv_colrotbeat.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tv_colrotbeat_so_CFLAGS) $(CFLAGS) -c -o tv_colrotbeat_so-tv_colrotbeat.o `test -f 'tv_colrotbeat.c' || echo '$(srcdir)/'`tv_colrotbeat.c + +tv_colrotbeat_so-tv_colrotbeat.obj: tv_colrotbeat.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tv_colrotbeat_so_CFLAGS) $(CFLAGS) -MT tv_colrotbeat_so-tv_colrotbeat.obj -MD -MP -MF $(DEPDIR)/tv_colrotbeat_so-tv_colrotbeat.Tpo -c -o tv_colrotbeat_so-tv_colrotbeat.obj `if test -f 'tv_colrotbeat.c'; then $(CYGPATH_W) 'tv_colrotbeat.c'; else $(CYGPATH_W) '$(srcdir)/tv_colrotbeat.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/tv_colrotbeat_so-tv_colrotbeat.Tpo $(DEPDIR)/tv_colrotbeat_so-tv_colrotbeat.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='tv_colrotbeat.c' object='tv_colrotbeat_so-tv_colrotbeat.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tv_colrotbeat_so_CFLAGS) $(CFLAGS) -c -o tv_colrotbeat_so-tv_colrotbeat.obj `if test -f 'tv_colrotbeat.c'; then $(CYGPATH_W) 'tv_colrotbeat.c'; else $(CYGPATH_W) '$(srcdir)/tv_colrotbeat.c'; fi` + +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags + +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + set x; \ + here=`pwd`; \ + $(am__define_uniq_tagged_files); \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ + fi +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ + test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(PROGRAMS) +installdirs: + for dir in "$(DESTDIR)$(plugindir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-pluginPROGRAMS mostlyclean-am + +distclean: distclean-am + -rm -f ./$(DEPDIR)/tv_colrotbeat_so-tv_colrotbeat.Po + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-tags + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: install-pluginPROGRAMS + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f ./$(DEPDIR)/tv_colrotbeat_so-tv_colrotbeat.Po + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-compile mostlyclean-generic + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-pluginPROGRAMS + +.MAKE: install-am install-strip + +.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \ + clean-generic clean-pluginPROGRAMS cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-pluginPROGRAMS install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \ + ps ps-am tags tags-am uninstall uninstall-am \ + uninstall-pluginPROGRAMS + +.PRECIOUS: Makefile + + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -Nru lebiniou-3.31/plugins/stable/main/tv_colrotbeat/tv_colrotbeat.c lebiniou-3.40/plugins/stable/main/tv_colrotbeat/tv_colrotbeat.c --- lebiniou-3.31/plugins/stable/main/tv_colrotbeat/tv_colrotbeat.c 1970-01-01 00:00:00.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/tv_colrotbeat/tv_colrotbeat.c 2020-01-22 18:33:57.000000000 +0000 @@ -0,0 +1,109 @@ +/* + * Copyright 1994-2020 Olivier Girondel + * Copyright 2019-2020 Tavasti + * + * This file is part of lebiniou. + * + * lebiniou 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 of the License, or + * (at your option) any later version. + * + * lebiniou 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 lebiniou. If not, see . + */ + +/* Colrot, Color Rotation + + basic idea of plugin: Show only part of the colors from webcam video, + and scroll thru colors. Not visible colors are transparent, + showing stuff happening under. Using lens mode. + + This plugin is beat version which is scrolling colors only at the beat. + With higher volume, more bigger scroll. + + At the beat also more colors are visible, giving stronger feedabck to beat +*/ + + +#include "context.h" + +#define MASK_SIZE 63 /* what size of chunks colorspace is divided */ +#define COLORCOUNT 7 /* how many colors are visible in each chunk */ + +#define CURVE_VOL_MIN 0.05 /* Minimum volume we start changing curve */ +#define CURVE_VOL_STEP 0.1 /* Volume amount we step on curve */ +#define CURVE_VOL_MULT 1.7 /* multiplier on each step */ +#define CURVE_DIVISOR 4 /* value we are finally dividing increment */ +#define MAX_INCREMENT 9 /* maximum value of increment */ +#define INC_MULT_TO_COUNT 5 /* multiplier from increment to added colors */ +#define INIT_INCREMENT 2 /* initial increment on beat. Algorithm works if + floor(INIT_INC * CURVE_VOL_STEP) > INIT_INC */ +u_long id = 1552774707; +uint32_t version = 0; +u_long options = BE_GFX|BE_LENS|BE_SFX2D|BEQ_MUTE_CAM; +char desc[] = "Show overlay of cam, scrolling thru colors on beat"; +u_long mode = OVERLAY; + +extern int webcams; +static Pixel_t min1 = 0, max1 = COLORCOUNT; + + +void +run(Context_t *ctx) +{ + /* increment calculation */ + int increment = INIT_INCREMENT; + if (ctx->input->on_beat) { + double peak; + for (peak = ctx->input->curpeak; peak > CURVE_VOL_MIN; peak -= CURVE_VOL_STEP) { + increment *= CURVE_VOL_MULT; + } + } else { + increment = 0; /* no progression outside beat */ + } + increment = increment / CURVE_DIVISOR; + if (increment > MAX_INCREMENT) { + increment = MAX_INCREMENT; + } + int prevmax = max1; + /* To show more colors on beat we raise max1 on this run, but return after */ + max1 += increment * INC_MULT_TO_COUNT; + if (max1 > MASK_SIZE) { + max1 = max1 - MASK_SIZE; + } + + Pixel_t *src1, *start, *dst; + + dst = start = passive_buffer(ctx)->buffer; + + pthread_mutex_lock(&ctx->cam_mtx[ctx->cam]); + src1 = ctx->cam_save[ctx->cam][0]->buffer; + for (; dst < start + BUFFSIZE * sizeof(Pixel_t); src1++, dst++) { + if (/* max1 is bigger than min, show values between them */ + ((max1 > min1) && + ((*src1 & MASK_SIZE) > min1) && ((*src1 & MASK_SIZE) < max1)) || + /* max is rotated over, show values below max or above min */ + ((max1 < min1) && + (((*src1 & MASK_SIZE)> min1) || ((*src1 & MASK_SIZE) < max1)))) { + *dst = *src1; + } else { + *dst = 0; + } + } + pthread_mutex_unlock(&ctx->cam_mtx[ctx->cam]); + /* restore max1 to previous, and add increment */ + max1 = prevmax + increment; + if (max1 > MASK_SIZE) { + max1 -= MASK_SIZE; + } + min1 += increment; + if (min1 > MASK_SIZE) { + min1 -= MASK_SIZE; + } +} diff -Nru lebiniou-3.31/plugins/stable/main/tv_colrotslow/Makefile.am lebiniou-3.40/plugins/stable/main/tv_colrotslow/Makefile.am --- lebiniou-3.31/plugins/stable/main/tv_colrotslow/Makefile.am 1970-01-01 00:00:00.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/tv_colrotslow/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -0,0 +1,7 @@ +plugindir = @libdir@/lebiniou/plugins/main/tv_colrotslow +plugin_PROGRAMS = tv_colrotslow.so + +tv_colrotslow_so_SOURCES = tv_colrotslow.c +tv_colrotslow_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +tv_colrotslow_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +tv_colrotslow_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/tv_colrotslow/Makefile.in lebiniou-3.40/plugins/stable/main/tv_colrotslow/Makefile.in --- lebiniou-3.31/plugins/stable/main/tv_colrotslow/Makefile.in 1970-01-01 00:00:00.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/tv_colrotslow/Makefile.in 2020-01-23 13:57:18.000000000 +0000 @@ -0,0 +1,666 @@ +# Makefile.in generated by automake 1.16.1 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994-2018 Free Software Foundation, Inc. + +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +VPATH = @srcdir@ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +target_triplet = @target@ +plugin_PROGRAMS = tv_colrotslow.so$(EXEEXT) +subdir = plugins/stable/main/tv_colrotslow +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +am__installdirs = "$(DESTDIR)$(plugindir)" +PROGRAMS = $(plugin_PROGRAMS) +am_tv_colrotslow_so_OBJECTS = \ + tv_colrotslow_so-tv_colrotslow.$(OBJEXT) +tv_colrotslow_so_OBJECTS = $(am_tv_colrotslow_so_OBJECTS) +tv_colrotslow_so_DEPENDENCIES = +tv_colrotslow_so_LINK = $(CCLD) $(tv_colrotslow_so_CFLAGS) $(CFLAGS) \ + $(tv_colrotslow_so_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) +depcomp = $(SHELL) $(top_srcdir)/depcomp +am__maybe_remake_depfiles = depfiles +am__depfiles_remade = ./$(DEPDIR)/tv_colrotslow_so-tv_colrotslow.Po +am__mv = mv -f +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = +CCLD = $(CC) +LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = +SOURCES = $(tv_colrotslow_so_SOURCES) +DIST_SOURCES = $(tv_colrotslow_so_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +ALSA_CFLAGS = @ALSA_CFLAGS@ +ALSA_LIBS = @ALSA_LIBS@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AVUTIL_CFLAGS = @AVUTIL_CFLAGS@ +AVUTIL_LIBS = @AVUTIL_LIBS@ +AWK = @AWK@ +BINIOU_VERSION = @BINIOU_VERSION@ +CACA_CFLAGS = @CACA_CFLAGS@ +CACA_LIBS = @CACA_LIBS@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DPKG_BUILDFLAGS_CHECK = @DPKG_BUILDFLAGS_CHECK@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +ESD_CFLAGS = @ESD_CFLAGS@ +ESD_LIBS = @ESD_LIBS@ +EXEEXT = @EXEEXT@ +FFTW3_CFLAGS = @FFTW3_CFLAGS@ +FFTW3_LIBS = @FFTW3_LIBS@ +FT2_CFLAGS = @FT2_CFLAGS@ +FT2_LIBS = @FT2_LIBS@ +GETOPT_LONG_LIBS = @GETOPT_LONG_LIBS@ +GLIB_CFLAGS = @GLIB_CFLAGS@ +GLIB_LIBS = @GLIB_LIBS@ +GLU_CFLAGS = @GLU_CFLAGS@ +GLU_LIBS = @GLU_LIBS@ +GREP = @GREP@ +INPUT_PLUGINS = @INPUT_PLUGINS@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +JACK_CFLAGS = @JACK_CFLAGS@ +JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ +LDFLAGS = @LDFLAGS@ +LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ +LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ +LEBINIOU_SCHEMES_FILE = @LEBINIOU_SCHEMES_FILE@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ +MagickWand_CFLAGS = @MagickWand_CFLAGS@ +MagickWand_LIBS = @MagickWand_LIBS@ +OBJEXT = @OBJEXT@ +OSD_FONT = @OSD_FONT@ +OSD_PTSIZE = @OSD_PTSIZE@ +OUTPUT_PLUGINS = @OUTPUT_PLUGINS@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ +PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ +PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ +PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ +PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ +SDL2_CFLAGS = @SDL2_CFLAGS@ +SDL2_LIBS = @SDL2_LIBS@ +SDL2_ttf_CFLAGS = @SDL2_ttf_CFLAGS@ +SDL2_ttf_LIBS = @SDL2_ttf_LIBS@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +SNDFILE_CFLAGS = @SNDFILE_CFLAGS@ +SNDFILE_LIBS = @SNDFILE_LIBS@ +STRIP = @STRIP@ +SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ +SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ +VERSION = @VERSION@ +XML2_CFLAGS = @XML2_CFLAGS@ +XML2_LIBS = @XML2_LIBS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_CC = @ac_ct_CC@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +have_pandoc = @have_pandoc@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +runstatedir = @runstatedir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target = @target@ +target_alias = @target_alias@ +target_cpu = @target_cpu@ +target_os = @target_os@ +target_vendor = @target_vendor@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +plugindir = @libdir@/lebiniou/plugins/main/tv_colrotslow +tv_colrotslow_so_SOURCES = tv_colrotslow.c +tv_colrotslow_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +tv_colrotslow_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +tv_colrotslow_so_LDADD = @PLUGIN_LDADD@ +all: all-am + +.SUFFIXES: +.SUFFIXES: .c .o .obj +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign plugins/stable/main/tv_colrotslow/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --foreign plugins/stable/main/tv_colrotslow/Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): +install-pluginPROGRAMS: $(plugin_PROGRAMS) + @$(NORMAL_INSTALL) + @list='$(plugin_PROGRAMS)'; test -n "$(plugindir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \ + fi; \ + for p in $$list; do echo "$$p $$p"; done | \ + sed 's/$(EXEEXT)$$//' | \ + while read p p1; do if test -f $$p \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ + done | \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ + -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ + sed 'N;N;N;s,\n, ,g' | \ + $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ + { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ + if ($$2 == $$4) files[d] = files[d] " " $$1; \ + else { print "f", $$3 "/" $$4, $$1; } } \ + END { for (d in files) print "f", d, files[d] }' | \ + while read type dir files; do \ + if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ + test -z "$$files" || { \ + echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(plugindir)$$dir'"; \ + $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(plugindir)$$dir" || exit $$?; \ + } \ + ; done + +uninstall-pluginPROGRAMS: + @$(NORMAL_UNINSTALL) + @list='$(plugin_PROGRAMS)'; test -n "$(plugindir)" || list=; \ + files=`for p in $$list; do echo "$$p"; done | \ + sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ + -e 's/$$/$(EXEEXT)/' \ + `; \ + test -n "$$list" || exit 0; \ + echo " ( cd '$(DESTDIR)$(plugindir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(plugindir)" && rm -f $$files + +clean-pluginPROGRAMS: + -test -z "$(plugin_PROGRAMS)" || rm -f $(plugin_PROGRAMS) + +tv_colrotslow.so$(EXEEXT): $(tv_colrotslow_so_OBJECTS) $(tv_colrotslow_so_DEPENDENCIES) $(EXTRA_tv_colrotslow_so_DEPENDENCIES) + @rm -f tv_colrotslow.so$(EXEEXT) + $(AM_V_CCLD)$(tv_colrotslow_so_LINK) $(tv_colrotslow_so_OBJECTS) $(tv_colrotslow_so_LDADD) $(LIBS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tv_colrotslow_so-tv_colrotslow.Po@am__quote@ # am--include-marker + +$(am__depfiles_remade): + @$(MKDIR_P) $(@D) + @echo '# dummy' >$@-t && $(am__mv) $@-t $@ + +am--depfiles: $(am__depfiles_remade) + +.c.o: +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< + +.c.obj: +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + +tv_colrotslow_so-tv_colrotslow.o: tv_colrotslow.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tv_colrotslow_so_CFLAGS) $(CFLAGS) -MT tv_colrotslow_so-tv_colrotslow.o -MD -MP -MF $(DEPDIR)/tv_colrotslow_so-tv_colrotslow.Tpo -c -o tv_colrotslow_so-tv_colrotslow.o `test -f 'tv_colrotslow.c' || echo '$(srcdir)/'`tv_colrotslow.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/tv_colrotslow_so-tv_colrotslow.Tpo $(DEPDIR)/tv_colrotslow_so-tv_colrotslow.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='tv_colrotslow.c' object='tv_colrotslow_so-tv_colrotslow.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tv_colrotslow_so_CFLAGS) $(CFLAGS) -c -o tv_colrotslow_so-tv_colrotslow.o `test -f 'tv_colrotslow.c' || echo '$(srcdir)/'`tv_colrotslow.c + +tv_colrotslow_so-tv_colrotslow.obj: tv_colrotslow.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tv_colrotslow_so_CFLAGS) $(CFLAGS) -MT tv_colrotslow_so-tv_colrotslow.obj -MD -MP -MF $(DEPDIR)/tv_colrotslow_so-tv_colrotslow.Tpo -c -o tv_colrotslow_so-tv_colrotslow.obj `if test -f 'tv_colrotslow.c'; then $(CYGPATH_W) 'tv_colrotslow.c'; else $(CYGPATH_W) '$(srcdir)/tv_colrotslow.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/tv_colrotslow_so-tv_colrotslow.Tpo $(DEPDIR)/tv_colrotslow_so-tv_colrotslow.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='tv_colrotslow.c' object='tv_colrotslow_so-tv_colrotslow.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tv_colrotslow_so_CFLAGS) $(CFLAGS) -c -o tv_colrotslow_so-tv_colrotslow.obj `if test -f 'tv_colrotslow.c'; then $(CYGPATH_W) 'tv_colrotslow.c'; else $(CYGPATH_W) '$(srcdir)/tv_colrotslow.c'; fi` + +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags + +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + set x; \ + here=`pwd`; \ + $(am__define_uniq_tagged_files); \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ + fi +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ + test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(PROGRAMS) +installdirs: + for dir in "$(DESTDIR)$(plugindir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-pluginPROGRAMS mostlyclean-am + +distclean: distclean-am + -rm -f ./$(DEPDIR)/tv_colrotslow_so-tv_colrotslow.Po + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-tags + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: install-pluginPROGRAMS + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f ./$(DEPDIR)/tv_colrotslow_so-tv_colrotslow.Po + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-compile mostlyclean-generic + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-pluginPROGRAMS + +.MAKE: install-am install-strip + +.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \ + clean-generic clean-pluginPROGRAMS cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-pluginPROGRAMS install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \ + ps ps-am tags tags-am uninstall uninstall-am \ + uninstall-pluginPROGRAMS + +.PRECIOUS: Makefile + + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -Nru lebiniou-3.31/plugins/stable/main/tv_colrotslow/tv_colrotslow.c lebiniou-3.40/plugins/stable/main/tv_colrotslow/tv_colrotslow.c --- lebiniou-3.31/plugins/stable/main/tv_colrotslow/tv_colrotslow.c 1970-01-01 00:00:00.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/tv_colrotslow/tv_colrotslow.c 2020-01-22 18:33:57.000000000 +0000 @@ -0,0 +1,82 @@ +/* + * Copyright 1994-2020 Olivier Girondel + * Copyright 2019-2020 Tavasti + * + * This file is part of lebiniou. + * + * lebiniou 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 of the License, or + * (at your option) any later version. + * + * lebiniou 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 lebiniou. If not, see . + */ + +/* Colrot, Color Rotation + + basic idea of plugin: Show only part of the colors from webcam video, + and scroll thru colors. Not visible colors are transparent, + showing stuff happening under. Using lens mode. + + This plugin is 'normal', pretty agressive version of Colrot +*/ + + +#include "context.h" + +#define MASK_SIZE 63 /* what size of chunks colorspace is divided */ +#define COLORCOUNT 28 /* how many colors are visible in each chunk */ +#define INTERVAL 2 /* how often to scroll colors, 1 means every round */ + +u_long id = 1552773786; +uint32_t version = 0; +u_long options = BE_GFX|BE_LENS|BEQ_MUTE_CAM; +char desc[] = "Show overlay of cam, scrolling thru colors"; +u_long mode = OVERLAY; + +static Pixel_t min1 = 0, max1 = COLORCOUNT; +static int cycle = 0; + + +void +run(Context_t *ctx) +{ + Pixel_t *src1, *start, *src2, *dst; + + dst = start = passive_buffer(ctx)->buffer; + + pthread_mutex_lock(&ctx->cam_mtx[ctx->cam]); + src1 = ctx->cam_save[ctx->cam][0]->buffer; + src2 = ctx->cam_ref[ctx->cam]->buffer; + for (; dst < start + BUFFSIZE * sizeof(Pixel_t); src1++, src2++, dst++) { + if ( /* max1 is bigger than min, show values between them */ + ((max1 > min1) && + ((*src1 & MASK_SIZE) > min1) && ((*src1 & MASK_SIZE) < max1)) || + /* max is rotated over, show values below max or above min */ + ((max1 < min1) && + (((*src1 & MASK_SIZE)> min1) || ((*src1 & MASK_SIZE) < max1)))) { + *dst = *src1; + } else { + *dst = 0; + } + } + pthread_mutex_unlock(&ctx->cam_mtx[ctx->cam]); + cycle++; + if (cycle >= INTERVAL) { + min1++; + max1++; + if (min1 > MASK_SIZE) { + min1 = 0; + } + if (max1 > MASK_SIZE) { + max1 = 0; + } + cycle = 0; + } +} diff -Nru lebiniou-3.31/plugins/stable/main/tv_diff/Makefile.am lebiniou-3.40/plugins/stable/main/tv_diff/Makefile.am --- lebiniou-3.31/plugins/stable/main/tv_diff/Makefile.am 2018-11-27 13:50:08.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/tv_diff/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -2,5 +2,6 @@ plugin_PROGRAMS = tv_diff.so tv_diff_so_SOURCES = tv_diff.c -tv_diff_so_LDFLAGS = @PLUGIN_LDFLAGS@ -tv_diff_so_CFLAGS = @PLUGIN_CFLAGS@ +tv_diff_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +tv_diff_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +tv_diff_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/tv_diff/Makefile.in lebiniou-3.40/plugins/stable/main/tv_diff/Makefile.in --- lebiniou-3.31/plugins/stable/main/tv_diff/Makefile.in 2019-04-14 11:52:34.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/tv_diff/Makefile.in 2020-01-23 13:57:18.000000000 +0000 @@ -104,7 +104,7 @@ PROGRAMS = $(plugin_PROGRAMS) am_tv_diff_so_OBJECTS = tv_diff_so-tv_diff.$(OBJEXT) tv_diff_so_OBJECTS = $(am_tv_diff_so_OBJECTS) -tv_diff_so_LDADD = $(LDADD) +tv_diff_so_DEPENDENCIES = tv_diff_so_LINK = $(CCLD) $(tv_diff_so_CFLAGS) $(CFLAGS) \ $(tv_diff_so_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -216,6 +216,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -243,6 +245,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -257,7 +260,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -319,8 +325,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/main/tv_diff tv_diff_so_SOURCES = tv_diff.c -tv_diff_so_LDFLAGS = @PLUGIN_LDFLAGS@ -tv_diff_so_CFLAGS = @PLUGIN_CFLAGS@ +tv_diff_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +tv_diff_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +tv_diff_so_LDADD = @PLUGIN_LDADD@ all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/main/tv_diff/tv_diff.c lebiniou-3.40/plugins/stable/main/tv_diff/tv_diff.c --- lebiniou-3.31/plugins/stable/main/tv_diff/tv_diff.c 2019-04-05 20:39:15.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/tv_diff/tv_diff.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -21,21 +21,13 @@ u_long id = 1329763807; -u_long options = BE_GFX|BEQ_IMAGE|BEQ_MUTE_CAM|BEQ_NORANDOM; +uint32_t version = 0; +u_long options = BE_GFX|BEQ_MUTE_CAM|BEQ_NORANDOM; char desc[] = "DiffTV"; u_long mode = OVERLAY; void -create(Context_t *ctx) -{ - if (!ctx->webcams) { - options |= BEQ_DISABLED; - } -} - - -void on_switch_on(Context_t *ctx) { ctx->ref_taken[ctx->cam] = 0; diff -Nru lebiniou-3.31/plugins/stable/main/tv_diff2/Makefile.am lebiniou-3.40/plugins/stable/main/tv_diff2/Makefile.am --- lebiniou-3.31/plugins/stable/main/tv_diff2/Makefile.am 2019-04-05 20:39:15.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/tv_diff2/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -2,5 +2,6 @@ plugin_PROGRAMS = tv_diff2.so tv_diff2_so_SOURCES = tv_diff2.c -tv_diff2_so_LDFLAGS = @PLUGIN_LDFLAGS@ -tv_diff2_so_CFLAGS = @PLUGIN_CFLAGS@ +tv_diff2_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +tv_diff2_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +tv_diff2_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/tv_diff2/Makefile.in lebiniou-3.40/plugins/stable/main/tv_diff2/Makefile.in --- lebiniou-3.31/plugins/stable/main/tv_diff2/Makefile.in 2019-04-14 11:52:34.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/tv_diff2/Makefile.in 2020-01-23 13:57:18.000000000 +0000 @@ -104,7 +104,7 @@ PROGRAMS = $(plugin_PROGRAMS) am_tv_diff2_so_OBJECTS = tv_diff2_so-tv_diff2.$(OBJEXT) tv_diff2_so_OBJECTS = $(am_tv_diff2_so_OBJECTS) -tv_diff2_so_LDADD = $(LDADD) +tv_diff2_so_DEPENDENCIES = tv_diff2_so_LINK = $(CCLD) $(tv_diff2_so_CFLAGS) $(CFLAGS) \ $(tv_diff2_so_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -216,6 +216,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -243,6 +245,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -257,7 +260,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -319,8 +325,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/main/tv_diff2 tv_diff2_so_SOURCES = tv_diff2.c -tv_diff2_so_LDFLAGS = @PLUGIN_LDFLAGS@ -tv_diff2_so_CFLAGS = @PLUGIN_CFLAGS@ +tv_diff2_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +tv_diff2_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +tv_diff2_so_LDADD = @PLUGIN_LDADD@ all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/main/tv_diff2/tv_diff2.c lebiniou-3.40/plugins/stable/main/tv_diff2/tv_diff2.c --- lebiniou-3.31/plugins/stable/main/tv_diff2/tv_diff2.c 2019-04-05 20:39:15.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/tv_diff2/tv_diff2.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,6 +1,6 @@ /* - * Copyright 1994-2019 Olivier Girondel - * Copyright 2019 Tavasti + * Copyright 1994-2020 Olivier Girondel + * Copyright 2019-2020 Tavasti * * This file is part of lebiniou. * @@ -29,21 +29,13 @@ but also show more flickering */ u_long id = 1552077641; -u_long options = BE_GFX|BE_LENS|BEQ_IMAGE|BEQ_MUTE_CAM|BEQ_NORANDOM; +uint32_t version = 0; +u_long options = BE_GFX|BE_LENS|BEQ_MUTE_CAM|BEQ_NORANDOM; char desc[] = "Show cam pic which differs"; u_long mode = OVERLAY; void -create(Context_t *ctx) -{ - if (!ctx->webcams) { - options |= BEQ_DISABLED; - } -} - - -void run(Context_t *ctx) { Pixel_t *src1, *start, *src2, *dst; diff -Nru lebiniou-3.31/plugins/stable/main/tv_diff3/Makefile.am lebiniou-3.40/plugins/stable/main/tv_diff3/Makefile.am --- lebiniou-3.31/plugins/stable/main/tv_diff3/Makefile.am 2019-04-05 20:39:15.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/tv_diff3/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -2,5 +2,6 @@ plugin_PROGRAMS = tv_diff3.so tv_diff3_so_SOURCES = tv_diff3.c -tv_diff3_so_LDFLAGS = @PLUGIN_LDFLAGS@ -tv_diff3_so_CFLAGS = @PLUGIN_CFLAGS@ +tv_diff3_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +tv_diff3_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +tv_diff3_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/tv_diff3/Makefile.in lebiniou-3.40/plugins/stable/main/tv_diff3/Makefile.in --- lebiniou-3.31/plugins/stable/main/tv_diff3/Makefile.in 2019-04-14 11:52:34.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/tv_diff3/Makefile.in 2020-01-23 13:57:18.000000000 +0000 @@ -104,7 +104,7 @@ PROGRAMS = $(plugin_PROGRAMS) am_tv_diff3_so_OBJECTS = tv_diff3_so-tv_diff3.$(OBJEXT) tv_diff3_so_OBJECTS = $(am_tv_diff3_so_OBJECTS) -tv_diff3_so_LDADD = $(LDADD) +tv_diff3_so_DEPENDENCIES = tv_diff3_so_LINK = $(CCLD) $(tv_diff3_so_CFLAGS) $(CFLAGS) \ $(tv_diff3_so_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -216,6 +216,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -243,6 +245,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -257,7 +260,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -319,8 +325,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/main/tv_diff3 tv_diff3_so_SOURCES = tv_diff3.c -tv_diff3_so_LDFLAGS = @PLUGIN_LDFLAGS@ -tv_diff3_so_CFLAGS = @PLUGIN_CFLAGS@ +tv_diff3_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +tv_diff3_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +tv_diff3_so_LDADD = @PLUGIN_LDADD@ all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/main/tv_diff3/tv_diff3.c lebiniou-3.40/plugins/stable/main/tv_diff3/tv_diff3.c --- lebiniou-3.31/plugins/stable/main/tv_diff3/tv_diff3.c 2019-04-05 20:39:15.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/tv_diff3/tv_diff3.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,6 +1,6 @@ /* - * Copyright 1994-2019 Olivier Girondel - * Copyright 2019 Tavasti + * Copyright 1994-2020 Olivier Girondel + * Copyright 2019-2020 Tavasti * * This file is part of lebiniou. * @@ -25,21 +25,13 @@ but also show more flickering */ u_long id = 1552077700; -u_long options = BE_GFX|BE_LENS|BEQ_IMAGE|BEQ_MUTE_CAM|BEQ_NORANDOM; +uint32_t version = 0; +u_long options = BE_GFX|BE_LENS|BEQ_MUTE_CAM|BEQ_NORANDOM; char desc[] = "Show cam pic which differs"; u_long mode = OVERLAY; void -create(Context_t *ctx) -{ - if (!ctx->webcams) { - options |= BEQ_DISABLED; - } -} - - -void run(Context_t *ctx) { Pixel_t *src1, *start, *src2, *dst; diff -Nru lebiniou-3.31/plugins/stable/main/tv_diff4/Makefile.am lebiniou-3.40/plugins/stable/main/tv_diff4/Makefile.am --- lebiniou-3.31/plugins/stable/main/tv_diff4/Makefile.am 2019-04-05 20:39:15.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/tv_diff4/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -2,5 +2,6 @@ plugin_PROGRAMS = tv_diff4.so tv_diff4_so_SOURCES = tv_diff4.c -tv_diff4_so_LDFLAGS = @PLUGIN_LDFLAGS@ -tv_diff4_so_CFLAGS = @PLUGIN_CFLAGS@ +tv_diff4_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +tv_diff4_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +tv_diff4_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/tv_diff4/Makefile.in lebiniou-3.40/plugins/stable/main/tv_diff4/Makefile.in --- lebiniou-3.31/plugins/stable/main/tv_diff4/Makefile.in 2019-04-14 11:52:34.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/tv_diff4/Makefile.in 2020-01-23 13:57:18.000000000 +0000 @@ -104,7 +104,7 @@ PROGRAMS = $(plugin_PROGRAMS) am_tv_diff4_so_OBJECTS = tv_diff4_so-tv_diff4.$(OBJEXT) tv_diff4_so_OBJECTS = $(am_tv_diff4_so_OBJECTS) -tv_diff4_so_LDADD = $(LDADD) +tv_diff4_so_DEPENDENCIES = tv_diff4_so_LINK = $(CCLD) $(tv_diff4_so_CFLAGS) $(CFLAGS) \ $(tv_diff4_so_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -216,6 +216,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -243,6 +245,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -257,7 +260,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -319,8 +325,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/main/tv_diff4 tv_diff4_so_SOURCES = tv_diff4.c -tv_diff4_so_LDFLAGS = @PLUGIN_LDFLAGS@ -tv_diff4_so_CFLAGS = @PLUGIN_CFLAGS@ +tv_diff4_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +tv_diff4_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +tv_diff4_so_LDADD = @PLUGIN_LDADD@ all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/main/tv_diff4/tv_diff4.c lebiniou-3.40/plugins/stable/main/tv_diff4/tv_diff4.c --- lebiniou-3.31/plugins/stable/main/tv_diff4/tv_diff4.c 2019-04-05 20:39:15.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/tv_diff4/tv_diff4.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,6 +1,6 @@ /* - * Copyright 1994-2019 Olivier Girondel - * Copyright 2019 Tavasti + * Copyright 1994-2020 Olivier Girondel + * Copyright 2019-2020 Tavasti * * This file is part of lebiniou. * @@ -30,21 +30,13 @@ but also show more flickering */ u_long id = 1552169199; -u_long options = BE_GFX|BE_LENS|BEQ_IMAGE|BEQ_MUTE_CAM|BEQ_NORANDOM; +uint32_t version = 0; +u_long options = BE_GFX|BE_LENS|BEQ_MUTE_CAM|BEQ_NORANDOM; char desc[] = "Show cam pic which differs"; u_long mode = OVERLAY; void -create(Context_t *ctx) -{ - if (!ctx->webcams) { - options |= BEQ_DISABLED; - } -} - - -void run(Context_t *ctx) { Pixel_t *src1, *start, *src2, *src3, *dst; diff -Nru lebiniou-3.31/plugins/stable/main/tv_diffbeat/Makefile.am lebiniou-3.40/plugins/stable/main/tv_diffbeat/Makefile.am --- lebiniou-3.31/plugins/stable/main/tv_diffbeat/Makefile.am 2019-04-05 20:39:15.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/tv_diffbeat/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -2,5 +2,6 @@ plugin_PROGRAMS = tv_diffbeat.so tv_diffbeat_so_SOURCES = tv_diffbeat.c -tv_diffbeat_so_LDFLAGS = @PLUGIN_LDFLAGS@ -tv_diffbeat_so_CFLAGS = @PLUGIN_CFLAGS@ +tv_diffbeat_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +tv_diffbeat_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +tv_diffbeat_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/tv_diffbeat/Makefile.in lebiniou-3.40/plugins/stable/main/tv_diffbeat/Makefile.in --- lebiniou-3.31/plugins/stable/main/tv_diffbeat/Makefile.in 2019-04-14 11:52:34.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/tv_diffbeat/Makefile.in 2020-01-23 13:57:18.000000000 +0000 @@ -104,7 +104,7 @@ PROGRAMS = $(plugin_PROGRAMS) am_tv_diffbeat_so_OBJECTS = tv_diffbeat_so-tv_diffbeat.$(OBJEXT) tv_diffbeat_so_OBJECTS = $(am_tv_diffbeat_so_OBJECTS) -tv_diffbeat_so_LDADD = $(LDADD) +tv_diffbeat_so_DEPENDENCIES = tv_diffbeat_so_LINK = $(CCLD) $(tv_diffbeat_so_CFLAGS) $(CFLAGS) \ $(tv_diffbeat_so_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -216,6 +216,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -243,6 +245,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -257,7 +260,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -319,8 +325,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/main/tv_diffbeat tv_diffbeat_so_SOURCES = tv_diffbeat.c -tv_diffbeat_so_LDFLAGS = @PLUGIN_LDFLAGS@ -tv_diffbeat_so_CFLAGS = @PLUGIN_CFLAGS@ +tv_diffbeat_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +tv_diffbeat_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +tv_diffbeat_so_LDADD = @PLUGIN_LDADD@ all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/main/tv_diffbeat/tv_diffbeat.c lebiniou-3.40/plugins/stable/main/tv_diffbeat/tv_diffbeat.c --- lebiniou-3.31/plugins/stable/main/tv_diffbeat/tv_diffbeat.c 2019-04-05 20:39:15.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/tv_diffbeat/tv_diffbeat.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,6 +1,6 @@ /* - * Copyright 1994-2019 Olivier Girondel - * Copyright 2019 Tavasti + * Copyright 1994-2020 Olivier Girondel + * Copyright 2019-2020 Tavasti * * This file is part of lebiniou. * @@ -38,21 +38,13 @@ so we need at least 2 */ u_long id = 1552382051; -u_long options = BE_GFX|BE_LENS|BEQ_IMAGE|BEQ_MUTE_CAM|BEQ_NORANDOM; +uint32_t version = 0; +u_long options = BE_GFX|BE_LENS|BE_SFX2D|BEQ_MUTE_CAM|BEQ_NORANDOM; char desc[] = "Show cam pic which differs, react beat"; u_long mode = OVERLAY; void -create(Context_t *ctx) -{ - if (!ctx->webcams || (ctx->input == NULL)) { - options |= BEQ_DISABLED; - } -} - - -void run(Context_t *ctx) { int diff = CURVE_START; diff -Nru lebiniou-3.31/plugins/stable/main/tv_fire/Makefile.am lebiniou-3.40/plugins/stable/main/tv_fire/Makefile.am --- lebiniou-3.31/plugins/stable/main/tv_fire/Makefile.am 2018-11-27 13:50:08.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/tv_fire/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -2,5 +2,6 @@ plugin_PROGRAMS = tv_fire.so tv_fire_so_SOURCES = tv_fire.c -tv_fire_so_LDFLAGS = @PLUGIN_LDFLAGS@ -tv_fire_so_CFLAGS = @PLUGIN_CFLAGS@ +tv_fire_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +tv_fire_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +tv_fire_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/tv_fire/Makefile.in lebiniou-3.40/plugins/stable/main/tv_fire/Makefile.in --- lebiniou-3.31/plugins/stable/main/tv_fire/Makefile.in 2019-04-14 11:52:34.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/tv_fire/Makefile.in 2020-01-23 13:57:18.000000000 +0000 @@ -104,7 +104,7 @@ PROGRAMS = $(plugin_PROGRAMS) am_tv_fire_so_OBJECTS = tv_fire_so-tv_fire.$(OBJEXT) tv_fire_so_OBJECTS = $(am_tv_fire_so_OBJECTS) -tv_fire_so_LDADD = $(LDADD) +tv_fire_so_DEPENDENCIES = tv_fire_so_LINK = $(CCLD) $(tv_fire_so_CFLAGS) $(CFLAGS) \ $(tv_fire_so_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -216,6 +216,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -243,6 +245,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -257,7 +260,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -319,8 +325,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/main/tv_fire tv_fire_so_SOURCES = tv_fire.c -tv_fire_so_LDFLAGS = @PLUGIN_LDFLAGS@ -tv_fire_so_CFLAGS = @PLUGIN_CFLAGS@ +tv_fire_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +tv_fire_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +tv_fire_so_LDADD = @PLUGIN_LDADD@ all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/main/tv_fire/tv_fire.c lebiniou-3.40/plugins/stable/main/tv_fire/tv_fire.c --- lebiniou-3.31/plugins/stable/main/tv_fire/tv_fire.c 2019-04-05 20:39:15.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/tv_fire/tv_fire.c 2020-01-23 13:56:18.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -30,6 +30,7 @@ u_long id = 1325531475; +uint32_t version = 0; u_long options = BE_GFX|BEQ_IMAGE|BEQ_MUTE_CAM; char desc[] = "FireTV plugin from the EffecTV project"; u_long mode = OVERLAY; @@ -119,16 +120,14 @@ #endif -void +int8_t create(Context_t *ctx) { - if (!ctx->webcams) { - options |= BEQ_DISABLED; - } else { - buffer = Buffer8_new(); - diff = Buffer8_new(); - fastsrand(time(NULL)); - } + buffer = Buffer8_new(); + diff = Buffer8_new(); + fastsrand(time(NULL)); + + return 1; } @@ -203,9 +202,9 @@ v = buffer->buffer[i]; if (v < Decay) { - buffer->buffer[i - WIDTH] = 0; + buffer->buffer[i - WIDTH] = 0; } else { - buffer->buffer[i - WIDTH + fastrand() % 3 - 1] = v - (fastrand() & Decay); + buffer->buffer[i - WIDTH + fastrand() % 3 - 1] = v - (fastrand() & Decay); } i += WIDTH; } @@ -216,9 +215,9 @@ // for (x = 1; x < WIDTH - 1; x++) for (x = 0; x < WIDTH; x++) // dest[y * WIDTH + x] = palette[buffer[y*video_width+x]]; - { - dst[y * WIDTH + x] = buffer->buffer[y * WIDTH + x]; - } + { + dst[y * WIDTH + x] = buffer->buffer[y * WIDTH + x]; + } } @@ -237,29 +236,29 @@ } switch(mode) { - case 0: - default: - diff = image_bgsubtract_y(src); - for(i=0; i>16) & 0xff; - if(v > 150) { - buffer[i] |= v; + case 0: + default: + diff = image_bgsubtract_y(src); + for(i=0; i>16) & 0xff; + if(v > 150) { + buffer[i] |= v; + } } - } - break; + break; + case 2: + for(i=0; itype == SDL_KEYDOWN) { switch(event->key.keysym.sym) { - case SDLK_SPACE: - if(mode == 0) { - bgIsSet = 0; - } - break; - case SDLK_1: - case SDLK_KP1: - mode = 0; - break; - case SDLK_2: - case SDLK_KP2: - mode = 1; - break; - case SDLK_3: - case SDLK_KP3: - mode = 2; - break; - default: - break; + case SDLK_SPACE: + if(mode == 0) { + bgIsSet = 0; + } + break; + case SDLK_1: + case SDLK_KP1: + mode = 0; + break; + case SDLK_2: + case SDLK_KP2: + mode = 1; + break; + case SDLK_3: + case SDLK_KP3: + mode = 2; + break; + default: + break; } } return 0; diff -Nru lebiniou-3.31/plugins/stable/main/tv_nervous/Makefile.am lebiniou-3.40/plugins/stable/main/tv_nervous/Makefile.am --- lebiniou-3.31/plugins/stable/main/tv_nervous/Makefile.am 2018-11-27 13:50:08.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/tv_nervous/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -2,5 +2,6 @@ plugin_PROGRAMS = tv_nervous.so tv_nervous_so_SOURCES = tv_nervous.c -tv_nervous_so_LDFLAGS = @PLUGIN_LDFLAGS@ -tv_nervous_so_CFLAGS = @PLUGIN_CFLAGS@ +tv_nervous_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +tv_nervous_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +tv_nervous_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/tv_nervous/Makefile.in lebiniou-3.40/plugins/stable/main/tv_nervous/Makefile.in --- lebiniou-3.31/plugins/stable/main/tv_nervous/Makefile.in 2019-04-14 11:52:34.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/tv_nervous/Makefile.in 2020-01-23 13:57:18.000000000 +0000 @@ -104,7 +104,7 @@ PROGRAMS = $(plugin_PROGRAMS) am_tv_nervous_so_OBJECTS = tv_nervous_so-tv_nervous.$(OBJEXT) tv_nervous_so_OBJECTS = $(am_tv_nervous_so_OBJECTS) -tv_nervous_so_LDADD = $(LDADD) +tv_nervous_so_DEPENDENCIES = tv_nervous_so_LINK = $(CCLD) $(tv_nervous_so_CFLAGS) $(CFLAGS) \ $(tv_nervous_so_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -216,6 +216,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -243,6 +245,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -257,7 +260,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -319,8 +325,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/main/tv_nervous tv_nervous_so_SOURCES = tv_nervous.c -tv_nervous_so_LDFLAGS = @PLUGIN_LDFLAGS@ -tv_nervous_so_CFLAGS = @PLUGIN_CFLAGS@ +tv_nervous_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +tv_nervous_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +tv_nervous_so_LDADD = @PLUGIN_LDADD@ all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/main/tv_nervous/tv_nervous.c lebiniou-3.40/plugins/stable/main/tv_nervous/tv_nervous.c --- lebiniou-3.31/plugins/stable/main/tv_nervous/tv_nervous.c 2019-04-05 20:39:15.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/tv_nervous/tv_nervous.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -33,6 +33,7 @@ u_long id = 1325194798; +uint32_t version = 0; u_long options = BE_GFX|BEQ_IMAGE|BEQ_MUTE_CAM; char desc[] = "NervousTV plugin from the EffecTV project"; u_long mode = OVERLAY; @@ -42,22 +43,18 @@ static Buffer8_t *nervous = NULL; -void +int8_t create(Context_t *ctx) { - if (!ctx->webcams) { - options |= BEQ_DISABLED; - } else if (PLANES > CAM_SAVE) { - printf("[!] NervousTV: not enough frames (%d, want %d)\n", CAM_SAVE, PLANES); - options |= BEQ_DISABLED; - } else { - uint32_t i; - - nervous = Buffer8_new(); - for (i = 0; i < BUFFSIZE; i++) { - nervous->buffer[i] = b_rand_int_range(0, PLANES-1); - } + uint32_t i; + + assert(PLANES <= CAM_SAVE); + nervous = Buffer8_new(); + for (i = 0; i < BUFFSIZE; i++) { + nervous->buffer[i] = b_rand_int_range(0, PLANES-1); } + + return 1; } diff -Nru lebiniou-3.31/plugins/stable/main/tv_predator/Makefile.am lebiniou-3.40/plugins/stable/main/tv_predator/Makefile.am --- lebiniou-3.31/plugins/stable/main/tv_predator/Makefile.am 2018-11-27 13:50:08.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/tv_predator/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -2,5 +2,6 @@ plugin_PROGRAMS = tv_predator.so tv_predator_so_SOURCES = tv_predator.c -tv_predator_so_LDFLAGS = @PLUGIN_LDFLAGS@ -tv_predator_so_CFLAGS = @PLUGIN_CFLAGS@ +tv_predator_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +tv_predator_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +tv_predator_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/tv_predator/Makefile.in lebiniou-3.40/plugins/stable/main/tv_predator/Makefile.in --- lebiniou-3.31/plugins/stable/main/tv_predator/Makefile.in 2019-04-14 11:52:34.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/tv_predator/Makefile.in 2020-01-23 13:57:18.000000000 +0000 @@ -104,7 +104,7 @@ PROGRAMS = $(plugin_PROGRAMS) am_tv_predator_so_OBJECTS = tv_predator_so-tv_predator.$(OBJEXT) tv_predator_so_OBJECTS = $(am_tv_predator_so_OBJECTS) -tv_predator_so_LDADD = $(LDADD) +tv_predator_so_DEPENDENCIES = tv_predator_so_LINK = $(CCLD) $(tv_predator_so_CFLAGS) $(CFLAGS) \ $(tv_predator_so_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -216,6 +216,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -243,6 +245,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -257,7 +260,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -319,8 +325,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/main/tv_predator tv_predator_so_SOURCES = tv_predator.c -tv_predator_so_LDFLAGS = @PLUGIN_LDFLAGS@ -tv_predator_so_CFLAGS = @PLUGIN_CFLAGS@ +tv_predator_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +tv_predator_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +tv_predator_so_LDADD = @PLUGIN_LDADD@ all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/main/tv_predator/tv_predator.c lebiniou-3.40/plugins/stable/main/tv_predator/tv_predator.c --- lebiniou-3.31/plugins/stable/main/tv_predator/tv_predator.c 2019-04-05 20:39:15.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/tv_predator/tv_predator.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -29,6 +29,7 @@ u_long id = 1325445400; +uint32_t version = 0; u_long options = BE_GFX|BEQ_IMAGE|BEQ_MUTE_CAM|BEQ_NORANDOM; char desc[] = "PredatorTV plugin from the EffecTV project"; u_long mode = OVERLAY; @@ -38,14 +39,12 @@ static Buffer8_t *diff = NULL; -void +int8_t create(Context_t *ctx) { - if (!ctx->webcams) { - options |= BEQ_DISABLED; - } else { - diff = Buffer8_new(); - } + diff = Buffer8_new(); + + return 1; } @@ -87,9 +86,9 @@ for (y = 1; y < MAXY; y++) { for (x = 0; x < WIDTH; x++) { if (*d) { - *dst = src[4] & 0xfc; + *dst = src[4] & 0xfc; } else { - *dst = *src; + *dst = *src; } d++; diff -Nru lebiniou-3.31/plugins/stable/main/tv_quark/Makefile.am lebiniou-3.40/plugins/stable/main/tv_quark/Makefile.am --- lebiniou-3.31/plugins/stable/main/tv_quark/Makefile.am 2018-11-27 13:50:08.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/tv_quark/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -2,5 +2,6 @@ plugin_PROGRAMS = tv_quark.so tv_quark_so_SOURCES = tv_quark.c -tv_quark_so_LDFLAGS = @PLUGIN_LDFLAGS@ -tv_quark_so_CFLAGS = @PLUGIN_CFLAGS@ +tv_quark_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +tv_quark_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +tv_quark_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/tv_quark/Makefile.in lebiniou-3.40/plugins/stable/main/tv_quark/Makefile.in --- lebiniou-3.31/plugins/stable/main/tv_quark/Makefile.in 2019-04-14 11:52:34.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/tv_quark/Makefile.in 2020-01-23 13:57:18.000000000 +0000 @@ -104,7 +104,7 @@ PROGRAMS = $(plugin_PROGRAMS) am_tv_quark_so_OBJECTS = tv_quark_so-tv_quark.$(OBJEXT) tv_quark_so_OBJECTS = $(am_tv_quark_so_OBJECTS) -tv_quark_so_LDADD = $(LDADD) +tv_quark_so_DEPENDENCIES = tv_quark_so_LINK = $(CCLD) $(tv_quark_so_CFLAGS) $(CFLAGS) \ $(tv_quark_so_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -216,6 +216,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -243,6 +245,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -257,7 +260,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -319,8 +325,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/main/tv_quark tv_quark_so_SOURCES = tv_quark.c -tv_quark_so_LDFLAGS = @PLUGIN_LDFLAGS@ -tv_quark_so_CFLAGS = @PLUGIN_CFLAGS@ +tv_quark_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +tv_quark_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +tv_quark_so_LDADD = @PLUGIN_LDADD@ all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/main/tv_quark/tv_quark.c lebiniou-3.40/plugins/stable/main/tv_quark/tv_quark.c --- lebiniou-3.31/plugins/stable/main/tv_quark/tv_quark.c 2019-04-05 20:39:15.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/tv_quark/tv_quark.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -28,7 +28,8 @@ #include "context.h" -uint32_t id = 1324068377; +u_long id = 1324068377; +uint32_t version = 0; u_long options = BE_GFX|BEQ_WEBCAM|BEQ_MUTE_CAM; char desc[] = "QuarkTV plugin from the EffecTV project"; u_long mode = OVERLAY; @@ -38,22 +39,18 @@ static Buffer8_t *qtv = NULL; -void +int8_t create(Context_t *ctx) { - if (!ctx->webcams) { - options |= BEQ_DISABLED; - } else if (MIN_FRAMES > CAM_SAVE) { - printf("[!] QuarkTV: not enough frames (%d, want %d)\n", CAM_SAVE, MIN_FRAMES); - options |= BEQ_DISABLED; - } else { - uint32_t i; - - qtv = Buffer8_new(); - for (i = 0; i < BUFFSIZE; i++) { - qtv->buffer[i] = b_rand_int_range(0, MIN_FRAMES-1); - } + uint32_t i; + + assert(MIN_FRAMES <= CAM_SAVE); + qtv = Buffer8_new(); + for (i = 0; i < BUFFSIZE; i++) { + qtv->buffer[i] = b_rand_int_range(0, MIN_FRAMES-1); } + + return 1; } diff -Nru lebiniou-3.31/plugins/stable/main/tv_streak/Makefile.am lebiniou-3.40/plugins/stable/main/tv_streak/Makefile.am --- lebiniou-3.31/plugins/stable/main/tv_streak/Makefile.am 2018-11-27 13:50:08.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/tv_streak/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -2,5 +2,6 @@ plugin_PROGRAMS = tv_streak.so tv_streak_so_SOURCES = tv_streak.c -tv_streak_so_LDFLAGS = @PLUGIN_LDFLAGS@ -tv_streak_so_CFLAGS = @PLUGIN_CFLAGS@ +tv_streak_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +tv_streak_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +tv_streak_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/tv_streak/Makefile.in lebiniou-3.40/plugins/stable/main/tv_streak/Makefile.in --- lebiniou-3.31/plugins/stable/main/tv_streak/Makefile.in 2019-04-14 11:52:34.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/tv_streak/Makefile.in 2020-01-23 13:57:19.000000000 +0000 @@ -104,7 +104,7 @@ PROGRAMS = $(plugin_PROGRAMS) am_tv_streak_so_OBJECTS = tv_streak_so-tv_streak.$(OBJEXT) tv_streak_so_OBJECTS = $(am_tv_streak_so_OBJECTS) -tv_streak_so_LDADD = $(LDADD) +tv_streak_so_DEPENDENCIES = tv_streak_so_LINK = $(CCLD) $(tv_streak_so_CFLAGS) $(CFLAGS) \ $(tv_streak_so_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -216,6 +216,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -243,6 +245,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -257,7 +260,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -319,8 +325,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/main/tv_streak tv_streak_so_SOURCES = tv_streak.c -tv_streak_so_LDFLAGS = @PLUGIN_LDFLAGS@ -tv_streak_so_CFLAGS = @PLUGIN_CFLAGS@ +tv_streak_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +tv_streak_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +tv_streak_so_LDADD = @PLUGIN_LDADD@ all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/main/tv_streak/tv_streak.c lebiniou-3.40/plugins/stable/main/tv_streak/tv_streak.c --- lebiniou-3.31/plugins/stable/main/tv_streak/tv_streak.c 2019-04-05 20:39:15.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/tv_streak/tv_streak.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -28,7 +28,8 @@ #include "context.h" -uint32_t id = 1325100452; +u_long id = 1325100452; +uint32_t version = 0; u_long options = BE_GFX|BEQ_WEBCAM|BEQ_MUTE_CAM; char desc[] = "StreakTV plugin from the EffecTV project"; u_long mode = OVERLAY; @@ -43,22 +44,18 @@ static int plane = 0; -void +int8_t create(Context_t *ctx) { - if (!ctx->webcams) { - options |= BEQ_DISABLED; - } else if (PLANES > CAM_SAVE) { - printf("[!] StreakTV: not enough frames (%d, want %d)\n", CAM_SAVE, PLANES); - options |= BEQ_DISABLED; - } else { - int i; - - for (i = 0; i < PLANES; i++) { - planes[i] = Buffer8_new(); - planetable[i] = planes[i]->buffer; - } + int i; + + assert(PLANES <= CAM_SAVE); + for (i = 0; i < PLANES; i++) { + planes[i] = Buffer8_new(); + planetable[i] = planes[i]->buffer; } + + return 1; } @@ -91,13 +88,13 @@ cf = plane & (STRIDE-1); for (i = 0; i < BUFFSIZE; i++) { dst[i] = planetable[cf][i] - + planetable[cf+STRIDE][i] - + planetable[cf+STRIDE*2][i] - + planetable[cf+STRIDE*3][i] - + planetable[cf+STRIDE*4][i] - + planetable[cf+STRIDE*5][i] - + planetable[cf+STRIDE*6][i] - + planetable[cf+STRIDE*7][i]; + + planetable[cf+STRIDE][i] + + planetable[cf+STRIDE*2][i] + + planetable[cf+STRIDE*3][i] + + planetable[cf+STRIDE*4][i] + + planetable[cf+STRIDE*5][i] + + planetable[cf+STRIDE*6][i] + + planetable[cf+STRIDE*7][i]; } plane++; diff -Nru lebiniou-3.31/plugins/stable/main/tv_webcam/Makefile.am lebiniou-3.40/plugins/stable/main/tv_webcam/Makefile.am --- lebiniou-3.31/plugins/stable/main/tv_webcam/Makefile.am 2018-11-27 13:50:08.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/tv_webcam/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -2,5 +2,6 @@ plugin_PROGRAMS = tv_webcam.so tv_webcam_so_SOURCES = tv_webcam.c -tv_webcam_so_LDFLAGS = @PLUGIN_LDFLAGS@ -tv_webcam_so_CFLAGS = @PLUGIN_CFLAGS@ +tv_webcam_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +tv_webcam_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +tv_webcam_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/tv_webcam/Makefile.in lebiniou-3.40/plugins/stable/main/tv_webcam/Makefile.in --- lebiniou-3.31/plugins/stable/main/tv_webcam/Makefile.in 2019-04-14 11:52:34.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/tv_webcam/Makefile.in 2020-01-23 13:57:19.000000000 +0000 @@ -104,7 +104,7 @@ PROGRAMS = $(plugin_PROGRAMS) am_tv_webcam_so_OBJECTS = tv_webcam_so-tv_webcam.$(OBJEXT) tv_webcam_so_OBJECTS = $(am_tv_webcam_so_OBJECTS) -tv_webcam_so_LDADD = $(LDADD) +tv_webcam_so_DEPENDENCIES = tv_webcam_so_LINK = $(CCLD) $(tv_webcam_so_CFLAGS) $(CFLAGS) \ $(tv_webcam_so_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -216,6 +216,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -243,6 +245,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -257,7 +260,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -319,8 +325,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/main/tv_webcam tv_webcam_so_SOURCES = tv_webcam.c -tv_webcam_so_LDFLAGS = @PLUGIN_LDFLAGS@ -tv_webcam_so_CFLAGS = @PLUGIN_CFLAGS@ +tv_webcam_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +tv_webcam_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +tv_webcam_so_LDADD = @PLUGIN_LDADD@ all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/main/tv_webcam/tv_webcam.c lebiniou-3.40/plugins/stable/main/tv_webcam/tv_webcam.c --- lebiniou-3.31/plugins/stable/main/tv_webcam/tv_webcam.c 2019-04-05 20:39:15.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/tv_webcam/tv_webcam.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -19,19 +19,11 @@ #include "context.h" -uint32_t id = 1172430309; +u_long id = 1172430309; +uint32_t version = 0; u_long options = BE_GFX|BEQ_WEBCAM|BEQ_MUTE_CAM; char desc[] = "Webcam plugin"; -uint8_t mode = OVERLAY; - - -void -create(Context_t *ctx) -{ - if (!ctx->webcams) { - options |= BEQ_DISABLED; - } -} +u_long mode = OVERLAY; void diff -Nru lebiniou-3.31/plugins/stable/main/venus/Makefile.am lebiniou-3.40/plugins/stable/main/venus/Makefile.am --- lebiniou-3.31/plugins/stable/main/venus/Makefile.am 2018-11-27 13:50:08.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/venus/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -2,5 +2,6 @@ plugin_PROGRAMS = venus.so venus_so_SOURCES = venus.c -venus_so_LDFLAGS = @PLUGIN_LDFLAGS@ -venus_so_CFLAGS = @PLUGIN_CFLAGS@ +venus_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +venus_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +venus_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/venus/Makefile.in lebiniou-3.40/plugins/stable/main/venus/Makefile.in --- lebiniou-3.31/plugins/stable/main/venus/Makefile.in 2019-04-14 11:52:34.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/venus/Makefile.in 2020-01-23 13:57:19.000000000 +0000 @@ -104,7 +104,7 @@ PROGRAMS = $(plugin_PROGRAMS) am_venus_so_OBJECTS = venus_so-venus.$(OBJEXT) venus_so_OBJECTS = $(am_venus_so_OBJECTS) -venus_so_LDADD = $(LDADD) +venus_so_DEPENDENCIES = venus_so_LINK = $(CCLD) $(venus_so_CFLAGS) $(CFLAGS) \ $(venus_so_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -216,6 +216,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -243,6 +245,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -257,7 +260,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -319,8 +325,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/main/venus venus_so_SOURCES = venus.c -venus_so_LDFLAGS = @PLUGIN_LDFLAGS@ -venus_so_CFLAGS = @PLUGIN_CFLAGS@ +venus_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +venus_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +venus_so_LDADD = @PLUGIN_LDADD@ all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/main/venus/venus.c lebiniou-3.40/plugins/stable/main/venus/venus.c --- lebiniou-3.31/plugins/stable/main/venus/venus.c 2019-04-13 13:36:49.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/venus/venus.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -21,6 +21,7 @@ u_long id = 1181509809; +uint32_t version = 0; u_long options = BE_GFX|BEQ_FIRST|BEQ_NORANDOM; u_long mode = XOR; char desc[] = "Cellular automaton"; @@ -33,11 +34,13 @@ static Buffer8_t *game[2] = { NULL, NULL }; -void +int8_t create(Context_t *ctx) { game[0] = Buffer8_new(); game[1] = Buffer8_new(); + + return 1; } @@ -90,24 +93,24 @@ #define C 1 switch (rule) { - case 0: - new = 2 * ((*nw&C) ^ (*sw&C)) + (*w&C); - break; - - case 1: - /* new = 2 * ((*nw&C) ^ (*ne&C)) + (*n&C);*/ - new = 2 * ((*nw&C) ^ (*(nw+2)&C)) + (*(nw+1)&C); - break; - - case 2: - /* new = 2 * ((*ne&C) ^ (*se&C)) + (*e&C);*/ - new = 2 * ((*(nw+2)&C) ^ (*(sw+2)&C)) + (*(w+2)&C); - break; - - case 3: - /* new = 2 * ((*se&C) ^ (*sw&C)) + (*s&C);*/ - new = 2 * ((*(sw+2)&C) ^ (*sw&C)) + (*(sw+1)&C); - break; + case 0: + new = 2 * ((*nw&C) ^ (*sw&C)) + (*w&C); + break; + + case 1: + /* new = 2 * ((*nw&C) ^ (*ne&C)) + (*n&C);*/ + new = 2 * ((*nw&C) ^ (*(nw+2)&C)) + (*(nw+1)&C); + break; + + case 2: + /* new = 2 * ((*ne&C) ^ (*se&C)) + (*e&C);*/ + new = 2 * ((*(nw+2)&C) ^ (*(sw+2)&C)) + (*(w+2)&C); + break; + + case 3: + /* new = 2 * ((*se&C) ^ (*sw&C)) + (*s&C);*/ + new = 2 * ((*(sw+2)&C) ^ (*sw&C)) + (*(sw+1)&C); + break; } *d = new; diff -Nru lebiniou-3.31/plugins/stable/main/video/Makefile.am lebiniou-3.40/plugins/stable/main/video/Makefile.am --- lebiniou-3.31/plugins/stable/main/video/Makefile.am 2019-01-20 19:59:26.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/video/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -2,5 +2,6 @@ plugin_PROGRAMS = video.so video_so_SOURCES = video.c -video_so_CFLAGS = @PLUGIN_CFLAGS@ -video_so_LDFLAGS = @PLUGIN_LDFLAGS@ +video_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +video_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +video_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/video/Makefile.in lebiniou-3.40/plugins/stable/main/video/Makefile.in --- lebiniou-3.31/plugins/stable/main/video/Makefile.in 2019-04-14 11:52:34.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/video/Makefile.in 2020-01-23 13:57:19.000000000 +0000 @@ -104,7 +104,7 @@ PROGRAMS = $(plugin_PROGRAMS) am_video_so_OBJECTS = video_so-video.$(OBJEXT) video_so_OBJECTS = $(am_video_so_OBJECTS) -video_so_LDADD = $(LDADD) +video_so_DEPENDENCIES = video_so_LINK = $(CCLD) $(video_so_CFLAGS) $(CFLAGS) \ $(video_so_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -216,6 +216,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -243,6 +245,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -257,7 +260,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -319,8 +325,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/main/video video_so_SOURCES = video.c -video_so_CFLAGS = @PLUGIN_CFLAGS@ -video_so_LDFLAGS = @PLUGIN_LDFLAGS@ +video_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +video_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +video_so_LDADD = @PLUGIN_LDADD@ all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/main/video/video.c lebiniou-3.40/plugins/stable/main/video/video.c --- lebiniou-3.31/plugins/stable/main/video/video.c 2019-04-05 20:39:15.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/video/video.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -20,6 +20,7 @@ #include "context.h" u_long id = 1544575336; +uint32_t version = 0; u_long options = BE_GFX|BEQ_FIRST; char desc[] = "Video player"; @@ -40,18 +41,20 @@ if (check_command(FFMPEG_CHECK) == -1) { VERBOSE(printf("[!] %s: ffmpeg binary not found, plugin disabled\n", __FILE__)); - options |= BEQ_DISABLED; + return NULL; } else { if ((NULL == video_filename) && (NULL == (video_filename = getenv("LEBINIOU_VIDEO")))) { VERBOSE(printf("[!] %s: no video defined\n", __FILE__)); - options |= BEQ_DISABLED; + return NULL; } else { char *cmd = g_strdup_printf(VIDEO_CMD, video_filename, WIDTH, HEIGHT, WIDTH, HEIGHT, ctx->max_fps); +#ifdef DEBUG VERBOSE(printf("[i] %s: cmd= %s\n", __FILE__, cmd)); +#endif if (NULL == (stream = popen(cmd, "r"))) { - xperror("popen"); + xperror("popen"); } else { - VERBOSE(printf("[i] %s: opened stream from %s\n", __FILE__, video_filename)); + VERBOSE(printf("[i] %s: opened stream from %s\n", __FILE__, video_filename)); } g_free(cmd); } @@ -61,10 +64,11 @@ } -void +int8_t create(Context_t *ctx) { video = open_video(ctx); + return (video != NULL); } @@ -99,7 +103,7 @@ int res = pclose(video); if (res != 0) { #ifdef DEBUG - printf("%s: command exited with return code %d\n", __FILE__, res); + printf("%s: command exited with return code %d\n", __FILE__, res); #endif } video = open_video(ctx); diff -Nru lebiniou-3.31/plugins/stable/main/voiceprint/Makefile.am lebiniou-3.40/plugins/stable/main/voiceprint/Makefile.am --- lebiniou-3.31/plugins/stable/main/voiceprint/Makefile.am 2018-11-27 13:50:08.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/voiceprint/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -2,5 +2,6 @@ plugin_PROGRAMS = voiceprint.so voiceprint_so_SOURCES = voiceprint.c -voiceprint_so_LDFLAGS = @PLUGIN_LDFLAGS@ -voiceprint_so_CFLAGS = @PLUGIN_CFLAGS@ +voiceprint_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +voiceprint_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +voiceprint_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/voiceprint/Makefile.in lebiniou-3.40/plugins/stable/main/voiceprint/Makefile.in --- lebiniou-3.31/plugins/stable/main/voiceprint/Makefile.in 2019-04-14 11:52:34.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/voiceprint/Makefile.in 2020-01-23 13:57:19.000000000 +0000 @@ -104,7 +104,7 @@ PROGRAMS = $(plugin_PROGRAMS) am_voiceprint_so_OBJECTS = voiceprint_so-voiceprint.$(OBJEXT) voiceprint_so_OBJECTS = $(am_voiceprint_so_OBJECTS) -voiceprint_so_LDADD = $(LDADD) +voiceprint_so_DEPENDENCIES = voiceprint_so_LINK = $(CCLD) $(voiceprint_so_CFLAGS) $(CFLAGS) \ $(voiceprint_so_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -216,6 +216,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -243,6 +245,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -257,7 +260,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -319,8 +325,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/main/voiceprint voiceprint_so_SOURCES = voiceprint.c -voiceprint_so_LDFLAGS = @PLUGIN_LDFLAGS@ -voiceprint_so_CFLAGS = @PLUGIN_CFLAGS@ +voiceprint_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +voiceprint_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +voiceprint_so_LDADD = @PLUGIN_LDADD@ all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/main/voiceprint/voiceprint.c lebiniou-3.40/plugins/stable/main/voiceprint/voiceprint.c --- lebiniou-3.31/plugins/stable/main/voiceprint/voiceprint.c 2019-04-05 20:39:15.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/voiceprint/voiceprint.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -18,9 +18,11 @@ */ #include "context.h" +#include "parameters.h" u_long id = 945291309; +uint32_t version = 0; u_long options = BE_SFX2D|BEQ_NORANDOM; u_long mode = OVERLAY; char desc[] = "Voiceprint effect"; @@ -30,6 +32,42 @@ static u_short *v_start = NULL, *v_end = NULL; +static float volume_scale = 0; + +json_t * +get_parameters() +{ + json_t *params = json_object(); + plugin_parameters_add_double(params, BPP_VOLUME_SCALE, volume_scale, -0.01, 0.01); + + return params; +} + + +void +set_parameters(const json_t *in_parameters) +{ + plugin_parameter_parse_float_range(in_parameters, BPP_VOLUME_SCALE, &volume_scale, 0, 100); +} + + +json_t * +parameters(const json_t *in_parameters) +{ + set_parameters(in_parameters); + + return get_parameters(); +} + + +void +on_switch_on(Context_t *ctx) +{ + /* Initialize parameters */ + volume_scale = 1; +} + + static void init_v(Context_t *ctx) { @@ -56,7 +94,7 @@ pthread_mutex_lock(&ctx->input->mutex); for (k = 1; k < ctx->input->spectrum_size; k++) { - Pixel_t color1 = (Pixel_t)(255.0 * ctx->input->spectrum_log[A_MONO][k]); + Pixel_t color1 = (Pixel_t)(255.0 * ctx->input->spectrum_log[A_MONO][k] * volume_scale); v_line_nc(src, MAXX, v_start[k], v_end[k] - 1, color1); } pthread_mutex_unlock(&ctx->input->mutex); @@ -70,19 +108,17 @@ } -void +int8_t create(Context_t *ctx) { - if (ctx->input != NULL) { - v_start = xcalloc(ctx->input->spectrum_size, sizeof(u_short)); - v_end = xcalloc(ctx->input->spectrum_size, sizeof(u_short)); - - my_scr = Buffer8_new(); - - init_v(ctx); - } else { - options |= BEQ_DISABLED; - } + v_start = xcalloc(ctx->input->spectrum_size, sizeof(u_short)); + v_end = xcalloc(ctx->input->spectrum_size, sizeof(u_short)); + + my_scr = Buffer8_new(); + + init_v(ctx); + + return 1; } diff -Nru lebiniou-3.31/plugins/stable/main/warp/Makefile.am lebiniou-3.40/plugins/stable/main/warp/Makefile.am --- lebiniou-3.31/plugins/stable/main/warp/Makefile.am 2018-11-27 13:50:08.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/warp/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -2,5 +2,6 @@ plugin_PROGRAMS = warp.so warp_so_SOURCES = warp.c -warp_so_LDFLAGS = @PLUGIN_LDFLAGS@ -warp_so_CFLAGS = @PLUGIN_CFLAGS@ +warp_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +warp_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +warp_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/warp/Makefile.in lebiniou-3.40/plugins/stable/main/warp/Makefile.in --- lebiniou-3.31/plugins/stable/main/warp/Makefile.in 2019-04-14 11:52:34.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/warp/Makefile.in 2020-01-23 13:57:19.000000000 +0000 @@ -104,7 +104,7 @@ PROGRAMS = $(plugin_PROGRAMS) am_warp_so_OBJECTS = warp_so-warp.$(OBJEXT) warp_so_OBJECTS = $(am_warp_so_OBJECTS) -warp_so_LDADD = $(LDADD) +warp_so_DEPENDENCIES = warp_so_LINK = $(CCLD) $(warp_so_CFLAGS) $(CFLAGS) $(warp_so_LDFLAGS) \ $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -216,6 +216,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -243,6 +245,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -257,7 +260,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -319,8 +325,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/main/warp warp_so_SOURCES = warp.c -warp_so_LDFLAGS = @PLUGIN_LDFLAGS@ -warp_so_CFLAGS = @PLUGIN_CFLAGS@ +warp_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +warp_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +warp_so_LDADD = @PLUGIN_LDADD@ all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/main/warp/warp.c lebiniou-3.40/plugins/stable/main/warp/warp.c --- lebiniou-3.31/plugins/stable/main/warp/warp.c 2019-04-05 20:39:15.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/warp/warp.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -20,6 +20,7 @@ #include "context.h" u_long id = 945172539; +uint32_t version = 0; u_long options = BE_WARP|BE_LENS; char desc[] = "Warp effect"; @@ -171,10 +172,12 @@ } -void +int8_t create(Context_t *ctx) { initWarp(ctx); + + return 1; } diff -Nru lebiniou-3.31/plugins/stable/main/xgum/Makefile.am lebiniou-3.40/plugins/stable/main/xgum/Makefile.am --- lebiniou-3.31/plugins/stable/main/xgum/Makefile.am 2018-11-27 13:50:08.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/xgum/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -2,5 +2,6 @@ plugin_PROGRAMS = xgum.so xgum_so_SOURCES = xgum.c -xgum_so_LDFLAGS = @PLUGIN_LDFLAGS@ -xgum_so_CFLAGS = @PLUGIN_CFLAGS@ +xgum_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +xgum_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +xgum_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/xgum/Makefile.in lebiniou-3.40/plugins/stable/main/xgum/Makefile.in --- lebiniou-3.31/plugins/stable/main/xgum/Makefile.in 2019-04-14 11:52:34.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/xgum/Makefile.in 2020-01-23 13:57:19.000000000 +0000 @@ -104,7 +104,7 @@ PROGRAMS = $(plugin_PROGRAMS) am_xgum_so_OBJECTS = xgum_so-xgum.$(OBJEXT) xgum_so_OBJECTS = $(am_xgum_so_OBJECTS) -xgum_so_LDADD = $(LDADD) +xgum_so_DEPENDENCIES = xgum_so_LINK = $(CCLD) $(xgum_so_CFLAGS) $(CFLAGS) $(xgum_so_LDFLAGS) \ $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -216,6 +216,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -243,6 +245,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -257,7 +260,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -319,8 +325,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/main/xgum xgum_so_SOURCES = xgum.c -xgum_so_LDFLAGS = @PLUGIN_LDFLAGS@ -xgum_so_CFLAGS = @PLUGIN_CFLAGS@ +xgum_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +xgum_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +xgum_so_LDADD = @PLUGIN_LDADD@ all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/main/xgum/xgum.c lebiniou-3.40/plugins/stable/main/xgum/xgum.c --- lebiniou-3.31/plugins/stable/main/xgum/xgum.c 2019-04-05 20:39:15.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/xgum/xgum.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -18,6 +18,8 @@ */ #include "context.h" +#include "parameters.h" +#include "gum.h" /* TODO optimize * we can precompute an array for the "idx" variable @@ -26,11 +28,11 @@ */ u_long id = 1074631868; +uint32_t version = 0; u_long options = BE_LENS|BEQ_HOR; char dname[] = "X gum"; char desc[] = "Gum effect"; - static inline void gum(Context_t *ctx, u_short x, u_short max_y) { @@ -58,17 +60,16 @@ static inline void do_gum(Context_t *ctx, u_short x, float val) { - u_short max_y = HHEIGHT + val * HHEIGHT; + u_short max_y = HHEIGHT + val * volume_scale * HHEIGHT; gum(ctx, x, max_y); } void -create(Context_t *ctx) +on_switch_on(Context_t *ctx) { - if (ctx->input == NULL) { - options |= BEQ_DISABLED; - } + /* Initialize parameters */ + volume_scale = 1; } diff -Nru lebiniou-3.31/plugins/stable/main/xmirror_bottom/Makefile.am lebiniou-3.40/plugins/stable/main/xmirror_bottom/Makefile.am --- lebiniou-3.31/plugins/stable/main/xmirror_bottom/Makefile.am 2018-11-27 13:50:08.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/xmirror_bottom/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -2,5 +2,6 @@ plugin_PROGRAMS = xmirror_bottom.so xmirror_bottom_so_SOURCES = xmirror_bottom.c -xmirror_bottom_so_LDFLAGS = @PLUGIN_LDFLAGS@ -xmirror_bottom_so_CFLAGS = @PLUGIN_CFLAGS@ +xmirror_bottom_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +xmirror_bottom_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +xmirror_bottom_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/xmirror_bottom/Makefile.in lebiniou-3.40/plugins/stable/main/xmirror_bottom/Makefile.in --- lebiniou-3.31/plugins/stable/main/xmirror_bottom/Makefile.in 2019-04-14 11:52:34.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/xmirror_bottom/Makefile.in 2020-01-23 13:57:19.000000000 +0000 @@ -105,7 +105,7 @@ am_xmirror_bottom_so_OBJECTS = \ xmirror_bottom_so-xmirror_bottom.$(OBJEXT) xmirror_bottom_so_OBJECTS = $(am_xmirror_bottom_so_OBJECTS) -xmirror_bottom_so_LDADD = $(LDADD) +xmirror_bottom_so_DEPENDENCIES = xmirror_bottom_so_LINK = $(CCLD) $(xmirror_bottom_so_CFLAGS) $(CFLAGS) \ $(xmirror_bottom_so_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -217,6 +217,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -244,6 +246,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -258,7 +261,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -320,8 +326,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/main/xmirror_bottom xmirror_bottom_so_SOURCES = xmirror_bottom.c -xmirror_bottom_so_LDFLAGS = @PLUGIN_LDFLAGS@ -xmirror_bottom_so_CFLAGS = @PLUGIN_CFLAGS@ +xmirror_bottom_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +xmirror_bottom_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +xmirror_bottom_so_LDADD = @PLUGIN_LDADD@ all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/main/xmirror_bottom/xmirror_bottom.c lebiniou-3.40/plugins/stable/main/xmirror_bottom/xmirror_bottom.c --- lebiniou-3.31/plugins/stable/main/xmirror_bottom/xmirror_bottom.c 2019-04-05 20:39:15.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/xmirror_bottom/xmirror_bottom.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -21,6 +21,7 @@ u_long id = 947154951; +uint32_t version = 0; u_long options = BE_MIRROR|BEQ_HOR; char dname[] = "Mirror bottom"; char desc[] = "Mirror effect"; diff -Nru lebiniou-3.31/plugins/stable/main/xmirror_top/Makefile.am lebiniou-3.40/plugins/stable/main/xmirror_top/Makefile.am --- lebiniou-3.31/plugins/stable/main/xmirror_top/Makefile.am 2018-11-27 13:50:08.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/xmirror_top/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -2,5 +2,6 @@ plugin_PROGRAMS = xmirror_top.so xmirror_top_so_SOURCES = xmirror_top.c -xmirror_top_so_LDFLAGS = @PLUGIN_LDFLAGS@ -xmirror_top_so_CFLAGS = @PLUGIN_CFLAGS@ +xmirror_top_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +xmirror_top_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +xmirror_top_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/xmirror_top/Makefile.in lebiniou-3.40/plugins/stable/main/xmirror_top/Makefile.in --- lebiniou-3.31/plugins/stable/main/xmirror_top/Makefile.in 2019-04-14 11:52:34.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/xmirror_top/Makefile.in 2020-01-23 13:57:19.000000000 +0000 @@ -104,7 +104,7 @@ PROGRAMS = $(plugin_PROGRAMS) am_xmirror_top_so_OBJECTS = xmirror_top_so-xmirror_top.$(OBJEXT) xmirror_top_so_OBJECTS = $(am_xmirror_top_so_OBJECTS) -xmirror_top_so_LDADD = $(LDADD) +xmirror_top_so_DEPENDENCIES = xmirror_top_so_LINK = $(CCLD) $(xmirror_top_so_CFLAGS) $(CFLAGS) \ $(xmirror_top_so_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -216,6 +216,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -243,6 +245,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -257,7 +260,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -319,8 +325,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/main/xmirror_top xmirror_top_so_SOURCES = xmirror_top.c -xmirror_top_so_LDFLAGS = @PLUGIN_LDFLAGS@ -xmirror_top_so_CFLAGS = @PLUGIN_CFLAGS@ +xmirror_top_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +xmirror_top_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +xmirror_top_so_LDADD = @PLUGIN_LDADD@ all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/main/xmirror_top/xmirror_top.c lebiniou-3.40/plugins/stable/main/xmirror_top/xmirror_top.c --- lebiniou-3.31/plugins/stable/main/xmirror_top/xmirror_top.c 2019-04-05 20:39:15.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/xmirror_top/xmirror_top.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -21,6 +21,7 @@ u_long id = 947154950; +uint32_t version = 0; u_long options = BE_MIRROR|BEQ_HOR; char dname[] = "Mirror top"; char desc[] = "Mirror effect"; diff -Nru lebiniou-3.31/plugins/stable/main/xoscillo/Makefile.am lebiniou-3.40/plugins/stable/main/xoscillo/Makefile.am --- lebiniou-3.31/plugins/stable/main/xoscillo/Makefile.am 2018-11-27 13:50:08.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/xoscillo/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -2,5 +2,6 @@ plugin_PROGRAMS = xoscillo.so xoscillo_so_SOURCES = xoscillo.c -xoscillo_so_LDFLAGS = @PLUGIN_LDFLAGS@ -xoscillo_so_CFLAGS = @PLUGIN_CFLAGS@ +xoscillo_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +xoscillo_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +xoscillo_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/xoscillo/Makefile.in lebiniou-3.40/plugins/stable/main/xoscillo/Makefile.in --- lebiniou-3.31/plugins/stable/main/xoscillo/Makefile.in 2019-04-14 11:52:34.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/xoscillo/Makefile.in 2020-01-23 13:57:19.000000000 +0000 @@ -104,7 +104,7 @@ PROGRAMS = $(plugin_PROGRAMS) am_xoscillo_so_OBJECTS = xoscillo_so-xoscillo.$(OBJEXT) xoscillo_so_OBJECTS = $(am_xoscillo_so_OBJECTS) -xoscillo_so_LDADD = $(LDADD) +xoscillo_so_DEPENDENCIES = xoscillo_so_LINK = $(CCLD) $(xoscillo_so_CFLAGS) $(CFLAGS) \ $(xoscillo_so_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -216,6 +216,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -243,6 +245,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -257,7 +260,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -319,8 +325,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/main/xoscillo xoscillo_so_SOURCES = xoscillo.c -xoscillo_so_LDFLAGS = @PLUGIN_LDFLAGS@ -xoscillo_so_CFLAGS = @PLUGIN_CFLAGS@ +xoscillo_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +xoscillo_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +xoscillo_so_LDADD = @PLUGIN_LDADD@ all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/main/xoscillo/xoscillo.c lebiniou-3.40/plugins/stable/main/xoscillo/xoscillo.c --- lebiniou-3.31/plugins/stable/main/xoscillo/xoscillo.c 2019-04-05 20:39:15.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/xoscillo/xoscillo.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -18,9 +18,11 @@ */ #include "oscillo.h" +#include "parameters.h" u_long id = 946482110; +uint32_t version = 0; u_long options = BE_SFX2D|BEQ_HOR; char dname[] = "X oscillo"; u_long mode = OVERLAY; @@ -28,7 +30,25 @@ static Porteuse_t *P = NULL; -static int connect = 1; +static int xoscillo_connect = 1; + +static float volume_scale = 0; + +json_t * +get_parameters() +{ + json_t *params = json_object(); + plugin_parameters_add_double(params, BPP_VOLUME_SCALE, volume_scale, -0.01, 0.01); + + return params; +} + + +void +set_parameters(const json_t *in_parameters) +{ + plugin_parameter_parse_float_range(in_parameters, BPP_VOLUME_SCALE, &volume_scale, 0, 100); +} static void @@ -42,7 +62,7 @@ P->origin.x = 0; P->origin.y = CENTERY; - t.v_j_factor = HMAXY * 0.85; + t.v_j_factor = HMAXY * volume_scale; t.v_i.x = 1.0 / (float)(P->size - 1) * (float)MAXX; for (i = 0; i < P->size; i++) { @@ -53,15 +73,34 @@ } -void -create(Context_t *ctx) +json_t * +parameters(const json_t *in_parameters) { - if (ctx->input != NULL) { - P = Porteuse_new(ctx->input->size, A_MONO); + set_parameters(in_parameters); + if(in_parameters) { init(); - } else { - options |= BEQ_DISABLED; } + + return get_parameters(); +} + + +void +on_switch_on(Context_t *ctx) +{ + /* Initialize parameters */ + volume_scale = 0.85; + init(); +} + + +int8_t +create(Context_t *ctx) +{ + P = Porteuse_new(ctx->input->size, A_MONO); + init(); + + return 1; } @@ -78,5 +117,5 @@ run(Context_t *ctx) { Buffer8_clear(passive_buffer(ctx)); - Porteuse_draw(P, ctx, connect); + Porteuse_draw(P, ctx, xoscillo_connect); } diff -Nru lebiniou-3.31/plugins/stable/main/xoscillo_s/Makefile.am lebiniou-3.40/plugins/stable/main/xoscillo_s/Makefile.am --- lebiniou-3.31/plugins/stable/main/xoscillo_s/Makefile.am 2018-11-27 13:50:08.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/xoscillo_s/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -2,5 +2,6 @@ plugin_PROGRAMS = xoscillo_s.so xoscillo_s_so_SOURCES = xoscillo_s.c -xoscillo_s_so_LDFLAGS = @PLUGIN_LDFLAGS@ -xoscillo_s_so_CFLAGS = @PLUGIN_CFLAGS@ +xoscillo_s_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +xoscillo_s_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +xoscillo_s_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/xoscillo_s/Makefile.in lebiniou-3.40/plugins/stable/main/xoscillo_s/Makefile.in --- lebiniou-3.31/plugins/stable/main/xoscillo_s/Makefile.in 2019-04-14 11:52:34.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/xoscillo_s/Makefile.in 2020-01-23 13:57:19.000000000 +0000 @@ -104,7 +104,7 @@ PROGRAMS = $(plugin_PROGRAMS) am_xoscillo_s_so_OBJECTS = xoscillo_s_so-xoscillo_s.$(OBJEXT) xoscillo_s_so_OBJECTS = $(am_xoscillo_s_so_OBJECTS) -xoscillo_s_so_LDADD = $(LDADD) +xoscillo_s_so_DEPENDENCIES = xoscillo_s_so_LINK = $(CCLD) $(xoscillo_s_so_CFLAGS) $(CFLAGS) \ $(xoscillo_s_so_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -216,6 +216,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -243,6 +245,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -257,7 +260,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -319,8 +325,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/main/xoscillo_s xoscillo_s_so_SOURCES = xoscillo_s.c -xoscillo_s_so_LDFLAGS = @PLUGIN_LDFLAGS@ -xoscillo_s_so_CFLAGS = @PLUGIN_CFLAGS@ +xoscillo_s_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +xoscillo_s_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +xoscillo_s_so_LDADD = @PLUGIN_LDADD@ all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/main/xoscillo_s/xoscillo_s.c lebiniou-3.40/plugins/stable/main/xoscillo_s/xoscillo_s.c --- lebiniou-3.31/plugins/stable/main/xoscillo_s/xoscillo_s.c 2019-04-05 20:39:15.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/xoscillo_s/xoscillo_s.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -18,9 +18,11 @@ */ #include "oscillo.h" +#include "parameters.h" u_long id = 1089152274; +uint32_t version = 0; u_long options = BE_SFX2D|BEQ_HOR; char dname[] = "X oscillo stereo"; u_long mode = OVERLAY; @@ -28,7 +30,25 @@ static Porteuse_t *PL = NULL, *PR = NULL; -static int connect = 1; +static int xoscillo_s_connect = 1; + +static float volume_scale = 0; + +json_t * +get_parameters() +{ + json_t *params = json_object(); + plugin_parameters_add_double(params, BPP_VOLUME_SCALE, volume_scale, -0.01, 0.01); + + return params; +} + + +void +set_parameters(const json_t *in_parameters) +{ + plugin_parameter_parse_float_range(in_parameters, BPP_VOLUME_SCALE, &volume_scale, 0, 100); +} static void @@ -44,7 +64,7 @@ PL->origin.y = HHEIGHT/2; PR->origin.y = MAXY-HHEIGHT/2; - t.v_j_factor = HMAXY * 0.85; + t.v_j_factor = HMAXY * volume_scale; t.v_i.x = 1.0 / (float)(PL->size - 1) * (float)MAXX; for (i = 0; i < PL->size; i++) { @@ -56,22 +76,36 @@ } -void +int8_t create(Context_t *ctx) { - if (ctx->input != NULL) { - PL = Porteuse_new(ctx->input->size, A_LEFT); - PR = Porteuse_new(ctx->input->size, A_RIGHT); + PL = Porteuse_new(ctx->input->size, A_LEFT); + PR = Porteuse_new(ctx->input->size, A_RIGHT); + init(); + + return 1; +} + + +json_t * +parameters(const json_t *in_parameters) +{ + set_parameters(in_parameters); + if(in_parameters) { init(); - } else { - options |= BEQ_DISABLED; } + + return get_parameters(); } void on_switch_on(Context_t *ctx) { + /* Initialize parameters */ + volume_scale = 0.85; + init(); + /* connect = b_rand_boolean(); */ } @@ -90,6 +124,6 @@ run(Context_t *ctx) { Buffer8_clear(passive_buffer(ctx)); - Porteuse_draw(PL, ctx, connect); - Porteuse_draw(PR, ctx, connect); + Porteuse_draw(PL, ctx, xoscillo_s_connect); + Porteuse_draw(PR, ctx, xoscillo_s_connect); } diff -Nru lebiniou-3.31/plugins/stable/main/xscanline/Makefile.am lebiniou-3.40/plugins/stable/main/xscanline/Makefile.am --- lebiniou-3.31/plugins/stable/main/xscanline/Makefile.am 2018-11-27 13:50:08.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/xscanline/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -2,5 +2,6 @@ plugin_PROGRAMS = xscanline.so xscanline_so_SOURCES = xscanline.c -xscanline_so_LDFLAGS = @PLUGIN_LDFLAGS@ -xscanline_so_CFLAGS = @PLUGIN_CFLAGS@ +xscanline_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +xscanline_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +xscanline_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/xscanline/Makefile.in lebiniou-3.40/plugins/stable/main/xscanline/Makefile.in --- lebiniou-3.31/plugins/stable/main/xscanline/Makefile.in 2019-04-14 11:52:34.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/xscanline/Makefile.in 2020-01-23 13:57:19.000000000 +0000 @@ -104,7 +104,7 @@ PROGRAMS = $(plugin_PROGRAMS) am_xscanline_so_OBJECTS = xscanline_so-xscanline.$(OBJEXT) xscanline_so_OBJECTS = $(am_xscanline_so_OBJECTS) -xscanline_so_LDADD = $(LDADD) +xscanline_so_DEPENDENCIES = xscanline_so_LINK = $(CCLD) $(xscanline_so_CFLAGS) $(CFLAGS) \ $(xscanline_so_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -216,6 +216,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -243,6 +245,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -257,7 +260,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -319,8 +325,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/main/xscanline xscanline_so_SOURCES = xscanline.c -xscanline_so_LDFLAGS = @PLUGIN_LDFLAGS@ -xscanline_so_CFLAGS = @PLUGIN_CFLAGS@ +xscanline_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +xscanline_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +xscanline_so_LDADD = @PLUGIN_LDADD@ all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/main/xscanline/xscanline.c lebiniou-3.40/plugins/stable/main/xscanline/xscanline.c --- lebiniou-3.31/plugins/stable/main/xscanline/xscanline.c 2019-04-05 20:39:15.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/xscanline/xscanline.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -22,6 +22,7 @@ u_long id = 949094844; +uint32_t version = 0; u_long options = BE_GFX|BEQ_IMAGE; char dname[] = "X Scanline"; char desc[] = "Horizontal scanline"; @@ -40,16 +41,14 @@ static xscanline_conf xscanline_cf; -void +int8_t create(Context_t *ctx) { - if (images == NULL) { - options |= BEQ_DISABLED; - } else { - xscanline_cf.size = MINPCT; - xscanline_cf.dir = 1; - xscanline_cf.ping_pong = 0; - } + xscanline_cf.size = MINPCT; + xscanline_cf.dir = 1; + xscanline_cf.ping_pong = 0; + + return 1; } diff -Nru lebiniou-3.31/plugins/stable/main/xshaker/Makefile.am lebiniou-3.40/plugins/stable/main/xshaker/Makefile.am --- lebiniou-3.31/plugins/stable/main/xshaker/Makefile.am 2018-11-27 13:50:08.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/xshaker/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -2,5 +2,6 @@ plugin_PROGRAMS = xshaker.so xshaker_so_SOURCES = xshaker.c -xshaker_so_LDFLAGS = @PLUGIN_LDFLAGS@ -xshaker_so_CFLAGS = @PLUGIN_CFLAGS@ +xshaker_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +xshaker_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +xshaker_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/xshaker/Makefile.in lebiniou-3.40/plugins/stable/main/xshaker/Makefile.in --- lebiniou-3.31/plugins/stable/main/xshaker/Makefile.in 2019-04-14 11:52:34.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/xshaker/Makefile.in 2020-01-23 13:57:19.000000000 +0000 @@ -104,7 +104,7 @@ PROGRAMS = $(plugin_PROGRAMS) am_xshaker_so_OBJECTS = xshaker_so-xshaker.$(OBJEXT) xshaker_so_OBJECTS = $(am_xshaker_so_OBJECTS) -xshaker_so_LDADD = $(LDADD) +xshaker_so_DEPENDENCIES = xshaker_so_LINK = $(CCLD) $(xshaker_so_CFLAGS) $(CFLAGS) \ $(xshaker_so_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -216,6 +216,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -243,6 +245,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -257,7 +260,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -319,8 +325,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/main/xshaker xshaker_so_SOURCES = xshaker.c -xshaker_so_LDFLAGS = @PLUGIN_LDFLAGS@ -xshaker_so_CFLAGS = @PLUGIN_CFLAGS@ +xshaker_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +xshaker_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +xshaker_so_LDADD = @PLUGIN_LDADD@ all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/main/xshaker/xshaker.c lebiniou-3.40/plugins/stable/main/xshaker/xshaker.c --- lebiniou-3.31/plugins/stable/main/xshaker/xshaker.c 2019-04-05 20:39:15.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/xshaker/xshaker.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -18,20 +18,20 @@ */ #include "context.h" -#include "../include/shaker.h" +#include "shaker.h" u_long id = 947072846; +uint32_t version = 0; u_long options = BE_LENS; char dname[] = "X Shaker"; char desc[] = "Shaker effect"; void -create(Context_t *ctx) +on_switch_on(Context_t *ctx) { - if (ctx->input == NULL) { - options |= BEQ_DISABLED; - } + /* Initialize parameters */ + volume_scale = 1; } @@ -50,11 +50,11 @@ uint16_t j; for (j = 0; j < HEIGHT; j++) { - char dx = Input_clamp(ctx->input->data[A_LEFT][idx]) * SOUND_DISTURB_K; - char dy = Input_clamp(ctx->input->data[A_RIGHT][idx]) * SOUND_DISTURB_K; + char dx = Input_clamp(ctx->input->data[A_LEFT][idx]) * volume_scale * SOUND_DISTURB_K; + char dy = Input_clamp(ctx->input->data[A_RIGHT][idx]) * volume_scale * SOUND_DISTURB_K; if (++idx == ctx->input->size) { - idx = 0; + idx = 0; } displace(src, dst, i, j, i + dx, j + dy); diff -Nru lebiniou-3.31/plugins/stable/main/xwave/Makefile.am lebiniou-3.40/plugins/stable/main/xwave/Makefile.am --- lebiniou-3.31/plugins/stable/main/xwave/Makefile.am 2018-11-27 13:50:08.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/xwave/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -2,5 +2,6 @@ plugin_PROGRAMS = xwave.so xwave_so_SOURCES = xwave.c -xwave_so_LDFLAGS = @PLUGIN_LDFLAGS@ -xwave_so_CFLAGS = @PLUGIN_CFLAGS@ +xwave_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +xwave_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +xwave_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/xwave/Makefile.in lebiniou-3.40/plugins/stable/main/xwave/Makefile.in --- lebiniou-3.31/plugins/stable/main/xwave/Makefile.in 2019-04-14 11:52:34.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/xwave/Makefile.in 2020-01-23 13:57:19.000000000 +0000 @@ -104,7 +104,7 @@ PROGRAMS = $(plugin_PROGRAMS) am_xwave_so_OBJECTS = xwave_so-xwave.$(OBJEXT) xwave_so_OBJECTS = $(am_xwave_so_OBJECTS) -xwave_so_LDADD = $(LDADD) +xwave_so_DEPENDENCIES = xwave_so_LINK = $(CCLD) $(xwave_so_CFLAGS) $(CFLAGS) \ $(xwave_so_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -216,6 +216,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -243,6 +245,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -257,7 +260,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -319,8 +325,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/main/xwave xwave_so_SOURCES = xwave.c -xwave_so_LDFLAGS = @PLUGIN_LDFLAGS@ -xwave_so_CFLAGS = @PLUGIN_CFLAGS@ +xwave_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +xwave_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +xwave_so_LDADD = @PLUGIN_LDADD@ all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/main/xwave/xwave.c lebiniou-3.40/plugins/stable/main/xwave/xwave.c --- lebiniou-3.31/plugins/stable/main/xwave/xwave.c 2019-04-05 20:39:15.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/xwave/xwave.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -21,21 +21,13 @@ u_long id = 949847207; +uint32_t version = 0; u_long options = BE_LENS; char dname[] = "X Wave"; char desc[] = "Swap columns"; void -create(Context_t *ctx) -{ - if (ctx->input == NULL) { - options |= BEQ_DISABLED; - } -} - - -void run(Context_t *ctx) { int16_t a, b; diff -Nru lebiniou-3.31/plugins/stable/main/ygum/Makefile.am lebiniou-3.40/plugins/stable/main/ygum/Makefile.am --- lebiniou-3.31/plugins/stable/main/ygum/Makefile.am 2018-11-27 13:50:08.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/ygum/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -2,5 +2,6 @@ plugin_PROGRAMS = ygum.so ygum_so_SOURCES = ygum.c -ygum_so_LDFLAGS = @PLUGIN_LDFLAGS@ -ygum_so_CFLAGS = @PLUGIN_CFLAGS@ +ygum_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +ygum_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +ygum_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/ygum/Makefile.in lebiniou-3.40/plugins/stable/main/ygum/Makefile.in --- lebiniou-3.31/plugins/stable/main/ygum/Makefile.in 2019-04-14 11:52:34.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/ygum/Makefile.in 2020-01-23 13:57:19.000000000 +0000 @@ -104,7 +104,7 @@ PROGRAMS = $(plugin_PROGRAMS) am_ygum_so_OBJECTS = ygum_so-ygum.$(OBJEXT) ygum_so_OBJECTS = $(am_ygum_so_OBJECTS) -ygum_so_LDADD = $(LDADD) +ygum_so_DEPENDENCIES = ygum_so_LINK = $(CCLD) $(ygum_so_CFLAGS) $(CFLAGS) $(ygum_so_LDFLAGS) \ $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -216,6 +216,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -243,6 +245,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -257,7 +260,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -319,8 +325,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/main/ygum ygum_so_SOURCES = ygum.c -ygum_so_LDFLAGS = @PLUGIN_LDFLAGS@ -ygum_so_CFLAGS = @PLUGIN_CFLAGS@ +ygum_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +ygum_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +ygum_so_LDADD = @PLUGIN_LDADD@ all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/main/ygum/ygum.c lebiniou-3.40/plugins/stable/main/ygum/ygum.c --- lebiniou-3.31/plugins/stable/main/ygum/ygum.c 2019-04-05 20:39:15.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/ygum/ygum.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -18,6 +18,8 @@ */ #include "context.h" +#include "parameters.h" +#include "gum.h" /* TODO optimize * we can precompute an array for the "idx" variable @@ -26,6 +28,7 @@ */ u_long id = 1074631869; +uint32_t version = 0; u_long options = BE_LENS|BEQ_VER; char dname[] = "Y gum"; char desc[] = "Gum effect"; @@ -58,17 +61,16 @@ static inline void do_gum(Context_t *ctx, u_short y, float val) { - u_short max_x = HWIDTH + val * HWIDTH; + u_short max_x = HWIDTH + val * volume_scale * HWIDTH; gum(ctx, y, max_x); } void -create(Context_t *ctx) +on_switch_on(Context_t *ctx) { - if (ctx->input == NULL) { - options |= BEQ_DISABLED; - } + /* Initialize parameters */ + volume_scale = 1; } diff -Nru lebiniou-3.31/plugins/stable/main/ymirror_left/Makefile.am lebiniou-3.40/plugins/stable/main/ymirror_left/Makefile.am --- lebiniou-3.31/plugins/stable/main/ymirror_left/Makefile.am 2018-11-27 13:50:08.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/ymirror_left/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -2,5 +2,6 @@ plugin_PROGRAMS = ymirror_left.so ymirror_left_so_SOURCES = ymirror_left.c -ymirror_left_so_LDFLAGS = @PLUGIN_LDFLAGS@ -ymirror_left_so_CFLAGS = @PLUGIN_CFLAGS@ +ymirror_left_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +ymirror_left_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +ymirror_left_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/ymirror_left/Makefile.in lebiniou-3.40/plugins/stable/main/ymirror_left/Makefile.in --- lebiniou-3.31/plugins/stable/main/ymirror_left/Makefile.in 2019-04-14 11:52:34.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/ymirror_left/Makefile.in 2020-01-23 13:57:19.000000000 +0000 @@ -104,7 +104,7 @@ PROGRAMS = $(plugin_PROGRAMS) am_ymirror_left_so_OBJECTS = ymirror_left_so-ymirror_left.$(OBJEXT) ymirror_left_so_OBJECTS = $(am_ymirror_left_so_OBJECTS) -ymirror_left_so_LDADD = $(LDADD) +ymirror_left_so_DEPENDENCIES = ymirror_left_so_LINK = $(CCLD) $(ymirror_left_so_CFLAGS) $(CFLAGS) \ $(ymirror_left_so_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -216,6 +216,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -243,6 +245,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -257,7 +260,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -319,8 +325,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/main/ymirror_left ymirror_left_so_SOURCES = ymirror_left.c -ymirror_left_so_LDFLAGS = @PLUGIN_LDFLAGS@ -ymirror_left_so_CFLAGS = @PLUGIN_CFLAGS@ +ymirror_left_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +ymirror_left_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +ymirror_left_so_LDADD = @PLUGIN_LDADD@ all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/main/ymirror_left/ymirror_left.c lebiniou-3.40/plugins/stable/main/ymirror_left/ymirror_left.c --- lebiniou-3.31/plugins/stable/main/ymirror_left/ymirror_left.c 2019-04-05 20:39:15.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/ymirror_left/ymirror_left.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -21,6 +21,7 @@ u_long id = 947154952; +uint32_t version = 0; u_long options = BE_MIRROR|BEQ_VER; char dname[] = "Mirror left"; char desc[] = "Mirror effect"; diff -Nru lebiniou-3.31/plugins/stable/main/ymirror_right/Makefile.am lebiniou-3.40/plugins/stable/main/ymirror_right/Makefile.am --- lebiniou-3.31/plugins/stable/main/ymirror_right/Makefile.am 2018-11-27 13:50:08.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/ymirror_right/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -2,5 +2,6 @@ plugin_PROGRAMS = ymirror_right.so ymirror_right_so_SOURCES = ymirror_right.c -ymirror_right_so_LDFLAGS = @PLUGIN_LDFLAGS@ -ymirror_right_so_CFLAGS = @PLUGIN_CFLAGS@ +ymirror_right_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +ymirror_right_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +ymirror_right_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/ymirror_right/Makefile.in lebiniou-3.40/plugins/stable/main/ymirror_right/Makefile.in --- lebiniou-3.31/plugins/stable/main/ymirror_right/Makefile.in 2019-04-14 11:52:34.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/ymirror_right/Makefile.in 2020-01-23 13:57:19.000000000 +0000 @@ -105,7 +105,7 @@ am_ymirror_right_so_OBJECTS = \ ymirror_right_so-ymirror_right.$(OBJEXT) ymirror_right_so_OBJECTS = $(am_ymirror_right_so_OBJECTS) -ymirror_right_so_LDADD = $(LDADD) +ymirror_right_so_DEPENDENCIES = ymirror_right_so_LINK = $(CCLD) $(ymirror_right_so_CFLAGS) $(CFLAGS) \ $(ymirror_right_so_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -217,6 +217,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -244,6 +246,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -258,7 +261,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -320,8 +326,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/main/ymirror_right ymirror_right_so_SOURCES = ymirror_right.c -ymirror_right_so_LDFLAGS = @PLUGIN_LDFLAGS@ -ymirror_right_so_CFLAGS = @PLUGIN_CFLAGS@ +ymirror_right_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +ymirror_right_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +ymirror_right_so_LDADD = @PLUGIN_LDADD@ all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/main/ymirror_right/ymirror_right.c lebiniou-3.40/plugins/stable/main/ymirror_right/ymirror_right.c --- lebiniou-3.31/plugins/stable/main/ymirror_right/ymirror_right.c 2019-04-05 20:39:15.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/ymirror_right/ymirror_right.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -21,6 +21,7 @@ u_long id = 947154953; +uint32_t version = 0; u_long options = BE_MIRROR|BEQ_VER; char dname[] = "Mirror right"; char desc[] = "Mirror effect"; diff -Nru lebiniou-3.31/plugins/stable/main/yoscillo/Makefile.am lebiniou-3.40/plugins/stable/main/yoscillo/Makefile.am --- lebiniou-3.31/plugins/stable/main/yoscillo/Makefile.am 2018-11-27 13:50:08.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/yoscillo/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -2,5 +2,6 @@ plugin_PROGRAMS = yoscillo.so yoscillo_so_SOURCES = yoscillo.c -yoscillo_so_LDFLAGS = @PLUGIN_LDFLAGS@ -yoscillo_so_CFLAGS = @PLUGIN_CFLAGS@ +yoscillo_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +yoscillo_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +yoscillo_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/yoscillo/Makefile.in lebiniou-3.40/plugins/stable/main/yoscillo/Makefile.in --- lebiniou-3.31/plugins/stable/main/yoscillo/Makefile.in 2019-04-14 11:52:35.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/yoscillo/Makefile.in 2020-01-23 13:57:19.000000000 +0000 @@ -104,7 +104,7 @@ PROGRAMS = $(plugin_PROGRAMS) am_yoscillo_so_OBJECTS = yoscillo_so-yoscillo.$(OBJEXT) yoscillo_so_OBJECTS = $(am_yoscillo_so_OBJECTS) -yoscillo_so_LDADD = $(LDADD) +yoscillo_so_DEPENDENCIES = yoscillo_so_LINK = $(CCLD) $(yoscillo_so_CFLAGS) $(CFLAGS) \ $(yoscillo_so_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -216,6 +216,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -243,6 +245,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -257,7 +260,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -319,8 +325,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/main/yoscillo yoscillo_so_SOURCES = yoscillo.c -yoscillo_so_LDFLAGS = @PLUGIN_LDFLAGS@ -yoscillo_so_CFLAGS = @PLUGIN_CFLAGS@ +yoscillo_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +yoscillo_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +yoscillo_so_LDADD = @PLUGIN_LDADD@ all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/main/yoscillo/yoscillo.c lebiniou-3.40/plugins/stable/main/yoscillo/yoscillo.c --- lebiniou-3.31/plugins/stable/main/yoscillo/yoscillo.c 2019-04-05 20:39:15.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/yoscillo/yoscillo.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -18,16 +18,36 @@ */ #include "oscillo.h" +#include "parameters.h" u_long id = 946482111; +uint32_t version = 0; u_long options = BE_SFX2D; char dname[] = "Y oscillo"; u_long mode = OVERLAY; char desc[] = "Vertical mono oscilloscope"; static Porteuse_t *P = NULL; -static int connect = 1; +static int yoscillo_connect = 1; + +static float volume_scale = 0; + +json_t * +get_parameters() +{ + json_t *params = json_object(); + plugin_parameters_add_double(params, BPP_VOLUME_SCALE, volume_scale, -0.01, 0.01); + + return params; +} + + +void +set_parameters(const json_t *in_parameters) +{ + plugin_parameter_parse_float_range(in_parameters, BPP_VOLUME_SCALE, &volume_scale, 0, 100); +} static void @@ -41,7 +61,7 @@ P->origin.x = CENTERX; P->origin.y = 0; - t.v_j_factor = HMAXX * 0.85; + t.v_j_factor = HMAXX * volume_scale; t.v_i.y = 1.0 / (float)(P->size - 1) * (float)MAXY; for (i = 0; i < P->size; i++) { @@ -52,15 +72,34 @@ } -void -create(Context_t *ctx) +json_t * +parameters(const json_t *in_parameters) { - if (ctx->input != NULL) { - P = Porteuse_new(ctx->input->size, A_MONO); + set_parameters(in_parameters); + if(in_parameters) { init(); - } else { - options |= BEQ_DISABLED; } + + return get_parameters(); +} + + +void +on_switch_on(Context_t *ctx) +{ + /* Initialize parameters */ + volume_scale = 0.85; + init(); +} + + +int8_t +create(Context_t *ctx) +{ + P = Porteuse_new(ctx->input->size, A_MONO); + init(); + + return 1; } @@ -77,5 +116,5 @@ run(Context_t *ctx) { Buffer8_clear(passive_buffer(ctx)); - Porteuse_draw(P, ctx, connect); + Porteuse_draw(P, ctx, yoscillo_connect); } diff -Nru lebiniou-3.31/plugins/stable/main/yoscillo_s/Makefile.am lebiniou-3.40/plugins/stable/main/yoscillo_s/Makefile.am --- lebiniou-3.31/plugins/stable/main/yoscillo_s/Makefile.am 2018-11-27 13:50:08.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/yoscillo_s/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -2,5 +2,6 @@ plugin_PROGRAMS = yoscillo_s.so yoscillo_s_so_SOURCES = yoscillo_s.c -yoscillo_s_so_LDFLAGS = @PLUGIN_LDFLAGS@ -yoscillo_s_so_CFLAGS = @PLUGIN_CFLAGS@ +yoscillo_s_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +yoscillo_s_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +yoscillo_s_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/yoscillo_s/Makefile.in lebiniou-3.40/plugins/stable/main/yoscillo_s/Makefile.in --- lebiniou-3.31/plugins/stable/main/yoscillo_s/Makefile.in 2019-04-14 11:52:35.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/yoscillo_s/Makefile.in 2020-01-23 13:57:19.000000000 +0000 @@ -104,7 +104,7 @@ PROGRAMS = $(plugin_PROGRAMS) am_yoscillo_s_so_OBJECTS = yoscillo_s_so-yoscillo_s.$(OBJEXT) yoscillo_s_so_OBJECTS = $(am_yoscillo_s_so_OBJECTS) -yoscillo_s_so_LDADD = $(LDADD) +yoscillo_s_so_DEPENDENCIES = yoscillo_s_so_LINK = $(CCLD) $(yoscillo_s_so_CFLAGS) $(CFLAGS) \ $(yoscillo_s_so_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -216,6 +216,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -243,6 +245,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -257,7 +260,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -319,8 +325,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/main/yoscillo_s yoscillo_s_so_SOURCES = yoscillo_s.c -yoscillo_s_so_LDFLAGS = @PLUGIN_LDFLAGS@ -yoscillo_s_so_CFLAGS = @PLUGIN_CFLAGS@ +yoscillo_s_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +yoscillo_s_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +yoscillo_s_so_LDADD = @PLUGIN_LDADD@ all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/main/yoscillo_s/yoscillo_s.c lebiniou-3.40/plugins/stable/main/yoscillo_s/yoscillo_s.c --- lebiniou-3.31/plugins/stable/main/yoscillo_s/yoscillo_s.c 2019-04-05 20:39:15.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/yoscillo_s/yoscillo_s.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -18,16 +18,36 @@ */ #include "oscillo.h" +#include "parameters.h" u_long id = 1089152275; +uint32_t version = 0; u_long options = BE_SFX2D|BEQ_VER; char dname[] = "Y oscillo stereo"; u_long mode = OVERLAY; char desc[] = "Vertical stereo oscilloscope"; static Porteuse_t *PL = NULL, *PR = NULL; -static int connect = 1; +static int yoscillo_s_connect = 1; + +static float volume_scale = 0; + +json_t * +get_parameters() +{ + json_t *params = json_object(); + plugin_parameters_add_double(params, BPP_VOLUME_SCALE, volume_scale, -0.01, 0.01); + + return params; +} + + +void +set_parameters(const json_t *in_parameters) +{ + plugin_parameter_parse_float_range(in_parameters, BPP_VOLUME_SCALE, &volume_scale, 0, 100); +} static void @@ -43,7 +63,7 @@ PL->origin.x = HWIDTH/2; PR->origin.x = MAXX-HWIDTH/2; - t.v_j_factor = HMAXX * 0.85; + t.v_j_factor = HMAXX * volume_scale; t.v_i.y = 1.0 / (float)(PL->size - 1) * (float)MAXY; for (i = 0; i < PL->size; i++) { @@ -55,16 +75,14 @@ } -void +int8_t create(Context_t *ctx) { - if (ctx->input != NULL) { - PL = Porteuse_new(ctx->input->size, A_LEFT); - PR = Porteuse_new(ctx->input->size, A_RIGHT); - init(); - } else { - options |= BEQ_DISABLED; - } + PL = Porteuse_new(ctx->input->size, A_LEFT); + PR = Porteuse_new(ctx->input->size, A_RIGHT); + init(); + + return 1; } @@ -78,9 +96,25 @@ } +json_t * +parameters(const json_t *in_parameters) +{ + set_parameters(in_parameters); + if(in_parameters) { + init(); + } + + return get_parameters(); +} + + void on_switch_on(Context_t *ctx) { + /* Initialize parameters */ + volume_scale = 0.85; + init(); + /* connect = b_rand_boolean(); */ } @@ -89,6 +123,6 @@ run(Context_t *ctx) { Buffer8_clear(passive_buffer(ctx)); - Porteuse_draw(PL, ctx, connect); - Porteuse_draw(PR, ctx, connect); + Porteuse_draw(PL, ctx, yoscillo_s_connect); + Porteuse_draw(PR, ctx, yoscillo_s_connect); } diff -Nru lebiniou-3.31/plugins/stable/main/yscanline/Makefile.am lebiniou-3.40/plugins/stable/main/yscanline/Makefile.am --- lebiniou-3.31/plugins/stable/main/yscanline/Makefile.am 2018-11-27 13:50:08.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/yscanline/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -2,5 +2,6 @@ plugin_PROGRAMS = yscanline.so yscanline_so_SOURCES = yscanline.c -yscanline_so_LDFLAGS = @PLUGIN_LDFLAGS@ -yscanline_so_CFLAGS = @PLUGIN_CFLAGS@ +yscanline_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +yscanline_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +yscanline_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/yscanline/Makefile.in lebiniou-3.40/plugins/stable/main/yscanline/Makefile.in --- lebiniou-3.31/plugins/stable/main/yscanline/Makefile.in 2019-04-14 11:52:35.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/yscanline/Makefile.in 2020-01-23 13:57:19.000000000 +0000 @@ -104,7 +104,7 @@ PROGRAMS = $(plugin_PROGRAMS) am_yscanline_so_OBJECTS = yscanline_so-yscanline.$(OBJEXT) yscanline_so_OBJECTS = $(am_yscanline_so_OBJECTS) -yscanline_so_LDADD = $(LDADD) +yscanline_so_DEPENDENCIES = yscanline_so_LINK = $(CCLD) $(yscanline_so_CFLAGS) $(CFLAGS) \ $(yscanline_so_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -216,6 +216,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -243,6 +245,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -257,7 +260,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -319,8 +325,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/main/yscanline yscanline_so_SOURCES = yscanline.c -yscanline_so_LDFLAGS = @PLUGIN_LDFLAGS@ -yscanline_so_CFLAGS = @PLUGIN_CFLAGS@ +yscanline_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +yscanline_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +yscanline_so_LDADD = @PLUGIN_LDADD@ all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/main/yscanline/yscanline.c lebiniou-3.40/plugins/stable/main/yscanline/yscanline.c --- lebiniou-3.31/plugins/stable/main/yscanline/yscanline.c 2019-04-05 20:39:15.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/yscanline/yscanline.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -22,6 +22,7 @@ u_long id = 949094845; +uint32_t version = 0; u_long options = BE_GFX|BEQ_IMAGE; char dname[] = "Y Scanline"; char desc[] = "Vertical scanline"; @@ -40,16 +41,14 @@ static yscanline_conf yscanline_cf; -void +int8_t create(Context_t *ctx) { - if (images == NULL) { - options |= BEQ_DISABLED; - } else { - yscanline_cf.size = MINPCT; - yscanline_cf.dir = 1; - yscanline_cf.ping_pong = 0; - } + yscanline_cf.size = MINPCT; + yscanline_cf.dir = 1; + yscanline_cf.ping_pong = 0; + + return 1; } diff -Nru lebiniou-3.31/plugins/stable/main/yshaker/Makefile.am lebiniou-3.40/plugins/stable/main/yshaker/Makefile.am --- lebiniou-3.31/plugins/stable/main/yshaker/Makefile.am 2018-11-27 13:50:08.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/yshaker/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -2,5 +2,6 @@ plugin_PROGRAMS = yshaker.so yshaker_so_SOURCES = yshaker.c -yshaker_so_LDFLAGS = @PLUGIN_LDFLAGS@ -yshaker_so_CFLAGS = @PLUGIN_CFLAGS@ +yshaker_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +yshaker_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +yshaker_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/yshaker/Makefile.in lebiniou-3.40/plugins/stable/main/yshaker/Makefile.in --- lebiniou-3.31/plugins/stable/main/yshaker/Makefile.in 2019-04-14 11:52:35.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/yshaker/Makefile.in 2020-01-23 13:57:19.000000000 +0000 @@ -104,7 +104,7 @@ PROGRAMS = $(plugin_PROGRAMS) am_yshaker_so_OBJECTS = yshaker_so-yshaker.$(OBJEXT) yshaker_so_OBJECTS = $(am_yshaker_so_OBJECTS) -yshaker_so_LDADD = $(LDADD) +yshaker_so_DEPENDENCIES = yshaker_so_LINK = $(CCLD) $(yshaker_so_CFLAGS) $(CFLAGS) \ $(yshaker_so_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -216,6 +216,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -243,6 +245,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -257,7 +260,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -319,8 +325,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/main/yshaker yshaker_so_SOURCES = yshaker.c -yshaker_so_LDFLAGS = @PLUGIN_LDFLAGS@ -yshaker_so_CFLAGS = @PLUGIN_CFLAGS@ +yshaker_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +yshaker_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +yshaker_so_LDADD = @PLUGIN_LDADD@ all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/main/yshaker/yshaker.c lebiniou-3.40/plugins/stable/main/yshaker/yshaker.c --- lebiniou-3.31/plugins/stable/main/yshaker/yshaker.c 2019-04-05 20:39:15.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/yshaker/yshaker.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -18,20 +18,20 @@ */ #include "context.h" -#include "../include/shaker.h" +#include "shaker.h" u_long id = 947072847; +uint32_t version = 0; u_long options = BE_LENS; char dname[] = "Y Shaker"; char desc[] = "Shaker effect"; void -create(Context_t *ctx) +on_switch_on(Context_t *ctx) { - if (ctx->input == NULL) { - options |= BEQ_DISABLED; - } + /* Initialize parameters */ + volume_scale = 1; } @@ -50,11 +50,11 @@ uint16_t i; for (i = 0; i < WIDTH; i++) { - char dx = Input_clamp(ctx->input->data[A_LEFT][idx]) * SOUND_DISTURB_K; - char dy = Input_clamp(ctx->input->data[A_RIGHT][idx]) * SOUND_DISTURB_K; + char dx = Input_clamp(ctx->input->data[A_LEFT][idx]) * volume_scale * SOUND_DISTURB_K; + char dy = Input_clamp(ctx->input->data[A_RIGHT][idx]) * volume_scale * SOUND_DISTURB_K; if (++idx == ctx->input->size) { - idx = 0; + idx = 0; } displace(src, dst, i, j, i + dx, j + dy); diff -Nru lebiniou-3.31/plugins/stable/main/ywave/Makefile.am lebiniou-3.40/plugins/stable/main/ywave/Makefile.am --- lebiniou-3.31/plugins/stable/main/ywave/Makefile.am 2018-11-27 13:50:08.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/ywave/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -2,5 +2,6 @@ plugin_PROGRAMS = ywave.so ywave_so_SOURCES = ywave.c -ywave_so_LDFLAGS = @PLUGIN_LDFLAGS@ -ywave_so_CFLAGS = @PLUGIN_CFLAGS@ +ywave_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +ywave_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +ywave_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/ywave/Makefile.in lebiniou-3.40/plugins/stable/main/ywave/Makefile.in --- lebiniou-3.31/plugins/stable/main/ywave/Makefile.in 2019-04-14 11:52:35.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/ywave/Makefile.in 2020-01-23 13:57:19.000000000 +0000 @@ -104,7 +104,7 @@ PROGRAMS = $(plugin_PROGRAMS) am_ywave_so_OBJECTS = ywave_so-ywave.$(OBJEXT) ywave_so_OBJECTS = $(am_ywave_so_OBJECTS) -ywave_so_LDADD = $(LDADD) +ywave_so_DEPENDENCIES = ywave_so_LINK = $(CCLD) $(ywave_so_CFLAGS) $(CFLAGS) \ $(ywave_so_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -216,6 +216,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -243,6 +245,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -257,7 +260,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -319,8 +325,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/main/ywave ywave_so_SOURCES = ywave.c -ywave_so_LDFLAGS = @PLUGIN_LDFLAGS@ -ywave_so_CFLAGS = @PLUGIN_CFLAGS@ +ywave_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +ywave_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +ywave_so_LDADD = @PLUGIN_LDADD@ all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/main/ywave/ywave.c lebiniou-3.40/plugins/stable/main/ywave/ywave.c --- lebiniou-3.31/plugins/stable/main/ywave/ywave.c 2019-04-05 20:39:15.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/ywave/ywave.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -21,21 +21,13 @@ u_long id = 949847208; +uint32_t version = 0; u_long options = BE_LENS; char dname[] = "Y Wave"; char desc[] = "Swap rows"; void -create(Context_t *ctx) -{ - if (ctx->input == NULL) { - options |= BEQ_DISABLED; - } -} - - -void run(Context_t *ctx) { int16_t a, b; diff -Nru lebiniou-3.31/plugins/stable/main/zblur1/Makefile.am lebiniou-3.40/plugins/stable/main/zblur1/Makefile.am --- lebiniou-3.31/plugins/stable/main/zblur1/Makefile.am 2018-11-27 13:50:08.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/zblur1/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -2,5 +2,6 @@ plugin_PROGRAMS = zblur1.so zblur1_so_SOURCES = zblur1.c -zblur1_so_LDFLAGS = @PLUGIN_LDFLAGS@ -zblur1_so_CFLAGS = @PLUGIN_CFLAGS@ +zblur1_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +zblur1_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +zblur1_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/zblur1/Makefile.in lebiniou-3.40/plugins/stable/main/zblur1/Makefile.in --- lebiniou-3.31/plugins/stable/main/zblur1/Makefile.in 2019-04-14 11:52:35.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/zblur1/Makefile.in 2020-01-23 13:57:19.000000000 +0000 @@ -104,7 +104,7 @@ PROGRAMS = $(plugin_PROGRAMS) am_zblur1_so_OBJECTS = zblur1_so-zblur1.$(OBJEXT) zblur1_so_OBJECTS = $(am_zblur1_so_OBJECTS) -zblur1_so_LDADD = $(LDADD) +zblur1_so_DEPENDENCIES = zblur1_so_LINK = $(CCLD) $(zblur1_so_CFLAGS) $(CFLAGS) \ $(zblur1_so_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -216,6 +216,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -243,6 +245,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -257,7 +260,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -319,8 +325,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/main/zblur1 zblur1_so_SOURCES = zblur1.c -zblur1_so_LDFLAGS = @PLUGIN_LDFLAGS@ -zblur1_so_CFLAGS = @PLUGIN_CFLAGS@ +zblur1_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +zblur1_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +zblur1_so_LDADD = @PLUGIN_LDADD@ all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/main/zblur1/zblur1.c lebiniou-3.40/plugins/stable/main/zblur1/zblur1.c --- lebiniou-3.31/plugins/stable/main/zblur1/zblur1.c 2019-04-05 20:39:15.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/zblur1/zblur1.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,6 +1,6 @@ /* - * Copyright 2014-2019 Frantz Balinski - * Copyright 2018-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel + * Copyright 2014-2020 Frantz Balinski * * This file is part of lebiniou. * @@ -24,14 +24,54 @@ */ #include "context.h" +#include "parameters.h" u_long id = 1410477171; +uint32_t version = 0; u_long options = BE_BLUR|BEQ_NORANDOM; char desc[] = "Color fade-out effect"; static float decay; +enum Mode { MODE_SELECTED = 0, MODE_RANDOM, MODE_NB } Mode_e; +const char *mode_list[MODE_NB] = { "Selected", "Random" }; + +/* parameters */ +static enum Mode mode = MODE_RANDOM; + +json_t * +get_parameters() +{ + json_t *params = json_object(); + plugin_parameters_add_string_list(params, BPP_MODE, MODE_NB, mode_list, mode); + plugin_parameters_add_double(params, BPP_DECAY, decay, -0.01, 0.01); + + return params; +} + + +void +set_parameters(const json_t *in_parameters) +{ + int mode_idx = 0; + if (plugin_parameter_parse_string_list_as_int_range(in_parameters, BPP_MODE, MODE_NB, mode_list, &mode_idx, 0, MODE_NB-1)) { + mode = (enum Mode)mode_idx; + } + + if (mode == MODE_SELECTED) { + plugin_parameter_parse_float_range(in_parameters, BPP_DECAY, &decay, 0, 1); + } +} + + +json_t * +parameters(const json_t *in_parameters) +{ + set_parameters(in_parameters); + + return get_parameters(); +} void @@ -62,6 +102,7 @@ void on_switch_on(Context_t *ctx) { + mode = MODE_RANDOM; decay = (float) pow(2, b_rand_double_range(log2(1), log2(31))); decay = decay / (decay + 1.f); #ifdef DEBUG diff -Nru lebiniou-3.31/plugins/stable/main/zblur1beat/Makefile.am lebiniou-3.40/plugins/stable/main/zblur1beat/Makefile.am --- lebiniou-3.31/plugins/stable/main/zblur1beat/Makefile.am 2019-04-05 20:39:15.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/zblur1beat/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -2,5 +2,6 @@ plugin_PROGRAMS = zblur1beat.so zblur1beat_so_SOURCES = zblur1beat.c -zblur1beat_so_LDFLAGS = @PLUGIN_LDFLAGS@ -zblur1beat_so_CFLAGS = @PLUGIN_CFLAGS@ +zblur1beat_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +zblur1beat_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +zblur1beat_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/zblur1beat/Makefile.in lebiniou-3.40/plugins/stable/main/zblur1beat/Makefile.in --- lebiniou-3.31/plugins/stable/main/zblur1beat/Makefile.in 2019-04-14 11:52:35.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/zblur1beat/Makefile.in 2020-01-23 13:57:19.000000000 +0000 @@ -104,7 +104,7 @@ PROGRAMS = $(plugin_PROGRAMS) am_zblur1beat_so_OBJECTS = zblur1beat_so-zblur1beat.$(OBJEXT) zblur1beat_so_OBJECTS = $(am_zblur1beat_so_OBJECTS) -zblur1beat_so_LDADD = $(LDADD) +zblur1beat_so_DEPENDENCIES = zblur1beat_so_LINK = $(CCLD) $(zblur1beat_so_CFLAGS) $(CFLAGS) \ $(zblur1beat_so_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -216,6 +216,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -243,6 +245,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -257,7 +260,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -319,8 +325,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/main/zblur1beat zblur1beat_so_SOURCES = zblur1beat.c -zblur1beat_so_LDFLAGS = @PLUGIN_LDFLAGS@ -zblur1beat_so_CFLAGS = @PLUGIN_CFLAGS@ +zblur1beat_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +zblur1beat_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +zblur1beat_so_LDADD = @PLUGIN_LDADD@ all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/main/zblur1beat/zblur1beat.c lebiniou-3.40/plugins/stable/main/zblur1beat/zblur1beat.c --- lebiniou-3.31/plugins/stable/main/zblur1beat/zblur1beat.c 2019-04-05 20:39:15.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/zblur1beat/zblur1beat.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,7 +1,7 @@ /* - * Copyright 2014-2018 Frantz Balinski - * Copyright 2018-2019 Olivier Girondel - * Copyright 2019 Tavasti + * Copyright 1994-2020 Olivier Girondel + * Copyright 2014-2020 Frantz Balinski + * Copyright 2019-2020 Tavasti * * This file is part of lebiniou. * @@ -32,20 +32,12 @@ #define CURVE_VOL_MULT (9.0 / 7.0) /* multiplier on count on one step */ u_long id = 1546935176; +uint32_t version = 0; u_long options = BE_BLUR|BE_SFX2D|BEQ_NORANDOM; char desc[] = "Color fade-out on beat"; void -create(Context_t *ctx) -{ - if (ctx->input == NULL) { - options |= BEQ_DISABLED; - } -} - - -void run(Context_t *ctx) { if (ctx->input->on_beat) { @@ -62,18 +54,18 @@ colorcount = colorcount * CURVE_VOL_MULT; colorcount++; } - + if (colorcount > MAXCOLORCOUNT) { colorcount = MAXCOLORCOUNT; } - + for (i = 0; i < BUFFSIZE; i++) { Pixel_t col = *src++; if (col > colorcount) { - col -= colorcount; + col -= colorcount; } else { - col = PIXEL_MINVAL; + col = PIXEL_MINVAL; } *dst++ = col; } diff -Nru lebiniou-3.31/plugins/stable/main/zblur1mist/Makefile.am lebiniou-3.40/plugins/stable/main/zblur1mist/Makefile.am --- lebiniou-3.31/plugins/stable/main/zblur1mist/Makefile.am 2019-04-05 20:39:15.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/zblur1mist/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -2,5 +2,6 @@ plugin_PROGRAMS = zblur1mist.so zblur1mist_so_SOURCES = zblur1mist.c -zblur1mist_so_LDFLAGS = @PLUGIN_LDFLAGS@ -zblur1mist_so_CFLAGS = @PLUGIN_CFLAGS@ +zblur1mist_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +zblur1mist_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +zblur1mist_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/zblur1mist/Makefile.in lebiniou-3.40/plugins/stable/main/zblur1mist/Makefile.in --- lebiniou-3.31/plugins/stable/main/zblur1mist/Makefile.in 2019-04-14 11:52:35.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/zblur1mist/Makefile.in 2020-01-23 13:57:19.000000000 +0000 @@ -104,7 +104,7 @@ PROGRAMS = $(plugin_PROGRAMS) am_zblur1mist_so_OBJECTS = zblur1mist_so-zblur1mist.$(OBJEXT) zblur1mist_so_OBJECTS = $(am_zblur1mist_so_OBJECTS) -zblur1mist_so_LDADD = $(LDADD) +zblur1mist_so_DEPENDENCIES = zblur1mist_so_LINK = $(CCLD) $(zblur1mist_so_CFLAGS) $(CFLAGS) \ $(zblur1mist_so_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -216,6 +216,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -243,6 +245,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -257,7 +260,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -319,8 +325,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/main/zblur1mist zblur1mist_so_SOURCES = zblur1mist.c -zblur1mist_so_LDFLAGS = @PLUGIN_LDFLAGS@ -zblur1mist_so_CFLAGS = @PLUGIN_CFLAGS@ +zblur1mist_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +zblur1mist_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +zblur1mist_so_LDADD = @PLUGIN_LDADD@ all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/main/zblur1mist/zblur1mist.c lebiniou-3.40/plugins/stable/main/zblur1mist/zblur1mist.c --- lebiniou-3.31/plugins/stable/main/zblur1mist/zblur1mist.c 2019-04-05 20:39:15.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/zblur1mist/zblur1mist.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,7 +1,7 @@ /* - * Copyright 2014-2018 Frantz Balinski - * Copyright 2018-2019 Olivier Girondel - * Copyright 2019 Tavasti + * Copyright 1994-2020 Olivier Girondel + * Copyright 2014-2020 Frantz Balinski + * Copyright 2019-2020 Tavasti * * This file is part of lebiniou. * @@ -30,6 +30,7 @@ #define RANDOM_FACTOR 5 /* 1/factor will be possibility of pixel to degrade to lower colod value */ u_long id = 1546800377; +uint32_t version = 0; u_long options = BE_BLUR|BEQ_NORANDOM; char desc[] = "Slow color fade-out effect"; diff -Nru lebiniou-3.31/plugins/stable/main/zblur1slow/Makefile.am lebiniou-3.40/plugins/stable/main/zblur1slow/Makefile.am --- lebiniou-3.31/plugins/stable/main/zblur1slow/Makefile.am 2019-04-05 20:39:15.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/zblur1slow/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -2,5 +2,6 @@ plugin_PROGRAMS = zblur1slow.so zblur1slow_so_SOURCES = zblur1slow.c -zblur1slow_so_LDFLAGS = @PLUGIN_LDFLAGS@ -zblur1slow_so_CFLAGS = @PLUGIN_CFLAGS@ +zblur1slow_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +zblur1slow_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +zblur1slow_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/zblur1slow/Makefile.in lebiniou-3.40/plugins/stable/main/zblur1slow/Makefile.in --- lebiniou-3.31/plugins/stable/main/zblur1slow/Makefile.in 2019-04-14 11:52:35.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/zblur1slow/Makefile.in 2020-01-23 13:57:19.000000000 +0000 @@ -104,7 +104,7 @@ PROGRAMS = $(plugin_PROGRAMS) am_zblur1slow_so_OBJECTS = zblur1slow_so-zblur1slow.$(OBJEXT) zblur1slow_so_OBJECTS = $(am_zblur1slow_so_OBJECTS) -zblur1slow_so_LDADD = $(LDADD) +zblur1slow_so_DEPENDENCIES = zblur1slow_so_LINK = $(CCLD) $(zblur1slow_so_CFLAGS) $(CFLAGS) \ $(zblur1slow_so_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -216,6 +216,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -243,6 +245,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -257,7 +260,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -319,8 +325,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/main/zblur1slow zblur1slow_so_SOURCES = zblur1slow.c -zblur1slow_so_LDFLAGS = @PLUGIN_LDFLAGS@ -zblur1slow_so_CFLAGS = @PLUGIN_CFLAGS@ +zblur1slow_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +zblur1slow_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +zblur1slow_so_LDADD = @PLUGIN_LDADD@ all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/main/zblur1slow/zblur1slow.c lebiniou-3.40/plugins/stable/main/zblur1slow/zblur1slow.c --- lebiniou-3.31/plugins/stable/main/zblur1slow/zblur1slow.c 2019-04-05 20:39:15.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/zblur1slow/zblur1slow.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,7 +1,7 @@ /* - * Copyright 2014-2018 Frantz Balinski - * Copyright 2018-2019 Olivier Girondel - * Copyright 2019 Tavasti + * Copyright 1994-2020 Olivier Girondel + * Copyright 2014-2020 Frantz Balinski + * Copyright 2019-2020 Tavasti * * This file is part of lebiniou. * @@ -28,6 +28,7 @@ #define INTERVAL 0 /* How often (in FPS) we degrade color values */ u_long id = 1546800357; +uint32_t version = 0; u_long options = BE_BLUR|BEQ_NORANDOM; char desc[] = "Slow color fade-out effect"; diff -Nru lebiniou-3.31/plugins/stable/main/zblur2/Makefile.am lebiniou-3.40/plugins/stable/main/zblur2/Makefile.am --- lebiniou-3.31/plugins/stable/main/zblur2/Makefile.am 2018-11-27 13:50:08.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/zblur2/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -2,5 +2,6 @@ plugin_PROGRAMS = zblur2.so zblur2_so_SOURCES = zblur2.c -zblur2_so_LDFLAGS = @PLUGIN_LDFLAGS@ -zblur2_so_CFLAGS = @PLUGIN_CFLAGS@ +zblur2_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +zblur2_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +zblur2_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/zblur2/Makefile.in lebiniou-3.40/plugins/stable/main/zblur2/Makefile.in --- lebiniou-3.31/plugins/stable/main/zblur2/Makefile.in 2019-04-14 11:52:35.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/zblur2/Makefile.in 2020-01-23 13:57:20.000000000 +0000 @@ -104,7 +104,7 @@ PROGRAMS = $(plugin_PROGRAMS) am_zblur2_so_OBJECTS = zblur2_so-zblur2.$(OBJEXT) zblur2_so_OBJECTS = $(am_zblur2_so_OBJECTS) -zblur2_so_LDADD = $(LDADD) +zblur2_so_DEPENDENCIES = zblur2_so_LINK = $(CCLD) $(zblur2_so_CFLAGS) $(CFLAGS) \ $(zblur2_so_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -216,6 +216,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -243,6 +245,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -257,7 +260,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -319,8 +325,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/main/zblur2 zblur2_so_SOURCES = zblur2.c -zblur2_so_LDFLAGS = @PLUGIN_LDFLAGS@ -zblur2_so_CFLAGS = @PLUGIN_CFLAGS@ +zblur2_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +zblur2_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +zblur2_so_LDADD = @PLUGIN_LDADD@ all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/main/zblur2/zblur2.c lebiniou-3.40/plugins/stable/main/zblur2/zblur2.c --- lebiniou-3.31/plugins/stable/main/zblur2/zblur2.c 2019-04-05 20:39:15.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/zblur2/zblur2.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,6 +1,6 @@ /* - * Copyright 2014-2019 Frantz Balinski - * Copyright 2018-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel + * Copyright 2014-2020 Frantz Balinski * * This file is part of lebiniou. * @@ -30,6 +30,7 @@ #include "context.h" u_long id = 1403972381; +uint32_t version = 0; u_long options = BE_BLUR; char desc[] = "Spherical blur (3x3)"; diff -Nru lebiniou-3.31/plugins/stable/main/zbroken/Makefile.am lebiniou-3.40/plugins/stable/main/zbroken/Makefile.am --- lebiniou-3.31/plugins/stable/main/zbroken/Makefile.am 2018-11-27 13:50:08.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/zbroken/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -2,5 +2,6 @@ plugin_PROGRAMS = zbroken.so zbroken_so_SOURCES = zbroken.c -zbroken_so_LDFLAGS = @PLUGIN_LDFLAGS@ -zbroken_so_CFLAGS = @PLUGIN_CFLAGS@ +zbroken_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +zbroken_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +zbroken_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/zbroken/Makefile.in lebiniou-3.40/plugins/stable/main/zbroken/Makefile.in --- lebiniou-3.31/plugins/stable/main/zbroken/Makefile.in 2019-04-14 11:52:35.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/zbroken/Makefile.in 2020-01-23 13:57:20.000000000 +0000 @@ -104,7 +104,7 @@ PROGRAMS = $(plugin_PROGRAMS) am_zbroken_so_OBJECTS = zbroken_so-zbroken.$(OBJEXT) zbroken_so_OBJECTS = $(am_zbroken_so_OBJECTS) -zbroken_so_LDADD = $(LDADD) +zbroken_so_DEPENDENCIES = zbroken_so_LINK = $(CCLD) $(zbroken_so_CFLAGS) $(CFLAGS) \ $(zbroken_so_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -216,6 +216,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -243,6 +245,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -257,7 +260,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -319,8 +325,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/main/zbroken zbroken_so_SOURCES = zbroken.c -zbroken_so_LDFLAGS = @PLUGIN_LDFLAGS@ -zbroken_so_CFLAGS = @PLUGIN_CFLAGS@ +zbroken_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +zbroken_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +zbroken_so_LDADD = @PLUGIN_LDADD@ all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/main/zbroken/zbroken.c lebiniou-3.40/plugins/stable/main/zbroken/zbroken.c --- lebiniou-3.31/plugins/stable/main/zbroken/zbroken.c 2019-04-05 20:39:15.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/zbroken/zbroken.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,6 +1,6 @@ /* - * Copyright 1994-2019 Olivier Girondel - * Copyright 2014-2019 Frantz Balinski + * Copyright 1994-2020 Olivier Girondel + * Copyright 2014-2020 Frantz Balinski * * This file is part of lebiniou. * @@ -19,8 +19,7 @@ */ /* - * l'idée : - * simuler l'effet d'une vitre ou d'un mirroir brisé + * the idea is to simulate a broken mirror */ #include @@ -30,77 +29,42 @@ u_long id = 1405678380; +uint32_t version = 0; u_long options = BE_DISPLACE | BE_LENS; char desc[] = "Broken mirror effect"; - -static Translation_t *t_zbroken = NULL; - -void on_switch_on(void); - -static Map_t zbroken(u_short, u_short); -static void init_params(void); +#define NBCENTRES 32 typedef struct { - u_short x, y; + u_short x, y; } zPoint2D; -#define NBCENTRES (32) +static Translation_t *t_zbroken = NULL; static zPoint2D centres[NBCENTRES]; -void -create(Context_t *ctx) -{ - t_zbroken = Translation_new(&zbroken, &init_params); -} - - -void -destroy(Context_t *ctx) -{ - if (NULL != t_zbroken) { - Translation_delete(t_zbroken); - } -} - - -void -run(Context_t *ctx) -{ - Translation_run(t_zbroken, ctx); -} - - -void -on_switch_on(void) -{ - Translation_batch_init(t_zbroken); -} - - static Map_t -zbroken(u_short x, u_short y) +zbroken(const short x, const short y) { Map_t m; - float dist, dmin; - int i, cc, dx, dy, sx, sy, lx, ly; + float dist, dmin, dx, dy, lx, ly; + int i, cc, sx, sy; - cc = -1; // no (closest) center found - dmin = 1e9; // initialise avec une valeur assez grande + cc = -1; // no (closest) center found + dmin = 1e9; // initialize too large value /* Found closest center */ for (i = 0; i < NBCENTRES; i++) { - dx = (int) x - centres[i].x; - dy = (int) y - centres[i].y; + dx = (int)x - centres[i].x; + dy = (int)y - centres[i].y; - dist = sqrtf(dx*dx + dy*dy); + dist = sqrtf(dx * dx + dy * dy); if (dist < dmin) { dmin = dist; - cc = i; - } else if (dist == dmin) { // gagnant ex-equo ? + cc = i; + } else if (dist == dmin) { if (b_rand_boolean() != 0) { cc = i; } @@ -109,8 +73,8 @@ if (cc != -1) { /* Compute displacement to closest center found */ - dx = (int) x - centres[cc].x; - dy = (int) y - centres[cc].y; + dx = (int)x - centres[cc].x; + dy = (int)y - centres[cc].y; if (dx < 0) { lx = -dx; @@ -131,8 +95,8 @@ dx = sqrtf(lx) * sx; dy = sqrtf(ly) * sy; - m.map_x = ((x + dx + WIDTH ) % WIDTH ); - m.map_y = ((y + dy + HEIGHT) % HEIGHT); + m.map_x = (float)x + dx; + m.map_y = (float)y + dy; } else { /* else don't move ! */ m.map_x = x; @@ -153,3 +117,33 @@ centres[i].y = b_rand_int_range(0, MAXY + 1); } } + + +int8_t +create(Context_t *ctx) +{ + t_zbroken = Translation_new(&zbroken, &init_params); + + return 1; +} + + +void +destroy(Context_t *ctx) +{ + Translation_delete(t_zbroken); +} + + +void +run(Context_t *ctx) +{ + Translation_run(t_zbroken, ctx); +} + + +void +on_switch_on(void) +{ + Translation_batch_init(t_zbroken); +} diff -Nru lebiniou-3.31/plugins/stable/main/zebu1/Makefile.am lebiniou-3.40/plugins/stable/main/zebu1/Makefile.am --- lebiniou-3.31/plugins/stable/main/zebu1/Makefile.am 2018-11-27 13:50:08.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/zebu1/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -2,5 +2,6 @@ plugin_PROGRAMS = zebu1.so zebu1_so_SOURCES = zebu1.c -zebu1_so_LDFLAGS = @PLUGIN_LDFLAGS@ -zebu1_so_CFLAGS = @PLUGIN_CFLAGS@ +zebu1_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +zebu1_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +zebu1_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/zebu1/Makefile.in lebiniou-3.40/plugins/stable/main/zebu1/Makefile.in --- lebiniou-3.31/plugins/stable/main/zebu1/Makefile.in 2019-04-14 11:52:35.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/zebu1/Makefile.in 2020-01-23 13:57:20.000000000 +0000 @@ -104,7 +104,7 @@ PROGRAMS = $(plugin_PROGRAMS) am_zebu1_so_OBJECTS = zebu1_so-zebu1.$(OBJEXT) zebu1_so_OBJECTS = $(am_zebu1_so_OBJECTS) -zebu1_so_LDADD = $(LDADD) +zebu1_so_DEPENDENCIES = zebu1_so_LINK = $(CCLD) $(zebu1_so_CFLAGS) $(CFLAGS) \ $(zebu1_so_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -216,6 +216,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -243,6 +245,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -257,7 +260,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -319,8 +325,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/main/zebu1 zebu1_so_SOURCES = zebu1.c -zebu1_so_LDFLAGS = @PLUGIN_LDFLAGS@ -zebu1_so_CFLAGS = @PLUGIN_CFLAGS@ +zebu1_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +zebu1_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +zebu1_so_LDADD = @PLUGIN_LDADD@ all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/main/zebu1/zebu1.c lebiniou-3.40/plugins/stable/main/zebu1/zebu1.c --- lebiniou-3.31/plugins/stable/main/zebu1/zebu1.c 2019-04-05 20:39:15.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/zebu1/zebu1.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,6 +1,7 @@ /* - * Copyright 1994-2019 Olivier Girondel - * Copyright 2014-2019 Frantz Balinski + * Copyright 1994-2020 Olivier Girondel + * Copyright 2014-2020 Frantz Balinski + * Copyright 2019-2020 Laurent Marsac * * This file is part of lebiniou. * @@ -20,9 +21,11 @@ #include "constants.h" #include "context.h" +#include "parameters.h" u_long id = 1177412508; +uint32_t version = 0; u_long options = BE_SFX2D; u_long mode = OVERLAY; char desc[] = "Zebulon effect"; @@ -30,103 +33,144 @@ /* - * Optimisation : - * Les spheres ayant toutes le meme rayon dans une meme image, - * on va precalculer l'index de couleur d'une sphere dans une grille. + * Optimisation: + * Spheres color indices are precomputed. */ typedef struct position { - u_short x, y; + uint16_t x, y; } POSITION; -/* Nombre total de spheres */ -#define NB_SPHERES 16 +/* spheres centres */ +static POSITION *centres = NULL; -/* Rayon max : hauteur ecran / 12 */ -#define RADIUS(h) ((h)/12) +/* sphere radius */ +static uint16_t radius; -/* Centre des spheres */ -static POSITION centres[NB_SPHERES]; +/* max radius */ +static uint16_t radius_max; -/* Rayon d'une sphere */ -static u_short rayon; +/* size maximum of color indices grid */ +static uint16_t size_max; + +/* color indices grid */ +static Pixel_t *color_indices = NULL; + +/* parameters */ +static int nb_spheres = 0; +static float radius_factor = 0; /* sets radius max */ +static float volume_scale = 0; +static float sensibility = 0; +static float move_factor = 1; +static float border_x = 0; /* border will be set to border_x * HWIDTH */ +static float border_y = 0; /* border will be set to border_y * HHEIGHT */ + +static void free_spheres(); +static void move_spheres(); + +json_t * +get_parameters() +{ + json_t *params = json_object(); + plugin_parameters_add_int(params, BPP_NB_SPHERES, nb_spheres, -1, 1); + plugin_parameters_add_double(params, BPP_RADIUS_FACTOR, radius_factor, -0.01, 0.01); + plugin_parameters_add_double(params, BPP_VOLUME_SCALE, volume_scale, -0.01, 0.01); + plugin_parameters_add_double(params, BPP_SENSITIVITY, sensibility, -0.1, 0.1); + plugin_parameters_add_double(params, BPP_MOVE_FACTOR, move_factor, -0.1, 0.1); + plugin_parameters_add_double(params, BPP_BORDER_X, border_x, -0.01, 0.01); + plugin_parameters_add_double(params, BPP_BORDER_Y, border_y, -0.01, 0.01); -/** Rayon maxi **/ -static u_short rayon_maxi; + return params; +} -/* Cote maximum de la grille des index couleur */ -static u_short cote_maxi; -/* Grille des index, dans sa taille maximale */ -static Pixel_t *index_couleurs; +void +set_parameters(const json_t *in_parameters) +{ + int reload = 0; + reload |= plugin_parameter_parse_int_range(in_parameters, BPP_NB_SPHERES, &nb_spheres, 1, 64) & PLUGIN_PARAMETER_CHANGED; + reload |= plugin_parameter_parse_float_range(in_parameters, BPP_RADIUS_FACTOR, &radius_factor, 0, 0.24) & PLUGIN_PARAMETER_CHANGED; + plugin_parameter_parse_float_range(in_parameters, BPP_VOLUME_SCALE, &volume_scale, 0, 100); + plugin_parameter_parse_float_range(in_parameters, BPP_SENSITIVITY, &sensibility, 0, 10); + plugin_parameter_parse_float_range(in_parameters, BPP_MOVE_FACTOR, &move_factor, 0, 10); + plugin_parameter_parse_float_range(in_parameters, BPP_BORDER_X, &border_x, 0, 1); + plugin_parameter_parse_float_range(in_parameters, BPP_BORDER_Y, &border_y, 0, 1); + + if (reload) { + move_spheres(); + } +} -/* Allouer un buffer pour une sphere */ -inline static void -alloue_sphere() +json_t * +parameters(const json_t *in_parameters) { - size_t n; - /* Rayon maxi pour cette taille d'ecran */ - rayon_maxi = (u_short) RADIUS(HEIGHT); - /* cote du buffer conteneur */ - cote_maxi = (rayon_maxi << 1) + 1; - /* Allocation du buffer */ - n = (size_t) cote_maxi * cote_maxi; - index_couleurs = (Pixel_t *) xcalloc(n, sizeof(Pixel_t)); + set_parameters(in_parameters); + + return get_parameters(); } -/* Liberer la memoire allouee pour le buffer sphere */ inline static void -libere_sphere() +init_sphere() { - xfree(index_couleurs); + free_spheres(); + centres = (POSITION *)xcalloc(nb_spheres, sizeof(POSITION)); + + /* max radius for this screen size */ + radius_max = (uint16_t)(radius_factor * HEIGHT); + /* buffer size */ + size_max = (radius_max << 1) + 1; + /* Allocate buffer */ + size_t n = (size_t) size_max * size_max; + color_indices = (Pixel_t *) xcalloc(n, sizeof(Pixel_t)); } -/* Calculer le rayon d'une sphere */ inline static void -calcul_rayon(Context_t *ctx) +free_spheres() { - float volume; + xfree(color_indices); + xfree(centres); +} - volume = Input_get_volume(ctx->input); - /** Ajustement du volume **/ - /* pow(volume, X) modifie la sensibilité du plugin : - * comme volume est compris entre 0.0 et 1.0, - * X > 0 ET X < 1 va "gonfler" la réponse (plus sensible sur petits volumes), - * X > 1 va "plaquer" la réponse vers le bas (moins sensible sur petits - * volumes, et meilleur pulse sur beats +inline static void +compute_radius(Context_t *ctx) +{ + float volume = volume_scale * Input_get_volume(ctx->input); + + /** Volume ajustement **/ + /* pow(volume, X) modify plugin sensibility: + * as volume is between 0.0 and 1.0, + * X > 0 AND X < 1: "increase" the effect (more sensitive on small volumes), + * X > 1: "decrease" the effect (less sensitive on small volumes and better on beats) */ - /* et "* 50.0" pour réajuster le volume globalement, sinon on voit des - * petits points en guise de sphères */ - volume = powf(volume, 3) * 50.0; - - /* Rayon d'une sphere */ - rayon = (u_short)(volume * rayon_maxi); - if (rayon > rayon_maxi) { - rayon = rayon_maxi; - } + /* and "* 50.0" to reajust global volume, otherwise spheres are too small */ + volume = powf(volume, sensibility) * 50.0; + + /* sphere radius */ + radius = (uint16_t)(volume * radius_max); + radius = MIN(radius, radius_max); } -/* Calculer les index de couleur d'une sphere */ +/* compute color indices */ inline static void -calcul_index() +compute_index() { - if (rayon > 0) { - Pixel_t *p = index_couleurs; + if (radius > 0) { + Pixel_t *p = color_indices; float a, b; short dx, dy, r1; - r1 = rayon - 1; + r1 = radius - 1; for (dy = -r1; dy <= r1; dy++) { - b = (float)dy / rayon; + b = (float)dy / radius; b *= b; for (dx = -r1; dx <= r1; dx++) { - a = (float)dx / rayon; + a = (float)dx / radius; a *= a; a += b; a = floor(sqrtf(1 - a) * 255); @@ -142,36 +186,35 @@ } -/* Placer les spheres au hasard */ +/* Move spheres randomly */ inline static void -place_spheres() +move_spheres() { - u_short i, *p; + init_sphere(); - p = (u_short *)centres; - for (i = 0; i < NB_SPHERES; i++) { - *p++ = (u_short)(b_rand_int() % WIDTH); - *p++ = (u_short)(b_rand_int() % HEIGHT); + uint16_t i; + uint16_t *p = (uint16_t *)centres; + for (i = 0; i < nb_spheres; i++) { + *p++ = 2*radius_max + (uint16_t)(b_rand_int() % (WIDTH - 4*radius_max)); + *p++ = 2*radius_max + (uint16_t)(b_rand_int() % (HEIGHT - 4*radius_max)); } } -/* Tracer une sphere */ +/* Plot one sphere */ inline static void -trace_sphere(Buffer8_t *dst, POSITION *pos) +plot_sphere(Buffer8_t *dst, POSITION *pos) { - if (rayon > 0) { - u_short x, y, r1; - short dx, dy; - Pixel_t index, *p = index_couleurs; + if (radius > 0) { + Pixel_t *p = color_indices; - r1 = rayon - 1; - for (dy = -r1; dy <= r1; dy++) { - y = (pos->y + HEIGHT + dy) % HEIGHT; - for (dx = -r1; dx <= r1; dx++) { - index = *p++; + uint16_t r1 = radius - 1; + for (int16_t dy = -r1; dy <= r1; dy++) { + uint16_t y = (pos->y + HEIGHT + dy) % HEIGHT; + for (int16_t dx = -r1; dx <= r1; dx++) { + Pixel_t index = *p++; if (index > 0) { - x = (pos->x + WIDTH + dx) % WIDTH; + uint16_t x = (pos->x + WIDTH + dx) % WIDTH; if (index > get_pixel_nc(dst, x, y)) { set_pixel_nc(dst, x, y, index); } @@ -182,62 +225,70 @@ } -/* Tracer toutes les spheres */ +/* Plot all spheres */ inline static void -trace_spheres(Context_t *ctx) +plot_spheres(Context_t *ctx) { - u_short longueur, offset, i, n, *p; + uint16_t length, offset, i, n, *p; Buffer8_t *dst = passive_buffer(ctx); Buffer8_clear(dst); - /* Deplacement maximal d'une sphere : +/- (rayon/4) */ - offset = rayon / 4; - longueur = offset * 2 + 1; - - p = (u_short *)centres; - for (i = 0; i < NB_SPHERES; i++) { - trace_sphere(dst, (POSITION *)p); + /* max sphere move: +/- (radius/4) */ + offset = radius * move_factor / 4; + length = offset * 2 + 1; + + uint16_t border_offset_x = MAX(2 * radius_max, border_x * HWIDTH); + uint16_t border_offset_y = MAX(2 * radius_max, border_y * HHEIGHT); + + p = (uint16_t *)centres; + for (i = 0; i < nb_spheres; i++) { + plot_sphere(dst, (POSITION *)p); - /* Deplacer la sphere */ + /* Move sphere */ n = *p; - *p++ = (u_short)((n + WIDTH + (b_rand_int() % longueur) - offset) % WIDTH); + *p++ = MAX( border_offset_x, MIN( (uint16_t) ((n + WIDTH + (b_rand_int() % length) - offset) % WIDTH), WIDTH - border_offset_x)); n = *p; - *p++ = (u_short)((n + HEIGHT + (b_rand_int() % longueur) - offset) % HEIGHT); + *p++ = MAX( border_offset_y, MIN( (uint16_t) ((n + HEIGHT + (b_rand_int() % length) - offset) % HEIGHT), HEIGHT - border_offset_y)); } } -void +int8_t create(Context_t *ctx) { - if (ctx->input == NULL) { - options |= BEQ_DISABLED; - } else { - alloue_sphere(); - place_spheres(); - } + move_spheres(); + return 1; } void run(Context_t *ctx) { - calcul_rayon(ctx); - calcul_index(); - trace_spheres(ctx); + compute_radius(ctx); + compute_index(); + plot_spheres(ctx); } void on_switch_on(Context_t *ctx) { - place_spheres(); + /* Initialize parameters */ + nb_spheres = 16; + radius_factor = 0.04; + volume_scale = 1; + sensibility = 3; + move_factor = 1; + border_x = 0; + border_y = 0; + + move_spheres(); } void destroy(Context_t *ctx) { - libere_sphere(); + free_spheres(); } diff -Nru lebiniou-3.31/plugins/stable/main/zmonitor/Makefile.am lebiniou-3.40/plugins/stable/main/zmonitor/Makefile.am --- lebiniou-3.31/plugins/stable/main/zmonitor/Makefile.am 2018-11-27 13:50:08.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/zmonitor/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -2,5 +2,6 @@ plugin_PROGRAMS = zmonitor.so zmonitor_so_SOURCES = zmonitor.c -zmonitor_so_LDADD = @PLUGIN_LDFLAGS@ -zmonitor_so_CFLAGS = @PLUGIN_CFLAGS@ +zmonitor_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +zmonitor_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +zmonitor_so_LDADD = @PLUGIN_LDADD@ @SWSCALE_LDFLAGS@ diff -Nru lebiniou-3.31/plugins/stable/main/zmonitor/Makefile.in lebiniou-3.40/plugins/stable/main/zmonitor/Makefile.in --- lebiniou-3.31/plugins/stable/main/zmonitor/Makefile.in 2019-04-14 11:52:35.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/zmonitor/Makefile.in 2020-01-23 13:57:20.000000000 +0000 @@ -106,7 +106,7 @@ zmonitor_so_OBJECTS = $(am_zmonitor_so_OBJECTS) zmonitor_so_DEPENDENCIES = zmonitor_so_LINK = $(CCLD) $(zmonitor_so_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ + $(zmonitor_so_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) am__v_P_0 = false @@ -216,6 +216,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -243,6 +245,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -257,7 +260,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -319,8 +325,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/main/zmonitor zmonitor_so_SOURCES = zmonitor.c -zmonitor_so_LDADD = @PLUGIN_LDFLAGS@ -zmonitor_so_CFLAGS = @PLUGIN_CFLAGS@ +zmonitor_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +zmonitor_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +zmonitor_so_LDADD = @PLUGIN_LDADD@ @SWSCALE_LDFLAGS@ all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/main/zmonitor/zmonitor.c lebiniou-3.40/plugins/stable/main/zmonitor/zmonitor.c --- lebiniou-3.31/plugins/stable/main/zmonitor/zmonitor.c 2019-04-05 20:39:15.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/zmonitor/zmonitor.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,6 +1,6 @@ /* - * Copyright 2014-2019 Frantz Balinski - * Copyright 2018-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel + * Copyright 2014-2020 Frantz Balinski * * This file is part of lebiniou. * @@ -30,6 +30,7 @@ u_long id = 1405944413; +uint32_t version = 0; u_long options = BE_LENS; u_long mode = OVERLAY; char desc[] = "Monitor-view effect"; @@ -162,50 +163,45 @@ } -void +int8_t create(Context_t *ctx) { /* compute monitor size */ mView.size.x = SCALE(WIDTH, MONITOR_SIZE_PERCENT); - if (mView.size.x < 1) { - options |= BEQ_DISABLED; - printf("\r[-] WARNING: zmonitor width is less than 1 pixel: plugin disabled\n"); - } else { - mView.size.y = SCALE(HEIGHT, MONITOR_SIZE_PERCENT); - if (mView.size.y < 1) { - options |= BEQ_DISABLED; - printf("\r[-] WARNING: zmonitor height is less than 1 pixel: plugin disabled\n"); - } else { - enum eSource es; - short i; + assert(mView.size.x >= 1); + mView.size.y = SCALE(HEIGHT, MONITOR_SIZE_PERCENT); + assert(mView.size.y >= 1); - /* check sources */ - for (es = sFIRST; es <= sLAST; es++) { - sources[es] = bENABLED; - } + enum eSource es; + short i; - if (ctx->webcams < 1) { - sources[sCAMERA] = bDISABLED; - } - /* we have now, at least, 2 sources enabled: sCAPTURE & sCLEAR */ + /* check sources */ + for (es = sFIRST; es <= sLAST; es++) { + sources[es] = bENABLED; + } - /* init recording flag */ - rRecording = b_rand_boolean(); + if (ctx->webcams < 1) { + sources[sCAMERA] = bDISABLED; + } + /* we have now, at least, 2 sources enabled: sCAPTURE & sCLEAR */ - /* allocate webcam copy buffer, if needed */ - if (sources[sCAMERA] != bDISABLED) { - webcam = Buffer8_new(); - } + /* init recording flag */ + rRecording = b_rand_boolean(); - /* allocate monitor buffers */ - size_t bytes = (size_t) mView.size.x * mView.size.y * sizeof(Pixel_t); - for (i = 0; i < rBUFFERS; i++) { - Pixel_t *p = xmalloc(bytes); - randomize_buffer(p); - rBuffer[i] = p; - } - } + /* allocate webcam copy buffer, if needed */ + if (sources[sCAMERA] != bDISABLED) { + webcam = Buffer8_new(); + } + + /* allocate monitor buffers */ + size_t bytes = (size_t) mView.size.x * mView.size.y * sizeof(Pixel_t); + for (i = 0; i < rBUFFERS; i++) { + Pixel_t *p = xmalloc(bytes); + randomize_buffer(p); + rBuffer[i] = p; } + + return 1; } @@ -255,26 +251,26 @@ if ((sources[rSource] != bDISABLED) && (rRecording != bOFF)) { switch (rSource) { - case sCAMERA: - pthread_mutex_lock(&ctx->cam_mtx[ctx->cam]); - Buffer8_copy(ctx->cam_save[ctx->cam][0], webcam); - pthread_mutex_unlock(&ctx->cam_mtx[ctx->cam]); - zscale(src, webcam->buffer); - randomize_sometimes(src, b_rand_int_range(0, 11)); - break; - - case sCAPTURE: - b8 = active_buffer(ctx); - zscale(src, b8->buffer); - randomize_sometimes(src, b_rand_int_range(0, 6)); - break; - - case sCLEAR: - randomize_buffer(src); - break; + case sCAMERA: + pthread_mutex_lock(&ctx->cam_mtx[ctx->cam]); + Buffer8_copy(ctx->cam_save[ctx->cam][0], webcam); + pthread_mutex_unlock(&ctx->cam_mtx[ctx->cam]); + zscale(src, webcam->buffer); + randomize_sometimes(src, b_rand_int_range(0, 11)); + break; + + case sCAPTURE: + b8 = active_buffer(ctx); + zscale(src, b8->buffer); + randomize_sometimes(src, b_rand_int_range(0, 6)); + break; + + case sCLEAR: + randomize_buffer(src); + break; - default: /* do nothing */ - break; + default: /* do nothing */ + break; } } @@ -410,17 +406,17 @@ n = b_rand_int_range(0, 2 + 1); switch (n) { - case 0: - rec = bOFF; - break; - - case 1: - rec = bON; - break; - - default: /* inverse */ - rec = (rRecording == bOFF ? bON : bOFF); - break; + case 0: + rec = bOFF; + break; + + case 1: + rec = bON; + break; + + default: /* inverse */ + rec = (rRecording == bOFF ? bON : bOFF); + break; } if (rec != rRecording) { diff -Nru lebiniou-3.31/plugins/stable/main/zreflector/Makefile.am lebiniou-3.40/plugins/stable/main/zreflector/Makefile.am --- lebiniou-3.31/plugins/stable/main/zreflector/Makefile.am 2018-11-27 13:50:08.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/zreflector/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -2,5 +2,6 @@ plugin_PROGRAMS = zreflector.so zreflector_so_SOURCES = zreflector.c -zreflector_so_LDFLAGS = @PLUGIN_LDFLAGS@ -zreflector_so_CFLAGS = @PLUGIN_CFLAGS@ +zreflector_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +zreflector_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +zreflector_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/zreflector/Makefile.in lebiniou-3.40/plugins/stable/main/zreflector/Makefile.in --- lebiniou-3.31/plugins/stable/main/zreflector/Makefile.in 2019-04-14 11:52:35.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/zreflector/Makefile.in 2020-01-23 13:57:20.000000000 +0000 @@ -104,7 +104,7 @@ PROGRAMS = $(plugin_PROGRAMS) am_zreflector_so_OBJECTS = zreflector_so-zreflector.$(OBJEXT) zreflector_so_OBJECTS = $(am_zreflector_so_OBJECTS) -zreflector_so_LDADD = $(LDADD) +zreflector_so_DEPENDENCIES = zreflector_so_LINK = $(CCLD) $(zreflector_so_CFLAGS) $(CFLAGS) \ $(zreflector_so_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -216,6 +216,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -243,6 +245,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -257,7 +260,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -319,8 +325,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/main/zreflector zreflector_so_SOURCES = zreflector.c -zreflector_so_LDFLAGS = @PLUGIN_LDFLAGS@ -zreflector_so_CFLAGS = @PLUGIN_CFLAGS@ +zreflector_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +zreflector_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +zreflector_so_LDADD = @PLUGIN_LDADD@ all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/main/zreflector/zreflector.c lebiniou-3.40/plugins/stable/main/zreflector/zreflector.c --- lebiniou-3.31/plugins/stable/main/zreflector/zreflector.c 2019-04-05 20:39:15.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/zreflector/zreflector.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,6 +1,6 @@ /* - * Copyright 1994-2019 Olivier Girondel - * Copyright 2014-2019 Frantz Balinski + * Copyright 1994-2020 Olivier Girondel + * Copyright 2014-2020 Frantz Balinski * * This file is part of lebiniou. * @@ -19,8 +19,7 @@ */ /* - * l'idée : - * simuler l'effet d'un catadioptre + * the idea is to simulate a corner reflector */ #include "brandom.h" @@ -28,32 +27,34 @@ u_long id = 1405350829; +uint32_t version = 0; u_long options = BE_DISPLACE | BE_LENS; char desc[] = "Reflector-like effect"; -void on_switch_on(void); -static Map_t zreflector(u_short, u_short); -static void init_params(void); +void on_switch_on(void); +static Map_t zreflector(short, short); +static void init_params(void); static Translation_t *t_zreflector; static int radius, length, ox, oy, onx, ony; -void +int8_t create(Context_t *ctx) { if (WIDTH < 2) { - options |= BEQ_DISABLED; printf("\r\e[33m[-] zreflector: WIDTH is less than 2 pixels: plugin disabled\e[0m.\n"); + return 0; } else { if (HEIGHT < 16) { // see init_params() below - options |= BEQ_DISABLED; printf("\r\e[33m[-] zreflector: HEIGHT is less than 16 pixels: plugin disabled\e[0m.\n"); + return 0; } else { ox = (WIDTH >> 1); oy = (HEIGHT >> 1); t_zreflector = Translation_new(&zreflector, &init_params); + return 1; } } } @@ -79,30 +80,23 @@ Translation_batch_init(t_zreflector); } - static Map_t -zreflector(u_short x, u_short y) +zreflector(const short x, const short y) { Map_t m; if (onx != 0) { - int dx, xx; - - xx = (int) x - ox; - dx = ((int) (xx + WIDTH ) % length) - radius; - - m.map_x = ((x + dx + WIDTH ) % WIDTH ); + int xx = x - ox; + int dx = ((int)(xx + WIDTH) % length) - radius; + m.map_x = x + dx; } else { m.map_x = x; } if (ony != 0) { - int dy, yy; - - yy = (int) y - oy; - dy = ((int) (yy + HEIGHT) % length) - radius; - - m.map_y = ((y + dy + HEIGHT) % HEIGHT); + int yy = y - oy; + int dy = ((int)(yy + HEIGHT) % length) - radius; + m.map_y = y + dy; } else { m.map_y = y; } diff -Nru lebiniou-3.31/plugins/stable/main/zspirals/Makefile.am lebiniou-3.40/plugins/stable/main/zspirals/Makefile.am --- lebiniou-3.31/plugins/stable/main/zspirals/Makefile.am 2018-11-27 13:50:08.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/zspirals/Makefile.am 2020-01-22 18:33:56.000000000 +0000 @@ -2,5 +2,6 @@ plugin_PROGRAMS = zspirals.so zspirals_so_SOURCES = zspirals.c -zspirals_so_LDFLAGS = @PLUGIN_LDFLAGS@ -zspirals_so_CFLAGS = @PLUGIN_CFLAGS@ +zspirals_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +zspirals_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +zspirals_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/main/zspirals/Makefile.in lebiniou-3.40/plugins/stable/main/zspirals/Makefile.in --- lebiniou-3.31/plugins/stable/main/zspirals/Makefile.in 2019-04-14 11:52:35.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/zspirals/Makefile.in 2020-01-23 13:57:20.000000000 +0000 @@ -104,7 +104,7 @@ PROGRAMS = $(plugin_PROGRAMS) am_zspirals_so_OBJECTS = zspirals_so-zspirals.$(OBJEXT) zspirals_so_OBJECTS = $(am_zspirals_so_OBJECTS) -zspirals_so_LDADD = $(LDADD) +zspirals_so_DEPENDENCIES = zspirals_so_LINK = $(CCLD) $(zspirals_so_CFLAGS) $(CFLAGS) \ $(zspirals_so_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -216,6 +216,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -243,6 +245,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -257,7 +260,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -319,8 +325,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/main/zspirals zspirals_so_SOURCES = zspirals.c -zspirals_so_LDFLAGS = @PLUGIN_LDFLAGS@ -zspirals_so_CFLAGS = @PLUGIN_CFLAGS@ +zspirals_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +zspirals_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/plugins/stable/main/include +zspirals_so_LDADD = @PLUGIN_LDADD@ all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/main/zspirals/zspirals.c lebiniou-3.40/plugins/stable/main/zspirals/zspirals.c --- lebiniou-3.31/plugins/stable/main/zspirals/zspirals.c 2019-04-05 20:39:15.000000000 +0000 +++ lebiniou-3.40/plugins/stable/main/zspirals/zspirals.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,6 +1,6 @@ /* - * Copyright 1994-2019 Olivier Girondel - * Copyright 2014-2019 Frantz Balinski + * Copyright 1994-2020 Olivier Girondel + * Copyright 2014-2020 Frantz Balinski * * This file is part of lebiniou. * @@ -25,6 +25,7 @@ u_long id = 1406046076; +uint32_t version = 0; u_long options = BE_DISPLACE; char desc[] = "Poly-spirals effect"; @@ -41,7 +42,7 @@ static void init_params(void); -static Map_t cth_spiral(const u_short, const u_short); +static Map_t cth_spiral(const short, const short); static inline float hypof(const float x, const float y) @@ -50,10 +51,12 @@ } -void +int8_t create(Context_t *ctx) { t_spiral = Translation_new(&cth_spiral, &init_params); + + return 1; } @@ -93,7 +96,7 @@ static Map_t -cth_spiral(const u_short xx, const u_short yy) +cth_spiral(const short xx, const short yy) { Map_t m; float ang, cx, cy, dist, dx, dy, radius, x, y; @@ -131,8 +134,8 @@ y += dy; } - m.map_x = abs((int) rintf(x)) % WIDTH; - m.map_y = abs((int) rintf(y)) % HEIGHT; + m.map_x = x; + m.map_y = y; return m; } diff -Nru lebiniou-3.31/plugins/stable/Makefile.in lebiniou-3.40/plugins/stable/Makefile.in --- lebiniou-3.31/plugins/stable/Makefile.in 2019-04-14 11:52:29.000000000 +0000 +++ lebiniou-3.40/plugins/stable/Makefile.in 2020-01-23 13:57:14.000000000 +0000 @@ -228,6 +228,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -255,6 +257,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -269,7 +272,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ diff -Nru lebiniou-3.31/plugins/stable/output/caca/caca.c lebiniou-3.40/plugins/stable/output/caca/caca.c --- lebiniou-3.31/plugins/stable/output/caca/caca.c 2019-04-05 20:39:15.000000000 +0000 +++ lebiniou-3.40/plugins/stable/output/caca/caca.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -58,7 +58,7 @@ } -void +int8_t create(Context_t *ctx) { screen = xcalloc(SBUFFSIZE, sizeof(Pixel_t)); @@ -96,6 +96,8 @@ printf("[i] exporting caca display with prefix '%s'\n", export_prefix); } } + + return 1; } diff -Nru lebiniou-3.31/plugins/stable/output/caca/Makefile.am lebiniou-3.40/plugins/stable/output/caca/Makefile.am --- lebiniou-3.31/plugins/stable/output/caca/Makefile.am 2018-12-04 00:52:13.000000000 +0000 +++ lebiniou-3.40/plugins/stable/output/caca/Makefile.am 2019-12-15 03:01:34.000000000 +0000 @@ -2,6 +2,6 @@ plugin_PROGRAMS = caca.so caca_so_SOURCES = caca.c -caca_so_CFLAGS = @PLUGIN_CFLAGS@ -caca_so_LDFLAGS = @PLUGIN_LDFLAGS@ -caca_so_LDADD = @CACA_LIBS@ +caca_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src +caca_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +caca_so_LDADD = @PLUGIN_LDADD@ @CACA_LIBS@ diff -Nru lebiniou-3.31/plugins/stable/output/caca/Makefile.in lebiniou-3.40/plugins/stable/output/caca/Makefile.in --- lebiniou-3.31/plugins/stable/output/caca/Makefile.in 2019-04-14 11:52:35.000000000 +0000 +++ lebiniou-3.40/plugins/stable/output/caca/Makefile.in 2020-01-23 13:57:20.000000000 +0000 @@ -216,6 +216,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -243,6 +245,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -257,7 +260,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -319,9 +325,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/output/caca caca_so_SOURCES = caca.c -caca_so_CFLAGS = @PLUGIN_CFLAGS@ -caca_so_LDFLAGS = @PLUGIN_LDFLAGS@ -caca_so_LDADD = @CACA_LIBS@ +caca_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src +caca_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +caca_so_LDADD = @PLUGIN_LDADD@ @CACA_LIBS@ all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/output/diskwriter/diskwriter.c lebiniou-3.40/plugins/stable/output/diskwriter/diskwriter.c --- lebiniou-3.31/plugins/stable/output/diskwriter/diskwriter.c 2019-03-01 11:47:47.000000000 +0000 +++ lebiniou-3.40/plugins/stable/output/diskwriter/diskwriter.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * diff -Nru lebiniou-3.31/plugins/stable/output/diskwriter/Makefile.am lebiniou-3.40/plugins/stable/output/diskwriter/Makefile.am --- lebiniou-3.31/plugins/stable/output/diskwriter/Makefile.am 2018-11-27 13:50:09.000000000 +0000 +++ lebiniou-3.40/plugins/stable/output/diskwriter/Makefile.am 2019-12-15 03:01:34.000000000 +0000 @@ -2,5 +2,6 @@ plugin_PROGRAMS = diskwriter.so diskwriter_so_SOURCES = diskwriter.c -diskwriter_so_CFLAGS = @PLUGIN_CFLAGS@ -diskwriter_so_LDFLAGS = @PLUGIN_LDFLAGS@ +diskwriter_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src +diskwriter_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +diskwriter_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/output/diskwriter/Makefile.in lebiniou-3.40/plugins/stable/output/diskwriter/Makefile.in --- lebiniou-3.31/plugins/stable/output/diskwriter/Makefile.in 2019-04-14 11:52:35.000000000 +0000 +++ lebiniou-3.40/plugins/stable/output/diskwriter/Makefile.in 2020-01-23 13:57:20.000000000 +0000 @@ -104,7 +104,7 @@ PROGRAMS = $(plugin_PROGRAMS) am_diskwriter_so_OBJECTS = diskwriter_so-diskwriter.$(OBJEXT) diskwriter_so_OBJECTS = $(am_diskwriter_so_OBJECTS) -diskwriter_so_LDADD = $(LDADD) +diskwriter_so_DEPENDENCIES = diskwriter_so_LINK = $(CCLD) $(diskwriter_so_CFLAGS) $(CFLAGS) \ $(diskwriter_so_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -216,6 +216,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -243,6 +245,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -257,7 +260,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -319,8 +325,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/output/diskwriter diskwriter_so_SOURCES = diskwriter.c -diskwriter_so_CFLAGS = @PLUGIN_CFLAGS@ -diskwriter_so_LDFLAGS = @PLUGIN_LDFLAGS@ +diskwriter_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src +diskwriter_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +diskwriter_so_LDADD = @PLUGIN_LDADD@ all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/output/GL/GL.c lebiniou-3.40/plugins/stable/output/GL/GL.c --- lebiniou-3.31/plugins/stable/output/GL/GL.c 2019-04-05 20:39:15.000000000 +0000 +++ lebiniou-3.40/plugins/stable/output/GL/GL.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -44,92 +44,92 @@ BKey_t key; switch (evt.type) { - case SDL_KEYDOWN: - key.val = evt.key.keysym.sym; - key.mod = evt.key.keysym.mod; - - on_key(ctx, &key); - break; - - case SDL_QUIT: - Context_send_event(ctx, BT_CONTEXT, BC_QUIT, BA_NONE); - break; - - case SDL_MOUSEMOTION: - // printf("motion.state: %d\n", evt.motion.state); - //printf("left: %d\n", SDL_BUTTON_LEFT); - //printf("right: %d\n", SDL_BUTTON_RIGHT); - - switch (evt.motion.state) { - /* TODO un switch pour le mouse drag/drop mode */ - case SDL_BUTTON_LEFT: + case SDL_KEYDOWN: + key.val = evt.key.keysym.sym; + key.mod = evt.key.keysym.mod; + + on_key(ctx, &key); + break; + + case SDL_QUIT: + Context_send_event(ctx, BT_CONTEXT, BC_QUIT, BA_NONE); + break; + + case SDL_MOUSEMOTION: + // printf("motion.state: %d\n", evt.motion.state); + //printf("left: %d\n", SDL_BUTTON_LEFT); + //printf("right: %d\n", SDL_BUTTON_RIGHT); + + switch (evt.motion.state) { + /* TODO un switch pour le mouse drag/drop mode */ + case SDL_BUTTON_LEFT: #ifdef WITH_GL - ctx->params3d.gl_xe = evt.motion.x; - ctx->params3d.gl_ye = evt.motion.y; - Params3d_rotate_GL(&ctx->params3d); + ctx->params3d.gl_xe = evt.motion.x; + ctx->params3d.gl_ye = evt.motion.y; + Params3d_rotate_GL(&ctx->params3d); #else - ctx->params3d.xe = evt.motion.x; - ctx->params3d.ye = evt.motion.y; - Params3d_rotate(&ctx->params3d); + ctx->params3d.xe = evt.motion.x; + ctx->params3d.ye = evt.motion.y; + Params3d_rotate(&ctx->params3d); #endif - // printf("left button motion @ %d %d\n", evt.motion.x, evt.motion.y); - break; + // printf("left button motion @ %d %d\n", evt.motion.x, evt.motion.y); + break; - case SDL_BUTTON_RIGHT+SDL_BUTTON_LEFT: /* <- WTF ? */ - // printf("right button motion @ %d %d\n", evt.motion.x, evt.motion.y); - set_pixel_nc(active_buffer(ctx), evt.motion.x, MAXY-evt.motion.y, 255); - break; + case SDL_BUTTON_RIGHT+SDL_BUTTON_LEFT: /* <- WTF ? */ + // printf("right button motion @ %d %d\n", evt.motion.x, evt.motion.y); + set_pixel_nc(active_buffer(ctx), evt.motion.x, MAXY-evt.motion.y, 255); + break; - default: + default: + break; + } break; - } - break; - case SDL_MOUSEBUTTONDOWN: - /* printf("type= %d, button= %d\n", evt.button.type, evt.button.button); */ - switch (evt.button.button) { - case SDL_BUTTON_LEFT: + case SDL_MOUSEBUTTONDOWN: + /* printf("type= %d, button= %d\n", evt.button.type, evt.button.button); */ + switch (evt.button.button) { + case SDL_BUTTON_LEFT: #ifdef WITH_GL /* TODO switch GL/not-GL */ - ctx->params3d.gl_xs = evt.motion.x; - ctx->params3d.gl_ys = evt.motion.y; + ctx->params3d.gl_xs = evt.motion.x; + ctx->params3d.gl_ys = evt.motion.y; #else - ctx->params3d.xs = evt.motion.x; - ctx->params3d.ys = evt.motion.y; + ctx->params3d.xs = evt.motion.x; + ctx->params3d.ys = evt.motion.y; #endif - break; + break; - case SDL_BUTTON_RIGHT: - // printf("button down @ %d %d\n", evt.motion.x, evt.motion.y); - set_pixel_nc(active_buffer(ctx), evt.motion.x, MAXY-evt.motion.y, 255); + case SDL_BUTTON_RIGHT: + // printf("button down @ %d %d\n", evt.motion.x, evt.motion.y); + set_pixel_nc(active_buffer(ctx), evt.motion.x, MAXY-evt.motion.y, 255); + break; + } break; - } - break; - case SDL_MOUSEWHEEL: - if (evt.wheel.y > 0) { // scroll up + case SDL_MOUSEWHEEL: + if (evt.wheel.y > 0) { // scroll up #ifdef WITH_GL /* TODO switch GL/not-GL */ - if (ctx->params3d.gl_fov > 1) { - ctx->params3d.gl_fov--; - } - //printf("FOV: %f\n", ctx->params3d.gl_fov); + if (ctx->params3d.gl_fov > 1) { + ctx->params3d.gl_fov--; + } + //printf("FOV: %f\n", ctx->params3d.gl_fov); #else - ctx->params3d.scale_factor /= 0.9; - /* printf("scale: %d\n", ctx->params3d->scale_factor); */ + ctx->params3d.scale_factor /= 0.9; + /* printf("scale: %d\n", ctx->params3d->scale_factor); */ #endif - } else if (evt.wheel.y < 0) { // scroll down + } else if (evt.wheel.y < 0) { // scroll down #ifdef WITH_GL /* TODO switch GL/not-GL */ - ctx->params3d.gl_fov++; - //printf("FOV: %f\n", ctx->params3d.gl_fov); + ctx->params3d.gl_fov++; + //printf("FOV: %f\n", ctx->params3d.gl_fov); #else - if (ctx->params3d.scale_factor > 11) { - ctx->params3d.scale_factor *= 0.9; - } + if (ctx->params3d.scale_factor > 11) { + ctx->params3d.scale_factor *= 0.9; + } #endif - } - break; + } + break; - default: - break; + default: + break; } } } @@ -277,7 +277,7 @@ } -void +int8_t create(Context_t *ctx) { char *icon_file; @@ -292,7 +292,7 @@ if (NULL != glcube) { printf("[i] glcube found @%p\n", glcube); if (NULL != glcube->create) { - glcube->create(ctx); + (void)glcube->create(ctx); } } @@ -357,4 +357,6 @@ #endif glViewport(0, 0, WIDTH, HEIGHT); + + return 1; } diff -Nru lebiniou-3.31/plugins/stable/output/GL/Makefile.am lebiniou-3.40/plugins/stable/output/GL/Makefile.am --- lebiniou-3.31/plugins/stable/output/GL/Makefile.am 2018-12-07 01:09:06.000000000 +0000 +++ lebiniou-3.40/plugins/stable/output/GL/Makefile.am 2019-12-15 03:01:34.000000000 +0000 @@ -2,6 +2,6 @@ plugin_PROGRAMS = GL.so GL_so_SOURCES = GL.c -GL_so_CFLAGS = @PLUGIN_CFLAGS@ @SDL2_CFLAGS@ @GLU_CFLAGS@ -GL_so_LDFLAGS = @PLUGIN_LDFLAGS@ -GL_so_LDADD = @GLU_LIBS@ @SDL2_LIBS@ +GL_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src @SDL2_CFLAGS@ @GLU_CFLAGS@ +GL_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +GL_so_LDADD = @PLUGIN_LDADD@ @GLU_LIBS@ @SDL2_LIBS@ diff -Nru lebiniou-3.31/plugins/stable/output/GL/Makefile.in lebiniou-3.40/plugins/stable/output/GL/Makefile.in --- lebiniou-3.31/plugins/stable/output/GL/Makefile.in 2019-04-14 11:52:35.000000000 +0000 +++ lebiniou-3.40/plugins/stable/output/GL/Makefile.in 2020-01-23 13:57:20.000000000 +0000 @@ -216,6 +216,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -243,6 +245,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -257,7 +260,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -319,9 +325,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/output/GL GL_so_SOURCES = GL.c -GL_so_CFLAGS = @PLUGIN_CFLAGS@ @SDL2_CFLAGS@ @GLU_CFLAGS@ -GL_so_LDFLAGS = @PLUGIN_LDFLAGS@ -GL_so_LDADD = @GLU_LIBS@ @SDL2_LIBS@ +GL_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src @SDL2_CFLAGS@ @GLU_CFLAGS@ +GL_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +GL_so_LDADD = @PLUGIN_LDADD@ @GLU_LIBS@ @SDL2_LIBS@ all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/output/Makefile.in lebiniou-3.40/plugins/stable/output/Makefile.in --- lebiniou-3.31/plugins/stable/output/Makefile.in 2019-04-14 11:52:35.000000000 +0000 +++ lebiniou-3.40/plugins/stable/output/Makefile.in 2020-01-23 13:57:20.000000000 +0000 @@ -231,6 +231,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -258,6 +260,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -272,7 +275,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ diff -Nru lebiniou-3.31/plugins/stable/output/mp4/Makefile.am lebiniou-3.40/plugins/stable/output/mp4/Makefile.am --- lebiniou-3.31/plugins/stable/output/mp4/Makefile.am 2019-01-20 19:59:26.000000000 +0000 +++ lebiniou-3.40/plugins/stable/output/mp4/Makefile.am 2019-12-15 03:01:34.000000000 +0000 @@ -2,5 +2,6 @@ plugin_PROGRAMS = mp4.so mp4_so_SOURCES = mp4.c -mp4_so_CFLAGS = @PLUGIN_CFLAGS@ -mp4_so_LDFLAGS = @PLUGIN_LDFLAGS@ +mp4_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src +mp4_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +mp4_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/output/mp4/Makefile.in lebiniou-3.40/plugins/stable/output/mp4/Makefile.in --- lebiniou-3.31/plugins/stable/output/mp4/Makefile.in 2019-04-14 11:52:35.000000000 +0000 +++ lebiniou-3.40/plugins/stable/output/mp4/Makefile.in 2020-01-23 13:57:20.000000000 +0000 @@ -104,7 +104,7 @@ PROGRAMS = $(plugin_PROGRAMS) am_mp4_so_OBJECTS = mp4_so-mp4.$(OBJEXT) mp4_so_OBJECTS = $(am_mp4_so_OBJECTS) -mp4_so_LDADD = $(LDADD) +mp4_so_DEPENDENCIES = mp4_so_LINK = $(CCLD) $(mp4_so_CFLAGS) $(CFLAGS) $(mp4_so_LDFLAGS) \ $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -216,6 +216,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -243,6 +245,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -257,7 +260,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -319,8 +325,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/output/mp4 mp4_so_SOURCES = mp4.c -mp4_so_CFLAGS = @PLUGIN_CFLAGS@ -mp4_so_LDFLAGS = @PLUGIN_LDFLAGS@ +mp4_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src +mp4_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +mp4_so_LDADD = @PLUGIN_LDADD@ all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/output/mp4/mp4.c lebiniou-3.40/plugins/stable/output/mp4/mp4.c --- lebiniou-3.31/plugins/stable/output/mp4/mp4.c 2019-04-05 20:39:15.000000000 +0000 +++ lebiniou-3.40/plugins/stable/output/mp4/mp4.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -84,7 +84,7 @@ } -void +int8_t create(Context_t *ctx) { if (check_command(FFMPEG_CHECK) == -1) { @@ -92,6 +92,8 @@ } else { open_mp4(ctx); } + + return 1; } diff -Nru lebiniou-3.31/plugins/stable/output/RTMP/Makefile.am lebiniou-3.40/plugins/stable/output/RTMP/Makefile.am --- lebiniou-3.31/plugins/stable/output/RTMP/Makefile.am 2018-11-27 13:50:08.000000000 +0000 +++ lebiniou-3.40/plugins/stable/output/RTMP/Makefile.am 2019-12-15 03:01:34.000000000 +0000 @@ -2,5 +2,6 @@ plugin_PROGRAMS = RTMP.so RTMP_so_SOURCES = RTMP.c -RTMP_so_CFLAGS = @PLUGIN_CFLAGS@ -RTMP_so_LDFLAGS = @PLUGIN_LDFLAGS@ +RTMP_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src +RTMP_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +RTMP_so_LDADD = @PLUGIN_LDADD@ diff -Nru lebiniou-3.31/plugins/stable/output/RTMP/Makefile.in lebiniou-3.40/plugins/stable/output/RTMP/Makefile.in --- lebiniou-3.31/plugins/stable/output/RTMP/Makefile.in 2019-04-14 11:52:35.000000000 +0000 +++ lebiniou-3.40/plugins/stable/output/RTMP/Makefile.in 2020-01-23 13:57:20.000000000 +0000 @@ -104,7 +104,7 @@ PROGRAMS = $(plugin_PROGRAMS) am_RTMP_so_OBJECTS = RTMP_so-RTMP.$(OBJEXT) RTMP_so_OBJECTS = $(am_RTMP_so_OBJECTS) -RTMP_so_LDADD = $(LDADD) +RTMP_so_DEPENDENCIES = RTMP_so_LINK = $(CCLD) $(RTMP_so_CFLAGS) $(CFLAGS) $(RTMP_so_LDFLAGS) \ $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -216,6 +216,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -243,6 +245,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -257,7 +260,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -319,8 +325,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/output/RTMP RTMP_so_SOURCES = RTMP.c -RTMP_so_CFLAGS = @PLUGIN_CFLAGS@ -RTMP_so_LDFLAGS = @PLUGIN_LDFLAGS@ +RTMP_so_CFLAGS = @PLUGIN_CFLAGS@ -I$(top_srcdir)/src +RTMP_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +RTMP_so_LDADD = @PLUGIN_LDADD@ all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/output/RTMP/RTMP.c lebiniou-3.40/plugins/stable/output/RTMP/RTMP.c --- lebiniou-3.31/plugins/stable/output/RTMP/RTMP.c 2019-04-05 20:39:15.000000000 +0000 +++ lebiniou-3.40/plugins/stable/output/RTMP/RTMP.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -32,7 +32,7 @@ static FILE *rtmp = NULL; -static void +static int8_t open_rtmp() { char cmd[MAXLEN+1]; @@ -53,17 +53,19 @@ VERBOSE(printf("[i] %s: opened stream to %s\n", __FILE__, url)); VERBOSE(printf("[i] %s: ffmpeg args: '%s'\n", __FILE__, args)); } + + return 1; } -void +int8_t create(Context_t *ctx) { if (check_command(FFMPEG_CHECK) == -1) { printf("[!] %s: ffmpeg binary not found, plugin disabled\n", __FILE__); - options |= BEQ_DISABLED; + return 0; } else { - open_rtmp(); + return open_rtmp(); } } diff -Nru lebiniou-3.31/plugins/stable/output/SDL2/Makefile.am lebiniou-3.40/plugins/stable/output/SDL2/Makefile.am --- lebiniou-3.31/plugins/stable/output/SDL2/Makefile.am 2019-01-20 19:59:26.000000000 +0000 +++ lebiniou-3.40/plugins/stable/output/SDL2/Makefile.am 2019-12-15 03:01:34.000000000 +0000 @@ -2,6 +2,6 @@ plugin_PROGRAMS = SDL2.so SDL2_so_SOURCES = SDL2.c osd.h osd.c ttf.c ttf.h -SDL2_so_CFLAGS = -DOSD_FONT=\"@OSD_FONT@\" -DOSD_PTSIZE=@OSD_PTSIZE@ @PLUGIN_CFLAGS@ @SDL2_CFLAGS@ -SDL2_so_LDFLAGS = @PLUGIN_LDFLAGS@ -SDL2_so_LDADD = @SDL2_LIBS@ @SDL2_ttf_LIBS@ +SDL2_so_CFLAGS = -DOSD_FONT=\"@OSD_FONT@\" -DOSD_PTSIZE=@OSD_PTSIZE@ @PLUGIN_CFLAGS@ -I$(top_srcdir)/src @SDL2_CFLAGS@ +SDL2_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +SDL2_so_LDADD = @PLUGIN_LDADD@ @SDL2_LIBS@ @SDL2_ttf_LIBS@ diff -Nru lebiniou-3.31/plugins/stable/output/SDL2/Makefile.in lebiniou-3.40/plugins/stable/output/SDL2/Makefile.in --- lebiniou-3.31/plugins/stable/output/SDL2/Makefile.in 2019-04-14 11:52:35.000000000 +0000 +++ lebiniou-3.40/plugins/stable/output/SDL2/Makefile.in 2020-01-23 13:57:20.000000000 +0000 @@ -218,6 +218,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -245,6 +247,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -259,7 +262,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -321,9 +327,9 @@ top_srcdir = @top_srcdir@ plugindir = @libdir@/lebiniou/plugins/output/SDL2 SDL2_so_SOURCES = SDL2.c osd.h osd.c ttf.c ttf.h -SDL2_so_CFLAGS = -DOSD_FONT=\"@OSD_FONT@\" -DOSD_PTSIZE=@OSD_PTSIZE@ @PLUGIN_CFLAGS@ @SDL2_CFLAGS@ -SDL2_so_LDFLAGS = @PLUGIN_LDFLAGS@ -SDL2_so_LDADD = @SDL2_LIBS@ @SDL2_ttf_LIBS@ +SDL2_so_CFLAGS = -DOSD_FONT=\"@OSD_FONT@\" -DOSD_PTSIZE=@OSD_PTSIZE@ @PLUGIN_CFLAGS@ -I$(top_srcdir)/src @SDL2_CFLAGS@ +SDL2_so_LDFLAGS = @PLUGIN_LDFLAGS@ -L$(top_builddir)/src +SDL2_so_LDADD = @PLUGIN_LDADD@ @SDL2_LIBS@ @SDL2_ttf_LIBS@ all: all-am .SUFFIXES: diff -Nru lebiniou-3.31/plugins/stable/output/SDL2/osd.c lebiniou-3.40/plugins/stable/output/SDL2/osd.c --- lebiniou-3.31/plugins/stable/output/SDL2/osd.c 2019-04-05 20:39:15.000000000 +0000 +++ lebiniou-3.40/plugins/stable/output/SDL2/osd.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -60,7 +60,11 @@ } icon_file = g_strdup_printf("%s/lebiniou.bmp", DEFAULT_DATADIR); +#ifdef DEBUG + printf("[i] Loading icon from %s\n", icon_file); +#endif icon = SDL_LoadBMP(icon_file); + assert(icon != NULL); g_free(icon_file); colorkey = SDL_MapRGB(icon->format, 0, 0, 0); SDL_SetColorKey(icon, SDL_TRUE, colorkey); @@ -99,7 +103,7 @@ now_str = ctime((time_t *)&now.tv_sec); now_str[strlen(now_str)-1] = '\0'; - dst_y = osd_print(BORDER, dst_y, 0, 0, 0, "%s", now_str); + dst_y = osd_print(BORDER, dst_y, 0, 0, "%s", now_str); /* Uptime */ elapsed = b_timer_elapsed(ctx->timer); @@ -111,37 +115,39 @@ elapsed -= m*60; s = (u_short)elapsed; elapsed -= s; - dst_y = osd_print(BORDER, dst_y, 0, 0, 0, "Up: %1dd %02d:%02d:%02d.%02d", + dst_y = osd_print(BORDER, dst_y, 0, 0, "Up: %1dd %02d:%02d:%02d.%02d", d, h, m, s, (u_short)(elapsed*100)); /* Display sequence name */ - dst_y = osd_print(BORDER, dst_y, 0, 0, 0, "Sequence: %s", + dst_y = osd_print(BORDER, dst_y, 0, 0, "Sequence: %s", (cur_seq->name != NULL) ? cur_seq->name : "(none)"); /* Display current bankset:bank */ switch (ctx->bank_mode) { - case SEQUENCES: - dst_y = osd_print(BORDER, dst_y, 0, 0, 0, "Sequences bank: %d-%d", - ctx->bankset[SEQUENCES]+1, ctx->bank[SEQUENCES]+1); - break; - case COLORMAPS: - dst_y = osd_print(BORDER, dst_y, 0, 0, 0, "Colormaps bank: %d-%d", - ctx->bankset[COLORMAPS]+1, ctx->bank[COLORMAPS]+1); - break; - case IMAGES: - dst_y = osd_print(BORDER, dst_y, 0, 0, 0, "Images bank: %d-%d", - ctx->bankset[IMAGES]+1, ctx->bank[IMAGES]+1); - break; + case SEQUENCES: + dst_y = osd_print(BORDER, dst_y, 0, 0, "Sequences bank: %d-%d", + ctx->bankset[SEQUENCES]+1, ctx->bank[SEQUENCES]+1); + break; + case COLORMAPS: + dst_y = osd_print(BORDER, dst_y, 0, 0, "Colormaps bank: %d-%d", + ctx->bankset[COLORMAPS]+1, ctx->bank[COLORMAPS]+1); + break; + case IMAGES: + dst_y = osd_print(BORDER, dst_y, 0, 0, "Images bank: %d-%d", + ctx->bankset[IMAGES]+1, ctx->bank[IMAGES]+1); + break; } /* Display colormap and image (if any) */ - assert(colormaps != NULL); - dst_y = osd_print(BORDER, dst_y, 0, 0, 0, "Colormap: %s", - (cur_seq->cmap_id) ? Colormaps_name(cur_seq->cmap_id) : "(default)"); + if (colormaps != NULL) { + dst_y = osd_print(BORDER, dst_y, 0, 0, "Colormap: %s", + (cur_seq->cmap_id) ? Colormaps_name(cur_seq->cmap_id) : "(default)"); + } - if (NULL != images) - dst_y = osd_print(BORDER, dst_y, 0, 0, 0, "Image: %s", + if (images != NULL) { + dst_y = osd_print(BORDER, dst_y, 0, 0, "Image: %s", (cur_seq->image_id) ? Images_name(cur_seq->image_id) : "(default)"); + } /* Display auto* stuff */ if (ctx->random_mode != BR_NONE) { @@ -158,42 +164,42 @@ } else { snprintf(buff, OSD_BUFFLEN * sizeof(char), "Auto mode: Off"); } - dst_y = osd_print(BORDER, dst_y, 0, 0, 0, "%s", buff); + dst_y = osd_print(BORDER, dst_y, 0, 0, "%s", buff); /* Display random cmap/image */ if ((colormaps != NULL) && (colormaps->size > 1)) - dst_y = osd_print(BORDER, dst_y, 0, 0, 0, "Random colormaps: %s", + dst_y = osd_print(BORDER, dst_y, 0, 0, "Random colormaps: %s", ctx->auto_colormaps ? "On" : "Off"); if ((images != NULL) && (images->size > 1)) - dst_y = osd_print(BORDER, dst_y, 0, 0, 0, "Random images: %s", + dst_y = osd_print(BORDER, dst_y, 0, 0, "Random images: %s", ctx->auto_images ? "On" : "Off"); /* Display locked plugin, if any */ if (ctx->locked != NULL) { - dst_y = osd_print(BORDER, dst_y, 0, 0, 0, "Locked: %s", Plugin_dname(ctx->locked)); + dst_y = osd_print(BORDER, dst_y, 0, 0, "Locked: %s", Plugin_dname(ctx->locked)); } /* Display phase-space delay */ - dst_y = osd_print(BORDER, dst_y, 0, 0, 0, "Phase-space delay: %d", Context_get_phase_space_delay(ctx)); + dst_y = osd_print(BORDER, dst_y, 0, 0, "Phase-space delay: %d", Context_get_phase_space_delay(ctx)); /* Spline span size */ - dst_y = osd_print(BORDER, dst_y, 0, 0, 0, "Span size: %d", Context_get_span_size(ctx)); + dst_y = osd_print(BORDER, dst_y, 0, 0, "Span size: %d", Context_get_span_size(ctx)); /* Volume scaling */ if (ctx->input != NULL) { - dst_y = osd_print(BORDER, dst_y, 0, 0, 0, "Volume scale: %.1f", Context_get_volume_scale(ctx)); + dst_y = osd_print(BORDER, dst_y, 0, 0, "Volume scale: %.1f", Context_get_volume_scale(ctx)); } /* 3D scale factor */ - dst_y = osd_print(BORDER, dst_y, 0, 0, 0, "3D scale factor: %.2f", ctx->params3d.scale_factor); + dst_y = osd_print(BORDER, dst_y, 0, 0, "3D scale factor: %.2f", ctx->params3d.scale_factor); } static void osd_fps(const Context_t *ctx) { - (void)osd_print(BORDER, 0, 1, 1, 0, "%03d FPS (%03d)", (int)Context_fps(ctx), ctx->max_fps); + (void)osd_print(BORDER, 0, 1, 1, "%03d FPS (%03d)", (int)Context_fps(ctx), ctx->max_fps); } @@ -227,11 +233,52 @@ } xfree(name); - dst_y = osd_print(BORDER, dst_y, 1, 0, 0, "%s", buff); + dst_y = osd_print(BORDER, dst_y, 1, 0, "%s", buff); } tmp = g_list_next(tmp); } + if (plugins != NULL && plugins->selected != NULL) { + if (plugins->selected->parameters != NULL) { + json_t *j_params = plugins->selected->parameters(NULL); + + /* find max parameter name size */ + uint8_t max_name_size = 0; + const char *name; + json_t *iter_value; + json_object_foreach(j_params, name, iter_value) { + if (json_is_integer(iter_value) || json_is_real(iter_value)) { + max_name_size = MAX(max_name_size, strlen(name)); + } + } + + dst_y = osd_print(BORDER, dst_y, 1, 0, " "); + char *p_name = plugins->selected->dname; + dst_y = osd_print(BORDER, dst_y, 1, 0, "%s parameters%*s", p_name, + MAX(0, 2 + (int)max_name_size + 7 - (11 + (int)strlen(p_name))), ""); + + uint8_t n = 0; + json_object_foreach(j_params, name, iter_value) { + json_t *j_value = json_object_get(iter_value, "value"); + const char *arrow = (n == plugins->selected->selected_param) ? ARROW : ""; + + if (json_is_integer(j_value)) { + int value = json_integer_value(j_value); + dst_y = osd_print(BORDER, dst_y, 1, 0, "%s %*s: %-4d", arrow, max_name_size, name, value); + } else if (json_is_real(j_value)) { + double value = json_real_value(j_value); + dst_y = osd_print(BORDER, dst_y, 1, 0, "%s %*s: %-4.2f", arrow, max_name_size, name, value); + } else if (json_is_string(j_value)) { + const char *str = json_string_value(j_value); + dst_y = osd_print(BORDER, dst_y, 1, 0, "%s %*s: %s", arrow, max_name_size, name, str); + } + + n++; + } + + json_decref(j_params); + } + } cur_seq = ctx->sm->cur; } @@ -259,7 +306,7 @@ in_sequence = Sequence_find(ctx->sm->cur, plugin) ? '*' : ' '; name = Plugin_dname(plugin); - (void)osd_print(BORDER, dst_y, 0, 1, (*plugin->options & BEQ_DISABLED) ? 1 : 0, "%c|%c|%c|%c|%c %s %c %s", + (void)osd_print(BORDER, dst_y, 0, 1, "%c|%c|%c|%c|%c %s %c %s", ((*plugin->options & BE_SFX2D) || (*plugin->options & BE_SFX3D)) ? 'S' : ' ', (*plugin->options & BE_GFX) ? 'G' : ' ', ((*plugin->options & BE_BLUR) || (*plugin->options & BE_DISPLACE) @@ -286,13 +333,15 @@ char *dsc = NULL; int skip = fontlineskip - 1; - if (NULL == plugins->selected->desc) { - dsc = "NO DESCRIPTION"; - } else { - dsc = plugins->selected->desc; - } + if (NULL != plugins->selected) { + if (NULL == plugins->selected->desc) { + dsc = "NO DESCRIPTION"; + } else { + dsc = plugins->selected->desc; + } - (void)osd_print(BORDER, skip, 1, 1, 0, "%s", dsc); + (void)osd_print(BORDER, skip, 1, 1, "%s", dsc); + } } @@ -343,9 +392,10 @@ osd_sequence(ctx); - osd_plugins(ctx); - - osd_plugin_desc(ctx); + if (plugins != NULL) { + osd_plugins(ctx); + osd_plugin_desc(ctx); + } if (SDL_UpdateWindowSurface(osd_window) < 0) { SDL_Log("SDL_UpdateWindowSurface failed: %s", SDL_GetError()); diff -Nru lebiniou-3.31/plugins/stable/output/SDL2/osd.h lebiniou-3.40/plugins/stable/output/SDL2/osd.h --- lebiniou-3.31/plugins/stable/output/SDL2/osd.h 2019-04-05 20:39:15.000000000 +0000 +++ lebiniou-3.40/plugins/stable/output/SDL2/osd.h 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -27,7 +27,7 @@ u_short osd_print(const u_short, u_short, const u_char, const u_char, - const u_char, const char *, ...); + const char *, ...); void osd(const Context_t *); diff -Nru lebiniou-3.31/plugins/stable/output/SDL2/SDL2.c lebiniou-3.40/plugins/stable/output/SDL2/SDL2.c --- lebiniou-3.31/plugins/stable/output/SDL2/SDL2.c 2019-04-05 20:39:15.000000000 +0000 +++ lebiniou-3.40/plugins/stable/output/SDL2/SDL2.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -42,7 +42,10 @@ char *window_title; window_title = g_strdup_printf("Le Biniou (%dx%d)", WIDTH, HEIGHT); - window = SDL_CreateWindow(window_title, current.w - WIDTH, 0, WIDTH, HEIGHT, flags); + + int x0 = WIDTH_ORIGIN == INT32_MIN ? current.w - WIDTH : WIDTH_ORIGIN; + int y0 = HEIGHT_ORIGIN == INT32_MIN ? 0 : HEIGHT_ORIGIN; + window = SDL_CreateWindow(window_title, x0, y0, WIDTH, HEIGHT, flags); g_free(window_title); if (NULL == window) { xerror("Couldn't set %dx%d video mode: %s\n", WIDTH, HEIGHT, SDL_GetError()); @@ -70,7 +73,7 @@ const int depth = 32, pitch = 4 * WIDTH; const Uint32 pixel_format = SDL_PIXELFORMAT_RGBA32; - SDL_Surface* surf = SDL_CreateRGBSurfaceWithFormatFrom((void *)src, WIDTH, HEIGHT, + SDL_Surface *surf = SDL_CreateRGBSurfaceWithFormatFrom((void *)src, WIDTH, HEIGHT, depth, pitch, pixel_format); assert(surf != NULL); if (SDL_BlitScaled(surf, NULL, SDL_GetWindowSurface(window), NULL) < 0) { @@ -92,65 +95,66 @@ BKey_t key; switch (evt.type) { - case SDL_KEYDOWN: - key.val = evt.key.keysym.sym; - key.mod = evt.key.keysym.mod; - - on_key(ctx, &key); - break; - - case SDL_QUIT: - Context_send_event(ctx, BT_CONTEXT, BC_QUIT, BA_NONE); - break; - - case SDL_MOUSEMOTION: - switch (evt.motion.state) { - case SDL_BUTTON_LEFT: - ctx->params3d.xe = evt.motion.x; - ctx->params3d.ye = evt.motion.y; - Params3d_rotate(&ctx->params3d); - break; - - case SDL_BUTTON_RIGHT + SDL_BUTTON_LEFT: /* <- WTF ? */ - // printf("right button motion @ %d %d\n", evt.motion.x, evt.motion.y); - set_pixel_nc(active_buffer(ctx), evt.motion.x, MAXY-evt.motion.y, 255); + case SDL_KEYDOWN: + key.val = evt.key.keysym.sym; + key.mod = evt.key.keysym.mod; + + on_key(ctx, &key); break; - default: + case SDL_QUIT: + Context_send_event(ctx, BT_CONTEXT, BC_QUIT, BA_NONE); break; - } - break; - case SDL_MOUSEWHEEL: - if (evt.wheel.y > 0) { // scroll up - ctx->params3d.scale_factor /= SCALE_FACTOR_MULT; - } else if (evt.wheel.y < 0) { // scroll down - if (ctx->params3d.scale_factor > SCALE_FACTOR_MIN) - ctx->params3d.scale_factor *= SCALE_FACTOR_MULT; - } - printf("[i] 3D scale factor: %.2f\n", ctx->params3d.scale_factor); - break; - - case SDL_MOUSEBUTTONDOWN: - /* printf("type= %d, button= %d\n", evt.button.type, evt.button.button); */ - switch (evt.button.button) { - case SDL_BUTTON_LEFT: - ctx->params3d.xs = evt.motion.x; - ctx->params3d.ys = evt.motion.y; - break; - - case SDL_BUTTON_RIGHT: - // printf("button down @ %d %d\n", evt.motion.x, evt.motion.y); - set_pixel_nc(active_buffer(ctx), evt.motion.x, MAXY-evt.motion.y, 255); + case SDL_MOUSEMOTION: + switch (evt.motion.state) { + case SDL_BUTTON_LEFT: + ctx->params3d.xe = evt.motion.x; + ctx->params3d.ye = evt.motion.y; + Params3d_rotate(&ctx->params3d); + break; + + case SDL_BUTTON_RIGHT + SDL_BUTTON_LEFT: /* <- WTF ? */ + // printf("right button motion @ %d %d\n", evt.motion.x, evt.motion.y); + set_pixel_nc(active_buffer(ctx), evt.motion.x, MAXY-evt.motion.y, 255); + break; + + default: + break; + } break; - default: + case SDL_MOUSEWHEEL: + if (evt.wheel.y > 0) { // scroll up + ctx->params3d.scale_factor /= SCALE_FACTOR_MULT; + } else if (evt.wheel.y < 0) { // scroll down + if (ctx->params3d.scale_factor > SCALE_FACTOR_MIN) { + ctx->params3d.scale_factor *= SCALE_FACTOR_MULT; + } + } + printf("[i] 3D scale factor: %.2f\n", ctx->params3d.scale_factor); break; - } - break; - default: - break; + case SDL_MOUSEBUTTONDOWN: + /* printf("type= %d, button= %d\n", evt.button.type, evt.button.button); */ + switch (evt.button.button) { + case SDL_BUTTON_LEFT: + ctx->params3d.xs = evt.motion.x; + ctx->params3d.ys = evt.motion.y; + break; + + case SDL_BUTTON_RIGHT: + // printf("button down @ %d %d\n", evt.motion.x, evt.motion.y); + set_pixel_nc(active_buffer(ctx), evt.motion.x, MAXY-evt.motion.y, 255); + break; + + default: + break; + } + break; + + default: + break; } } } @@ -174,7 +178,7 @@ } -void +int8_t create(Context_t *ctx) { Uint32 flags = 0; @@ -202,6 +206,10 @@ osd_init(); + if (ctx->window_decorations == 0) { + flags |= SDL_WINDOW_BORDERLESS; + } + #ifndef FIXED flags |= SDL_WINDOW_RESIZABLE; #endif @@ -210,6 +218,42 @@ #ifdef NO_MOUSE_CURSOR SDL_ShowCursor(SDL_DISABLE); #endif + + /* Fill windows on boot */ + /* Initialize main window with target picture */ + /* No colormaps are loaded yet, so we convert to grayscale */ + const int depth = 24, pitch = 3 * WIDTH; + const Uint32 pixel_format = SDL_PIXELFORMAT_RGB24; + Pixel_t *target = xmalloc(3 * BUFFSIZE * sizeof(Pixel_t)); + Buffer8_t *pic = Buffer8_new(); + Buffer8_copy(ctx->target_pic->buff, pic); + Buffer8_flip_v(pic); + const Pixel_t *src = pic->buffer; + Pixel_t *dst = target; + uint32_t i = 0; + + for (i = 0; i < BUFFSIZE; i++, src++, dst += 3) { + dst[0] = dst[1] = dst[2] = *src; + } + SDL_Surface *surf = SDL_CreateRGBSurfaceWithFormatFrom((void *)target, WIDTH, HEIGHT, + depth, pitch, pixel_format); + Buffer8_delete(pic); + xfree(target); + assert(surf != NULL); + if (SDL_BlitScaled(surf, NULL, SDL_GetWindowSurface(window), NULL) < 0) { + xerror("SDL_BlitScaled failed\n"); + } + SDL_FreeSurface(surf); + if (SDL_UpdateWindowSurface(window) < 0) { + xerror("SDL_UpdateWindowSurface failed: %s\n", SDL_GetError()); + } + + /* OSD */ + if (has_osd) { + osd(ctx); + } + + return 1; } diff -Nru lebiniou-3.31/plugins/stable/output/SDL2/ttf.c lebiniou-3.40/plugins/stable/output/SDL2/ttf.c --- lebiniou-3.31/plugins/stable/output/SDL2/ttf.c 2019-04-05 20:39:15.000000000 +0000 +++ lebiniou-3.40/plugins/stable/output/SDL2/ttf.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -27,7 +27,6 @@ static SDL_Color white = { 0xFF, 0xFF, 0xFF, 0 }; static SDL_Color black = { 0, 0, 0, 0 }; -static SDL_Color red = { 0xFF, 0, 0, 0 }; static TTF_Font *font = NULL; u_short fontlineskip; @@ -93,7 +92,7 @@ u_short osd_print(const u_short x, u_short y, const u_char rev_x, const u_char rev_y, - const int disabled, const char *fmt, ...) + const char *fmt, ...) { char str[OSD_BUFFLEN+1]; va_list ap; @@ -110,7 +109,7 @@ vsprintf(str, fmt, ap); /* TODO vsnprintf */ va_end(ap); - fg_color = (disabled) ? red : white; + fg_color = white; text = TTF_RenderText_Blended(font, str, black); diff -Nru lebiniou-3.31/plugins/stable/output/SDL2/ttf.h lebiniou-3.40/plugins/stable/output/SDL2/ttf.h --- lebiniou-3.31/plugins/stable/output/SDL2/ttf.h 2019-02-02 00:30:11.000000000 +0000 +++ lebiniou-3.40/plugins/stable/output/SDL2/ttf.h 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * diff -Nru lebiniou-3.31/README.md lebiniou-3.40/README.md --- lebiniou-3.31/README.md 2019-04-05 20:39:14.000000000 +0000 +++ lebiniou-3.40/README.md 2020-01-22 18:33:56.000000000 +0000 @@ -12,11 +12,13 @@ ```sh sudo apt-get -qq update - sudo apt-get -qq install autoconf pkg-config gcc make libglib2.0-dev libfftw3-dev libxml2-dev libfreetype6-dev libswscale-dev libsdl2-ttf-dev libcaca-dev libjack-dev pandoc libsndfile1-dev libmagickwand-dev + sudo apt-get -qq install autoconf pkg-config gcc make libglib2.0-dev libfftw3-dev libxml2-dev libfreetype6-dev libswscale-dev libsdl2-ttf-dev libcaca-dev libjack-dev pandoc libsndfile1-dev libmagickwand-dev libjansson-dev libulfius-dev ``` 2. Configure, compile and install + The configure script has several [build options](BUILD.md). + ```sh autoreconf -fi ./configure @@ -38,6 +40,18 @@ man lebiniou ``` +## Arch Linux + +```sh +pacman --noconfirm -Sy autoconf automake grep pkg-config gcc make pandoc fftw libxml2 freetype2 libmagick6 ffmpeg sdl2_ttf libcaca +autoreconf -i +export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/lib/imagemagick6/pkgconfig" +export PATH="$PATH:/usr/bin/core_perl" +./configure +make +sudo make install +``` + ## BSD-based systems If you want to build the [documentation](https://biniou.net/manual.html), @@ -59,15 +73,34 @@ pkg_add autoconf automake pkg-config glib2 fftw libxml2 ffmpeg4 SDL2_ttf libcaca jack ImageMagick ``` -* OpenBSD (6.4) +* OpenBSD (6.5) ```sh - pkg_add glib2 fftw3 libxml ffmpeg sdl2-ttf libcaca jack ImageMagick + pkg_add gcc-8.3.0 glib2 fftw3 libxml ffmpeg sdl2-ttf libcaca jack ImageMagick ``` 2. Configure, compile and install ```sh autoreconf -fi ./configure + # for OpenBSD + CC=/usr/local/bin/egcc ./configure make make install ``` + +# Running a local build + +Make sure you have the data files at least downloaded ! + +* if they are installed +```sh +LD_LIBRARY_PATH=$PWD/src ./src/lebiniou -b plugins/stable +``` +* else +```sh +LD_LIBRARY_PATH=$PWD/src ./src/lebiniou -b plugins/stable -d /path/to/datafiles +``` + +# Support + +Join us on [IRC](irc://freenode/biniou) for general questions. diff -Nru lebiniou-3.31/src/alarm.c lebiniou-3.40/src/alarm.c --- lebiniou-3.31/src/alarm.c 2019-04-05 20:39:15.000000000 +0000 +++ lebiniou-3.40/src/alarm.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * diff -Nru lebiniou-3.31/src/alarm.h lebiniou-3.40/src/alarm.h --- lebiniou-3.31/src/alarm.h 2019-02-02 00:30:11.000000000 +0000 +++ lebiniou-3.40/src/alarm.h 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * diff -Nru lebiniou-3.31/src/biniou.c lebiniou-3.40/src/biniou.c --- lebiniou-3.31/src/biniou.c 2019-04-09 12:40:03.000000000 +0000 +++ lebiniou-3.40/src/biniou.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -25,50 +25,124 @@ #include "colormaps.h" +/* Auto-change timers and modes */ +static char *delay_names[MAX_TIMERS] = { + "colormaps", + "images", + "sequences" +#ifdef WITH_WEBCAM + , "webcams" +#endif +}; + +static int delays[MAX_TIMERS][2] = { + { DELAY_MIN, DELAY_MAX }, // colormaps + { DELAY_MIN, DELAY_MAX }, // images + { DELAY_MIN, DELAY_MAX } // sequences +#ifdef WITH_WEBCAM + , { DELAY_MIN, DELAY_MAX } // webcams +#endif +}; + uint8_t start_with_first_sequence = 0; +static pthread_t images_thread; +static struct Images_thread_args { + char *buf; + const char *themes; +} images_thread_args; + + +static void * +biniou_images_thread(void *_args) +{ + struct Images_thread_args *args = (struct Images_thread_args *)_args; + Images_new(args->buf, args->themes); + g_free(args->buf); + + return NULL; +} + + +static pthread_t colormaps_thread; +static struct Colormaps_thread_args { + char *buf; +} colormaps_thread_args; + + +static void * +biniou_colormaps_thread(void *_args) +{ + struct Colormaps_thread_args *args = (struct Colormaps_thread_args *)_args; + Colormaps_new(args->buf); + g_free(args->buf); + + return NULL; +} + void biniou_new(const char *datadir, const char *pluginsdir, const char *schemes, const char *themes, -#ifndef FIXED - const u_short width, const u_short height, -#endif const u_char options, const uint32_t input_size, const uint8_t phase_space_delay, const uint8_t span_size, const int webcams) { - char *buf; - if (options & B_INIT_VERBOSE) { libbiniou_verbose = 1; } -#ifndef FIXED - WIDTH = width; - HEIGHT = height; -#endif - - /* PRNG */ - b_rand_init(); - if (datadir != NULL) { + VERBOSE(printf("[+] Loading data files\n")); + /* Images */ - buf = g_strdup_printf("%s/images/", datadir); - VERBOSE(printf("[+] Loading images\n")); - Images_new(buf, themes); - g_free(buf); + images_thread_args.buf = g_strdup_printf("%s/images/", datadir); + images_thread_args.themes = themes; + pthread_create(&images_thread, NULL, biniou_images_thread, (void *)&images_thread_args); /* Colormaps */ - buf = g_strdup_printf("%s/colormaps/", datadir); - VERBOSE(printf("[+] Loading colormaps... ")); - Colormaps_new(buf); - g_free(buf); + colormaps_thread_args.buf = g_strdup_printf("%s/colormaps/", datadir); + pthread_create(&colormaps_thread, NULL, biniou_colormaps_thread, (void *)&colormaps_thread_args); + + pthread_join(images_thread, NULL); + pthread_join(colormaps_thread, NULL); } else { Colormaps_new(NULL); } + /* Create images fader and timer */ + if (images != NULL) { + VERBOSE(printf("[+] Creating images fader (%i images)\n", images->size)); + context->imgf = ImageFader_new(images->size); + + VERBOSE(printf("[+] Creating images timer (%d..%d)\n", delays[BD_IMAGES][0], delays[BD_IMAGES][1])); + context->a_images = Alarm_new(delays[BD_IMAGES][0], delays[BD_IMAGES][1]); + } + + /* Create colormaps fader and timer */ + if (colormaps != NULL) { + VERBOSE(printf("[+] Creating colormaps fader (%i colormaps)\n", colormaps->size)); + context->cf = CmapFader_new(colormaps->size); + + VERBOSE(printf("[+] Creating colormaps timer (%d..%d)\n", delays[BD_COLORMAPS][0], delays[BD_COLORMAPS][1])); + context->a_cmaps = Alarm_new(delays[BD_COLORMAPS][0], delays[BD_COLORMAPS][1]); + } + + /* Create sequences timer */ + VERBOSE(printf("[+] Creating sequences timer (%d..%d)\n", delays[BD_SEQUENCES][0], delays[BD_SEQUENCES][1])); + context->a_random = Alarm_new(delays[BD_SEQUENCES][0], delays[BD_SEQUENCES][1]); + context->random_mode = BR_NONE; + +#ifdef WITH_WEBCAM + /* Create webcams timer */ + if (webcams > 1) { + VERBOSE(printf("[+] Creating webcams timer (%d..%d)\n", delays[BD_WEBCAMS][0], delays[BD_WEBCAMS][1])); + context->a_webcams = Alarm_new(delays[BD_WEBCAMS][0], delays[BD_WEBCAMS][1]); + Alarm_init(context->a_webcams); + } +#endif + /* Schemes */ if (options & B_INIT_SCHEMES) { VERBOSE(printf("[+] Loading schemes from %s\n", schemes)); @@ -78,16 +152,10 @@ Schemes_new_default(); } - /* Context */ - context = Context_new(webcams); - Context_set_input_size(context, input_size); - Context_set_phase_space_delay(context, phase_space_delay); - Context_set_span_size(context, span_size); - /* Plugins */ VERBOSE(printf("[+] Loading plugins\n")); plugins = Plugins_new(pluginsdir); - Plugins_load(plugins); + Plugins_load(plugins, context); /* Sequences */ if (options & B_INIT_SEQUENCES) { @@ -216,9 +284,12 @@ p = Plugin_new(dir, name, PL_INPUT); if (NULL != p) { - Plugin_init(p); - context->input_plugin = p; - Context_set_volume_scale(context, volume_scale); + if (Plugin_init(p)) { + context->input_plugin = p; + Context_set_volume_scale(context, volume_scale); + } else { + xerror("Failed to initialize %s input_n", name); + } } } @@ -245,8 +316,11 @@ for ( ; *output != NULL; output++) { p = Plugin_new(dir, *output, PL_OUTPUT); if (NULL != p) { - Plugin_init(p); - context->outputs = g_slist_prepend(context->outputs, p); + if (Plugin_init(p)) { + context->outputs = g_slist_prepend(context->outputs, p); + } else { + xerror("Failed to initialize %s output\n", name); + } } } @@ -310,3 +384,19 @@ biniou_end(); } } + + +void +biniou_set_delay(const enum RandomDelays what, const int min, const int max) +{ + if ((max <= min) || (min < 1) || (max < 1)) { + xerror("Set random delay for %s: max (%d) must be > min (%d), both values must be > 1\n", + delay_names[what], max, min); + } + +#ifdef DEBUG + printf("[i] Setting min..max delays for %s: %d..%d\n", delay_names[what], min, max); +#endif + delays[what][0] = min; + delays[what][1] = max; +} diff -Nru lebiniou-3.31/src/biniou.h lebiniou-3.40/src/biniou.h --- lebiniou-3.31/src/biniou.h 2019-04-05 20:39:15.000000000 +0000 +++ lebiniou-3.40/src/biniou.h 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -30,9 +30,6 @@ #define B_INIT_ALL (B_INIT_SEQUENCES|B_INIT_SCHEMES) void biniou_new(const char *, const char *, const char *, const char *, -#ifndef FIXED - const u_short, const u_short, -#endif const u_char, const uint32_t, const uint8_t, const uint8_t, const int); void biniou_delete(); @@ -51,5 +48,6 @@ void biniou_set_max_fps(const u_short); void biniou_verbosity(const u_char); void biniou_set_random_mode(const enum RandomMode); +void biniou_set_delay(const enum RandomDelays, const int, const int); #endif /* __BINIOU_H */ diff -Nru lebiniou-3.31/src/brandom.c lebiniou-3.40/src/brandom.c --- lebiniou-3.31/src/brandom.c 2019-04-11 13:04:02.000000000 +0000 +++ lebiniou-3.40/src/brandom.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * diff -Nru lebiniou-3.31/src/brandom.h lebiniou-3.40/src/brandom.h --- lebiniou-3.31/src/brandom.h 2019-04-11 13:03:51.000000000 +0000 +++ lebiniou-3.40/src/brandom.h 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * diff -Nru lebiniou-3.31/src/btimer.c lebiniou-3.40/src/btimer.c --- lebiniou-3.31/src/btimer.c 2019-02-19 12:45:00.000000000 +0000 +++ lebiniou-3.40/src/btimer.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -54,6 +54,14 @@ } +void +b_timer_restart(BTimer_t *timer) +{ + b_timer_stop(timer); + b_timer_start(timer); +} + + float b_timer_elapsed(BTimer_t *timer) { diff -Nru lebiniou-3.31/src/btimer.h lebiniou-3.40/src/btimer.h --- lebiniou-3.31/src/btimer.h 2019-02-02 00:30:11.000000000 +0000 +++ lebiniou-3.40/src/btimer.h 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -33,6 +33,7 @@ void b_timer_delete(BTimer_t *); void b_timer_start(BTimer_t *); void b_timer_stop(BTimer_t *); +void b_timer_restart(BTimer_t *); float b_timer_elapsed(BTimer_t *); #endif /* __BINIOU_BTIMER_H */ diff -Nru lebiniou-3.31/src/buffer_8bits.c lebiniou-3.40/src/buffer_8bits.c --- lebiniou-3.31/src/buffer_8bits.c 2019-04-13 13:36:49.000000000 +0000 +++ lebiniou-3.40/src/buffer_8bits.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -209,20 +209,6 @@ void -Buffer8_mix_random(Buffer8_t *s1, const Buffer8_t *s2) -{ - /* copy half of s2 into s1 with random probability */ - Pixel_t *d = s1->buffer; - Pixel_t *s = (Pixel_t *)s2->buffer; - - for ( ; d < s1->buffer + BUFFSIZE*sizeof(Pixel_t); d++, s++) - if (b_rand_boolean()) { - *d = *s; - } -} - - -void Buffer8_randomize(Buffer8_t *buff) { Pixel_t *p = buff->buffer; @@ -251,7 +237,7 @@ { /* XOR pixels from s2 with pixels from s1 */ Pixel_t *d = s1->buffer; - Pixel_t *s = (Pixel_t *)s2->buffer; + const Pixel_t *s = s2->buffer; for ( ; d < s1->buffer + BUFFSIZE*sizeof(Pixel_t); d++, s++) { *d ^= *s; @@ -264,7 +250,7 @@ { /* mix pixels from s2 with pixels from s1 */ Pixel_t *d = s1->buffer; - Pixel_t *s = (Pixel_t *)s2->buffer; + const Pixel_t *s = s2->buffer; for ( ; d < s1->buffer + BUFFSIZE*sizeof(Pixel_t); d++, s++) { *d = (Pixel_t)((u_short)*d + (u_short)*s) >> 1; diff -Nru lebiniou-3.31/src/buffer_8bits.h lebiniou-3.40/src/buffer_8bits.h --- lebiniou-3.31/src/buffer_8bits.h 2019-04-13 13:36:49.000000000 +0000 +++ lebiniou-3.40/src/buffer_8bits.h 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -462,11 +462,6 @@ } } -/* TODO mix(s1, s2, C) => s1' = s1*C+s2*(1-C) - void Buffer8_mix_weighted(const Buffer8_t *, const Buffer8_t *, const float); */ - -void Buffer8_mix_random(Buffer8_t *, const Buffer8_t *); - void Buffer8_randomize(Buffer8_t *); void Buffer8_overlay(Buffer8_t *, const Buffer8_t *); diff -Nru lebiniou-3.31/src/buffer_RGBA.c lebiniou-3.40/src/buffer_RGBA.c --- lebiniou-3.31/src/buffer_RGBA.c 2019-04-05 20:39:15.000000000 +0000 +++ lebiniou-3.40/src/buffer_RGBA.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * diff -Nru lebiniou-3.31/src/buffer_RGBA.h lebiniou-3.40/src/buffer_RGBA.h --- lebiniou-3.31/src/buffer_RGBA.h 2019-02-02 00:30:11.000000000 +0000 +++ lebiniou-3.40/src/buffer_RGBA.h 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * diff -Nru lebiniou-3.31/src/bulfius_get.c lebiniou-3.40/src/bulfius_get.c --- lebiniou-3.31/src/bulfius_get.c 1970-01-01 00:00:00.000000000 +0000 +++ lebiniou-3.40/src/bulfius_get.c 2020-01-23 13:56:18.000000000 +0000 @@ -0,0 +1,100 @@ +/* + * Copyright 1994-2019 Olivier Girondel + * + * This file is part of lebiniou. + * + * lebiniou 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 of the License, or + * (at your option) any later version. + * + * lebiniou 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 lebiniou. If not, see . + */ + +#include "bulfius.h" +#include "context.h" +#include "plugins.h" + + +int +callback_get_parameters(const struct _u_request *request, struct _u_response *response, void *user_data) +{ + const struct _u_map *u_map = request->map_url; + + if (u_map_has_key(u_map, "name")) { + Plugin_t *p = Plugins_find_by_name(u_map_get(u_map, "name")); + json_t *res = NULL; + + if (NULL != p) { + if (NULL != p->parameters) { + res = p->parameters(NULL); + if (u_map_has_key(u_map, "param")) { + const char *param_name = u_map_get(u_map, "param"); + json_t *new_res = NULL; + + json_t *param = json_object_get(res, param_name); + if (param != NULL) { + new_res = json_object(); + json_object_set(new_res, param_name, json_object_get(param, "value")); + + assert(NULL != new_res); + ulfius_set_json_body_response(response, 200, new_res); // value + json_decref(res); + res = new_res; + } else { + ulfius_set_string_body_response(response, 404, "Parameter not found"); + } + } else { + ulfius_set_json_body_response(response, 200, res); // all parameters + } + } else { + ulfius_set_json_body_response(response, 200, res); // no parameters + } + json_decref(res); + } else { + ulfius_set_string_body_response(response, 404, "Plugin not found"); + } + } else { + ulfius_set_string_body_response(response, 400, "Bad request"); + } + + return U_CALLBACK_COMPLETE; +} + + +int +callback_get_sequence(const struct _u_request *request, struct _u_response *response, void *user_data) +{ + const Context_t *ctx = user_data; + + assert(ctx != NULL); + json_t *payload = Sequence_to_json(ctx->sm->cur, 1); + ulfius_set_json_body_response(response, 200, payload); + json_decref(payload); + + return U_CALLBACK_COMPLETE; +} + + +int +callback_get_statistics(const struct _u_request *request, struct _u_response *response, void *user_data) +{ + const Context_t *ctx = user_data; + + assert(ctx != NULL); + json_t *payload = json_object(); + json_object_set_new(payload, "frames", json_integer(ctx->frames)); + if (NULL != ctx->input) { + json_object_set_new(payload, "volume", json_real(ctx->input->volume)); + } + ulfius_set_json_body_response(response, 200, payload); + json_decref(payload); + + return U_CALLBACK_COMPLETE; +} diff -Nru lebiniou-3.31/src/bulfius.h lebiniou-3.40/src/bulfius.h --- lebiniou-3.31/src/bulfius.h 1970-01-01 00:00:00.000000000 +0000 +++ lebiniou-3.40/src/bulfius.h 2020-01-23 13:56:18.000000000 +0000 @@ -0,0 +1,42 @@ +/* + * Copyright 1994-2019 Olivier Girondel + * + * This file is part of lebiniou. + * + * lebiniou 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 of the License, or + * (at your option) any later version. + * + * lebiniou 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 lebiniou. If not, see . + */ + +#ifndef __BINIOU_ULFIUS_H +#define __BINIOU_ULFIUS_H + +#include + +#define ULFIUS_PORT 30543 // erlang:phash2("lebiniou", 64511) + 1024. + +#define BULFIUS_GET "GET" +#define BULFIUS_POST "POST" + +#define BULFIUS_PARAMETERS "/parameters" +#define BULFIUS_SEQUENCE "/sequence" +#define BULFIUS_STATISTICS "/statistics" + +// GET +int callback_get_parameters(const struct _u_request *, struct _u_response *, void *); +int callback_get_sequence(const struct _u_request *, struct _u_response *, void *); +int callback_get_statistics(const struct _u_request *, struct _u_response *, void *); + +// POST +int callback_post_parameters(const struct _u_request *, struct _u_response *, void *); + +#endif /* __BINIOU_ULFIUS_H */ diff -Nru lebiniou-3.31/src/bulfius_post.c lebiniou-3.40/src/bulfius_post.c --- lebiniou-3.31/src/bulfius_post.c 1970-01-01 00:00:00.000000000 +0000 +++ lebiniou-3.40/src/bulfius_post.c 2020-01-23 13:56:18.000000000 +0000 @@ -0,0 +1,101 @@ +/* + * Copyright 1994-2019 Olivier Girondel + * + * This file is part of lebiniou. + * + * lebiniou 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 of the License, or + * (at your option) any later version. + * + * lebiniou 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 lebiniou. If not, see . + */ + +#include "bulfius.h" +#include "context.h" +#include "plugins.h" + + +int +callback_post_parameters(const struct _u_request *request, struct _u_response *response, void *user_data) +{ + const struct _u_map *map_url = request->map_url; + + // check if we have a "?name=..." + if (u_map_has_key(map_url, "name")) { + Plugin_t *p = Plugins_find_by_name(u_map_get(map_url, "name")); + + if (NULL != p) { + if (NULL != p->parameters) { + // plugin exists and has parameters, get them + json_t *params = p->parameters(NULL); + json_error_t jerror; + // parse request body + json_t *body = ulfius_get_json_body_request(request, &jerror); + + if (NULL == body) { + // error + VERBOSE(printf("[!] %s: JSON error: %s\n", __FILE__, jerror.text)); + } else { + // iterate over json post body + const char *key; + json_t *value; + json_object_foreach(body, key, value) { + json_t *p = json_object_get(params, key); + if (NULL != p) { + // get old value, will be used for type checking + const json_t *old_value = json_object_get(p, "value"); + assert(NULL != old_value); + json_t *new_value = NULL; + + // convert new value to the right type + if (json_is_integer(old_value)) { + if (json_is_integer(value)) { + new_value = value; + } else { + new_value = json_integer(xatol(json_string_value(value))); + } + } else if (json_is_real(old_value)) { + if (json_is_real(value)) { + new_value = value; + } else if (json_is_integer(value)) { + new_value = json_real(json_integer_value(value)); + } else { + new_value = json_real(xatof(json_string_value(value))); + } + } else if (json_is_boolean(old_value)) { + if (json_is_boolean(value)) { + new_value = value; + } else { + new_value = (!strcmp("true", json_string_value(value))) ? json_true() : json_false(); + } + } else { + assert(json_is_string(old_value)); + new_value = value; + } + + assert(NULL != new_value); + // update new parameter and parameters object + // probable memory leak here + json_object_set(p, "value", new_value); + } + } + json_decref(p->parameters(params)); + } + ulfius_set_string_body_response(response, 204, NULL); + } else { + ulfius_set_string_body_response(response, 404, "Plugin not found"); + } + } + } else { + ulfius_set_string_body_response(response, 400, "Bad request"); + } + + return U_CALLBACK_COMPLETE; +} diff -Nru lebiniou-3.31/src/circle.c lebiniou-3.40/src/circle.c --- lebiniou-3.31/src/circle.c 2019-04-05 20:39:15.000000000 +0000 +++ lebiniou-3.40/src/circle.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * diff -Nru lebiniou-3.31/src/circle.h lebiniou-3.40/src/circle.h --- lebiniou-3.31/src/circle.h 2019-02-02 00:30:11.000000000 +0000 +++ lebiniou-3.40/src/circle.h 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * diff -Nru lebiniou-3.31/src/cmap_8bits.c lebiniou-3.40/src/cmap_8bits.c --- lebiniou-3.31/src/cmap_8bits.c 2019-04-05 20:39:15.000000000 +0000 +++ lebiniou-3.40/src/cmap_8bits.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * diff -Nru lebiniou-3.31/src/cmap_8bits.h lebiniou-3.40/src/cmap_8bits.h --- lebiniou-3.31/src/cmap_8bits.h 2019-02-02 00:30:11.000000000 +0000 +++ lebiniou-3.40/src/cmap_8bits.h 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * diff -Nru lebiniou-3.31/src/cmapfader.c lebiniou-3.40/src/cmapfader.c --- lebiniou-3.31/src/cmapfader.c 2019-04-05 20:39:15.000000000 +0000 +++ lebiniou-3.40/src/cmapfader.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -110,6 +110,9 @@ Cmap8_t *cur = cf->cur; const u_long elapsed = Fader_elapsed(fader); +#ifdef DEBUG_FADERS + printf("Cf "); +#endif Fader_start(fader); fader->faded += elapsed; @@ -137,8 +140,8 @@ /* FIXME alpha fading seems broken */ cur->colors[i].col.a = 255; /* cur->colors[i].col.a = */ - /* (u_char)((fader->tmp[i*3+3] += */ - /* elapsed*fader->delta[i*3+3])/MFACTOR); */ + /* (u_char)((fader->tmp[i*3+3] += */ + /* elapsed*fader->delta[i*3+3])/MFACTOR); */ } } Cmap8_findMinMax(cur); @@ -159,12 +162,8 @@ xerror("Colormap without name, WTF #@!\n"); } - if (cf->fader->fade) { - CmapFader_init(cf); - } else { - Cmap8_copy(cf->dst, cf->cur); - } - cf->fader->fading = cf->fader->fade; + CmapFader_init(cf); + cf->fader->fading = 1; Cmap8_findMinMax(cf->cur); cf->refresh = 1; } diff -Nru lebiniou-3.31/src/cmapfader_event.c lebiniou-3.40/src/cmapfader_event.c --- lebiniou-3.31/src/cmapfader_event.c 2019-02-19 12:45:00.000000000 +0000 +++ lebiniou-3.40/src/cmapfader_event.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -24,21 +24,21 @@ CmapFader_event(CmapFader_t *cf, const Event_t *e) { switch (e->cmd) { - case BC_SELECT: - if (e->arg0 == BA_PREV) { - CmapFader_prev(cf); - return 1; - } else if (e->arg0 == BA_NEXT) { - CmapFader_next(cf); - return 1; - } else if (e->arg0 == BA_RANDOM) { - CmapFader_random(cf); - return 1; - } - break; + case BC_SELECT: + if (e->arg0 == BA_PREV) { + CmapFader_prev(cf); + return 1; + } else if (e->arg0 == BA_NEXT) { + CmapFader_next(cf); + return 1; + } else if (e->arg0 == BA_RANDOM) { + CmapFader_random(cf); + return 1; + } + break; - default: - break; + default: + break; } return 0; diff -Nru lebiniou-3.31/src/cmapfader.h lebiniou-3.40/src/cmapfader.h --- lebiniou-3.31/src/cmapfader.h 2019-02-02 00:30:11.000000000 +0000 +++ lebiniou-3.40/src/cmapfader.h 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * diff -Nru lebiniou-3.31/src/cmdline.c lebiniou-3.40/src/cmdline.c --- lebiniou-3.31/src/cmdline.c 2019-04-05 20:39:15.000000000 +0000 +++ lebiniou-3.40/src/cmdline.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -47,10 +47,13 @@ "\t-v, --version\t\tDisplay the version and exit\n" "\t-q, --quiet\t\tSuppress messages\n" "\t-c, --config \tSet configuration file [~/" KEYFILE "]\n" + "\t-X, --xpos \tSet left position of the window\n" + "\t-Y, --ypos \tSet top position of the window\n" #ifndef FIXED "\t-x, --width \tSet width [%d]\n" "\t-y, --height \tSet height [%d]\n" #endif + "\t-n, --noborder\tDisable window borders\n" "\t-p, --pidfile \tSet the PID file [%s]\n" "\t-t, --themes \tComma-separated list of themes to use [biniou]\n" #ifdef WITH_WEBCAM @@ -101,10 +104,13 @@ {"help", no_argument, NULL, 'h'}, {"input", required_argument, NULL, 'i'}, {"maxfps", required_argument, NULL, 'm'}, + {"noborder", no_argument, NULL, 'n'}, {"output", required_argument, NULL, 'o'}, {"random", required_argument, NULL, 'r'}, {"quiet", no_argument, NULL, 'q'}, {"config", required_argument, NULL, 'c'}, + {"xpos", required_argument, NULL, 'X'}, + {"ypos", required_argument, NULL, 'Y'}, #ifndef FIXED {"width", required_argument, NULL, 'x'}, {"height", required_argument, NULL, 'y'}, @@ -123,166 +129,181 @@ /* Get command line arguments */ - while ((ch = getopt_long(argc, argv, "b:c:C:d:D:fhi:m:o:p:qr:St:x:y:vW:z:", long_opt, NULL)) != -1) + while ((ch = getopt_long(argc, argv, "b:c:C:d:D:fhi:m:no:p:qr:St:x:X:y:Y:vW:z:", long_opt, NULL)) != -1) #else - while ((ch = getopt(argc, argv, "b:c:C:d:D:fhi:m:o:p:qr:St:x:y:vW:z:")) != -1) + while ((ch = getopt(argc, argv, "b:c:C:d:D:fhi:m:no:p:qr:St:x:X:y:Y:vW:z:")) != -1) #endif switch (ch) { - case 'b': - if (base_dir == NULL) { - base_dir = optarg; - } - break; - - case 'c': - /* re-read configuration file */ - set_configuration(optarg); - read_keyfile(); - break; + case 'b': + if (base_dir == NULL) { + base_dir = optarg; + } + break; + + case 'c': + /* re-read configuration file */ + set_configuration(optarg); + read_keyfile(); + break; #ifdef WITH_WEBCAM - case 'C': - if (*optarg == 'h') { - hflip=!hflip; - } - if (*optarg == 'v') { - vflip=!vflip; - } - break; -#endif - - case 'd': - if (data_dir == NULL) { - data_dir = optarg; - } - break; - - case 'z': - if (schemes_file == NULL) { - schemes_file = optarg; - } - break; - - case 'f': - fullscreen = 1; - break; - - case 'h': - usage(); - break; - - case 'i': - if (NULL != input_plugin) { - xfree(input_plugin); - } - input_plugin = strdup(optarg); - VERBOSE(printf("[c] Setting input plugin: %s\n", input_plugin)); - break; - - case 'o': - if (NULL != output_plugin) { - xfree(output_plugin); - } - output_plugin = strdup(optarg); - VERBOSE(printf("[c] Setting output plugin: %s\n", output_plugin)); - break; - - case 'm': - max_fps = xatol(optarg); - if (max_fps > 0) { - VERBOSE(printf("[c] Maximum fps set to %li\n", max_fps)); - } else { - xerror("Invalid max_fps (%li)\n", max_fps); - } - break; - - case 'r': - random_mode = (enum RandomMode)xatol(optarg); - if (random_mode > BR_BOTH) { - xerror("Invalid random_mode (%d)\n", random_mode); - } else { - VERBOSE(printf("[c] Random mode set to %d\n", random_mode)); - } - break; - - case 't': - if (NULL != themes) { - xfree(themes); - } - themes = strdup(optarg); - VERBOSE(printf("[c] Using themes: %s\n", themes)); - break; - - case 'v': - printf("%s %s\n", PACKAGE_NAME, PACKAGE_VERSION); - exit(0); - break; - - case 'q': - libbiniou_verbose = 0; - break; + case 'C': + if (*optarg == 'h') { + hflip=!hflip; + } + if (*optarg == 'v') { + vflip=!vflip; + } + break; +#endif + + case 'd': + if (data_dir == NULL) { + data_dir = optarg; + } + break; + + case 'z': + if (schemes_file == NULL) { + schemes_file = optarg; + } + break; + + case 'f': + fullscreen = 1; + break; + + case 'h': + usage(); + break; + + case 'n': + window_decorations = 0; + VERBOSE(printf("[c] Deactivate window decorations\n")); + break; + + case 'i': + if (NULL != input_plugin) { + xfree(input_plugin); + } + input_plugin = optarg; + VERBOSE(printf("[c] Setting input plugin: %s\n", input_plugin)); + break; + + case 'o': + if (NULL != output_plugin) { + xfree(output_plugin); + } + output_plugin = optarg; + VERBOSE(printf("[c] Setting output plugin: %s\n", output_plugin)); + break; + + case 'm': + max_fps = xatol(optarg); + if (max_fps > 0) { + VERBOSE(printf("[c] Maximum fps set to %li\n", max_fps)); + } else { + xerror("Invalid max_fps (%li)\n", max_fps); + } + break; + + case 'r': + random_mode = (enum RandomMode)xatol(optarg); + if (random_mode > BR_BOTH) { + xerror("Invalid random_mode (%d)\n", random_mode); + } else { + VERBOSE(printf("[c] Random mode set to %d\n", random_mode)); + } + break; + + case 't': + if (NULL != themes) { + xfree(themes); + } + themes = strdup(optarg); + VERBOSE(printf("[c] Using themes: %s\n", themes)); + break; + + case 'v': + printf("%s %s\n", PACKAGE_NAME, PACKAGE_VERSION); + exit(0); + break; + + case 'q': + libbiniou_verbose = 0; + break; - case 'x': + case 'x': #ifndef FIXED - w = xatol(optarg); - if (w >= MIN_WIDTH) { - width = w; - VERBOSE(printf("[c] Width set to %i\n", width)); - } else { - xerror("Invalid width: %d (min: %d)\n", w, MIN_WIDTH); - } + w = xatol(optarg); + if (w >= MIN_WIDTH) { + width = w; + VERBOSE(printf("[c] Width set to %i\n", width)); + } else { + xerror("Invalid width: %d (min: %d)\n", w, MIN_WIDTH); + } #else - VERBOSE(fprintf(stderr, "[!] Compiled with fixed buffers, ignoring width= %li\n", xatol(optarg))); + VERBOSE(fprintf(stderr, "[!] Compiled with fixed buffers, ignoring width= %li\n", xatol(optarg))); #endif - break; + break; - case 'y': + case 'X': + x_origin = xatol(optarg); + VERBOSE(printf("[c] X origin set to %i\n", x_origin)); + break; + + case 'y': #ifndef FIXED - h = xatol(optarg); - if (h >= MIN_HEIGHT) { - height = h; - VERBOSE(printf("[c] Height set to %i\n", height)); - } else { - xerror("Invalid height: %d (min: %d)\n", h, MIN_HEIGHT); - } + h = xatol(optarg); + if (h >= MIN_HEIGHT) { + height = h; + VERBOSE(printf("[c] Height set to %i\n", height)); + } else { + xerror("Invalid height: %d (min: %d)\n", h, MIN_HEIGHT); + } #else - VERBOSE(fprintf(stderr, "[!] Compiled with fixed buffers, ignoring height= %li\n", xatol(optarg))); + VERBOSE(fprintf(stderr, "[!] Compiled with fixed buffers, ignoring height= %li\n", xatol(optarg))); #endif - break; + break; - case 'p': - if (pid_file == NULL) { - pid_file = optarg; - } - break; + case 'Y': + y_origin = xatol(optarg); + VERBOSE(printf("[c] Y origin set to %i\n", y_origin)); + break; + + case 'p': + if (pid_file == NULL) { + pid_file = optarg; + } + break; #ifdef WITH_WEBCAM - case 'W': /* webcams */ - webcams = xatol(optarg); - if ((webcams >= 0) && (webcams <= MAX_CAMS)) { - VERBOSE(printf("[c] webcam: grabbing %d device%s\n", webcams, (webcams == 1 ? "": "s"))); - } else { - webcams = 1; - } - break; - - case 'D': /* video_base */ - if (NULL != video_base) { - xfree(video_base); - } - video_base = strdup(optarg); - VERBOSE(printf("[c] webcam: first device is %s\n", video_base)); - break; -#endif - - case 'S': - libbiniou_verbose = 0; - statistics = 1; - break; - - default: - usage(); - break; + case 'W': /* webcams */ + webcams = xatol(optarg); + if ((webcams >= 0) && (webcams <= MAX_CAMS)) { + VERBOSE(printf("[c] webcam: grabbing %d device%s\n", webcams, (webcams == 1 ? "": "s"))); + } else { + webcams = 1; + } + break; + + case 'D': /* video_base */ + if (NULL != video_base) { + xfree(video_base); + } + video_base = strdup(optarg); + VERBOSE(printf("[c] webcam: first device is %s\n", video_base)); + break; +#endif + + case 'S': + libbiniou_verbose = 0; + statistics = 1; + break; + + default: + usage(); + break; } if (NULL == base_dir) { diff -Nru lebiniou-3.31/src/colormaps.c lebiniou-3.40/src/colormaps.c --- lebiniou-3.31/src/colormaps.c 2019-04-05 20:39:15.000000000 +0000 +++ lebiniou-3.40/src/colormaps.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -20,7 +20,6 @@ #include "globals.h" #include "colormaps.h" #include "brandom.h" -#include "pbar.h" Colormaps_t *colormaps = NULL; @@ -49,7 +48,6 @@ GSList *tmp = NULL; uint16_t size = 0; GSList *t; - PBar_t *pb = NULL; if (directoryname == NULL) { goto error; @@ -62,10 +60,6 @@ goto error; } - if (libbiniou_verbose) { - pb = pbar_new(); - } - while ((entry = readdir(dir)) != NULL) { uint32_t hash; Cmap8_t *map; @@ -114,17 +108,6 @@ tmp = g_slist_prepend(tmp, (gpointer)map); size++; - - if (libbiniou_verbose && !(size % 5)) { - pbar_step(pb); - } - - for (t = g_slist_next(tmp); - t != NULL; - t = g_slist_next(t)) - if (((Cmap8_t *)t->data)->id == hash) - xerror("Duplicated colormap hash: %s / %s, %li\n", - ((Cmap8_t *)t->data)->name, sentry, hash); } if (closedir(dir) == -1) { xperror("closedir"); @@ -132,8 +115,6 @@ colormaps = xcalloc(1, sizeof(Colormaps_t)); if (libbiniou_verbose) { - printf("done.\n"); - pbar_delete(pb); printf("[c] Loaded %d colormaps\n", size); } @@ -241,10 +222,10 @@ uint16_t idx = 0; assert(colormaps != NULL); + assert(colormaps->size); // There is at least a default colormap - /* printf("b_rand_int_range(0, %d)\n", cmaps->size-1); */ if (colormaps->size > 1) { - idx = b_rand_int_range(0, colormaps->size-1); + idx = b_rand_int_range(0, colormaps->size - 1); } else { /* no colormaps loaded but the default */ #ifdef DEBUG diff -Nru lebiniou-3.31/src/colormaps.h lebiniou-3.40/src/colormaps.h --- lebiniou-3.31/src/colormaps.h 2019-02-02 00:30:11.000000000 +0000 +++ lebiniou-3.40/src/colormaps.h 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * diff -Nru lebiniou-3.31/src/constants.h lebiniou-3.40/src/constants.h --- lebiniou-3.31/src/constants.h 2019-04-05 20:39:15.000000000 +0000 +++ lebiniou-3.40/src/constants.h 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -54,7 +54,7 @@ #define MAXLEN _POSIX2_LINE_MAX /* maximum length of a sequence */ -#define MAX_SEQ_LEN 254 +#define MAX_SEQ_LEN 254 /* handy shortcuts */ #define DEC(val, maxval) do { if (!val) val = maxval-1; else --val; } while (0) diff -Nru lebiniou-3.31/src/context_banks.c lebiniou-3.40/src/context_banks.c --- lebiniou-3.31/src/context_banks.c 2019-04-05 20:39:15.000000000 +0000 +++ lebiniou-3.40/src/context_banks.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -116,6 +116,7 @@ res = stat(filename, &dummy); if (-1 == res) { + g_free(filename); return; } diff -Nru lebiniou-3.31/src/context.c lebiniou-3.40/src/context.c --- lebiniou-3.31/src/context.c 2019-04-09 12:40:03.000000000 +0000 +++ lebiniou-3.40/src/context.c 2020-01-23 13:56:18.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -24,30 +24,14 @@ #include "images.h" #include "sequences.h" -#ifdef WITH_WEBCAM -#define MAX_TIMERS 4 -#else -#define MAX_TIMERS 3 -#endif - -/* Auto-change timers and modes */ -static char *delay_names[MAX_TIMERS] = { - "colormaps", - "images", - "sequences" -#ifdef WITH_WEBCAM - , "webcams" -#endif -}; +/* 3D parameters */ +/* auto rotations */ +double rot_amount = DEFAULT_ROT_AMOUNT; +/* 3D scale factor */ +double scale_factor = -1.0; +/* maximum rotation factor */ +uint8_t rotation_factor = DEFAULT_ROT_FACTOR; -static int delays[MAX_TIMERS][2] = { - { DELAY_MIN, DELAY_MAX }, // colormaps - { DELAY_MIN, DELAY_MAX }, // images - { DELAY_MIN, DELAY_MAX } // sequences -#ifdef WITH_WEBCAM - , { DELAY_MIN, DELAY_MAX } // webcams -#endif -}; static enum ShufflerMode random_modes[MAX_TIMERS] = { BS_RANDOM, // colormaps @@ -58,14 +42,6 @@ #endif }; -/* 3D parameters */ -/* auto rotations */ -double rot_amount = DEFAULT_ROT_AMOUNT; -/* 3D scale factor */ -double scale_factor = -1.0; -/* maximum rotation factor */ -uint8_t rotation_factor = DEFAULT_ROT_FACTOR; - #ifdef WITH_WEBCAM #include "webcam.h" @@ -78,7 +54,6 @@ #define MAX_TRIES 5 - static void Context_open_webcam(Context_t *ctx) { @@ -159,26 +134,6 @@ glGenTextures(MAX_CAMS, ctx->cam_textures); // TODO: delete on exit #endif - if (images != NULL) { - VERBOSE(printf("[+] Creating images fader (%i images)\n", images->size)); - ctx->imgf = ImageFader_new(images->size); - - VERBOSE(printf("[+] Creating images timer (%d..%d)\n", delays[BD_IMAGES][0], delays[BD_IMAGES][1])); - ctx->a_images = Alarm_new(delays[BD_IMAGES][0], delays[BD_IMAGES][1]); - } - - if (colormaps != NULL) { - VERBOSE(printf("[+] Creating colormaps fader (%i colormaps)\n", colormaps->size)); - ctx->cf = CmapFader_new(colormaps->size); - - VERBOSE(printf("[+] Creating colormaps timer (%d..%d)\n", delays[BD_COLORMAPS][0], delays[BD_COLORMAPS][1])); - ctx->a_cmaps = Alarm_new(delays[BD_COLORMAPS][0], delays[BD_COLORMAPS][1]); - } - - VERBOSE(printf("[+] Creating sequences timer (%d..%d)\n", delays[BD_SEQUENCES][0], delays[BD_SEQUENCES][1])); - ctx->a_random = Alarm_new(delays[BD_SEQUENCES][0], delays[BD_SEQUENCES][1]); - ctx->random_mode = BR_NONE; - VERBOSE(printf("[+] Initializing sequence manager\n")); ctx->sm = SequenceManager_new(); @@ -229,10 +184,6 @@ } if (webcams > 1) { - VERBOSE(printf("[+] Creating webcams timer (%d..%d)\n", delays[BD_WEBCAMS][0], delays[BD_WEBCAMS][1])); - ctx->a_webcams = Alarm_new(delays[BD_WEBCAMS][0], delays[BD_WEBCAMS][1]); - Alarm_init(ctx->a_webcams); - VERBOSE(printf("[+] Creating webcams shuffler (%d webcams)\n", webcams)); ctx->webcams_shuffler = Shuffler_new(webcams); Shuffler_set_mode(ctx->webcams_shuffler, Context_get_shuffler_mode(BD_WEBCAMS)); @@ -242,6 +193,11 @@ } #endif + ctx->random = Buffer8_new(); + for (u_long i = 0; i < BUFFSIZE; i++) { + ctx->random->buffer[i] = g_random_boolean(); + } + return ctx; } @@ -341,6 +297,8 @@ Image8_delete(ctx->target_pic); } + Buffer8_delete(ctx->random); + xfree(ctx); } @@ -402,10 +360,9 @@ Plugin_t *p = layer->plugin; assert(p != NULL); - if (p->on_switch_off != NULL) - if (!(*p->options & BEQ_DISABLED)) { - p->on_switch_off(ctx); - } + if (p->on_switch_off != NULL) { + p->on_switch_off(ctx); + } tmp = g_list_next(tmp); } @@ -419,10 +376,15 @@ Plugin_t *p = layer->plugin; assert(p != NULL); - if (p->on_switch_on != NULL) - if (!(*p->options & BEQ_DISABLED)) { - p->on_switch_on(ctx); - } + if (p->on_switch_on != NULL) { + p->on_switch_on(ctx); + } + + if (p->parameters != NULL) { + /* Todo: check and use returned parameters ? */ + json_decref(p->parameters(layer->plugin_parameters)); + } + tmp = g_list_next(tmp); } @@ -478,12 +440,12 @@ int Context_add_rand(Sequence_t *seq, - const enum PluginOptions options, const int not_lens) + const enum PluginOptions options, const int not_lens, const Plugin_t *locked) { Plugin_t *p; do { - p = Plugins_get_random(options); + p = Plugins_get_random(options, locked); if (p == NULL) { return -1; } @@ -753,22 +715,6 @@ void -Context_set_delay(const enum RandomDelays what, const int min, const int max) -{ - if ((max <= min) || (min < 1) || (max < 1)) { - xerror("Set random delay for %s: max (%d) must be > min (%d), both values must be > 1\n", - delay_names[what], max, min); - } - -#ifdef DEBUG - printf("[i] Setting min..max delays for %s: %d..%d\n", delay_names[what], min, max); -#endif - delays[what][0] = min; - delays[what][1] = max; -} - - -void Context_set_shuffler_mode(const enum RandomDelays what, const enum ShufflerMode mode) { random_modes[what] = mode; @@ -849,3 +795,57 @@ { return (ctx->input != NULL) ? ctx->input->volume_scale : 0; } + + +void +Context_mix_buffers(const Context_t *ctx, Buffer8_t *buffs[2]) +{ + Pixel_t *d = buffs[0]->buffer; + + uint32_t rnd_offset = b_rand_int_range(0, BUFFSIZE-1); + const Pixel_t *random = ctx->random->buffer + rnd_offset; + + u_long i = 0; + for (; i < BUFFSIZE - rnd_offset; i++, d++, random++) { + *d = buffs[*random]->buffer[i]; + } + random = ctx->random->buffer; + for (; i < BUFFSIZE; i++, d++, random++) { + *d = buffs[*random]->buffer[i]; + } +} + + +/* ulfius */ +#ifdef WITH_ULFIUS +void +Context_start_ulfius(Context_t *ctx) +{ + // Initialize instance with the port number + if (ulfius_init_instance(&ctx->instance, ULFIUS_PORT, NULL, NULL) != U_OK) { + xerror("ulfius_init_instance error, abort\n"); + } + + // Endpoint list declaration + // GET + ulfius_add_endpoint_by_val(&ctx->instance, BULFIUS_GET, NULL, BULFIUS_PARAMETERS, 0, &callback_get_parameters, NULL); + ulfius_add_endpoint_by_val(&ctx->instance, BULFIUS_GET, NULL, BULFIUS_SEQUENCE, 0, &callback_get_sequence, ctx); + ulfius_add_endpoint_by_val(&ctx->instance, BULFIUS_GET, NULL, BULFIUS_STATISTICS, 0, &callback_get_statistics, ctx); + // POST + ulfius_add_endpoint_by_val(&ctx->instance, BULFIUS_POST, NULL, BULFIUS_PARAMETERS, 0, &callback_post_parameters, NULL); + + // Start the framework + if (ulfius_start_framework(&ctx->instance) == U_OK) { + VERBOSE(printf("[i] Started ulfius framework on port %d\n", ctx->instance.port)); + } else { + xerror("Error starting ulfius framework\n"); + } +} + + +void Context_stop_ulfius(Context_t *ctx) +{ + ulfius_stop_framework(&ctx->instance); + ulfius_clean_instance(&ctx->instance); +} +#endif diff -Nru lebiniou-3.31/src/context_event.c lebiniou-3.40/src/context_event.c --- lebiniou-3.31/src/context_event.c 2019-04-05 20:39:15.000000000 +0000 +++ lebiniou-3.40/src/context_event.c 2020-01-22 18:34:05.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -35,35 +35,35 @@ { /* find out the recipient */ switch (e->to) { - case BT_NONE: - break; + case BT_NONE: + break; - case BT_IMAGEFADER: - if (ImageFader_event(ctx->imgf, e)) { - Sequence_changed(ctx->sm->cur); - } - break; - - case BT_CMAPFADER: - if (CmapFader_event(ctx->cf, e)) { - Sequence_changed(ctx->sm->cur); - } - break; - - case BT_CONTEXT: - (void)Context_event(ctx, e); - break; - - case BT_SEQMGR: - (void)SequenceManager_event(ctx->sm, e, ctx->auto_colormaps, ctx->auto_images); - break; - - case BT_PLUGINS: - (void)Plugins_event(plugins, e); - break; + case BT_IMAGEFADER: + if (ImageFader_event(ctx->imgf, e)) { + Sequence_changed(ctx->sm->cur); + } + break; - default: - break; + case BT_CMAPFADER: + if (CmapFader_event(ctx->cf, e)) { + Sequence_changed(ctx->sm->cur); + } + break; + + case BT_CONTEXT: + (void)Context_event(ctx, e); + break; + + case BT_SEQMGR: + (void)SequenceManager_event(ctx->sm, e, ctx->auto_colormaps, ctx->auto_images); + break; + + case BT_PLUGINS: + (void)Plugins_event(plugins, e); + break; + + default: + break; } ctx->nb_events++; @@ -110,393 +110,388 @@ uint8_t span; // spline span size switch (e->cmd) { - case BC_QUIT: - if (e->arg0 == BA_SAVE) - Sequence_save(ctx->sm->cur, 0, SequenceManager_is_transient(ctx->sm, ctx->sm->cur), - TRUE, ctx->auto_colormaps, ctx->auto_images); - ctx->running = 0; - return 1; - - case BC_SAVE: - if (e->arg0 == BA_SCREENSHOT) { - ctx->take_screenshot = 1; - return 1; - } else { - return 0; - } - - case BC_SWITCH: - switch (e->arg0) { - case BA_SELECTED: - if (!(*plugins->selected->options & BEQ_DISABLED)) { - if (Sequence_find(ctx->sm->cur, plugins->selected) != NULL) { - Context_remove_plugin(ctx, plugins->selected); - } else { - if (g_list_length(ctx->sm->cur->layers) < MAX_SEQ_LEN) { - Context_insert_plugin(ctx, plugins->selected); - } - } - } + case BC_QUIT: + if (e->arg0 == BA_SAVE) + Sequence_save(ctx->sm->cur, 0, SequenceManager_is_transient(ctx->sm, ctx->sm->cur), + TRUE, ctx->auto_colormaps, ctx->auto_images); + ctx->running = 0; return 1; - case BA_FULLSCREEN: - ctx->fullscreen = !ctx->fullscreen; - printf("[S] Full-screen %s\n", ctx->fullscreen ? "off" : "on"); - - for ( ; outputs != NULL; outputs = g_slist_next(outputs)) { - Plugin_t *output = (Plugin_t *)outputs->data; - - if (output->fullscreen != NULL) { - output->fullscreen(ctx->fullscreen); - } - } - return 1; - - case BA_CURSOR: - for ( ; outputs != NULL; outputs = g_slist_next(outputs)) { - Plugin_t *output = (Plugin_t *)outputs->data; - - if (output->switch_cursor != NULL) { - output->switch_cursor(); - } - } - return 1; - - case BA_COLORMAPS: - if ((colormaps != NULL) && (colormaps->size > 1)) { - ctx->sm->cur->auto_colormaps = ctx->auto_colormaps = !ctx->auto_colormaps; - Sequence_changed(ctx->sm->cur); - Context_update_auto(ctx); + case BC_SAVE: + if (e->arg0 == BA_SCREENSHOT) { + ctx->take_screenshot = 1; return 1; } else { return 0; } - case BA_IMAGES: - if ((images != NULL) && (images->size > 1)) { - ctx->sm->cur->auto_images = ctx->auto_images = !ctx->auto_images; - Sequence_changed(ctx->sm->cur); - Context_update_auto(ctx); - return 1; - } else { - return 0; - } + case BC_SWITCH: + switch (e->arg0) { + case BA_SELECTED: + if (Sequence_find(ctx->sm->cur, plugins->selected) != NULL) { + Context_remove_plugin(ctx, plugins->selected); + } else { + if (g_list_length(ctx->sm->cur->layers) < MAX_SEQ_LEN) { + Context_insert_plugin(ctx, plugins->selected); + } + } + return 1; - case BA_OSD_CMAP: - ctx->display_colormap = 1 - ctx->display_colormap; - return 1; + case BA_FULLSCREEN: + ctx->fullscreen = !ctx->fullscreen; + printf("[S] Full-screen %s\n", ctx->fullscreen ? "off" : "on"); + + for ( ; outputs != NULL; outputs = g_slist_next(outputs)) { + Plugin_t *output = (Plugin_t *)outputs->data; + + if (output->fullscreen != NULL) { + output->fullscreen(ctx->fullscreen); + } + } + return 1; - case BA_ROTATIONS: - if (Params3d_is_rotating(&ctx->params3d)) { - zero_3d(&ctx->params3d); - } else { - /* By default, rotate around the Y axis */ - ctx->params3d.rotate_factor[X_AXIS] = 0; - ctx->params3d.rotate_factor[Y_AXIS] = 1; - ctx->params3d.rotate_factor[Z_AXIS] = 0; - } - return 1; + case BA_CURSOR: + for ( ; outputs != NULL; outputs = g_slist_next(outputs)) { + Plugin_t *output = (Plugin_t *)outputs->data; + + if (output->switch_cursor != NULL) { + output->switch_cursor(); + } + } + return 1; - case BA_BYPASS: - ctx->bypass = !ctx->bypass; - return 1; + case BA_COLORMAPS: + if ((colormaps != NULL) && (colormaps->size > 1)) { + ctx->sm->cur->auto_colormaps = ctx->auto_colormaps = !ctx->auto_colormaps; + Sequence_changed(ctx->sm->cur); + Context_update_auto(ctx); + return 1; + } else { + return 0; + } -#ifdef WITH_GL - case BA_PULSE: - ctx->pulse_3d = !ctx->pulse_3d; - return 1; + case BA_IMAGES: + if ((images != NULL) && (images->size > 1)) { + ctx->sm->cur->auto_images = ctx->auto_images = !ctx->auto_images; + Sequence_changed(ctx->sm->cur); + Context_update_auto(ctx); + return 1; + } else { + return 0; + } - case BA_BOUNDARY: - ctx->force_cube = !ctx->force_cube; - return 1; -#endif + case BA_OSD_CMAP: + ctx->display_colormap = 1 - ctx->display_colormap; + return 1; + + case BA_ROTATIONS: + if (Params3d_is_rotating(&ctx->params3d)) { + zero_3d(&ctx->params3d); + } else { + /* By default, rotate around the Y axis */ + ctx->params3d.rotate_factor[X_AXIS] = 0; + ctx->params3d.rotate_factor[Y_AXIS] = 1; + ctx->params3d.rotate_factor[Z_AXIS] = 0; + } + return 1; - case BA_MUTE: - Input_toggle_mute(ctx->input); - return 1; + case BA_BYPASS: + ctx->bypass = !ctx->bypass; + return 1; - default: - return 0; - } +#ifdef WITH_GL + case BA_PULSE: + ctx->pulse_3d = !ctx->pulse_3d; + return 1; + + case BA_BOUNDARY: + ctx->force_cube = !ctx->force_cube; + return 1; +#endif - case BC_PREV: - switch (e->arg0) { - case BA_SEQUENCE: - Context_previous_sequence(ctx); - return 1; + case BA_MUTE: + Input_toggle_mute(ctx->input); + return 1; + + default: + return 0; + } + + case BC_PREV: + switch (e->arg0) { + case BA_SEQUENCE: + Context_previous_sequence(ctx); + return 1; + + case BA_RANDOM: + if (ctx->random_mode == BR_NONE) { + ctx->random_mode = BR_BOTH; + } else { + --ctx->random_mode; + } - case BA_RANDOM: - if (ctx->random_mode == BR_NONE) { - ctx->random_mode = BR_BOTH; - } else { - --ctx->random_mode; - } + if (ctx->random_mode == BR_SCHEMES) { + if ((schemes == NULL) || (!Shuffler_ok(schemes->shuffler))) { + printf("[i] Skipping random schemes since there are no schemes available\n"); + ctx->random_mode = BR_SEQUENCES; + } else { + Schemes_random(ctx); + Alarm_init(ctx->a_random); + } + } - if (ctx->random_mode == BR_SCHEMES) { - if ((schemes == NULL) || (!Shuffler_ok(schemes->shuffler))) { - printf("[i] Skipping random schemes since there are no schemes available\n"); - ctx->random_mode = BR_SEQUENCES; - } else { - Schemes_random(ctx); - Alarm_init(ctx->a_random); - } - } + if (ctx->random_mode == BR_SEQUENCES) { + if ((sequences->seqs == NULL) || !g_list_length(sequences->seqs)) { + printf("[i] Skipping random sequences since there are no sequences available\n"); + ctx->random_mode = BR_NONE; + } else { + Context_random_sequence(ctx); + Alarm_init(ctx->a_random); + } + } - if (ctx->random_mode == BR_SEQUENCES) { - if ((sequences->seqs == NULL) || !g_list_length(sequences->seqs)) { - printf("[i] Skipping random sequences since there are no sequences available\n"); - ctx->random_mode = BR_NONE; - } else { - Context_random_sequence(ctx); - Alarm_init(ctx->a_random); - } - } + Context_display_random(ctx); + return 1; - Context_display_random(ctx); - return 1; + case BA_DELAY: + if ((delay = Context_get_phase_space_delay(ctx)) > 1) { + Context_set_phase_space_delay(ctx, --delay); + printf("[i] Phase-space delay: %d\n", delay); + } + return 1; - case BA_DELAY: - if ((delay = Context_get_phase_space_delay(ctx)) > 1) { - Context_set_phase_space_delay(ctx, --delay); - printf("[i] Phase-space delay: %d\n", delay); - } - return 1; + case BA_SPAN: + if ((span = Context_get_span_size(ctx)) > 1) { + Context_set_span_size(ctx, --span); + printf("[i] Spline span size: %d\n", span); + } + return 1; - case BA_SPAN: - if ((span = Context_get_span_size(ctx)) > 1) { - Context_set_span_size(ctx, --span); - printf("[i] Spline span size: %d\n", span); + default: + return 0; } - return 1; - - default: - return 0; - } - break; - - case BC_NEXT: - switch (e->arg0) { - case BA_BOUNDARY: - ctx->params3d.draw_boundary = (ctx->params3d.draw_boundary+1) % 4; - return 1; - - case BA_SEQUENCE: - Context_next_sequence(ctx); - return 1; - - case BA_RANDOM: - ctx->random_mode = (enum RandomMode)((ctx->random_mode+1) % sizeof(RandomMode_e)); + break; - if (ctx->random_mode == BR_SEQUENCES) { - if ((sequences->seqs == NULL) || !g_list_length(sequences->seqs)) { - printf("[i] Skipping random sequences since there are no sequences available\n"); - ctx->random_mode = BR_SCHEMES; - } else { - Context_random_sequence(ctx); - Alarm_init(ctx->a_random); - } - } + case BC_NEXT: + switch (e->arg0) { + case BA_BOUNDARY: + ctx->params3d.draw_boundary = (ctx->params3d.draw_boundary+1) % 4; + return 1; + + case BA_SEQUENCE: + Context_next_sequence(ctx); + return 1; + + case BA_RANDOM: + ctx->random_mode = (enum RandomMode)((ctx->random_mode+1) % sizeof(RandomMode_e)); + + if (ctx->random_mode == BR_SEQUENCES) { + if ((sequences->seqs == NULL) || !g_list_length(sequences->seqs)) { + printf("[i] Skipping random sequences since there are no sequences available\n"); + ctx->random_mode = BR_SCHEMES; + } else { + Context_random_sequence(ctx); + Alarm_init(ctx->a_random); + } + } - if (ctx->random_mode == BR_SCHEMES) { - if ((schemes == NULL) || (!Shuffler_ok(schemes->shuffler))) { - printf("[i] Skipping random schemes since there are no schemes available\n"); - ctx->random_mode = BR_BOTH; - } else { - Schemes_random(ctx); - Alarm_init(ctx->a_random); - } - } + if (ctx->random_mode == BR_SCHEMES) { + if ((schemes == NULL) || (!Shuffler_ok(schemes->shuffler))) { + printf("[i] Skipping random schemes since there are no schemes available\n"); + ctx->random_mode = BR_BOTH; + } else { + Schemes_random(ctx); + Alarm_init(ctx->a_random); + } + } - Context_display_random(ctx); - return 1; + Context_display_random(ctx); + return 1; #ifdef WITH_WEBCAM - case BA_WEBCAM: - if (ctx->webcams) { - ctx->cam = (ctx->cam + 1) % ctx->webcams; - } else { - printf("[i] No webcams in use\n"); - } - return 1; + case BA_WEBCAM: + if (ctx->webcams) { + ctx->cam = (ctx->cam + 1) % ctx->webcams; + } else { + printf("[i] No webcams in use\n"); + } + return 1; #endif - case BA_DELAY: - if ((delay = Context_get_phase_space_delay(ctx)) < 255) { - Context_set_phase_space_delay(ctx, ++delay); - printf("[i] Phase-space delay: %d\n", delay); - } - return 1; + case BA_DELAY: + if ((delay = Context_get_phase_space_delay(ctx)) < 255) { + Context_set_phase_space_delay(ctx, ++delay); + printf("[i] Phase-space delay: %d\n", delay); + } + return 1; - case BA_SPAN: - if ((span = Context_get_span_size(ctx)) < 50) { - Context_set_span_size(ctx, ++span); - printf("[i] Spline span size: %d\n", span); - } - return 1; + case BA_SPAN: + if ((span = Context_get_span_size(ctx)) < 50) { + Context_set_span_size(ctx, ++span); + printf("[i] Spline span size: %d\n", span); + } + return 1; - default: - return 0; - } - break; - - case BC_RANDOM: - switch (e->arg0) { - case BA_SEQUENCE: - assert(sequences != NULL); - - if (sequences->size > 1) { - Context_random_sequence(ctx); - Alarm_init(ctx->a_random); + default: + return 0; } - return 1; + break; - case BA_SCHEME: - if ((schemes != NULL) && (schemes->size > 1)) { - Schemes_random(ctx); - Alarm_init(ctx->a_random); - } - return 1; + case BC_RANDOM: + switch (e->arg0) { + case BA_SEQUENCE: + assert(sequences != NULL); + + if (sequences->size > 1) { + Context_random_sequence(ctx); + Alarm_init(ctx->a_random); + } + return 1; - case BA_ROTATIONS: - printf("[i] Randomizing rotations\n"); - Params3d_randomize(&ctx->params3d); - return 1; + case BA_SCHEME: + if ((schemes != NULL) && (schemes->size > 1)) { + Schemes_random(ctx); + Alarm_init(ctx->a_random); + } + return 1; - default: - return 0; - } - break; - - case BC_RESET: - switch (e->arg0) { - case BA_RANDOM: - Buffer8_randomize(active_buffer(ctx)); - return 1; + case BA_ROTATIONS: + printf("[i] Randomizing rotations\n"); + Params3d_randomize(&ctx->params3d); + return 1; - case BA_SEQUENCE: - Buffer8_clear(active_buffer(ctx)); - return 1; + default: + return 0; + } + break; - case BA_NONE: - printf("[!] *** EMERGENCY STOP *** button pressed !!!\n"); - /* Emergency stop, all auto_* modes -> disabled */ - ctx->auto_colormaps = ctx->auto_images = 0; - ctx->sm->cur->auto_colormaps = ctx->sm->cur->auto_images = -1; - Context_update_auto(ctx); - Sequence_changed(ctx->sm->cur); - ctx->random_mode = BR_NONE; - ctx->locked = NULL; - - /* Stop and reset 3D rotations, remove boundary */ - zero_3d(&ctx->params3d); - ctx->params3d.draw_boundary = 0; - return 1; + case BC_RESET: + switch (e->arg0) { + case BA_RANDOM: + Buffer8_randomize(active_buffer(ctx)); + return 1; + + case BA_SEQUENCE: + Buffer8_clear(active_buffer(ctx)); + return 1; + + case BA_NONE: + printf("[!] *** EMERGENCY STOP *** button pressed !!!\n"); + /* Emergency stop, all auto_* modes -> disabled */ + ctx->auto_colormaps = ctx->auto_images = 0; + ctx->sm->cur->auto_colormaps = ctx->sm->cur->auto_images = -1; + Context_update_auto(ctx); + Sequence_changed(ctx->sm->cur); + ctx->random_mode = BR_NONE; + ctx->locked = NULL; - default: - return 0; - } + /* Stop and reset 3D rotations, remove boundary */ + zero_3d(&ctx->params3d); + ctx->params3d.draw_boundary = 0; + return 1; + + default: + return 0; + } + + case BC_USE_BANK: + switch (ctx->bank_mode) { + case SEQUENCES: + Context_use_sequence_bank(ctx, e->arg0); + return 1; + + case COLORMAPS: { + uint32_t id = ctx->banks[COLORMAPS][ctx->bankset[COLORMAPS]][e->arg0]; + if (id) { + printf("[i] Using colormap in bank #%d\n", (e->arg0+1)); + ctx->sm->next->cmap_id = id; + ctx->bank[COLORMAPS] = e->arg0; + Context_set_colormap(ctx); + } + } + return 1; - case BC_USE_BANK: - switch (ctx->bank_mode) { - case SEQUENCES: - Context_use_sequence_bank(ctx, e->arg0); - return 1; + case IMAGES: { + uint32_t id = ctx->banks[IMAGES][ctx->bankset[IMAGES]][e->arg0]; + if (id) { + printf("[i] Using image in bank #%d\n", (e->arg0+1)); + ctx->sm->next->image_id = id; + ctx->bank[IMAGES] = e->arg0; + Context_set_image(ctx); + } + } + return 1; - case COLORMAPS: { - uint32_t id = ctx->banks[COLORMAPS][ctx->bankset[COLORMAPS]][e->arg0]; - if (id) { - printf("[i] Using colormap in bank #%d\n", (e->arg0+1)); - ctx->sm->next->cmap_id = id; - ctx->bank[COLORMAPS] = e->arg0; - Context_set_colormap(ctx); - } - } - return 1; - - case IMAGES: { - uint32_t id = ctx->banks[IMAGES][ctx->bankset[IMAGES]][e->arg0]; - if (id) { - printf("[i] Using image in bank #%d\n", (e->arg0+1)); - ctx->sm->next->image_id = id; - ctx->bank[IMAGES] = e->arg0; - Context_set_image(ctx); + default: + return 0; } - } - return 1; - default: - return 0; - } - - case BC_CLEAR_BANK: - printf("[i] Clear sequence/colormap/image in bank #%d\n", (e->arg0+1)); - Context_clear_bank(ctx, e->arg0); - return 1; - - case BC_RELOAD: - if (e->arg0 == BA_SEQUENCE) { - Context_latest_sequence(ctx); + case BC_CLEAR_BANK: + printf("[i] Clear sequence/colormap/image in bank #%d\n", (e->arg0+1)); + Context_clear_bank(ctx, e->arg0); return 1; - } else { - return 0; - } + + case BC_RELOAD: + if (e->arg0 == BA_SEQUENCE) { + Context_latest_sequence(ctx); + return 1; + } else { + return 0; + } #ifdef WITH_WEBCAM - case BC_SET: - if (e->arg0 == BA_WEBCAM) { - if (ctx->webcams) { - pthread_mutex_lock(&ctx->cam_mtx[ctx->cam]); - Buffer8_copy(ctx->cam_save[ctx->cam][0], ctx->cam_ref[ctx->cam]); - pthread_mutex_unlock(&ctx->cam_mtx[ctx->cam]); + case BC_SET: + if (e->arg0 == BA_WEBCAM) { + if (ctx->webcams) { + pthread_mutex_lock(&ctx->cam_mtx[ctx->cam]); + Buffer8_copy(ctx->cam_save[ctx->cam][0], ctx->cam_ref[ctx->cam]); + pthread_mutex_unlock(&ctx->cam_mtx[ctx->cam]); + } else { + printf("[i] No webcams in use\n"); + } + return 1; } else { - printf("[i] No webcams in use\n"); + return 0; } - return 1; - } else { - return 0; - } #endif - case BC_STORE_BANK: - printf("[i] Storing sequence/colormap/image in bank #%d\n", e->arg0+1); - Context_store_bank(ctx, e->arg0); - return 1; - - case BC_USE_BANKSET: - printf("[i] Using bankset %d\n", (e->arg0+1)); - Context_use_bankset(ctx, e->arg0); - return 1; - - case BC_SAVE_BANKS: - printf("[i] Writing banks file\n"); - Context_save_banks(ctx); - return 1; - - case BC_SET_BANKMODE: - printf("[i] Set bank mode to "); - switch (e->arg0) { - case SEQUENCES: - printf("sequences"); - break; - case COLORMAPS: - printf("colormaps"); - break; - case IMAGES: - printf("images"); - break; - default: - xerror("Invalid bank mode %d\n", e->arg0); - break; - } - printf("\n"); - ctx->bank_mode = e->arg0; - return 1; - - case BC_LOCK: - if (e->arg0 == BA_SELECTED) { - if (*plugins->selected->options & BEQ_NORANDOM) { - printf("[!] Can not lock plugin '%s' (%s) [BEQ_NORANDOM]\n", plugins->selected->name, plugins->selected->dname); - } else { + case BC_STORE_BANK: + printf("[i] Storing sequence/colormap/image in bank #%d\n", e->arg0+1); + Context_store_bank(ctx, e->arg0); + return 1; + + case BC_USE_BANKSET: + printf("[i] Using bankset %d\n", (e->arg0+1)); + Context_use_bankset(ctx, e->arg0); + return 1; + + case BC_SAVE_BANKS: + printf("[i] Writing banks file\n"); + Context_save_banks(ctx); + return 1; + + case BC_SET_BANKMODE: + printf("[i] Set bank mode to "); + switch (e->arg0) { + case SEQUENCES: + printf("sequences"); + break; + case COLORMAPS: + printf("colormaps"); + break; + case IMAGES: + printf("images"); + break; + default: + xerror("Invalid bank mode %d\n", e->arg0); + break; + } + printf("\n"); + ctx->bank_mode = e->arg0; + return 1; + + case BC_LOCK: + if (e->arg0 == BA_SELECTED) { if (ctx->locked != plugins->selected) { ctx->locked = plugins->selected; printf("[i] Lock plugin '%s' (%s)\n", ctx->locked->name, plugins->selected->dname); @@ -504,25 +499,24 @@ printf("[i] Unlock plugin '%s' (%s)\n", ctx->locked->name, plugins->selected->dname); ctx->locked = NULL; } + return 1; + } else { + return 0; + } + + case BC_VOLUME_SCALE: + if (e->arg0 == BA_UP) { + Input_volume_upscale(ctx->input); + return 1; + } else if (e->arg0 == BA_DOWN) { + Input_volume_downscale(ctx->input); + return 1; + } else { + return 0; } - return 1; - } else { - return 0; - } - - case BC_VOLUME_SCALE: - if (e->arg0 == BA_UP) { - Input_volume_upscale(ctx->input); - return 1; - } else if (e->arg0 == BA_DOWN) { - Input_volume_downscale(ctx->input); - return 1; - } else { - return 0; - } - default: - break; + default: + break; } return 0; diff -Nru lebiniou-3.31/src/context_export.c lebiniou-3.40/src/context_export.c --- lebiniou-3.31/src/context_export.c 2019-04-05 20:39:15.000000000 +0000 +++ lebiniou-3.40/src/context_export.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * diff -Nru lebiniou-3.31/src/context_gl.c lebiniou-3.40/src/context_gl.c --- lebiniou-3.31/src/context_gl.c 2019-04-05 20:39:15.000000000 +0000 +++ lebiniou-3.40/src/context_gl.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * diff -Nru lebiniou-3.31/src/context.h lebiniou-3.40/src/context.h --- lebiniou-3.31/src/context.h 2019-04-09 12:40:03.000000000 +0000 +++ lebiniou-3.40/src/context.h 2020-01-23 13:56:18.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -32,8 +32,11 @@ #include "alarm.h" #include "brandom.h" #include "buffer_RGBA.h" +#ifdef WITH_ULFIUS +#include "bulfius.h" +#endif -#define NFPS 25 /* to get mean fps */ +#define NFPS 25 /* to get mean fps */ enum RandomMode { BR_NONE=0, BR_SEQUENCES, BR_SCHEMES, BR_BOTH } RandomMode_e; @@ -57,7 +60,7 @@ #define NSCREENS 3 #endif -#define MAX_CAMS 2 +#define MAX_CAMS 6 /* store the last N frames from the webcam -same as EffectTV */ #define CAM_SAVE 32 @@ -129,6 +132,7 @@ int fps[NFPS]; BTimer_t *fps_timer; + uint8_t window_decorations:1; u_char fullscreen:1; u_char display_colormap:1; u_char take_screenshot:1; @@ -162,6 +166,14 @@ char auto_colormaps; char auto_images; + + /* used to randomly mix buffers */ + Buffer8_t *random; + + /* ulfius */ +#ifdef WITH_ULFIUS + struct _u_instance instance; +#endif } Context_t; @@ -175,7 +187,7 @@ void Context_update(Context_t *); void Context_update_auto(Context_t *); -int Context_add_rand(Sequence_t *, const enum PluginOptions, const int); +int Context_add_rand(Sequence_t *, const enum PluginOptions, const int, const Plugin_t *); void Context_randomize(Context_t *); void Context_set_max_fps(Context_t *, const u_short); @@ -258,7 +270,6 @@ void Context_make_GL_gray_texture(Context_t *ctx, const u_char); #endif -void Context_set_delay(const enum RandomDelays, const int, const int); void Context_set_shuffler_mode(const enum RandomDelays, const enum ShufflerMode); enum ShufflerMode Context_get_shuffler_mode(const enum RandomDelays); @@ -277,4 +288,11 @@ void Context_set_volume_scale(Context_t *, const double); double Context_get_volume_scale(const Context_t *); +void Context_mix_buffers(const Context_t *, Buffer8_t *[2]); + +#ifdef WITH_ULFIUS +void Context_start_ulfius(Context_t *); +void Context_stop_ulfius(Context_t *); +#endif + #endif /* __BINIOU_CONTEXT_H */ diff -Nru lebiniou-3.31/src/context_run.c lebiniou-3.40/src/context_run.c --- lebiniou-3.31/src/context_run.c 2019-04-09 12:40:03.000000000 +0000 +++ lebiniou-3.40/src/context_run.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -34,20 +34,20 @@ Context_boundary(Context_t *ctx) { switch (ctx->params3d.draw_boundary) { - case 1: - draw_cube_3d(&ctx->params3d, active_buffer(ctx), 250); - break; - - case 2: - draw_sphere_3d(&ctx->params3d, active_buffer(ctx), 250); - break; - - case 3: - draw_sphere_wireframe_3d(&ctx->params3d, active_buffer(ctx), 250); - break; + case 1: + draw_cube_3d(&ctx->params3d, active_buffer(ctx), 250); + break; + + case 2: + draw_sphere_3d(&ctx->params3d, active_buffer(ctx), 250); + break; - default: - break; + case 3: + draw_sphere_wireframe_3d(&ctx->params3d, active_buffer(ctx), 250); + break; + + default: + break; } } @@ -93,7 +93,7 @@ push_buffer(ctx); } - if ((P->run != NULL) && !(*P->options & BEQ_DISABLED)) + if (P->run != NULL) if (!ctx->bypass || (ctx->bypass && !(*P->options & BEQ_MUTE_CAM))) { P->run(ctx); P->calls++; @@ -101,32 +101,34 @@ } switch (layer->mode) { - case NONE: - break; - - case NORMAL: - swap_buffers(ctx); - break; - - case OVERLAY: - Buffer8_overlay(active_buffer(ctx), passive_buffer(ctx)); - break; - - case XOR: - Buffer8_XOR(active_buffer(ctx), passive_buffer(ctx)); - break; + case NONE: + break; - case AVERAGE: - Buffer8_average(active_buffer(ctx), passive_buffer(ctx)); - break; - - case RANDOM: - Buffer8_mix_random(active_buffer(ctx), passive_buffer(ctx)); + case NORMAL: + swap_buffers(ctx); + break; + + case OVERLAY: + Buffer8_overlay(active_buffer(ctx), passive_buffer(ctx)); + break; + + case XOR: + Buffer8_XOR(active_buffer(ctx), passive_buffer(ctx)); + break; + + case AVERAGE: + Buffer8_average(active_buffer(ctx), passive_buffer(ctx)); + break; + + case RANDOM: { + Buffer8_t *buffs[2] = { active_buffer(ctx), passive_buffer(ctx) }; + Context_mix_buffers(ctx, buffs); + } break; - default: - xerror("Unsupported layer mode %d\n", layer->mode); - break; + default: + xerror("Unsupported layer mode %d\n", layer->mode); + break; } tmp = g_list_next(tmp); @@ -176,8 +178,7 @@ } /* Auto-change image */ - /* Only if there are more than one image loaded */ - if ((images != NULL) && (images->size > 1)) { + if (ctx->imgf != NULL) { /* Timer elapsed ? */ if (ctx->imgf->on && Alarm_ring(ctx->a_images)) { ImageFader_random(ctx->imgf); @@ -190,18 +191,14 @@ } /* Auto-change colormap */ - assert(colormaps != NULL); - /* Only if there are more than one colormap loaded */ - if (colormaps->size > 1) { - /* Timer elapsed ? */ - if (ctx->cf->on && Alarm_ring(ctx->a_cmaps)) { - CmapFader_random(ctx->cf); - } - /* Fade colormap */ - if (CmapFader_ring(ctx->cf)) { - CmapFader_run(ctx->cf); - ctx->sm->cur->cmap_id = ctx->cf->dst->id; - } + /* Timer elapsed ? */ + if (ctx->cf->on && Alarm_ring(ctx->a_cmaps)) { + CmapFader_random(ctx->cf); + } + /* Fade colormap */ + if (CmapFader_ring(ctx->cf)) { + CmapFader_run(ctx->cf); + ctx->sm->cur->cmap_id = ctx->cf->dst->id; } #ifdef WITH_WEBCAM diff -Nru lebiniou-3.31/src/defaults.h.in lebiniou-3.40/src/defaults.h.in --- lebiniou-3.31/src/defaults.h.in 2019-02-02 00:30:11.000000000 +0000 +++ lebiniou-3.40/src/defaults.h.in 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * diff -Nru lebiniou-3.31/src/event_enums.cmd lebiniou-3.40/src/event_enums.cmd --- lebiniou-3.31/src/event_enums.cmd 2019-02-06 14:36:27.000000000 +0000 +++ lebiniou-3.40/src/event_enums.cmd 2020-01-22 18:33:57.000000000 +0000 @@ -20,3 +20,9 @@ BC_LAST BC_LOCK BC_VOLUME_SCALE +BC_PARAM_PREV +BC_PARAM_NEXT +BC_PARAM_DEC +BC_PARAM_INC +BC_PARAM_DEC_FAST +BC_PARAM_INC_FAST diff -Nru lebiniou-3.31/src/event_enums.h lebiniou-3.40/src/event_enums.h --- lebiniou-3.31/src/event_enums.h 2019-04-14 11:52:41.000000000 +0000 +++ lebiniou-3.40/src/event_enums.h 2020-01-23 13:57:43.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -58,6 +58,12 @@ BC_LAST, BC_LOCK, BC_VOLUME_SCALE, + BC_PARAM_PREV, + BC_PARAM_NEXT, + BC_PARAM_DEC, + BC_PARAM_INC, + BC_PARAM_DEC_FAST, + BC_PARAM_INC_FAST, }; enum Arg { diff -Nru lebiniou-3.31/src/event_enums.h.head lebiniou-3.40/src/event_enums.h.head --- lebiniou-3.31/src/event_enums.h.head 2019-02-02 00:30:11.000000000 +0000 +++ lebiniou-3.40/src/event_enums.h.head 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * diff -Nru lebiniou-3.31/src/event.h lebiniou-3.40/src/event.h --- lebiniou-3.31/src/event.h 2019-02-02 00:30:11.000000000 +0000 +++ lebiniou-3.40/src/event.h 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * diff -Nru lebiniou-3.31/src/events.c lebiniou-3.40/src/events.c --- lebiniou-3.31/src/events.c 1970-01-01 00:00:00.000000000 +0000 +++ lebiniou-3.40/src/events.c 2020-01-23 13:57:43.000000000 +0000 @@ -0,0 +1,732 @@ +/* + * Copyright 1994-2020 Olivier Girondel + * + * This file is part of lebiniou. + * + * lebiniou 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 of the License, or + * (at your option) any later version. + * + * lebiniou 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 lebiniou. If not, see . + */ + +#include "events.h" + +/* + * Automagically generated from events.c.in + * DO NOT EDIT !!! + */ + +void +on_key(Context_t *ctx, const BKey_t *k) +{ + + /* =============== Context =============== */ + + /* [Alt-Shift-r] - Toggle 3D random rotations */ + if (BALTSHIFT(k, SDLK_r)) { + Context_send_event(ctx, BT_CONTEXT, BC_RANDOM, BA_ROTATIONS); + return; + } + + /* [Alt-b] - Next 3D boundary */ + if (BALT(k, SDLK_b)) { + Context_send_event(ctx, BT_CONTEXT, BC_NEXT, BA_BOUNDARY); + return; + } + + /* [Alt-r] - Toggle 3D auto rotations */ + if (BALT(k, SDLK_r)) { + Context_send_event(ctx, BT_CONTEXT, BC_SWITCH, BA_ROTATIONS); + return; + } + + /* [Alt-c] - Display current colormap */ + if (BALT(k, SDLK_c)) { + Context_send_event(ctx, BT_CONTEXT, BC_SWITCH, BA_OSD_CMAP); + return; + } + + /* [Ctrl-f] - Toggle full-screen on/off */ + if (BCTRL(k, SDLK_f)) { + Context_send_event(ctx, BT_CONTEXT, BC_SWITCH, BA_FULLSCREEN); + return; + } + + /* [Alt-m] - Show/hide mouse cursor */ + if (BALT(k, SDLK_m)) { + Context_send_event(ctx, BT_CONTEXT, BC_SWITCH, BA_CURSOR); + return; + } + + /* [Shift-d] - Increase phase-space delay */ + if (BSHIFT(k, SDLK_d)) { + Context_send_event(ctx, BT_CONTEXT, BC_NEXT, BA_DELAY); + return; + } + + /* [Alt-d] - Decrease phase-space delay */ + if (BALT(k, SDLK_d)) { + Context_send_event(ctx, BT_CONTEXT, BC_PREV, BA_DELAY); + return; + } + + /* [Shift-q] - Quit */ + if (BSHIFT(k, SDLK_q)) { + Context_send_event(ctx, BT_CONTEXT, BC_QUIT, BA_NONE); + return; + } + + /* [Shift-x] - Save the current sequence then exit */ + if (BSHIFT(k, SDLK_x)) { + Context_send_event(ctx, BT_CONTEXT, BC_QUIT, BA_SAVE); + return; + } + + /* [Shift-n] - Fill current frame with random pixels */ + if (BSHIFT(k, SDLK_n)) { + Context_send_event(ctx, BT_CONTEXT, BC_RESET, BA_RANDOM); + return; + } + + /* [n] - Clear the current frame */ + if (BKEY(k, SDLK_n)) { + Context_send_event(ctx, BT_CONTEXT, BC_RESET, BA_SEQUENCE); + return; + } + + /* [ESCAPE] - Turn off all auto changes */ + if (BKEY(k, SDLK_ESCAPE)) { + Context_send_event(ctx, BT_CONTEXT, BC_RESET, BA_NONE); + return; + } + + /* [RETURN] - Toggle selected plugin on/off */ + if (BKEY(k, SDLK_RETURN)) { + Context_send_event(ctx, BT_CONTEXT, BC_SWITCH, BA_SELECTED); + return; + } + + /* [Shift-RIGHT] - Use previous sequence */ + if (BSHIFT(k, SDLK_RIGHT)) { + Context_send_event(ctx, BT_CONTEXT, BC_PREV, BA_SEQUENCE); + return; + } + + /* [Shift-LEFT] - Use next sequence */ + if (BSHIFT(k, SDLK_LEFT)) { + Context_send_event(ctx, BT_CONTEXT, BC_NEXT, BA_SEQUENCE); + return; + } + + /* [Shift-PRINTSCREEN] - Take a screenshot */ + if (BSHIFT(k, SDLK_PRINTSCREEN)) { + Context_send_event(ctx, BT_CONTEXT, BC_SAVE, BA_SCREENSHOT); + return; + } + + /* [Ctrl-BACKSPACE] - Make a sequence from system schemes */ + if (BCTRL(k, SDLK_BACKSPACE)) { + Context_send_event(ctx, BT_CONTEXT, BC_RANDOM, BA_SCHEME); + return; + } + + /* [BACKSPACE] - Select a random user sequence */ + if (BKEY(k, SDLK_BACKSPACE)) { + Context_send_event(ctx, BT_CONTEXT, BC_RANDOM, BA_SEQUENCE); + return; + } + + /* [Ctrl-m] - Next random mode */ + if (BCTRL(k, SDLK_m)) { + Context_send_event(ctx, BT_CONTEXT, BC_NEXT, BA_RANDOM); + return; + } + + /* [Shift-m] - Previous random mode */ + if (BSHIFT(k, SDLK_m)) { + Context_send_event(ctx, BT_CONTEXT, BC_PREV, BA_RANDOM); + return; + } + + /* [Ctrl-t] - Auto colormaps on/off */ + if (BCTRL(k, SDLK_t)) { + Context_send_event(ctx, BT_CONTEXT, BC_SWITCH, BA_COLORMAPS); + return; + } + + /* [Ctrl-i] - Auto images on/off */ + if (BCTRL(k, SDLK_i)) { + Context_send_event(ctx, BT_CONTEXT, BC_SWITCH, BA_IMAGES); + return; + } + + /* [Ctrl-p] - Use the most recent sequence */ + if (BCTRL(k, SDLK_p)) { + Context_send_event(ctx, BT_CONTEXT, BC_RELOAD, BA_SEQUENCE); + return; + } + + /* [SPACE] - Bypass mode on/off */ + if (BKEY(k, SDLK_SPACE)) { + Context_send_event(ctx, BT_CONTEXT, BC_SWITCH, BA_BYPASS); + return; + } + + /* [Ctrl-SPACE] - Set webcam reference image */ + if (BCTRL(k, SDLK_SPACE)) { + Context_send_event(ctx, BT_CONTEXT, BC_SET, BA_WEBCAM); + return; + } + + /* [Ctrl-v] - Switch 3d cube on/off */ + if (BCTRL(k, SDLK_v)) { + Context_send_event(ctx, BT_CONTEXT, BC_SWITCH, BA_BOUNDARY); + return; + } + + /* [Ctrl-c] - Toggle 3D world pulse on/off */ + if (BCTRL(k, SDLK_c)) { + Context_send_event(ctx, BT_CONTEXT, BC_SWITCH, BA_PULSE); + return; + } + + /* [TAB] - Select next webcam */ + if (BKEY(k, SDLK_TAB)) { + Context_send_event(ctx, BT_CONTEXT, BC_NEXT, BA_WEBCAM); + return; + } + + /* [Ctrl-l] - Lock selected plugin */ + if (BCTRL(k, SDLK_l)) { + Context_send_event(ctx, BT_CONTEXT, BC_LOCK, BA_SELECTED); + return; + } + + /* [Shift-s] - Increase spline span size */ + if (BSHIFT(k, SDLK_s)) { + Context_send_event(ctx, BT_CONTEXT, BC_NEXT, BA_SPAN); + return; + } + + /* [Alt-s] - Decrease spline span size */ + if (BALT(k, SDLK_s)) { + Context_send_event(ctx, BT_CONTEXT, BC_PREV, BA_SPAN); + return; + } + + /* [Ctrl-TAB] - Freeze sound on/off */ + if (BCTRL(k, SDLK_TAB)) { + Context_send_event(ctx, BT_CONTEXT, BC_SWITCH, BA_MUTE); + return; + } + + /* [Shift-v] - Scale volume up */ + if (BSHIFT(k, SDLK_v)) { + Context_send_event(ctx, BT_CONTEXT, BC_VOLUME_SCALE, BA_UP); + return; + } + + /* [Alt-v] - Scale volume down */ + if (BALT(k, SDLK_v)) { + Context_send_event(ctx, BT_CONTEXT, BC_VOLUME_SCALE, BA_DOWN); + return; + } + + /* =============== Plugins =============== */ + + /* [UP] - Select previous plugin */ + if (BKEY(k, SDLK_UP)) { + Context_send_event(ctx, BT_PLUGINS, BC_PREV, BA_NONE); + return; + } + + /* [DOWN] - Select next plugin */ + if (BKEY(k, SDLK_DOWN)) { + Context_send_event(ctx, BT_PLUGINS, BC_NEXT, BA_NONE); + return; + } + + /* [PAGEUP] - Scroll up in the plugins list */ + if (BKEY(k, SDLK_PAGEUP)) { + Context_send_event(ctx, BT_PLUGINS, BC_SELECT, BA_UP); + return; + } + + /* [PAGEDOWN] - Scroll down in the plugins list */ + if (BKEY(k, SDLK_PAGEDOWN)) { + Context_send_event(ctx, BT_PLUGINS, BC_SELECT, BA_DOWN); + return; + } + + /* =============== Sequence =============== */ + + /* [Shift-z] - Reset the current sequence */ + if (BSHIFT(k, SDLK_z)) { + Context_send_event(ctx, BT_SEQMGR, BC_RESET, BA_SEQUENCE); + return; + } + + /* [Shift-l] - Toggle selected plugin as a lens on/off */ + if (BSHIFT(k, SDLK_l)) { + Context_send_event(ctx, BT_SEQMGR, BC_SWITCH, BA_LENS); + return; + } + + /* [Shift-UP] - Select previous plugin in the sequence */ + if (BSHIFT(k, SDLK_UP)) { + Context_send_event(ctx, BT_SEQMGR, BC_PREV, BA_NONE); + return; + } + + /* [Shift-DOWN] - Select next plugin in the sequence */ + if (BSHIFT(k, SDLK_DOWN)) { + Context_send_event(ctx, BT_SEQMGR, BC_NEXT, BA_NONE); + return; + } + + /* [Ctrl-UP] - Move selected plugin up in the sequence */ + if (BCTRL(k, SDLK_UP)) { + Context_send_event(ctx, BT_SEQMGR, BC_MOVE, BA_UP); + return; + } + + /* [Ctrl-DOWN] - Move selected plugin down in the sequence */ + if (BCTRL(k, SDLK_DOWN)) { + Context_send_event(ctx, BT_SEQMGR, BC_MOVE, BA_DOWN); + return; + } + + /* [Alt-y] - Select default layer mode for the current plugin */ + if (BALT(k, SDLK_y)) { + Context_send_event(ctx, BT_SEQMGR, BC_RESET, BA_LAYER_MODE); + return; + } + + /* [Shift-y] - Select next layer mode */ + if (BSHIFT(k, SDLK_y)) { + Context_send_event(ctx, BT_SEQMGR, BC_NEXT, BA_LAYER_MODE); + return; + } + + /* [Ctrl-s] - Save current sequence as new (full) */ + if (BCTRL(k, SDLK_s)) { + Context_send_event(ctx, BT_SEQMGR, BC_SAVE, BA_SEQUENCE_FULL); + return; + } + + /* [Ctrl-u] - Update current full sequence */ + if (BCTRL(k, SDLK_u)) { + Context_send_event(ctx, BT_SEQMGR, BC_SAVE, BA_OVERWRITE_FULL); + return; + } + + /* [Ctrl-Shift-s] - Save current sequence as new (bare) */ + if (BCTRLSHIFT(k, SDLK_s)) { + Context_send_event(ctx, BT_SEQMGR, BC_SAVE, BA_SEQUENCE_BARE); + return; + } + + /* [Ctrl-Shift-u] - Update current bare sequence */ + if (BCTRLSHIFT(k, SDLK_u)) { + Context_send_event(ctx, BT_SEQMGR, BC_SAVE, BA_OVERWRITE_BARE); + return; + } + + /* [Alt-UP] - Select previous plugin parameter */ + if (BALT(k, SDLK_UP)) { + Context_send_event(ctx, BT_SEQMGR, BC_PARAM_PREV, BA_NONE); + return; + } + + /* [Alt-DOWN] - Select next plugin parameter */ + if (BALT(k, SDLK_DOWN)) { + Context_send_event(ctx, BT_SEQMGR, BC_PARAM_NEXT, BA_NONE); + return; + } + + /* [Alt-LEFT] - Decrease plugin parameter value */ + if (BALT(k, SDLK_LEFT)) { + Context_send_event(ctx, BT_SEQMGR, BC_PARAM_DEC, BA_NONE); + return; + } + + /* [Alt-RIGHT] - Increase plugin parameter value */ + if (BALT(k, SDLK_RIGHT)) { + Context_send_event(ctx, BT_SEQMGR, BC_PARAM_INC, BA_NONE); + return; + } + + /* [Alt-Shift-LEFT] - Decrease plugin parameter value quickly */ + if (BALTSHIFT(k, SDLK_LEFT)) { + Context_send_event(ctx, BT_SEQMGR, BC_PARAM_DEC_FAST, BA_NONE); + return; + } + + /* [Alt-Shift-RIGHT] - Increase plugin parameter value quickly */ + if (BALTSHIFT(k, SDLK_RIGHT)) { + Context_send_event(ctx, BT_SEQMGR, BC_PARAM_INC_FAST, BA_NONE); + return; + } + + /* =============== Colormaps =============== */ + + /* [e] - Select previous colormap */ + if (BKEY(k, SDLK_e)) { + Context_send_event(ctx, BT_CMAPFADER, BC_SELECT, BA_PREV); + return; + } + + /* [r] - Select next colormap */ + if (BKEY(k, SDLK_r)) { + Context_send_event(ctx, BT_CMAPFADER, BC_SELECT, BA_NEXT); + return; + } + + /* [t] - Select random colormap */ + if (BKEY(k, SDLK_t)) { + Context_send_event(ctx, BT_CMAPFADER, BC_SELECT, BA_RANDOM); + return; + } + + /* =============== Images =============== */ + + /* [y] - Select previous image */ + if (BKEY(k, SDLK_y)) { + Context_send_event(ctx, BT_IMAGEFADER, BC_SELECT, BA_PREV); + return; + } + + /* [u] - Select next image */ + if (BKEY(k, SDLK_u)) { + Context_send_event(ctx, BT_IMAGEFADER, BC_SELECT, BA_NEXT); + return; + } + + /* [i] - Select random image */ + if (BKEY(k, SDLK_i)) { + Context_send_event(ctx, BT_IMAGEFADER, BC_SELECT, BA_RANDOM); + return; + } + + /* =============== Banks =============== */ + + /* [Ctrl-g] - Set bank mode to sequences */ + if (BCTRL(k, SDLK_g)) { + Context_send_event(ctx, BT_CONTEXT, BC_SET_BANKMODE, 0); + return; + } + + /* [Ctrl-h] - Set bank mode to colormaps */ + if (BCTRL(k, SDLK_h)) { + Context_send_event(ctx, BT_CONTEXT, BC_SET_BANKMODE, 1); + return; + } + + /* [Ctrl-j] - Set bank mode to images */ + if (BCTRL(k, SDLK_j)) { + Context_send_event(ctx, BT_CONTEXT, BC_SET_BANKMODE, 2); + return; + } + + /* [Ctrl-Shift-F1] - Clear bank 1 */ + if (BCTRLSHIFT(k, SDLK_F1)) { + Context_send_event(ctx, BT_CONTEXT, BC_CLEAR_BANK, 0); + return; + } + + /* [Ctrl-Shift-F2] - Clear bank 2 */ + if (BCTRLSHIFT(k, SDLK_F2)) { + Context_send_event(ctx, BT_CONTEXT, BC_CLEAR_BANK, 1); + return; + } + + /* [Ctrl-Shift-F3] - Clear bank 3 */ + if (BCTRLSHIFT(k, SDLK_F3)) { + Context_send_event(ctx, BT_CONTEXT, BC_CLEAR_BANK, 2); + return; + } + + /* [Ctrl-Shift-F4] - Clear bank 4 */ + if (BCTRLSHIFT(k, SDLK_F4)) { + Context_send_event(ctx, BT_CONTEXT, BC_CLEAR_BANK, 3); + return; + } + + /* [Ctrl-Shift-F5] - Clear bank 5 */ + if (BCTRLSHIFT(k, SDLK_F5)) { + Context_send_event(ctx, BT_CONTEXT, BC_CLEAR_BANK, 4); + return; + } + + /* [Ctrl-Shift-F6] - Clear bank 6 */ + if (BCTRLSHIFT(k, SDLK_F6)) { + Context_send_event(ctx, BT_CONTEXT, BC_CLEAR_BANK, 5); + return; + } + + /* [Ctrl-Shift-F7] - Clear bank 7 */ + if (BCTRLSHIFT(k, SDLK_F7)) { + Context_send_event(ctx, BT_CONTEXT, BC_CLEAR_BANK, 6); + return; + } + + /* [Ctrl-Shift-F8] - Clear bank 8 */ + if (BCTRLSHIFT(k, SDLK_F8)) { + Context_send_event(ctx, BT_CONTEXT, BC_CLEAR_BANK, 7); + return; + } + + /* [Ctrl-Shift-F9] - Clear bank 9 */ + if (BCTRLSHIFT(k, SDLK_F9)) { + Context_send_event(ctx, BT_CONTEXT, BC_CLEAR_BANK, 8); + return; + } + + /* [Ctrl-Shift-F10] - Clear bank 10 */ + if (BCTRLSHIFT(k, SDLK_F10)) { + Context_send_event(ctx, BT_CONTEXT, BC_CLEAR_BANK, 9); + return; + } + + /* [Ctrl-Shift-F11] - Clear bank 11 */ + if (BCTRLSHIFT(k, SDLK_F11)) { + Context_send_event(ctx, BT_CONTEXT, BC_CLEAR_BANK, 10); + return; + } + + /* [Ctrl-Shift-F12] - Clear bank 12 */ + if (BCTRLSHIFT(k, SDLK_F12)) { + Context_send_event(ctx, BT_CONTEXT, BC_CLEAR_BANK, 11); + return; + } + + /* [Shift-F1] - Assign current sequence/colormap/image to bank 1 */ + if (BSHIFT(k, SDLK_F1)) { + Context_send_event(ctx, BT_CONTEXT, BC_STORE_BANK, 0); + return; + } + + /* [Shift-F2] - Assign current sequence/colormap/image to bank 2 */ + if (BSHIFT(k, SDLK_F2)) { + Context_send_event(ctx, BT_CONTEXT, BC_STORE_BANK, 1); + return; + } + + /* [Shift-F3] - Assign current sequence/colormap/image to bank 3 */ + if (BSHIFT(k, SDLK_F3)) { + Context_send_event(ctx, BT_CONTEXT, BC_STORE_BANK, 2); + return; + } + + /* [Shift-F4] - Assign current sequence/colormap/image to bank 4 */ + if (BSHIFT(k, SDLK_F4)) { + Context_send_event(ctx, BT_CONTEXT, BC_STORE_BANK, 3); + return; + } + + /* [Shift-F5] - Assign current sequence/colormap/image to bank 5 */ + if (BSHIFT(k, SDLK_F5)) { + Context_send_event(ctx, BT_CONTEXT, BC_STORE_BANK, 4); + return; + } + + /* [Shift-F6] - Assign current sequence/colormap/image to bank 6 */ + if (BSHIFT(k, SDLK_F6)) { + Context_send_event(ctx, BT_CONTEXT, BC_STORE_BANK, 5); + return; + } + + /* [Shift-F7] - Assign current sequence/colormap/image to bank 7 */ + if (BSHIFT(k, SDLK_F7)) { + Context_send_event(ctx, BT_CONTEXT, BC_STORE_BANK, 6); + return; + } + + /* [Shift-F8] - Assign current sequence/colormap/image to bank 8 */ + if (BSHIFT(k, SDLK_F8)) { + Context_send_event(ctx, BT_CONTEXT, BC_STORE_BANK, 7); + return; + } + + /* [Shift-F9] - Assign current sequence/colormap/image to bank 9 */ + if (BSHIFT(k, SDLK_F9)) { + Context_send_event(ctx, BT_CONTEXT, BC_STORE_BANK, 8); + return; + } + + /* [Shift-F10] - Assign current sequence/colormap/image to bank 10 */ + if (BSHIFT(k, SDLK_F10)) { + Context_send_event(ctx, BT_CONTEXT, BC_STORE_BANK, 9); + return; + } + + /* [Shift-F11] - Assign current sequence/colormap/image to bank 11 */ + if (BSHIFT(k, SDLK_F11)) { + Context_send_event(ctx, BT_CONTEXT, BC_STORE_BANK, 10); + return; + } + + /* [Shift-F12] - Assign current sequence/colormap/image to bank 12 */ + if (BSHIFT(k, SDLK_F12)) { + Context_send_event(ctx, BT_CONTEXT, BC_STORE_BANK, 11); + return; + } + + /* [F1] - Use sequence/colormap/image in bank 1 */ + if (BKEY(k, SDLK_F1)) { + Context_send_event(ctx, BT_CONTEXT, BC_USE_BANK, 0); + return; + } + + /* [F2] - Use sequence/colormap/image in bank 2 */ + if (BKEY(k, SDLK_F2)) { + Context_send_event(ctx, BT_CONTEXT, BC_USE_BANK, 1); + return; + } + + /* [F3] - Use sequence/colormap/image in bank 3 */ + if (BKEY(k, SDLK_F3)) { + Context_send_event(ctx, BT_CONTEXT, BC_USE_BANK, 2); + return; + } + + /* [F4] - Use sequence/colormap/image in bank 4 */ + if (BKEY(k, SDLK_F4)) { + Context_send_event(ctx, BT_CONTEXT, BC_USE_BANK, 3); + return; + } + + /* [F5] - Use sequence/colormap/image in bank 5 */ + if (BKEY(k, SDLK_F5)) { + Context_send_event(ctx, BT_CONTEXT, BC_USE_BANK, 4); + return; + } + + /* [F6] - Use sequence/colormap/image in bank 6 */ + if (BKEY(k, SDLK_F6)) { + Context_send_event(ctx, BT_CONTEXT, BC_USE_BANK, 5); + return; + } + + /* [F7] - Use sequence/colormap/image in bank 7 */ + if (BKEY(k, SDLK_F7)) { + Context_send_event(ctx, BT_CONTEXT, BC_USE_BANK, 6); + return; + } + + /* [F8] - Use sequence/colormap/image in bank 8 */ + if (BKEY(k, SDLK_F8)) { + Context_send_event(ctx, BT_CONTEXT, BC_USE_BANK, 7); + return; + } + + /* [F9] - Use sequence/colormap/image in bank 9 */ + if (BKEY(k, SDLK_F9)) { + Context_send_event(ctx, BT_CONTEXT, BC_USE_BANK, 8); + return; + } + + /* [F10] - Use sequence/colormap/image in bank 10 */ + if (BKEY(k, SDLK_F10)) { + Context_send_event(ctx, BT_CONTEXT, BC_USE_BANK, 9); + return; + } + + /* [F11] - Use sequence/colormap/image in bank 11 */ + if (BKEY(k, SDLK_F11)) { + Context_send_event(ctx, BT_CONTEXT, BC_USE_BANK, 10); + return; + } + + /* [F12] - Use sequence/colormap/image in bank 12 */ + if (BKEY(k, SDLK_F12)) { + Context_send_event(ctx, BT_CONTEXT, BC_USE_BANK, 11); + return; + } + + /* [Ctrl-F1] - Use bankset 1 */ + if (BCTRL(k, SDLK_F1)) { + Context_send_event(ctx, BT_CONTEXT, BC_USE_BANKSET, 0); + return; + } + + /* [Ctrl-F2] - Use bankset 2 */ + if (BCTRL(k, SDLK_F2)) { + Context_send_event(ctx, BT_CONTEXT, BC_USE_BANKSET, 1); + return; + } + + /* [Ctrl-F3] - Use bankset 3 */ + if (BCTRL(k, SDLK_F3)) { + Context_send_event(ctx, BT_CONTEXT, BC_USE_BANKSET, 2); + return; + } + + /* [Ctrl-F4] - Use bankset 4 */ + if (BCTRL(k, SDLK_F4)) { + Context_send_event(ctx, BT_CONTEXT, BC_USE_BANKSET, 3); + return; + } + + /* [Ctrl-F5] - Use bankset 5 */ + if (BCTRL(k, SDLK_F5)) { + Context_send_event(ctx, BT_CONTEXT, BC_USE_BANKSET, 4); + return; + } + + /* [Ctrl-F6] - Use bankset 6 */ + if (BCTRL(k, SDLK_F6)) { + Context_send_event(ctx, BT_CONTEXT, BC_USE_BANKSET, 5); + return; + } + + /* [Ctrl-F7] - Use bankset 7 */ + if (BCTRL(k, SDLK_F7)) { + Context_send_event(ctx, BT_CONTEXT, BC_USE_BANKSET, 6); + return; + } + + /* [Ctrl-F8] - Use bankset 8 */ + if (BCTRL(k, SDLK_F8)) { + Context_send_event(ctx, BT_CONTEXT, BC_USE_BANKSET, 7); + return; + } + + /* [Ctrl-F9] - Use bankset 9 */ + if (BCTRL(k, SDLK_F9)) { + Context_send_event(ctx, BT_CONTEXT, BC_USE_BANKSET, 8); + return; + } + + /* [Ctrl-F10] - Use bankset 10 */ + if (BCTRL(k, SDLK_F10)) { + Context_send_event(ctx, BT_CONTEXT, BC_USE_BANKSET, 9); + return; + } + + /* [Ctrl-F11] - Use bankset 11 */ + if (BCTRL(k, SDLK_F11)) { + Context_send_event(ctx, BT_CONTEXT, BC_USE_BANKSET, 10); + return; + } + + /* [Ctrl-F12] - Use bankset 12 */ + if (BCTRL(k, SDLK_F12)) { + Context_send_event(ctx, BT_CONTEXT, BC_USE_BANKSET, 11); + return; + } + + /* [Ctrl-b] - Save the banks file */ + if (BCTRL(k, SDLK_b)) { + Context_send_event(ctx, BT_CONTEXT, BC_SAVE_BANKS, BA_NONE); + return; + } +} diff -Nru lebiniou-3.31/src/events.c.in lebiniou-3.40/src/events.c.in --- lebiniou-3.31/src/events.c.in 2019-04-05 20:39:15.000000000 +0000 +++ lebiniou-3.40/src/events.c.in 2020-01-22 18:33:57.000000000 +0000 @@ -109,6 +109,14 @@ S12 CS s BT_SEQMGR BC_SAVE BA_SEQUENCE_BARE Save current sequence as new (bare) S13 CS u BT_SEQMGR BC_SAVE BA_OVERWRITE_BARE Update current bare sequence +S14 A UP BT_SEQMGR BC_PARAM_PREV BA_NONE Select previous plugin parameter +S15 A DOWN BT_SEQMGR BC_PARAM_NEXT BA_NONE Select next plugin parameter + +S16 A LEFT BT_SEQMGR BC_PARAM_DEC BA_NONE Decrease plugin parameter value +S17 A RIGHT BT_SEQMGR BC_PARAM_INC BA_NONE Increase plugin parameter value +S18 AS LEFT BT_SEQMGR BC_PARAM_DEC_FAST BA_NONE Decrease plugin parameter value quickly +S19 AS RIGHT BT_SEQMGR BC_PARAM_INC_FAST BA_NONE Increase plugin parameter value quickly + # -------------------------------------------------------------------- * Colormaps # -------------------------------------------------------------------- diff -Nru lebiniou-3.31/src/events.h lebiniou-3.40/src/events.h --- lebiniou-3.31/src/events.h 2019-02-02 00:30:11.000000000 +0000 +++ lebiniou-3.40/src/events.h 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * diff -Nru lebiniou-3.31/src/fader.c lebiniou-3.40/src/fader.c --- lebiniou-3.31/src/fader.c 2019-04-05 20:39:15.000000000 +0000 +++ lebiniou-3.40/src/fader.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -30,7 +30,6 @@ fa->target = 0; fa->delta = xcalloc(size, sizeof(long)); fa->tmp = xcalloc(size, sizeof(u_long)); - fa->fade = 1; fa->fading = 1; fa->max = 0; fa->faded = 0; diff -Nru lebiniou-3.31/src/fader.h lebiniou-3.40/src/fader.h --- lebiniou-3.31/src/fader.h 2019-02-02 00:30:11.000000000 +0000 +++ lebiniou-3.40/src/fader.h 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -34,7 +34,6 @@ u_short target; long *delta; u_long *tmp; - u_char fade; u_char fading; u_long max; u_long faded; diff -Nru lebiniou-3.31/src/gen.awk lebiniou-3.40/src/gen.awk --- lebiniou-3.31/src/gen.awk 2019-04-05 20:39:15.000000000 +0000 +++ lebiniou-3.40/src/gen.awk 2020-01-22 18:33:57.000000000 +0000 @@ -1,6 +1,6 @@ BEGIN { print "/*"; - print " * Copyright 1994-2019 Olivier Girondel"; + print " * Copyright 1994-2020 Olivier Girondel"; print " *"; print " * This file is part of lebiniou."; print " *"; diff -Nru lebiniou-3.31/src/globals.c lebiniou-3.40/src/globals.c --- lebiniou-3.31/src/globals.c 2019-02-02 00:30:11.000000000 +0000 +++ lebiniou-3.40/src/globals.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -19,6 +19,7 @@ #include "globals.h" +int32_t WIDTH_ORIGIN, HEIGHT_ORIGIN; #ifndef FIXED u_short WIDTH, HEIGHT; #endif @@ -29,3 +30,15 @@ Schemes_t *schemes = NULL; u_char libbiniou_verbose = 1; + +char *data_dir = NULL; +#ifdef WITH_WEBCAM +int webcams = 1; +int hflip = 1; +int vflip = 1; +char *video_base; +#else +int webcams = 0; +#endif + +char *video_filename = NULL; // video plugin diff -Nru lebiniou-3.31/src/globals.h lebiniou-3.40/src/globals.h --- lebiniou-3.31/src/globals.h 2019-02-02 00:30:11.000000000 +0000 +++ lebiniou-3.40/src/globals.h 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -25,13 +25,22 @@ #include "schemes.h" #include "context.h" +extern int32_t WIDTH_ORIGIN; +extern int32_t HEIGHT_ORIGIN; #ifndef FIXED -extern u_short WIDTH; -extern u_short HEIGHT; +extern u_short WIDTH; +extern u_short HEIGHT; #endif -extern Plugins_t *plugins; -extern Sequences_t *sequences; -extern Schemes_t *schemes; -extern Context_t *context; +extern Plugins_t *plugins; +extern Sequences_t *sequences; +extern Schemes_t *schemes; +extern Context_t *context; + +#ifdef WITH_WEBCAM +#define MAX_TIMERS 4 +#else +#define MAX_TIMERS 3 +#endif +extern int webcams; #endif /* __BINIOU_GLOBALS_H */ diff -Nru lebiniou-3.31/src/image_8bits.c lebiniou-3.40/src/image_8bits.c --- lebiniou-3.31/src/image_8bits.c 2019-04-05 20:39:16.000000000 +0000 +++ lebiniou-3.40/src/image_8bits.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * diff -Nru lebiniou-3.31/src/image_8bits.h lebiniou-3.40/src/image_8bits.h --- lebiniou-3.31/src/image_8bits.h 2019-04-05 20:39:16.000000000 +0000 +++ lebiniou-3.40/src/image_8bits.h 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * diff -Nru lebiniou-3.31/src/imagefader.c lebiniou-3.40/src/imagefader.c --- lebiniou-3.31/src/imagefader.c 2019-04-05 20:39:16.000000000 +0000 +++ lebiniou-3.40/src/imagefader.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -84,6 +84,9 @@ Fader_t *fader = pf->fader; const u_long elapsed = Fader_elapsed(fader); +#ifdef DEBUG_FADERS + printf("If "); +#endif Fader_start(fader); fader->faded += elapsed; @@ -124,15 +127,8 @@ xerror("Image without name, WTF #@!\r\n"); } - if (pf->cur != NULL && pf->dst->id != pf->cur->id) { - if (fader->fade) { - ImageFader_init(pf); - } else { - pf->cur = pf->dst; - } - - fader->fading = fader->fade; - } + ImageFader_init(pf); + fader->fading = 1; } diff -Nru lebiniou-3.31/src/imagefader_event.c lebiniou-3.40/src/imagefader_event.c --- lebiniou-3.31/src/imagefader_event.c 2019-02-19 12:45:00.000000000 +0000 +++ lebiniou-3.40/src/imagefader_event.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -24,20 +24,20 @@ ImageFader_event(ImageFader_t *pf, const Event_t *e) { switch (e->cmd) { - case BC_SELECT: - if (e->arg0 == BA_PREV) { - ImageFader_prev(pf); - return 1; - } else if (e->arg0 == BA_NEXT) { - ImageFader_next(pf); - return 1; - } else if (e->arg0 == BA_RANDOM) { - ImageFader_random(pf); - return 1; - } + case BC_SELECT: + if (e->arg0 == BA_PREV) { + ImageFader_prev(pf); + return 1; + } else if (e->arg0 == BA_NEXT) { + ImageFader_next(pf); + return 1; + } else if (e->arg0 == BA_RANDOM) { + ImageFader_random(pf); + return 1; + } - default: - break; + default: + break; } return 0; diff -Nru lebiniou-3.31/src/imagefader.h lebiniou-3.40/src/imagefader.h --- lebiniou-3.31/src/imagefader.h 2019-02-02 00:30:11.000000000 +0000 +++ lebiniou-3.40/src/imagefader.h 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * diff -Nru lebiniou-3.31/src/image_filter.c lebiniou-3.40/src/image_filter.c --- lebiniou-3.31/src/image_filter.c 1970-01-01 00:00:00.000000000 +0000 +++ lebiniou-3.40/src/image_filter.c 2020-01-22 18:33:57.000000000 +0000 @@ -0,0 +1,401 @@ +/* + * Copyright 1994-2020 Olivier Girondel + * Copyright 2019-2020 Laurent Marsac + * + * This file is part of lebiniou. + * + * lebiniou 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 of the License, or + * (at your option) any later version. + * + * lebiniou 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 lebiniou. If not, see . + */ + +#include "image_filter.h" +#include "constants.h" + + +void +image_filter_average(Buffer8_t *dst, const Buffer8_t *src, enum FilterType type, + enum BorderMode borders, u_short size, u_short *filter) +{ + assert(dst != NULL); + assert(src != NULL); + + u_short hsize = (size - 1) / 2; + u_short sum_f = 0; + + /* optimized filters and generic version */ + switch (type) { + case FT_BLUR1_3x3: + filter = filter_BLUR1_3x3; + size = FILTER_BLUR1_3x3_SIZE; + sum_f = FILTER_BLUR1_3x3_SUM; + + for (u_short j = 1; j < MAXY; j++) + for (u_short i = 1; i < MAXX; i++) { + u_long sum = get_pixel_nc(src, i - 1, j); + sum += get_pixel_nc(src, i, j - 1); + sum += get_pixel_nc(src, i, j) * 4; + sum += get_pixel_nc(src, i, j + 1); + sum += get_pixel_nc(src, i + 1, j); + + set_pixel_nc(dst, i, j, (Pixel_t)(sum / FILTER_BLUR1_3x3_SUM)); + } + break; + + case FT_BLUR2_3x3: + filter = filter_BLUR2_3x3; + size = FILTER_BLUR2_3x3_SIZE; + sum_f = FILTER_BLUR2_3x3_SUM; + + for (u_short j = 1; j < MAXY; j++) + for (u_short i = 1; i < MAXX; i++) { + u_long sum = get_pixel_nc(src, i - 1, j) * 2; + sum += get_pixel_nc(src, i, j - 1); + sum += get_pixel_nc(src, i, j) * 2; + sum += get_pixel_nc(src, i, j + 1); + sum += get_pixel_nc(src, i + 1, j) * 2; + + set_pixel_nc(dst, i, j, (Pixel_t)(sum / FILTER_BLUR2_3x3_SUM)); + } + break; + + case FT_BLUR4_3x3: + filter = filter_BLUR4_3x3; + size = FILTER_BLUR4_3x3_SIZE; + sum_f = FILTER_BLUR4_3x3_SUM; + + for (u_short j = 1; j < MAXY; j++) + for (u_short i = 1; i < MAXX; i++) { + u_long sum = get_pixel_nc(src, i - 1, j - 1); + sum += get_pixel_nc(src, i - 1, j + 1); + sum += get_pixel_nc(src, i + 1, j - 1); + sum += get_pixel_nc(src, i + 1, j + 1); + + sum += get_pixel_nc(src, i - 1, j) * 2; + sum += get_pixel_nc(src, i, j - 1) * 2; + sum += get_pixel_nc(src, i, j) * 16; + sum += get_pixel_nc(src, i, j + 1) * 2; + sum += get_pixel_nc(src, i + 1, j) * 2; + + set_pixel_nc(dst, i, j, (Pixel_t)(sum / FILTER_BLUR4_3x3_SUM)); + } + break; + + case FT_VBLUR_3x3: + filter = filter_VBLUR_3x3; + size = FILTER_VBLUR_3x3_SIZE; + sum_f = FILTER_VBLUR_3x3_SUM; + + for (u_short j = 1; j < MAXY; j++) + for (u_short i = 1; i < MAXX; i++) { + u_long sum = get_pixel_nc(src, i - 1, j); + sum += get_pixel_nc(src, i, j - 1) * 2; + sum += get_pixel_nc(src, i, j) * 4; + sum += get_pixel_nc(src, i, j + 1) * 2; + sum += get_pixel_nc(src, i + 1, j); + + set_pixel_nc(dst, i, j, (Pixel_t)(sum / FILTER_VBLUR_3x3_SUM)); + } + break; + + case FT_HBLUR_3x3: + filter = filter_HBLUR_3x3; + size = FILTER_HBLUR_3x3_SIZE; + sum_f = FILTER_HBLUR_3x3_SUM; + + for (u_short j = 1; j < MAXY; j++) + for (u_short i = 1; i < MAXX; i++) { + u_long sum = get_pixel_nc(src, i - 1, j) * 2; + sum += get_pixel_nc(src, i, j - 1) * 1; + sum += get_pixel_nc(src, i, j) * 4; + sum += get_pixel_nc(src, i, j + 1) * 1; + sum += get_pixel_nc(src, i + 1, j) * 2; + + set_pixel_nc(dst, i, j, (Pixel_t)(sum / FILTER_VBLUR_3x3_SUM)); + } + break; + + case FT_DBLUR1_3x3: + filter = filter_DBLUR1_3x3; + size = FILTER_DBLUR1_3x3_SIZE; + sum_f = FILTER_DBLUR1_3x3_SUM; + + for (u_short j = 1; j < MAXY; j++) + for (u_short i = 1; i < MAXX; i++) { + u_long sum = get_pixel_nc(src, i - 1, j - 1) * 2; + sum += get_pixel_nc(src, i - 1, j + 1); + sum += get_pixel_nc(src, i, j) * 4; + sum += get_pixel_nc(src, i + 1, j + 1) * 2; + sum += get_pixel_nc(src, i + 1, j - 1); + + set_pixel_nc(dst, i, j, (Pixel_t)(sum / FILTER_VBLUR_3x3_SUM)); + } + break; + + case FT_DBLUR2_3x3: + filter = filter_DBLUR2_3x3; + size = FILTER_DBLUR2_3x3_SIZE; + sum_f = FILTER_DBLUR2_3x3_SUM; + + for (u_short j = 1; j < MAXY; j++) + for (u_short i = 1; i < MAXX; i++) { + u_long sum = get_pixel_nc(src, i - 1, j - 1); + sum += get_pixel_nc(src, i - 1, j + 1) * 2; + sum += get_pixel_nc(src, i, j) * 4; + sum += get_pixel_nc(src, i + 1, j + 1); + sum += get_pixel_nc(src, i + 1, j - 1) * 2; + + set_pixel_nc(dst, i, j, (Pixel_t)(sum / FILTER_VBLUR_3x3_SUM)); + } + break; + + case FT_GENERIC: + assert(filter != NULL); + assert(size % 2 == 1); + + for (u_short a = 0; a < size; a++) + for (u_short b = 0; b < size; b++) { + sum_f += filter[size * a + b]; + } + + for (u_short j = hsize; j <= MAXY - hsize; j++) + for (u_short i = hsize; i <= MAXX - hsize; i++) { + u_long sum = 0; + for (u_short a = 0; a < size; a++) + for (u_short b = 0; b < size; b++) + sum += get_pixel_nc(src, i - hsize + b, j - hsize + a) * + filter[size * a + b]; + + set_pixel_nc(dst, i, j, (Pixel_t)(sum / sum_f)); + } + break; + } + + /* handle borders, for any filter type */ + hsize = (size - 1) / 2; + + switch (borders) { + case BM_CLEAR: + /* bottom */ + for (u_short j = 0; j < hsize; j++) + for (u_short i = 0; i <= MAXX; i++) { + set_pixel_nc(dst, i, j, (Pixel_t)0); + } + + /* top */ + for (u_short j = MAXY - hsize + 1; j <= MAXY; j++) + for (u_short i = 0; i <= MAXX; i++) { + set_pixel_nc(dst, i, j, (Pixel_t)0); + } + + for (u_short j = 0; j <= MAXY; j++) { + /* left */ + for (u_short i = 0; i < hsize; i++) { + set_pixel_nc(dst, i, j, (Pixel_t)0); + } + + /* right */ + for (u_short i = MAXX - hsize + 1; i <= MAXX; i++) { + set_pixel_nc(dst, i, j, (Pixel_t)0); + } + } + break; + + /* blurring done using only real pixels arround (i,j) */ + case BM_LOCAL: + /* left */ + for (u_short j = hsize; j <= MAXY - hsize; j++) + for (u_short i = 0; i < hsize; i++) { + u_long sum = 0, sum_fl = 0; + + for (u_short b = 0; b < size; b++) { + short i2 = i - hsize + b; + if (i2 >= 0) + for (u_short a = 0; a < size; a++) { + sum += get_pixel_nc(src, i2, j - hsize + a) * + filter[size * a + b]; + sum_fl += filter[size * a + b]; + } + } + + set_pixel_nc(dst, i, j, (Pixel_t)(sum / sum_fl)); + } + + /* right */ + for (u_short j = hsize; j <= MAXY - hsize; j++) + for (u_short i = MAXX - hsize + 1; i <= MAXX; i++) { + u_long sum = 0, sum_fl = 0; + + for (u_short b = 0; b < size; b++) { + short i2 = i - hsize + b; + if (i2 <= MAXX) + for (u_short a = 0; a < size; a++) { + sum += get_pixel_nc(src, i2, j - hsize + a) * + filter[size * a + b]; + sum_fl += filter[size * a + b]; + } + } + + set_pixel_nc(dst, i, j, (Pixel_t)(sum / sum_fl)); + } + + /* bottom */ + for (u_short j = 0; j < hsize; j++) + for (u_short i = hsize; i <= MAXX - hsize; i++) { + u_long sum = 0, sum_fl = 0; + + for (u_short a = 0; a < size; a++) { + short j2 = j - hsize + a; + if (j2 >= 0) + for (u_short b = 0; b < size; b++) { + sum += get_pixel_nc(src, i - hsize + b, j2) * + filter[size * a + b]; + sum_fl += filter[size * a + b]; + } + } + + set_pixel_nc(dst, i, j, (Pixel_t)(sum / sum_fl)); + } + + /* top */ + for (u_short j = MAXY - hsize + 1; j <= MAXY; j++) + for (u_short i = hsize; i <= MAXX - hsize; i++) { + u_long sum = 0, sum_fl = 0; + + for (u_short a = 0; a < size; a++) { + short j2 = j - hsize + a; + if (j2 <= MAXY) + for (u_short b = 0; b < size; b++) { + sum += get_pixel_nc(src, i - hsize + b, j2) * + filter[size * a + b]; + sum_fl += filter[size * a + b]; + } + } + set_pixel_nc(dst, i, j, (Pixel_t)(sum / sum_fl)); + } + + /* corners */ + for (u_short bx = 0, b0 = hsize; bx <= MAXX; bx += MAXX, b0 -= hsize) + for (u_short by = 0, a0 = hsize; by <= MAXY; by += MAXY, a0 -= hsize) { + u_long sum = 0, sum_fl = 0; + for (u_short a = a0; a <= a0 + hsize; a++) + for (u_short b = b0; b <= b0 + hsize; b++) { + sum += get_pixel_nc(src, bx + b - hsize, by + a - hsize) * + filter[size * a + b]; + sum_fl += filter[size * a + b]; + } + set_pixel_nc(dst, bx, by, (Pixel_t)(sum / sum_fl)); + } + + break; + + /* blurring done as if border were touching (left/right and top/bottom) */ + case BM_TOROIDAL: + /* left */ + for (u_short j = hsize; j <= MAXY - hsize; j++) + for (u_short i = 0; i < hsize; i++) { + u_long sum = 0; + + for (u_short b = 0; b < size; b++) { + short i2 = i - hsize + b; + if (i2 < 0) { + i2 = WIDTH + i2; + } + + for (u_short a = 0; a < size; a++) + sum += get_pixel_nc(src, i2, j - hsize + a) * + filter[size * a + b]; + } + + set_pixel_nc(dst, i, j, (Pixel_t)(sum / sum_f)); + } + + /* right */ + for (u_short j = hsize; j <= MAXY - hsize; j++) + for (u_short i = MAXX - hsize + 1; i <= MAXX; i++) { + u_long sum = 0; + + for (u_short b = 0; b < size; b++) { + short i2 = i - hsize + b; + if (i2 > MAXX) { + i2 = i2 - MAXX - 1; + } + + for (u_short a = 0; a < size; a++) + sum += get_pixel_nc(src, i2, j - hsize + a) * + filter[size * a + b]; + } + + set_pixel_nc(dst, i, j, (Pixel_t)(sum / sum_f)); + } + + /* bottom */ + for (u_short j = 0; j < hsize; j++) + for (u_short i = hsize; i <= MAXX - hsize; i++) { + u_long sum = 0; + + for (u_short a = 0; a < size; a++) { + short j2 = j - hsize + a; + if (j2 < 0) { + j2 = HEIGHT + j2; + } + + for (u_short b = 0; b < size; b++) + sum += get_pixel_nc(src, i - hsize + b, j2) * + filter[size * a + b]; + } + + set_pixel_nc(dst, i, j, (Pixel_t)(sum / sum_f)); + } + + /* top */ + for (u_short j = MAXY - hsize + 1; j <= MAXY; j++) + for (u_short i = hsize; i <= MAXX - hsize; i++) { + u_long sum = 0; + + for (u_short a = 0; a < size; a++) { + short j2 = j - hsize + a; + if (j2 > MAXY) { + j2 = j2 - MAXY - 1; + } + + for (u_short b = 0; b < size; b++) + sum += get_pixel_nc(src, i - hsize + b, j2) * + filter[size * a + b]; + } + + set_pixel_nc(dst, i, j, (Pixel_t)(sum / sum_f)); + } + + /* corners */ + for (u_short i = 0; i <= MAXX; i += MAXX) + for (u_short j = 0; j <= MAXY; j += MAXY) { + u_long sum = 0; + + for (u_short a = 0; a < size; a++) + for (u_short b = 0; b < size; b++) { + u_short i2 = (i - hsize + b + WIDTH ) % WIDTH; + u_short j2 = (j - hsize + a + HEIGHT) % HEIGHT; + + sum += get_pixel_nc(src, i2, j2) * filter[size * a + b]; + } + + set_pixel_nc(dst, i, j, (Pixel_t)(sum / sum_f)); + } + + break; + + case BM_NONE: + default: + break; + } +} diff -Nru lebiniou-3.31/src/image_filter.h lebiniou-3.40/src/image_filter.h --- lebiniou-3.31/src/image_filter.h 1970-01-01 00:00:00.000000000 +0000 +++ lebiniou-3.40/src/image_filter.h 2020-01-22 18:33:57.000000000 +0000 @@ -0,0 +1,100 @@ +/* + * Copyright 1994-2020 Olivier Girondel + * Copyright 2019-2020 Laurent Marsac + * + * This file is part of lebiniou. + * + * lebiniou 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 of the License, or + * (at your option) any later version. + * + * lebiniou 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 lebiniou. If not, see . + */ + +#ifndef __BINIOU_IMAGE_FILTER_H +#define __BINIOU_IMAGE_FILTER_H + +#include "buffer_8bits.h" + +enum FilterType { FT_GENERIC = 0, + FT_BLUR1_3x3, + FT_BLUR2_3x3, + FT_BLUR4_3x3, + FT_VBLUR_3x3, + FT_HBLUR_3x3, + FT_DBLUR1_3x3, + FT_DBLUR2_3x3 + } FilterType_e; + +enum BorderMode { BM_NONE = 0, BM_CLEAR, BM_LOCAL, BM_TOROIDAL, BM_NB } BorderMode_e; +const char *border_list[BM_NB] = { "None", "Clear", "Local", "Toroidal" }; + +/* optimized filters */ +#define FILTER_BLUR1_3x3_SIZE 3 +#define FILTER_BLUR1_3x3_SUM 8 +u_short filter_BLUR1_3x3[3*3] = { + 0, 1, 0, + 1, 4, 1, + 0, 1, 0 +}; + +#define FILTER_BLUR2_3x3_SIZE 3 +#define FILTER_BLUR2_3x3_SUM 8 +u_short filter_BLUR2_3x3[3*3] = { + 0, 1, 0, + 2, 2, 2, + 0, 1, 0 +}; + +#define FILTER_BLUR4_3x3_SIZE 3 +#define FILTER_BLUR4_3x3_SUM 32 +u_short filter_BLUR4_3x3[3*3] = { + 1, 2, 1, + 2, 16, 2, + 1, 2, 1 +}; + +#define FILTER_VBLUR_3x3_SIZE 3 +#define FILTER_VBLUR_3x3_SUM 10 +u_short filter_VBLUR_3x3[3*3] = { + 0, 2, 0, + 1, 4, 1, + 0, 2, 0 +}; + +#define FILTER_HBLUR_3x3_SIZE 3 +#define FILTER_HBLUR_3x3_SUM 10 +u_short filter_HBLUR_3x3[3*3] = { + 0, 1, 0, + 2, 4, 2, + 0, 1, 0 +}; + +#define FILTER_DBLUR1_3x3_SIZE 3 +#define FILTER_DBLUR1_3x3_SUM 10 +u_short filter_DBLUR1_3x3[3*3] = { + 2, 0, 1, + 0, 4, 0, + 1, 0, 2 +}; + +#define FILTER_DBLUR2_3x3_SIZE 3 +#define FILTER_DBLUR2_3x3_SUM 10 +u_short filter_DBLUR2_3x3[3*3] = { + 1, 0, 2, + 0, 4, 0, + 2, 0, 1 +}; + +/* filter size must be size*size */ +void image_filter_average(Buffer8_t *dst, const Buffer8_t *src, + enum FilterType type, enum BorderMode borders, u_short size, u_short *filter); + +#endif /* __BINIOU_IMAGE_FILTER_H */ diff -Nru lebiniou-3.31/src/images.c lebiniou-3.40/src/images.c --- lebiniou-3.31/src/images.c 2019-04-05 20:39:16.000000000 +0000 +++ lebiniou-3.40/src/images.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -20,7 +20,6 @@ #include #include "images.h" #include "brandom.h" -#include "pbar.h" Images_t *images = NULL; @@ -49,16 +48,11 @@ GSList *tmp = NULL; uint16_t size = 0; GSList *t; - PBar_t *pb = NULL; gchar **tokens, **theme; assert(basedir != NULL); assert(themes != NULL); - if (libbiniou_verbose) { - pb = pbar_new(); - } - tokens = g_strsplit(themes, ",", 0); theme = tokens; @@ -66,7 +60,7 @@ char *directoryname; char *th = *theme; - VERBOSE(printf("[+] Loading theme '%s': ", th)); + VERBOSE(printf("[+] Loading theme '%s'\n", th)); fflush(stdout); if (*th == '~') { th++; @@ -120,10 +114,6 @@ Image8_delete(pic); } else { size++; - if (libbiniou_verbose && !(size % 5)) { - pbar_step(pb); - } - tmp = g_slist_prepend(tmp, (gpointer)pic); } } @@ -133,14 +123,12 @@ xperror("closedir"); } g_free(directoryname); - VERBOSE(printf("done.\n")); } g_strfreev(tokens); images = xmalloc(sizeof(Images_t)); if (libbiniou_verbose) { - pbar_delete(pb); VERBOSE(printf("[p] Loaded %d images\n", size)); } @@ -252,9 +240,7 @@ uint16_t idx = 0; assert(images != NULL); - if (!images->size) { - return 0; - } + assert(images->size); // There is at least a default image if (images->size > 1) { idx = b_rand_int_range(0, images->size - 1); @@ -270,9 +256,6 @@ uint16_t idx = 0; assert(images != NULL); - if (NULL == images) { - return NULL; - } if (images->size > 1) { idx = b_rand_int_range(0, images->size - 1); diff -Nru lebiniou-3.31/src/images.h lebiniou-3.40/src/images.h --- lebiniou-3.31/src/images.h 2019-02-02 00:30:11.000000000 +0000 +++ lebiniou-3.40/src/images.h 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * diff -Nru lebiniou-3.31/src/includes.h lebiniou-3.40/src/includes.h --- lebiniou-3.31/src/includes.h 2019-02-27 11:27:52.000000000 +0000 +++ lebiniou-3.40/src/includes.h 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * diff -Nru lebiniou-3.31/src/input.c lebiniou-3.40/src/input.c --- lebiniou-3.31/src/input.c 2019-04-13 13:36:49.000000000 +0000 +++ lebiniou-3.40/src/input.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -30,7 +30,7 @@ There is no best value, but 4 peaks/second is reasonable compromise before rewriting this system properly. */ #define PEAKS_PER_SECOND 4 /* how many peaks we try to find */ -#define PEAK_COUNT_ON_HISTORY (HISTORY_SIZE / PEAKS_PER_SECOND) +#define PEAK_COUNT_ON_HISTORY (HISTORY_SIZE / PEAKS_PER_SECOND) /* history ring buffer for peak detection */ static double history_buff[3][HISTORY_SIZE] = { { 0 } }; @@ -404,7 +404,7 @@ count = 0; for (i = 0; i < j; i++) { if (peak_val[i] > - (input->average + (input->maxpeak - input->average) * limit)) { + (input->average + (input->maxpeak - input->average) * limit)) { count++; } } @@ -468,3 +468,54 @@ VERBOSE(printf("[i] Volume scale: %.1f\n", input->volume_scale)); } } + + +double +compute_avg_abs(double *buf, u_long a, u_long b) +{ + if (b < a) { + return 0.0; + } + + double sum = 0.0; + for (u_long n = a; n < b; n++) { + sum += fabs(buf[n]); + } + + return sum / (b - a + 1); +} + + +u_short +compute_avg_freq_id(Input_t *input, double spectrum_low_treshold_factor) +{ + assert(input != NULL); + + /* find the frequency having the highest value of the spectrum */ + double spectrum_max = 0; + for (u_short i = 0; i < input->spectrum_size; i++) + if (input->spectrum_log[A_MONO][i] > spectrum_max) { + spectrum_max = input->spectrum_log[A_MONO][i]; + } + + double spectrum_low_treshold = spectrum_max * spectrum_low_treshold_factor; + + /* find average frequency, based on frequencies higher than spectrum_low_treshold */ + double average_freq_id = 0; + double spectrum_sum = 0; + for (u_short i = 0; i < input->spectrum_size; i++) { + if (input->spectrum_log[A_MONO][i] > spectrum_low_treshold) { + spectrum_sum += input->spectrum_log[A_MONO][i]; + average_freq_id += (double)(i+1) * input->spectrum_log[A_MONO][i]; + } + } + /* avoid 0 division and compute average frequency id */ + if (spectrum_sum == 0) { + average_freq_id = 0; + } else { + average_freq_id /= spectrum_sum ; + average_freq_id = round(average_freq_id); + } + + return (u_short)average_freq_id; +} diff -Nru lebiniou-3.31/src/input.h lebiniou-3.40/src/input.h --- lebiniou-3.31/src/input.h 2019-04-13 13:36:49.000000000 +0000 +++ lebiniou-3.40/src/input.h 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -84,7 +84,6 @@ double volume_scale; double volume; - double volume2; /* volume of data2 */ double maxpeak; /* highest peak on history buffer */ double curpeak; /* highest peak on data2 */ double average; /* average value on data2 */ @@ -123,4 +122,8 @@ double Input_clamp(const double); void Input_process(Input_t *); +/* signal processing */ +double compute_avg_abs(double *buf, u_long a, u_long b); +u_short compute_avg_freq_id(Input_t *input, double spectrum_low_treshold_factor); + #endif /* INPUT_H */ diff -Nru lebiniou-3.31/src/keyfile.c lebiniou-3.40/src/keyfile.c --- lebiniou-3.31/src/keyfile.c 2019-04-05 20:39:16.000000000 +0000 +++ lebiniou-3.40/src/keyfile.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -332,7 +332,7 @@ error = NULL; } - Context_set_delay(BD_COLORMAPS, colormaps_min, colormaps_max); + biniou_set_delay(BD_COLORMAPS, colormaps_min, colormaps_max); images_min = g_key_file_get_integer(kf, ENGINE, "ImagesMin", &error); if (NULL == error) { @@ -358,7 +358,7 @@ error = NULL; } - Context_set_delay(BD_IMAGES, images_min, images_max); + biniou_set_delay(BD_IMAGES, images_min, images_max); sequences_min = g_key_file_get_integer(kf, ENGINE, "SequencesMin", &error); if (NULL == error) { @@ -384,7 +384,7 @@ error = NULL; } - Context_set_delay(BD_SEQUENCES, sequences_min, sequences_max); + biniou_set_delay(BD_SEQUENCES, sequences_min, sequences_max); #ifdef WITH_WEBCAM gint webcams_min, webcams_max; @@ -413,7 +413,7 @@ error = NULL; } - Context_set_delay(BD_WEBCAMS, webcams_min, webcams_max); + biniou_set_delay(BD_WEBCAMS, webcams_min, webcams_max); #endif } @@ -437,18 +437,21 @@ if (NULL != colormaps_mode) { VERBOSE(printf("[k] Setting colormaps mode: %s\n", colormaps_mode)); Context_set_shuffler_mode(BD_COLORMAPS, Shuffler_parse_mode(colormaps_mode)); + xfree(colormaps_mode); } images_mode = g_key_file_get_string(kf, ENGINE, "ImagesMode", NULL); if (NULL != images_mode) { - VERBOSE(printf("[k] Setting images mode: %s\n", colormaps_mode)); + VERBOSE(printf("[k] Setting images mode: %s\n", images_mode)); Context_set_shuffler_mode(BD_IMAGES, Shuffler_parse_mode(images_mode)); + xfree(images_mode); } sequences_mode = g_key_file_get_string(kf, ENGINE, "SequencesMode", NULL); if (NULL != sequences_mode) { VERBOSE(printf("[k] Setting sequences mode: %s\n", sequences_mode)); Context_set_shuffler_mode(BD_SEQUENCES, Shuffler_parse_mode(sequences_mode)); + xfree(sequences_mode); } #ifdef WITH_WEBCAM diff -Nru lebiniou-3.31/src/keys.h lebiniou-3.40/src/keys.h --- lebiniou-3.31/src/keys.h 2019-04-05 20:39:16.000000000 +0000 +++ lebiniou-3.40/src/keys.h 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * diff -Nru lebiniou-3.31/src/layer.c lebiniou-3.40/src/layer.c --- lebiniou-3.31/src/layer.c 2019-04-05 20:39:16.000000000 +0000 +++ lebiniou-3.40/src/layer.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -36,6 +36,7 @@ void Layer_delete(Layer_t *l) { + json_decref(l->plugin_parameters); xfree(l); } @@ -44,7 +45,9 @@ Layer_copy(const Layer_t *from) { Layer_t *l = Layer_new(from->plugin); + l->mode = from->mode; + l->plugin_parameters = json_deep_copy(from->plugin_parameters); return l; } @@ -87,33 +90,33 @@ LayerMode_to_string(const enum LayerMode mode) { switch (mode) { - case NONE: - return "none"; - break; - - case NORMAL: - return "normal"; - break; - - case OVERLAY: - return "overlay"; - break; - - case XOR: - return "xor"; - break; - - case AVERAGE: - return "average"; - break; - - case RANDOM: - return "random"; - break; - - default: - xerror("LayerMode_to_string: unknown mode= %d\n", mode); - break; + case NONE: + return "none"; + break; + + case NORMAL: + return "normal"; + break; + + case OVERLAY: + return "overlay"; + break; + + case XOR: + return "xor"; + break; + + case AVERAGE: + return "average"; + break; + + case RANDOM: + return "random"; + break; + + default: + xerror("LayerMode_to_string: unknown mode= %d\n", mode); + break; } return NULL; /* not reached */ diff -Nru lebiniou-3.31/src/layer.h lebiniou-3.40/src/layer.h --- lebiniou-3.31/src/layer.h 2019-02-02 00:30:11.000000000 +0000 +++ lebiniou-3.40/src/layer.h 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -23,10 +23,11 @@ #include "plugin.h" -enum LayerMode { NONE=0, NORMAL, OVERLAY, XOR, AVERAGE, RANDOM } LayerMode_e; +enum LayerMode { NONE=0, NORMAL, OVERLAY, XOR, AVERAGE, RANDOM, NB_LAYER_MODES } LayerMode_e; typedef struct Layer_s { Plugin_t *plugin; + json_t *plugin_parameters; enum LayerMode mode; } Layer_t; diff -Nru lebiniou-3.31/src/main.c lebiniou-3.40/src/main.c --- lebiniou-3.31/src/main.c 2019-04-05 20:39:16.000000000 +0000 +++ lebiniou-3.40/src/main.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -23,28 +23,21 @@ #include "colormaps.h" -char *data_dir = NULL; char *base_dir = NULL; char *schemes_file = NULL; char *input_plugin = NULL; char *output_plugin = NULL; char fullscreen = 0; long max_fps = 50; +char window_decorations = 1; +int32_t x_origin = INT32_MIN; +int32_t y_origin = INT32_MIN; u_short width = DEFAULT_WIDTH; u_short height = DEFAULT_HEIGHT; enum RandomMode random_mode = BR_SCHEMES; char *pid_file = "/tmp/lebiniou.pid"; char *themes = NULL; -#ifdef WITH_WEBCAM -int webcams = 1; -int hflip = 1; -int vflip = 1; -char *video_base; -#else -int webcams = 0; -#endif uint8_t statistics = 0; // Display statistics -char *video_filename = NULL; // video plugin /* default input size (samples) */ #define DEFAULT_INPUT_SIZE 1024 @@ -59,20 +52,20 @@ double volume_scale = 1.0; -#define _BANNER "\n" \ - " _ ___ _ _ \n" \ - " | | ___ | _ | )_ _ ( )___ _ _ \n" \ - " | |__/ -_) | _ \\ | ' \\| / _ \\ || |\n" \ - " |____\\___| |___/_|_||_|_\\___/\\_,_|\n" \ - "\n" \ - " .:[ " PACKAGE_STRING " ]:.\n" \ - " -------------------------------------------\n" \ - " \"Une cause très petite, qui nous échappe,\n" \ - " détermine un effet considérable que nous \n" \ - " ne pouvons pas ne pas voir, et alors nous\n" \ - " disons que cet effet est dû au hasard.\" \n" \ - "\n" \ - " -- Henri Poincaré, 1908\n" \ +#define _BANNER "\n" \ + " _ ___ _ _ \n" \ + " | | ___ | _ | )_ _ ( )___ _ _ \n" \ + " | |__/ -_) | _ \\ | ' \\| / _ \\ || |\n" \ + " |____\\___| |___/_|_||_|_\\___/\\_,_|\n" \ + "\n" \ + " .:[ " PACKAGE_STRING " ]:.\n" \ + " -------------------------------------------\n" \ + " \"Une cause très petite, qui nous échappe,\n" \ + " détermine un effet considérable que nous \n" \ + " ne pouvons pas ne pas voir, et alors nous\n" \ + " disons que cet effet est dû au hasard.\" \n" \ + "\n" \ + " -- Henri Poincaré, 1908\n" \ " -------------------------------------------\n" @@ -157,11 +150,38 @@ do_banner(); } - /* Initialize library */ - biniou_new(data_dir, base_dir, schemes_file, themes, + WIDTH_ORIGIN = x_origin; + HEIGHT_ORIGIN = y_origin; #ifndef FIXED - width, height, + WIDTH = width; + HEIGHT = height; #endif + + /* PRNG */ + b_rand_init(); + + /* Create context */ + context = Context_new(webcams); + Context_set_input_size(context, input_size); + Context_set_phase_space_delay(context, phase_space_delay); + Context_set_span_size(context, span_size); + + biniou_set_max_fps(max_fps); + + /* Load input */ + if (NULL != input_plugin) { + biniou_load_input(base_dir, input_plugin, volume_scale); + } + + /* Load output */ + if (NULL != output_plugin) { + context->window_decorations = window_decorations; + biniou_load_output(base_dir, output_plugin); + biniou_set_full_screen(fullscreen); + } + + /* Initialize */ + biniou_new(data_dir, base_dir, schemes_file, themes, B_INIT_ALL #ifdef DEBUG |B_INIT_VERBOSE @@ -194,25 +214,19 @@ write_pid_file(); - biniou_set_max_fps(max_fps); biniou_set_random_mode(random_mode); - /* Load input */ - if (NULL != input_plugin) { - biniou_load_input(base_dir, input_plugin, volume_scale); - xfree(input_plugin); - } - - /* Load output */ - if (NULL != output_plugin) { - biniou_load_output(base_dir, output_plugin); - xfree(output_plugin); - biniou_set_full_screen(fullscreen); - } +#ifdef WITH_ULFIUS + Context_start_ulfius(context); +#endif /* Main loop */ biniou_run(); +#ifdef WITH_ULFIUS + Context_stop_ulfius(context); +#endif + /* All done */ biniou_delete(); diff -Nru lebiniou-3.31/src/main.h lebiniou-3.40/src/main.h --- lebiniou-3.31/src/main.h 2019-02-02 00:30:11.000000000 +0000 +++ lebiniou-3.40/src/main.h 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -30,6 +30,9 @@ extern char *output_plugin; extern char fullscreen; extern long max_fps; +extern char window_decorations; +extern int32_t x_origin; +extern int32_t y_origin; #ifndef FIXED extern u_short width; extern u_short height; diff -Nru lebiniou-3.31/src/Makefile.am lebiniou-3.40/src/Makefile.am --- lebiniou-3.31/src/Makefile.am 2019-04-05 20:39:15.000000000 +0000 +++ lebiniou-3.40/src/Makefile.am 2020-01-23 13:56:18.000000000 +0000 @@ -1,74 +1,90 @@ -bin_PROGRAMS = lebiniou - -lebiniou_SOURCES = main.c events.h cmdline.c signals.c main.h -lebiniou_SOURCES += \ +lebiniou_PROGRAMS = liblebiniou.so.0 +lebinioudir = $(libdir) +liblebiniou_so_0_CFLAGS = -fPIC ${MagickWand_CFLAGS} +liblebiniou_so_0_SOURCES = \ alarm.c alarm.h \ - biniou.c biniou.h \ btimer.c btimer.h \ - brandom.c brandom.h \ buffer_8bits.c buffer_8bits.h \ buffer_RGBA.c buffer_RGBA.h \ - circle.c circle.h \ + brandom.c brandom.h \ cmap_8bits.c cmap_8bits.h \ - cmapfader.c cmapfader.h \ + cmapfader.c cmapfader.h \ cmapfader_event.c \ colormaps.c colormaps.h \ - constants.h \ context.c context.h \ context_banks.c \ - context_event.c \ context_export.c \ - context_run.c \ + context_event.c \ event.h \ - event_enums.h \ + events.c \ fader.c fader.h \ globals.c globals.h \ - includes.h \ + image_8bits.c image_8bits.h \ + imagefader.c imagefader.h \ + imagefader_event.c \ + image_filter.c image_filter.h \ + images.c images.h \ input.c input.h \ - keyfile.c \ - keys.h \ layer.c layer.h \ options.c options.h \ oscillo.c oscillo.h \ params3d.c params3d.h \ particles.c particles.h \ - pbar.c pbar.h \ - imagefader.c imagefader.h \ - imagefader_event.c \ - image_8bits.c image_8bits.h \ - images.c images.h \ plugin.c plugin.h \ plugins.c plugins.h \ plugins_event.c \ pnglite.c pnglite.h \ - point2d.h point3d.h \ - rgba.h \ - schemes.c schemes.h \ schemes_random.c \ screenshot.c \ sequence.c sequence.h \ - sequence_load.c sequence_save.c \ sequencemanager.c sequencemanager.h \ sequencemanager_event.c \ + sequence_load.c sequence_save.c \ sequences.c sequences.h \ shuffler.c shuffler.h \ spline.c spline.h \ translation.c translation.h \ utils.c utils.h \ xmlutils.c xmlutils.h + if EXTRA_WEBCAM -lebiniou_SOURCES += webcam.h webcam_start_stop.c webcam_init_uninit.c \ +liblebiniou_so_0_SOURCES += webcam.h webcam_start_stop.c webcam_init_uninit.c \ webcam_loop.c webcam_open_close.c webcam_controls.c webcam_options.c endif + +if HAVE_ULFIUS +liblebiniou_so_0_SOURCES += bulfius.h bulfius_get.c bulfius_post.c +endif + +liblebiniou_so_0_LDFLAGS = -shared ${MagickWand_LDFLAGS} ${AVUTILS_LDFLAGS} ${SWSCALE_LDFLAGS} +liblebiniou_so_0_LDFLAGS += -Wl,-soname,liblebiniou.so.0 +liblebiniou_so_0_LDADD = ${MagickWand_LIBS} ${AVUTILS_LIBS} ${SWSCALE_LIBS} + +bin_PROGRAMS = lebiniou +lebiniou_SOURCES = main.c events.h cmdline.c signals.c main.h +lebiniou_SOURCES += \ + biniou.c biniou.h \ + circle.c circle.h \ + constants.h \ + context_run.c \ + event_enums.h \ + includes.h \ + keyfile.c \ + keys.h \ + point2d.h point3d.h \ + rgba.h \ + schemes.c schemes.h + if EXTRA_OPENGL lebiniou_SOURCES += context_gl.c endif dist_lebiniou_SOURCES = events.c.in gen.awk man.awk defaults.h.in -lebiniou_CFLAGS = -fPIE ${MagickWand_CFLAGS} -lebiniou_LDFLAGS = -pthread -pie -lebiniou_LDADD = ${MagickWand_LIBS} ${AVUTILS_LIBS} ${SWSCALE_LIBS} +lebiniou_DEPENDENCIES = liblebiniou.so.0 +lebiniou_CFLAGS = -fPIE -fPIC +lebiniou_LDFLAGS = -pthread +lebiniou_LDADD = ${MagickWand_LIBS} ${AVUTILS_LIBS} ${SWSCALE_LIBS} -L. -l:liblebiniou.so.0 BUILT_SOURCES = event_enums.h diff -Nru lebiniou-3.31/src/Makefile.in lebiniou-3.40/src/Makefile.in --- lebiniou-3.31/src/Makefile.in 2019-04-14 11:52:36.000000000 +0000 +++ lebiniou-3.40/src/Makefile.in 2020-01-23 13:57:20.000000000 +0000 @@ -89,11 +89,13 @@ build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ -bin_PROGRAMS = lebiniou$(EXEEXT) +lebiniou_PROGRAMS = liblebiniou.so.0$(EXEEXT) @EXTRA_WEBCAM_TRUE@am__append_1 = webcam.h webcam_start_stop.c webcam_init_uninit.c \ @EXTRA_WEBCAM_TRUE@ webcam_loop.c webcam_open_close.c webcam_controls.c webcam_options.c -@EXTRA_OPENGL_TRUE@am__append_2 = context_gl.c +@HAVE_ULFIUS_TRUE@am__append_2 = bulfius.h bulfius_get.c bulfius_post.c +bin_PROGRAMS = lebiniou$(EXEEXT) +@EXTRA_OPENGL_TRUE@am__append_3 = context_gl.c subdir = src ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac @@ -104,78 +106,104 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = defaults.h CONFIG_CLEAN_VPATH_FILES = -am__installdirs = "$(DESTDIR)$(bindir)" -PROGRAMS = $(bin_PROGRAMS) +am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(lebinioudir)" +PROGRAMS = $(bin_PROGRAMS) $(lebiniou_PROGRAMS) am__lebiniou_SOURCES_DIST = main.c events.h cmdline.c signals.c main.h \ - alarm.c alarm.h biniou.c biniou.h btimer.c btimer.h brandom.c \ - brandom.h buffer_8bits.c buffer_8bits.h buffer_RGBA.c \ - buffer_RGBA.h circle.c circle.h cmap_8bits.c cmap_8bits.h \ - cmapfader.c cmapfader.h cmapfader_event.c colormaps.c \ - colormaps.h constants.h context.c context.h context_banks.c \ - context_event.c context_export.c context_run.c event.h \ - event_enums.h fader.c fader.h globals.c globals.h includes.h \ - input.c input.h keyfile.c keys.h layer.c layer.h options.c \ - options.h oscillo.c oscillo.h params3d.c params3d.h \ - particles.c particles.h pbar.c pbar.h imagefader.c \ - imagefader.h imagefader_event.c image_8bits.c image_8bits.h \ - images.c images.h plugin.c plugin.h plugins.c plugins.h \ - plugins_event.c pnglite.c pnglite.h point2d.h point3d.h rgba.h \ - schemes.c schemes.h schemes_random.c screenshot.c sequence.c \ - sequence.h sequence_load.c sequence_save.c sequencemanager.c \ - sequencemanager.h sequencemanager_event.c sequences.c \ - sequences.h shuffler.c shuffler.h spline.c spline.h \ - translation.c translation.h utils.c utils.h xmlutils.c \ - xmlutils.h webcam.h webcam_start_stop.c webcam_init_uninit.c \ - webcam_loop.c webcam_open_close.c webcam_controls.c \ - webcam_options.c context_gl.c -@EXTRA_WEBCAM_TRUE@am__objects_1 = \ -@EXTRA_WEBCAM_TRUE@ lebiniou-webcam_start_stop.$(OBJEXT) \ -@EXTRA_WEBCAM_TRUE@ lebiniou-webcam_init_uninit.$(OBJEXT) \ -@EXTRA_WEBCAM_TRUE@ lebiniou-webcam_loop.$(OBJEXT) \ -@EXTRA_WEBCAM_TRUE@ lebiniou-webcam_open_close.$(OBJEXT) \ -@EXTRA_WEBCAM_TRUE@ lebiniou-webcam_controls.$(OBJEXT) \ -@EXTRA_WEBCAM_TRUE@ lebiniou-webcam_options.$(OBJEXT) -@EXTRA_OPENGL_TRUE@am__objects_2 = lebiniou-context_gl.$(OBJEXT) + biniou.c biniou.h circle.c circle.h constants.h context_run.c \ + event_enums.h includes.h keyfile.c keys.h point2d.h point3d.h \ + rgba.h schemes.c schemes.h context_gl.c +@EXTRA_OPENGL_TRUE@am__objects_1 = lebiniou-context_gl.$(OBJEXT) am_lebiniou_OBJECTS = lebiniou-main.$(OBJEXT) \ lebiniou-cmdline.$(OBJEXT) lebiniou-signals.$(OBJEXT) \ - lebiniou-alarm.$(OBJEXT) lebiniou-biniou.$(OBJEXT) \ - lebiniou-btimer.$(OBJEXT) lebiniou-brandom.$(OBJEXT) \ - lebiniou-buffer_8bits.$(OBJEXT) lebiniou-buffer_RGBA.$(OBJEXT) \ - lebiniou-circle.$(OBJEXT) lebiniou-cmap_8bits.$(OBJEXT) \ - lebiniou-cmapfader.$(OBJEXT) \ - lebiniou-cmapfader_event.$(OBJEXT) \ - lebiniou-colormaps.$(OBJEXT) lebiniou-context.$(OBJEXT) \ - lebiniou-context_banks.$(OBJEXT) \ - lebiniou-context_event.$(OBJEXT) \ - lebiniou-context_export.$(OBJEXT) \ - lebiniou-context_run.$(OBJEXT) lebiniou-fader.$(OBJEXT) \ - lebiniou-globals.$(OBJEXT) lebiniou-input.$(OBJEXT) \ - lebiniou-keyfile.$(OBJEXT) lebiniou-layer.$(OBJEXT) \ - lebiniou-options.$(OBJEXT) lebiniou-oscillo.$(OBJEXT) \ - lebiniou-params3d.$(OBJEXT) lebiniou-particles.$(OBJEXT) \ - lebiniou-pbar.$(OBJEXT) lebiniou-imagefader.$(OBJEXT) \ - lebiniou-imagefader_event.$(OBJEXT) \ - lebiniou-image_8bits.$(OBJEXT) lebiniou-images.$(OBJEXT) \ - lebiniou-plugin.$(OBJEXT) lebiniou-plugins.$(OBJEXT) \ - lebiniou-plugins_event.$(OBJEXT) lebiniou-pnglite.$(OBJEXT) \ - lebiniou-schemes.$(OBJEXT) lebiniou-schemes_random.$(OBJEXT) \ - lebiniou-screenshot.$(OBJEXT) lebiniou-sequence.$(OBJEXT) \ - lebiniou-sequence_load.$(OBJEXT) \ - lebiniou-sequence_save.$(OBJEXT) \ - lebiniou-sequencemanager.$(OBJEXT) \ - lebiniou-sequencemanager_event.$(OBJEXT) \ - lebiniou-sequences.$(OBJEXT) lebiniou-shuffler.$(OBJEXT) \ - lebiniou-spline.$(OBJEXT) lebiniou-translation.$(OBJEXT) \ - lebiniou-utils.$(OBJEXT) lebiniou-xmlutils.$(OBJEXT) \ - $(am__objects_1) $(am__objects_2) + lebiniou-biniou.$(OBJEXT) lebiniou-circle.$(OBJEXT) \ + lebiniou-context_run.$(OBJEXT) lebiniou-keyfile.$(OBJEXT) \ + lebiniou-schemes.$(OBJEXT) $(am__objects_1) dist_lebiniou_OBJECTS = nodist_lebiniou_OBJECTS = lebiniou-events.$(OBJEXT) lebiniou_OBJECTS = $(am_lebiniou_OBJECTS) $(dist_lebiniou_OBJECTS) \ $(nodist_lebiniou_OBJECTS) am__DEPENDENCIES_1 = -lebiniou_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) lebiniou_LINK = $(CCLD) $(lebiniou_CFLAGS) $(CFLAGS) \ $(lebiniou_LDFLAGS) $(LDFLAGS) -o $@ +am__liblebiniou_so_0_SOURCES_DIST = alarm.c alarm.h btimer.c btimer.h \ + buffer_8bits.c buffer_8bits.h buffer_RGBA.c buffer_RGBA.h \ + brandom.c brandom.h cmap_8bits.c cmap_8bits.h cmapfader.c \ + cmapfader.h cmapfader_event.c colormaps.c colormaps.h \ + context.c context.h context_banks.c context_export.c \ + context_event.c event.h events.c fader.c fader.h globals.c \ + globals.h image_8bits.c image_8bits.h imagefader.c \ + imagefader.h imagefader_event.c image_filter.c image_filter.h \ + images.c images.h input.c input.h layer.c layer.h options.c \ + options.h oscillo.c oscillo.h params3d.c params3d.h \ + particles.c particles.h plugin.c plugin.h plugins.c plugins.h \ + plugins_event.c pnglite.c pnglite.h schemes_random.c \ + screenshot.c sequence.c sequence.h sequencemanager.c \ + sequencemanager.h sequencemanager_event.c sequence_load.c \ + sequence_save.c sequences.c sequences.h shuffler.c shuffler.h \ + spline.c spline.h translation.c translation.h utils.c utils.h \ + xmlutils.c xmlutils.h webcam.h webcam_start_stop.c \ + webcam_init_uninit.c webcam_loop.c webcam_open_close.c \ + webcam_controls.c webcam_options.c bulfius.h bulfius_get.c \ + bulfius_post.c +@EXTRA_WEBCAM_TRUE@am__objects_2 = liblebiniou_so_0-webcam_start_stop.$(OBJEXT) \ +@EXTRA_WEBCAM_TRUE@ liblebiniou_so_0-webcam_init_uninit.$(OBJEXT) \ +@EXTRA_WEBCAM_TRUE@ liblebiniou_so_0-webcam_loop.$(OBJEXT) \ +@EXTRA_WEBCAM_TRUE@ liblebiniou_so_0-webcam_open_close.$(OBJEXT) \ +@EXTRA_WEBCAM_TRUE@ liblebiniou_so_0-webcam_controls.$(OBJEXT) \ +@EXTRA_WEBCAM_TRUE@ liblebiniou_so_0-webcam_options.$(OBJEXT) +@HAVE_ULFIUS_TRUE@am__objects_3 = \ +@HAVE_ULFIUS_TRUE@ liblebiniou_so_0-bulfius_get.$(OBJEXT) \ +@HAVE_ULFIUS_TRUE@ liblebiniou_so_0-bulfius_post.$(OBJEXT) +am_liblebiniou_so_0_OBJECTS = liblebiniou_so_0-alarm.$(OBJEXT) \ + liblebiniou_so_0-btimer.$(OBJEXT) \ + liblebiniou_so_0-buffer_8bits.$(OBJEXT) \ + liblebiniou_so_0-buffer_RGBA.$(OBJEXT) \ + liblebiniou_so_0-brandom.$(OBJEXT) \ + liblebiniou_so_0-cmap_8bits.$(OBJEXT) \ + liblebiniou_so_0-cmapfader.$(OBJEXT) \ + liblebiniou_so_0-cmapfader_event.$(OBJEXT) \ + liblebiniou_so_0-colormaps.$(OBJEXT) \ + liblebiniou_so_0-context.$(OBJEXT) \ + liblebiniou_so_0-context_banks.$(OBJEXT) \ + liblebiniou_so_0-context_export.$(OBJEXT) \ + liblebiniou_so_0-context_event.$(OBJEXT) \ + liblebiniou_so_0-events.$(OBJEXT) \ + liblebiniou_so_0-fader.$(OBJEXT) \ + liblebiniou_so_0-globals.$(OBJEXT) \ + liblebiniou_so_0-image_8bits.$(OBJEXT) \ + liblebiniou_so_0-imagefader.$(OBJEXT) \ + liblebiniou_so_0-imagefader_event.$(OBJEXT) \ + liblebiniou_so_0-image_filter.$(OBJEXT) \ + liblebiniou_so_0-images.$(OBJEXT) \ + liblebiniou_so_0-input.$(OBJEXT) \ + liblebiniou_so_0-layer.$(OBJEXT) \ + liblebiniou_so_0-options.$(OBJEXT) \ + liblebiniou_so_0-oscillo.$(OBJEXT) \ + liblebiniou_so_0-params3d.$(OBJEXT) \ + liblebiniou_so_0-particles.$(OBJEXT) \ + liblebiniou_so_0-plugin.$(OBJEXT) \ + liblebiniou_so_0-plugins.$(OBJEXT) \ + liblebiniou_so_0-plugins_event.$(OBJEXT) \ + liblebiniou_so_0-pnglite.$(OBJEXT) \ + liblebiniou_so_0-schemes_random.$(OBJEXT) \ + liblebiniou_so_0-screenshot.$(OBJEXT) \ + liblebiniou_so_0-sequence.$(OBJEXT) \ + liblebiniou_so_0-sequencemanager.$(OBJEXT) \ + liblebiniou_so_0-sequencemanager_event.$(OBJEXT) \ + liblebiniou_so_0-sequence_load.$(OBJEXT) \ + liblebiniou_so_0-sequence_save.$(OBJEXT) \ + liblebiniou_so_0-sequences.$(OBJEXT) \ + liblebiniou_so_0-shuffler.$(OBJEXT) \ + liblebiniou_so_0-spline.$(OBJEXT) \ + liblebiniou_so_0-translation.$(OBJEXT) \ + liblebiniou_so_0-utils.$(OBJEXT) \ + liblebiniou_so_0-xmlutils.$(OBJEXT) $(am__objects_2) \ + $(am__objects_3) +liblebiniou_so_0_OBJECTS = $(am_liblebiniou_so_0_OBJECTS) +liblebiniou_so_0_DEPENDENCIES = $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) +liblebiniou_so_0_LINK = $(CCLD) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) \ + $(liblebiniou_so_0_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) am__v_P_0 = false @@ -191,57 +219,65 @@ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__maybe_remake_depfiles = depfiles -am__depfiles_remade = ./$(DEPDIR)/lebiniou-alarm.Po \ - ./$(DEPDIR)/lebiniou-biniou.Po ./$(DEPDIR)/lebiniou-brandom.Po \ - ./$(DEPDIR)/lebiniou-btimer.Po \ - ./$(DEPDIR)/lebiniou-buffer_8bits.Po \ - ./$(DEPDIR)/lebiniou-buffer_RGBA.Po \ - ./$(DEPDIR)/lebiniou-circle.Po \ - ./$(DEPDIR)/lebiniou-cmap_8bits.Po \ - ./$(DEPDIR)/lebiniou-cmapfader.Po \ - ./$(DEPDIR)/lebiniou-cmapfader_event.Po \ - ./$(DEPDIR)/lebiniou-cmdline.Po \ - ./$(DEPDIR)/lebiniou-colormaps.Po \ - ./$(DEPDIR)/lebiniou-context.Po \ - ./$(DEPDIR)/lebiniou-context_banks.Po \ - ./$(DEPDIR)/lebiniou-context_event.Po \ - ./$(DEPDIR)/lebiniou-context_export.Po \ +am__depfiles_remade = ./$(DEPDIR)/lebiniou-biniou.Po \ + ./$(DEPDIR)/lebiniou-circle.Po ./$(DEPDIR)/lebiniou-cmdline.Po \ ./$(DEPDIR)/lebiniou-context_gl.Po \ ./$(DEPDIR)/lebiniou-context_run.Po \ - ./$(DEPDIR)/lebiniou-events.Po ./$(DEPDIR)/lebiniou-fader.Po \ - ./$(DEPDIR)/lebiniou-globals.Po \ - ./$(DEPDIR)/lebiniou-image_8bits.Po \ - ./$(DEPDIR)/lebiniou-imagefader.Po \ - ./$(DEPDIR)/lebiniou-imagefader_event.Po \ - ./$(DEPDIR)/lebiniou-images.Po ./$(DEPDIR)/lebiniou-input.Po \ - ./$(DEPDIR)/lebiniou-keyfile.Po ./$(DEPDIR)/lebiniou-layer.Po \ - ./$(DEPDIR)/lebiniou-main.Po ./$(DEPDIR)/lebiniou-options.Po \ - ./$(DEPDIR)/lebiniou-oscillo.Po \ - ./$(DEPDIR)/lebiniou-params3d.Po \ - ./$(DEPDIR)/lebiniou-particles.Po ./$(DEPDIR)/lebiniou-pbar.Po \ - ./$(DEPDIR)/lebiniou-plugin.Po ./$(DEPDIR)/lebiniou-plugins.Po \ - ./$(DEPDIR)/lebiniou-plugins_event.Po \ - ./$(DEPDIR)/lebiniou-pnglite.Po \ - ./$(DEPDIR)/lebiniou-schemes.Po \ - ./$(DEPDIR)/lebiniou-schemes_random.Po \ - ./$(DEPDIR)/lebiniou-screenshot.Po \ - ./$(DEPDIR)/lebiniou-sequence.Po \ - ./$(DEPDIR)/lebiniou-sequence_load.Po \ - ./$(DEPDIR)/lebiniou-sequence_save.Po \ - ./$(DEPDIR)/lebiniou-sequencemanager.Po \ - ./$(DEPDIR)/lebiniou-sequencemanager_event.Po \ - ./$(DEPDIR)/lebiniou-sequences.Po \ - ./$(DEPDIR)/lebiniou-shuffler.Po \ - ./$(DEPDIR)/lebiniou-signals.Po ./$(DEPDIR)/lebiniou-spline.Po \ - ./$(DEPDIR)/lebiniou-translation.Po \ - ./$(DEPDIR)/lebiniou-utils.Po \ - ./$(DEPDIR)/lebiniou-webcam_controls.Po \ - ./$(DEPDIR)/lebiniou-webcam_init_uninit.Po \ - ./$(DEPDIR)/lebiniou-webcam_loop.Po \ - ./$(DEPDIR)/lebiniou-webcam_open_close.Po \ - ./$(DEPDIR)/lebiniou-webcam_options.Po \ - ./$(DEPDIR)/lebiniou-webcam_start_stop.Po \ - ./$(DEPDIR)/lebiniou-xmlutils.Po + ./$(DEPDIR)/lebiniou-events.Po ./$(DEPDIR)/lebiniou-keyfile.Po \ + ./$(DEPDIR)/lebiniou-main.Po ./$(DEPDIR)/lebiniou-schemes.Po \ + ./$(DEPDIR)/lebiniou-signals.Po \ + ./$(DEPDIR)/liblebiniou_so_0-alarm.Po \ + ./$(DEPDIR)/liblebiniou_so_0-brandom.Po \ + ./$(DEPDIR)/liblebiniou_so_0-btimer.Po \ + ./$(DEPDIR)/liblebiniou_so_0-buffer_8bits.Po \ + ./$(DEPDIR)/liblebiniou_so_0-buffer_RGBA.Po \ + ./$(DEPDIR)/liblebiniou_so_0-bulfius_get.Po \ + ./$(DEPDIR)/liblebiniou_so_0-bulfius_post.Po \ + ./$(DEPDIR)/liblebiniou_so_0-cmap_8bits.Po \ + ./$(DEPDIR)/liblebiniou_so_0-cmapfader.Po \ + ./$(DEPDIR)/liblebiniou_so_0-cmapfader_event.Po \ + ./$(DEPDIR)/liblebiniou_so_0-colormaps.Po \ + ./$(DEPDIR)/liblebiniou_so_0-context.Po \ + ./$(DEPDIR)/liblebiniou_so_0-context_banks.Po \ + ./$(DEPDIR)/liblebiniou_so_0-context_event.Po \ + ./$(DEPDIR)/liblebiniou_so_0-context_export.Po \ + ./$(DEPDIR)/liblebiniou_so_0-events.Po \ + ./$(DEPDIR)/liblebiniou_so_0-fader.Po \ + ./$(DEPDIR)/liblebiniou_so_0-globals.Po \ + ./$(DEPDIR)/liblebiniou_so_0-image_8bits.Po \ + ./$(DEPDIR)/liblebiniou_so_0-image_filter.Po \ + ./$(DEPDIR)/liblebiniou_so_0-imagefader.Po \ + ./$(DEPDIR)/liblebiniou_so_0-imagefader_event.Po \ + ./$(DEPDIR)/liblebiniou_so_0-images.Po \ + ./$(DEPDIR)/liblebiniou_so_0-input.Po \ + ./$(DEPDIR)/liblebiniou_so_0-layer.Po \ + ./$(DEPDIR)/liblebiniou_so_0-options.Po \ + ./$(DEPDIR)/liblebiniou_so_0-oscillo.Po \ + ./$(DEPDIR)/liblebiniou_so_0-params3d.Po \ + ./$(DEPDIR)/liblebiniou_so_0-particles.Po \ + ./$(DEPDIR)/liblebiniou_so_0-plugin.Po \ + ./$(DEPDIR)/liblebiniou_so_0-plugins.Po \ + ./$(DEPDIR)/liblebiniou_so_0-plugins_event.Po \ + ./$(DEPDIR)/liblebiniou_so_0-pnglite.Po \ + ./$(DEPDIR)/liblebiniou_so_0-schemes_random.Po \ + ./$(DEPDIR)/liblebiniou_so_0-screenshot.Po \ + ./$(DEPDIR)/liblebiniou_so_0-sequence.Po \ + ./$(DEPDIR)/liblebiniou_so_0-sequence_load.Po \ + ./$(DEPDIR)/liblebiniou_so_0-sequence_save.Po \ + ./$(DEPDIR)/liblebiniou_so_0-sequencemanager.Po \ + ./$(DEPDIR)/liblebiniou_so_0-sequencemanager_event.Po \ + ./$(DEPDIR)/liblebiniou_so_0-sequences.Po \ + ./$(DEPDIR)/liblebiniou_so_0-shuffler.Po \ + ./$(DEPDIR)/liblebiniou_so_0-spline.Po \ + ./$(DEPDIR)/liblebiniou_so_0-translation.Po \ + ./$(DEPDIR)/liblebiniou_so_0-utils.Po \ + ./$(DEPDIR)/liblebiniou_so_0-webcam_controls.Po \ + ./$(DEPDIR)/liblebiniou_so_0-webcam_init_uninit.Po \ + ./$(DEPDIR)/liblebiniou_so_0-webcam_loop.Po \ + ./$(DEPDIR)/liblebiniou_so_0-webcam_open_close.Po \ + ./$(DEPDIR)/liblebiniou_so_0-webcam_options.Po \ + ./$(DEPDIR)/liblebiniou_so_0-webcam_start_stop.Po \ + ./$(DEPDIR)/liblebiniou_so_0-xmlutils.Po am__mv = mv -f AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) @@ -260,8 +296,9 @@ am__v_CCLD_0 = @echo " CCLD " $@; am__v_CCLD_1 = SOURCES = $(lebiniou_SOURCES) $(dist_lebiniou_SOURCES) \ - $(nodist_lebiniou_SOURCES) -DIST_SOURCES = $(am__lebiniou_SOURCES_DIST) $(dist_lebiniou_SOURCES) + $(nodist_lebiniou_SOURCES) $(liblebiniou_so_0_SOURCES) +DIST_SOURCES = $(am__lebiniou_SOURCES_DIST) $(dist_lebiniou_SOURCES) \ + $(am__liblebiniou_so_0_SOURCES_DIST) am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -337,6 +374,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ +JANSSON_CFLAGS = @JANSSON_CFLAGS@ +JANSSON_LIBS = @JANSSON_LIBS@ LDFLAGS = @LDFLAGS@ LEBINIOU_DATADIR = @LEBINIOU_DATADIR@ LEBINIOU_PLUGINSDIR = @LEBINIOU_PLUGINSDIR@ @@ -364,6 +403,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDADD = @PLUGIN_LDADD@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ @@ -378,7 +418,10 @@ SNDFILE_LIBS = @SNDFILE_LIBS@ STRIP = @STRIP@ SWSCALE_CFLAGS = @SWSCALE_CFLAGS@ +SWSCALE_LDFLAGS = @SWSCALE_LDFLAGS@ SWSCALE_LIBS = @SWSCALE_LIBS@ +ULFIUS_CFLAGS = @ULFIUS_CFLAGS@ +ULFIUS_LIBS = @ULFIUS_LIBS@ VERSION = @VERSION@ XML2_CFLAGS = @XML2_CFLAGS@ XML2_LIBS = @XML2_LIBS@ @@ -438,32 +481,40 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -lebiniou_SOURCES = main.c events.h cmdline.c signals.c main.h alarm.c \ - alarm.h biniou.c biniou.h btimer.c btimer.h brandom.c \ - brandom.h buffer_8bits.c buffer_8bits.h buffer_RGBA.c \ - buffer_RGBA.h circle.c circle.h cmap_8bits.c cmap_8bits.h \ - cmapfader.c cmapfader.h cmapfader_event.c colormaps.c \ - colormaps.h constants.h context.c context.h context_banks.c \ - context_event.c context_export.c context_run.c event.h \ - event_enums.h fader.c fader.h globals.c globals.h includes.h \ - input.c input.h keyfile.c keys.h layer.c layer.h options.c \ +lebinioudir = $(libdir) +liblebiniou_so_0_CFLAGS = -fPIC ${MagickWand_CFLAGS} +liblebiniou_so_0_SOURCES = alarm.c alarm.h btimer.c btimer.h \ + buffer_8bits.c buffer_8bits.h buffer_RGBA.c buffer_RGBA.h \ + brandom.c brandom.h cmap_8bits.c cmap_8bits.h cmapfader.c \ + cmapfader.h cmapfader_event.c colormaps.c colormaps.h \ + context.c context.h context_banks.c context_export.c \ + context_event.c event.h events.c fader.c fader.h globals.c \ + globals.h image_8bits.c image_8bits.h imagefader.c \ + imagefader.h imagefader_event.c image_filter.c image_filter.h \ + images.c images.h input.c input.h layer.c layer.h options.c \ options.h oscillo.c oscillo.h params3d.c params3d.h \ - particles.c particles.h pbar.c pbar.h imagefader.c \ - imagefader.h imagefader_event.c image_8bits.c image_8bits.h \ - images.c images.h plugin.c plugin.h plugins.c plugins.h \ - plugins_event.c pnglite.c pnglite.h point2d.h point3d.h rgba.h \ - schemes.c schemes.h schemes_random.c screenshot.c sequence.c \ - sequence.h sequence_load.c sequence_save.c sequencemanager.c \ - sequencemanager.h sequencemanager_event.c sequences.c \ - sequences.h shuffler.c shuffler.h spline.c spline.h \ - translation.c translation.h utils.c utils.h xmlutils.c \ - xmlutils.h $(am__append_1) $(am__append_2) + particles.c particles.h plugin.c plugin.h plugins.c plugins.h \ + plugins_event.c pnglite.c pnglite.h schemes_random.c \ + screenshot.c sequence.c sequence.h sequencemanager.c \ + sequencemanager.h sequencemanager_event.c sequence_load.c \ + sequence_save.c sequences.c sequences.h shuffler.c shuffler.h \ + spline.c spline.h translation.c translation.h utils.c utils.h \ + xmlutils.c xmlutils.h $(am__append_1) $(am__append_2) +liblebiniou_so_0_LDFLAGS = -shared ${MagickWand_LDFLAGS} \ + ${AVUTILS_LDFLAGS} ${SWSCALE_LDFLAGS} \ + -Wl,-soname,liblebiniou.so.0 +liblebiniou_so_0_LDADD = ${MagickWand_LIBS} ${AVUTILS_LIBS} ${SWSCALE_LIBS} +lebiniou_SOURCES = main.c events.h cmdline.c signals.c main.h biniou.c \ + biniou.h circle.c circle.h constants.h context_run.c \ + event_enums.h includes.h keyfile.c keys.h point2d.h point3d.h \ + rgba.h schemes.c schemes.h $(am__append_3) dist_lebiniou_SOURCES = events.c.in gen.awk man.awk defaults.h.in \ event_enums.h.head event_enums.to event_enums.cmd \ event_enums.arg event_enums.h.tail event_enums.awk gen.awk -lebiniou_CFLAGS = -fPIE ${MagickWand_CFLAGS} -lebiniou_LDFLAGS = -pthread -pie -lebiniou_LDADD = ${MagickWand_LIBS} ${AVUTILS_LIBS} ${SWSCALE_LIBS} +lebiniou_DEPENDENCIES = liblebiniou.so.0 +lebiniou_CFLAGS = -fPIE -fPIC +lebiniou_LDFLAGS = -pthread +lebiniou_LDADD = ${MagickWand_LIBS} ${AVUTILS_LIBS} ${SWSCALE_LIBS} -L. -l:liblebiniou.so.0 BUILT_SOURCES = event_enums.h nodist_lebiniou_SOURCES = events.c event_enums.h CLEANFILES = events.c event_enums.h @@ -545,76 +596,125 @@ clean-binPROGRAMS: -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) +install-lebiniouPROGRAMS: $(lebiniou_PROGRAMS) + @$(NORMAL_INSTALL) + @list='$(lebiniou_PROGRAMS)'; test -n "$(lebinioudir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(lebinioudir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(lebinioudir)" || exit 1; \ + fi; \ + for p in $$list; do echo "$$p $$p"; done | \ + sed 's/$(EXEEXT)$$//' | \ + while read p p1; do if test -f $$p \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ + done | \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ + -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ + sed 'N;N;N;s,\n, ,g' | \ + $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ + { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ + if ($$2 == $$4) files[d] = files[d] " " $$1; \ + else { print "f", $$3 "/" $$4, $$1; } } \ + END { for (d in files) print "f", d, files[d] }' | \ + while read type dir files; do \ + if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ + test -z "$$files" || { \ + echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(lebinioudir)$$dir'"; \ + $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(lebinioudir)$$dir" || exit $$?; \ + } \ + ; done + +uninstall-lebiniouPROGRAMS: + @$(NORMAL_UNINSTALL) + @list='$(lebiniou_PROGRAMS)'; test -n "$(lebinioudir)" || list=; \ + files=`for p in $$list; do echo "$$p"; done | \ + sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ + -e 's/$$/$(EXEEXT)/' \ + `; \ + test -n "$$list" || exit 0; \ + echo " ( cd '$(DESTDIR)$(lebinioudir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(lebinioudir)" && rm -f $$files + +clean-lebiniouPROGRAMS: + -test -z "$(lebiniou_PROGRAMS)" || rm -f $(lebiniou_PROGRAMS) lebiniou$(EXEEXT): $(lebiniou_OBJECTS) $(lebiniou_DEPENDENCIES) $(EXTRA_lebiniou_DEPENDENCIES) @rm -f lebiniou$(EXEEXT) $(AM_V_CCLD)$(lebiniou_LINK) $(lebiniou_OBJECTS) $(lebiniou_LDADD) $(LIBS) +liblebiniou.so.0$(EXEEXT): $(liblebiniou_so_0_OBJECTS) $(liblebiniou_so_0_DEPENDENCIES) $(EXTRA_liblebiniou_so_0_DEPENDENCIES) + @rm -f liblebiniou.so.0$(EXEEXT) + $(AM_V_CCLD)$(liblebiniou_so_0_LINK) $(liblebiniou_so_0_OBJECTS) $(liblebiniou_so_0_LDADD) $(LIBS) + mostlyclean-compile: -rm -f *.$(OBJEXT) distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lebiniou-alarm.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lebiniou-biniou.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lebiniou-brandom.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lebiniou-btimer.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lebiniou-buffer_8bits.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lebiniou-buffer_RGBA.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lebiniou-circle.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lebiniou-cmap_8bits.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lebiniou-cmapfader.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lebiniou-cmapfader_event.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lebiniou-cmdline.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lebiniou-colormaps.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lebiniou-context.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lebiniou-context_banks.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lebiniou-context_event.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lebiniou-context_export.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lebiniou-context_gl.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lebiniou-context_run.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lebiniou-events.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lebiniou-fader.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lebiniou-globals.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lebiniou-image_8bits.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lebiniou-imagefader.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lebiniou-imagefader_event.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lebiniou-images.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lebiniou-input.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lebiniou-keyfile.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lebiniou-layer.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lebiniou-main.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lebiniou-options.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lebiniou-oscillo.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lebiniou-params3d.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lebiniou-particles.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lebiniou-pbar.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lebiniou-plugin.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lebiniou-plugins.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lebiniou-plugins_event.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lebiniou-pnglite.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lebiniou-schemes.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lebiniou-schemes_random.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lebiniou-screenshot.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lebiniou-sequence.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lebiniou-sequence_load.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lebiniou-sequence_save.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lebiniou-sequencemanager.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lebiniou-sequencemanager_event.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lebiniou-sequences.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lebiniou-shuffler.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lebiniou-signals.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lebiniou-spline.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lebiniou-translation.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lebiniou-utils.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lebiniou-webcam_controls.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lebiniou-webcam_init_uninit.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lebiniou-webcam_loop.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lebiniou-webcam_open_close.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lebiniou-webcam_options.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lebiniou-webcam_start_stop.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lebiniou-xmlutils.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblebiniou_so_0-alarm.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblebiniou_so_0-brandom.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblebiniou_so_0-btimer.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblebiniou_so_0-buffer_8bits.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblebiniou_so_0-buffer_RGBA.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblebiniou_so_0-bulfius_get.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblebiniou_so_0-bulfius_post.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblebiniou_so_0-cmap_8bits.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblebiniou_so_0-cmapfader.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblebiniou_so_0-cmapfader_event.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblebiniou_so_0-colormaps.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblebiniou_so_0-context.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblebiniou_so_0-context_banks.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblebiniou_so_0-context_event.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblebiniou_so_0-context_export.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblebiniou_so_0-events.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblebiniou_so_0-fader.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblebiniou_so_0-globals.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblebiniou_so_0-image_8bits.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblebiniou_so_0-image_filter.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblebiniou_so_0-imagefader.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblebiniou_so_0-imagefader_event.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblebiniou_so_0-images.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblebiniou_so_0-input.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblebiniou_so_0-layer.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblebiniou_so_0-options.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblebiniou_so_0-oscillo.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblebiniou_so_0-params3d.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblebiniou_so_0-particles.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblebiniou_so_0-plugin.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblebiniou_so_0-plugins.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblebiniou_so_0-plugins_event.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblebiniou_so_0-pnglite.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblebiniou_so_0-schemes_random.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblebiniou_so_0-screenshot.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblebiniou_so_0-sequence.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblebiniou_so_0-sequence_load.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblebiniou_so_0-sequence_save.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblebiniou_so_0-sequencemanager.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblebiniou_so_0-sequencemanager_event.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblebiniou_so_0-sequences.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblebiniou_so_0-shuffler.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblebiniou_so_0-spline.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblebiniou_so_0-translation.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblebiniou_so_0-utils.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblebiniou_so_0-webcam_controls.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblebiniou_so_0-webcam_init_uninit.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblebiniou_so_0-webcam_loop.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblebiniou_so_0-webcam_open_close.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblebiniou_so_0-webcam_options.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblebiniou_so_0-webcam_start_stop.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblebiniou_so_0-xmlutils.Po@am__quote@ # am--include-marker $(am__depfiles_remade): @$(MKDIR_P) $(@D) @@ -678,20 +778,6 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -c -o lebiniou-signals.obj `if test -f 'signals.c'; then $(CYGPATH_W) 'signals.c'; else $(CYGPATH_W) '$(srcdir)/signals.c'; fi` -lebiniou-alarm.o: alarm.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -MT lebiniou-alarm.o -MD -MP -MF $(DEPDIR)/lebiniou-alarm.Tpo -c -o lebiniou-alarm.o `test -f 'alarm.c' || echo '$(srcdir)/'`alarm.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lebiniou-alarm.Tpo $(DEPDIR)/lebiniou-alarm.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='alarm.c' object='lebiniou-alarm.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -c -o lebiniou-alarm.o `test -f 'alarm.c' || echo '$(srcdir)/'`alarm.c - -lebiniou-alarm.obj: alarm.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -MT lebiniou-alarm.obj -MD -MP -MF $(DEPDIR)/lebiniou-alarm.Tpo -c -o lebiniou-alarm.obj `if test -f 'alarm.c'; then $(CYGPATH_W) 'alarm.c'; else $(CYGPATH_W) '$(srcdir)/alarm.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lebiniou-alarm.Tpo $(DEPDIR)/lebiniou-alarm.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='alarm.c' object='lebiniou-alarm.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -c -o lebiniou-alarm.obj `if test -f 'alarm.c'; then $(CYGPATH_W) 'alarm.c'; else $(CYGPATH_W) '$(srcdir)/alarm.c'; fi` - lebiniou-biniou.o: biniou.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -MT lebiniou-biniou.o -MD -MP -MF $(DEPDIR)/lebiniou-biniou.Tpo -c -o lebiniou-biniou.o `test -f 'biniou.c' || echo '$(srcdir)/'`biniou.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lebiniou-biniou.Tpo $(DEPDIR)/lebiniou-biniou.Po @@ -706,761 +792,817 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -c -o lebiniou-biniou.obj `if test -f 'biniou.c'; then $(CYGPATH_W) 'biniou.c'; else $(CYGPATH_W) '$(srcdir)/biniou.c'; fi` -lebiniou-btimer.o: btimer.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -MT lebiniou-btimer.o -MD -MP -MF $(DEPDIR)/lebiniou-btimer.Tpo -c -o lebiniou-btimer.o `test -f 'btimer.c' || echo '$(srcdir)/'`btimer.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lebiniou-btimer.Tpo $(DEPDIR)/lebiniou-btimer.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='btimer.c' object='lebiniou-btimer.o' libtool=no @AMDEPBACKSLASH@ +lebiniou-circle.o: circle.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -MT lebiniou-circle.o -MD -MP -MF $(DEPDIR)/lebiniou-circle.Tpo -c -o lebiniou-circle.o `test -f 'circle.c' || echo '$(srcdir)/'`circle.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lebiniou-circle.Tpo $(DEPDIR)/lebiniou-circle.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='circle.c' object='lebiniou-circle.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -c -o lebiniou-btimer.o `test -f 'btimer.c' || echo '$(srcdir)/'`btimer.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -c -o lebiniou-circle.o `test -f 'circle.c' || echo '$(srcdir)/'`circle.c -lebiniou-btimer.obj: btimer.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -MT lebiniou-btimer.obj -MD -MP -MF $(DEPDIR)/lebiniou-btimer.Tpo -c -o lebiniou-btimer.obj `if test -f 'btimer.c'; then $(CYGPATH_W) 'btimer.c'; else $(CYGPATH_W) '$(srcdir)/btimer.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lebiniou-btimer.Tpo $(DEPDIR)/lebiniou-btimer.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='btimer.c' object='lebiniou-btimer.obj' libtool=no @AMDEPBACKSLASH@ +lebiniou-circle.obj: circle.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -MT lebiniou-circle.obj -MD -MP -MF $(DEPDIR)/lebiniou-circle.Tpo -c -o lebiniou-circle.obj `if test -f 'circle.c'; then $(CYGPATH_W) 'circle.c'; else $(CYGPATH_W) '$(srcdir)/circle.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lebiniou-circle.Tpo $(DEPDIR)/lebiniou-circle.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='circle.c' object='lebiniou-circle.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -c -o lebiniou-btimer.obj `if test -f 'btimer.c'; then $(CYGPATH_W) 'btimer.c'; else $(CYGPATH_W) '$(srcdir)/btimer.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -c -o lebiniou-circle.obj `if test -f 'circle.c'; then $(CYGPATH_W) 'circle.c'; else $(CYGPATH_W) '$(srcdir)/circle.c'; fi` -lebiniou-brandom.o: brandom.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -MT lebiniou-brandom.o -MD -MP -MF $(DEPDIR)/lebiniou-brandom.Tpo -c -o lebiniou-brandom.o `test -f 'brandom.c' || echo '$(srcdir)/'`brandom.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lebiniou-brandom.Tpo $(DEPDIR)/lebiniou-brandom.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='brandom.c' object='lebiniou-brandom.o' libtool=no @AMDEPBACKSLASH@ +lebiniou-context_run.o: context_run.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -MT lebiniou-context_run.o -MD -MP -MF $(DEPDIR)/lebiniou-context_run.Tpo -c -o lebiniou-context_run.o `test -f 'context_run.c' || echo '$(srcdir)/'`context_run.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lebiniou-context_run.Tpo $(DEPDIR)/lebiniou-context_run.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='context_run.c' object='lebiniou-context_run.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -c -o lebiniou-brandom.o `test -f 'brandom.c' || echo '$(srcdir)/'`brandom.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -c -o lebiniou-context_run.o `test -f 'context_run.c' || echo '$(srcdir)/'`context_run.c -lebiniou-brandom.obj: brandom.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -MT lebiniou-brandom.obj -MD -MP -MF $(DEPDIR)/lebiniou-brandom.Tpo -c -o lebiniou-brandom.obj `if test -f 'brandom.c'; then $(CYGPATH_W) 'brandom.c'; else $(CYGPATH_W) '$(srcdir)/brandom.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lebiniou-brandom.Tpo $(DEPDIR)/lebiniou-brandom.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='brandom.c' object='lebiniou-brandom.obj' libtool=no @AMDEPBACKSLASH@ +lebiniou-context_run.obj: context_run.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -MT lebiniou-context_run.obj -MD -MP -MF $(DEPDIR)/lebiniou-context_run.Tpo -c -o lebiniou-context_run.obj `if test -f 'context_run.c'; then $(CYGPATH_W) 'context_run.c'; else $(CYGPATH_W) '$(srcdir)/context_run.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lebiniou-context_run.Tpo $(DEPDIR)/lebiniou-context_run.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='context_run.c' object='lebiniou-context_run.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -c -o lebiniou-brandom.obj `if test -f 'brandom.c'; then $(CYGPATH_W) 'brandom.c'; else $(CYGPATH_W) '$(srcdir)/brandom.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -c -o lebiniou-context_run.obj `if test -f 'context_run.c'; then $(CYGPATH_W) 'context_run.c'; else $(CYGPATH_W) '$(srcdir)/context_run.c'; fi` -lebiniou-buffer_8bits.o: buffer_8bits.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -MT lebiniou-buffer_8bits.o -MD -MP -MF $(DEPDIR)/lebiniou-buffer_8bits.Tpo -c -o lebiniou-buffer_8bits.o `test -f 'buffer_8bits.c' || echo '$(srcdir)/'`buffer_8bits.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lebiniou-buffer_8bits.Tpo $(DEPDIR)/lebiniou-buffer_8bits.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='buffer_8bits.c' object='lebiniou-buffer_8bits.o' libtool=no @AMDEPBACKSLASH@ +lebiniou-keyfile.o: keyfile.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -MT lebiniou-keyfile.o -MD -MP -MF $(DEPDIR)/lebiniou-keyfile.Tpo -c -o lebiniou-keyfile.o `test -f 'keyfile.c' || echo '$(srcdir)/'`keyfile.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lebiniou-keyfile.Tpo $(DEPDIR)/lebiniou-keyfile.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='keyfile.c' object='lebiniou-keyfile.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -c -o lebiniou-buffer_8bits.o `test -f 'buffer_8bits.c' || echo '$(srcdir)/'`buffer_8bits.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -c -o lebiniou-keyfile.o `test -f 'keyfile.c' || echo '$(srcdir)/'`keyfile.c -lebiniou-buffer_8bits.obj: buffer_8bits.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -MT lebiniou-buffer_8bits.obj -MD -MP -MF $(DEPDIR)/lebiniou-buffer_8bits.Tpo -c -o lebiniou-buffer_8bits.obj `if test -f 'buffer_8bits.c'; then $(CYGPATH_W) 'buffer_8bits.c'; else $(CYGPATH_W) '$(srcdir)/buffer_8bits.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lebiniou-buffer_8bits.Tpo $(DEPDIR)/lebiniou-buffer_8bits.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='buffer_8bits.c' object='lebiniou-buffer_8bits.obj' libtool=no @AMDEPBACKSLASH@ +lebiniou-keyfile.obj: keyfile.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -MT lebiniou-keyfile.obj -MD -MP -MF $(DEPDIR)/lebiniou-keyfile.Tpo -c -o lebiniou-keyfile.obj `if test -f 'keyfile.c'; then $(CYGPATH_W) 'keyfile.c'; else $(CYGPATH_W) '$(srcdir)/keyfile.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lebiniou-keyfile.Tpo $(DEPDIR)/lebiniou-keyfile.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='keyfile.c' object='lebiniou-keyfile.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -c -o lebiniou-buffer_8bits.obj `if test -f 'buffer_8bits.c'; then $(CYGPATH_W) 'buffer_8bits.c'; else $(CYGPATH_W) '$(srcdir)/buffer_8bits.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -c -o lebiniou-keyfile.obj `if test -f 'keyfile.c'; then $(CYGPATH_W) 'keyfile.c'; else $(CYGPATH_W) '$(srcdir)/keyfile.c'; fi` -lebiniou-buffer_RGBA.o: buffer_RGBA.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -MT lebiniou-buffer_RGBA.o -MD -MP -MF $(DEPDIR)/lebiniou-buffer_RGBA.Tpo -c -o lebiniou-buffer_RGBA.o `test -f 'buffer_RGBA.c' || echo '$(srcdir)/'`buffer_RGBA.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lebiniou-buffer_RGBA.Tpo $(DEPDIR)/lebiniou-buffer_RGBA.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='buffer_RGBA.c' object='lebiniou-buffer_RGBA.o' libtool=no @AMDEPBACKSLASH@ +lebiniou-schemes.o: schemes.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -MT lebiniou-schemes.o -MD -MP -MF $(DEPDIR)/lebiniou-schemes.Tpo -c -o lebiniou-schemes.o `test -f 'schemes.c' || echo '$(srcdir)/'`schemes.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lebiniou-schemes.Tpo $(DEPDIR)/lebiniou-schemes.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='schemes.c' object='lebiniou-schemes.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -c -o lebiniou-buffer_RGBA.o `test -f 'buffer_RGBA.c' || echo '$(srcdir)/'`buffer_RGBA.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -c -o lebiniou-schemes.o `test -f 'schemes.c' || echo '$(srcdir)/'`schemes.c -lebiniou-buffer_RGBA.obj: buffer_RGBA.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -MT lebiniou-buffer_RGBA.obj -MD -MP -MF $(DEPDIR)/lebiniou-buffer_RGBA.Tpo -c -o lebiniou-buffer_RGBA.obj `if test -f 'buffer_RGBA.c'; then $(CYGPATH_W) 'buffer_RGBA.c'; else $(CYGPATH_W) '$(srcdir)/buffer_RGBA.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lebiniou-buffer_RGBA.Tpo $(DEPDIR)/lebiniou-buffer_RGBA.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='buffer_RGBA.c' object='lebiniou-buffer_RGBA.obj' libtool=no @AMDEPBACKSLASH@ +lebiniou-schemes.obj: schemes.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -MT lebiniou-schemes.obj -MD -MP -MF $(DEPDIR)/lebiniou-schemes.Tpo -c -o lebiniou-schemes.obj `if test -f 'schemes.c'; then $(CYGPATH_W) 'schemes.c'; else $(CYGPATH_W) '$(srcdir)/schemes.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lebiniou-schemes.Tpo $(DEPDIR)/lebiniou-schemes.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='schemes.c' object='lebiniou-schemes.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -c -o lebiniou-buffer_RGBA.obj `if test -f 'buffer_RGBA.c'; then $(CYGPATH_W) 'buffer_RGBA.c'; else $(CYGPATH_W) '$(srcdir)/buffer_RGBA.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -c -o lebiniou-schemes.obj `if test -f 'schemes.c'; then $(CYGPATH_W) 'schemes.c'; else $(CYGPATH_W) '$(srcdir)/schemes.c'; fi` -lebiniou-circle.o: circle.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -MT lebiniou-circle.o -MD -MP -MF $(DEPDIR)/lebiniou-circle.Tpo -c -o lebiniou-circle.o `test -f 'circle.c' || echo '$(srcdir)/'`circle.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lebiniou-circle.Tpo $(DEPDIR)/lebiniou-circle.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='circle.c' object='lebiniou-circle.o' libtool=no @AMDEPBACKSLASH@ +lebiniou-context_gl.o: context_gl.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -MT lebiniou-context_gl.o -MD -MP -MF $(DEPDIR)/lebiniou-context_gl.Tpo -c -o lebiniou-context_gl.o `test -f 'context_gl.c' || echo '$(srcdir)/'`context_gl.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lebiniou-context_gl.Tpo $(DEPDIR)/lebiniou-context_gl.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='context_gl.c' object='lebiniou-context_gl.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -c -o lebiniou-circle.o `test -f 'circle.c' || echo '$(srcdir)/'`circle.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -c -o lebiniou-context_gl.o `test -f 'context_gl.c' || echo '$(srcdir)/'`context_gl.c -lebiniou-circle.obj: circle.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -MT lebiniou-circle.obj -MD -MP -MF $(DEPDIR)/lebiniou-circle.Tpo -c -o lebiniou-circle.obj `if test -f 'circle.c'; then $(CYGPATH_W) 'circle.c'; else $(CYGPATH_W) '$(srcdir)/circle.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lebiniou-circle.Tpo $(DEPDIR)/lebiniou-circle.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='circle.c' object='lebiniou-circle.obj' libtool=no @AMDEPBACKSLASH@ +lebiniou-context_gl.obj: context_gl.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -MT lebiniou-context_gl.obj -MD -MP -MF $(DEPDIR)/lebiniou-context_gl.Tpo -c -o lebiniou-context_gl.obj `if test -f 'context_gl.c'; then $(CYGPATH_W) 'context_gl.c'; else $(CYGPATH_W) '$(srcdir)/context_gl.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lebiniou-context_gl.Tpo $(DEPDIR)/lebiniou-context_gl.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='context_gl.c' object='lebiniou-context_gl.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -c -o lebiniou-circle.obj `if test -f 'circle.c'; then $(CYGPATH_W) 'circle.c'; else $(CYGPATH_W) '$(srcdir)/circle.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -c -o lebiniou-context_gl.obj `if test -f 'context_gl.c'; then $(CYGPATH_W) 'context_gl.c'; else $(CYGPATH_W) '$(srcdir)/context_gl.c'; fi` -lebiniou-cmap_8bits.o: cmap_8bits.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -MT lebiniou-cmap_8bits.o -MD -MP -MF $(DEPDIR)/lebiniou-cmap_8bits.Tpo -c -o lebiniou-cmap_8bits.o `test -f 'cmap_8bits.c' || echo '$(srcdir)/'`cmap_8bits.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lebiniou-cmap_8bits.Tpo $(DEPDIR)/lebiniou-cmap_8bits.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='cmap_8bits.c' object='lebiniou-cmap_8bits.o' libtool=no @AMDEPBACKSLASH@ +lebiniou-events.o: events.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -MT lebiniou-events.o -MD -MP -MF $(DEPDIR)/lebiniou-events.Tpo -c -o lebiniou-events.o `test -f 'events.c' || echo '$(srcdir)/'`events.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lebiniou-events.Tpo $(DEPDIR)/lebiniou-events.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='events.c' object='lebiniou-events.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -c -o lebiniou-cmap_8bits.o `test -f 'cmap_8bits.c' || echo '$(srcdir)/'`cmap_8bits.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -c -o lebiniou-events.o `test -f 'events.c' || echo '$(srcdir)/'`events.c -lebiniou-cmap_8bits.obj: cmap_8bits.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -MT lebiniou-cmap_8bits.obj -MD -MP -MF $(DEPDIR)/lebiniou-cmap_8bits.Tpo -c -o lebiniou-cmap_8bits.obj `if test -f 'cmap_8bits.c'; then $(CYGPATH_W) 'cmap_8bits.c'; else $(CYGPATH_W) '$(srcdir)/cmap_8bits.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lebiniou-cmap_8bits.Tpo $(DEPDIR)/lebiniou-cmap_8bits.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='cmap_8bits.c' object='lebiniou-cmap_8bits.obj' libtool=no @AMDEPBACKSLASH@ +lebiniou-events.obj: events.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -MT lebiniou-events.obj -MD -MP -MF $(DEPDIR)/lebiniou-events.Tpo -c -o lebiniou-events.obj `if test -f 'events.c'; then $(CYGPATH_W) 'events.c'; else $(CYGPATH_W) '$(srcdir)/events.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lebiniou-events.Tpo $(DEPDIR)/lebiniou-events.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='events.c' object='lebiniou-events.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -c -o lebiniou-cmap_8bits.obj `if test -f 'cmap_8bits.c'; then $(CYGPATH_W) 'cmap_8bits.c'; else $(CYGPATH_W) '$(srcdir)/cmap_8bits.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -c -o lebiniou-events.obj `if test -f 'events.c'; then $(CYGPATH_W) 'events.c'; else $(CYGPATH_W) '$(srcdir)/events.c'; fi` -lebiniou-cmapfader.o: cmapfader.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -MT lebiniou-cmapfader.o -MD -MP -MF $(DEPDIR)/lebiniou-cmapfader.Tpo -c -o lebiniou-cmapfader.o `test -f 'cmapfader.c' || echo '$(srcdir)/'`cmapfader.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lebiniou-cmapfader.Tpo $(DEPDIR)/lebiniou-cmapfader.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='cmapfader.c' object='lebiniou-cmapfader.o' libtool=no @AMDEPBACKSLASH@ +liblebiniou_so_0-alarm.o: alarm.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -MT liblebiniou_so_0-alarm.o -MD -MP -MF $(DEPDIR)/liblebiniou_so_0-alarm.Tpo -c -o liblebiniou_so_0-alarm.o `test -f 'alarm.c' || echo '$(srcdir)/'`alarm.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblebiniou_so_0-alarm.Tpo $(DEPDIR)/liblebiniou_so_0-alarm.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='alarm.c' object='liblebiniou_so_0-alarm.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -c -o lebiniou-cmapfader.o `test -f 'cmapfader.c' || echo '$(srcdir)/'`cmapfader.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -c -o liblebiniou_so_0-alarm.o `test -f 'alarm.c' || echo '$(srcdir)/'`alarm.c -lebiniou-cmapfader.obj: cmapfader.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -MT lebiniou-cmapfader.obj -MD -MP -MF $(DEPDIR)/lebiniou-cmapfader.Tpo -c -o lebiniou-cmapfader.obj `if test -f 'cmapfader.c'; then $(CYGPATH_W) 'cmapfader.c'; else $(CYGPATH_W) '$(srcdir)/cmapfader.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lebiniou-cmapfader.Tpo $(DEPDIR)/lebiniou-cmapfader.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='cmapfader.c' object='lebiniou-cmapfader.obj' libtool=no @AMDEPBACKSLASH@ +liblebiniou_so_0-alarm.obj: alarm.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -MT liblebiniou_so_0-alarm.obj -MD -MP -MF $(DEPDIR)/liblebiniou_so_0-alarm.Tpo -c -o liblebiniou_so_0-alarm.obj `if test -f 'alarm.c'; then $(CYGPATH_W) 'alarm.c'; else $(CYGPATH_W) '$(srcdir)/alarm.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblebiniou_so_0-alarm.Tpo $(DEPDIR)/liblebiniou_so_0-alarm.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='alarm.c' object='liblebiniou_so_0-alarm.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -c -o lebiniou-cmapfader.obj `if test -f 'cmapfader.c'; then $(CYGPATH_W) 'cmapfader.c'; else $(CYGPATH_W) '$(srcdir)/cmapfader.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -c -o liblebiniou_so_0-alarm.obj `if test -f 'alarm.c'; then $(CYGPATH_W) 'alarm.c'; else $(CYGPATH_W) '$(srcdir)/alarm.c'; fi` -lebiniou-cmapfader_event.o: cmapfader_event.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -MT lebiniou-cmapfader_event.o -MD -MP -MF $(DEPDIR)/lebiniou-cmapfader_event.Tpo -c -o lebiniou-cmapfader_event.o `test -f 'cmapfader_event.c' || echo '$(srcdir)/'`cmapfader_event.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lebiniou-cmapfader_event.Tpo $(DEPDIR)/lebiniou-cmapfader_event.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='cmapfader_event.c' object='lebiniou-cmapfader_event.o' libtool=no @AMDEPBACKSLASH@ +liblebiniou_so_0-btimer.o: btimer.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -MT liblebiniou_so_0-btimer.o -MD -MP -MF $(DEPDIR)/liblebiniou_so_0-btimer.Tpo -c -o liblebiniou_so_0-btimer.o `test -f 'btimer.c' || echo '$(srcdir)/'`btimer.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblebiniou_so_0-btimer.Tpo $(DEPDIR)/liblebiniou_so_0-btimer.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='btimer.c' object='liblebiniou_so_0-btimer.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -c -o lebiniou-cmapfader_event.o `test -f 'cmapfader_event.c' || echo '$(srcdir)/'`cmapfader_event.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -c -o liblebiniou_so_0-btimer.o `test -f 'btimer.c' || echo '$(srcdir)/'`btimer.c -lebiniou-cmapfader_event.obj: cmapfader_event.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -MT lebiniou-cmapfader_event.obj -MD -MP -MF $(DEPDIR)/lebiniou-cmapfader_event.Tpo -c -o lebiniou-cmapfader_event.obj `if test -f 'cmapfader_event.c'; then $(CYGPATH_W) 'cmapfader_event.c'; else $(CYGPATH_W) '$(srcdir)/cmapfader_event.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lebiniou-cmapfader_event.Tpo $(DEPDIR)/lebiniou-cmapfader_event.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='cmapfader_event.c' object='lebiniou-cmapfader_event.obj' libtool=no @AMDEPBACKSLASH@ +liblebiniou_so_0-btimer.obj: btimer.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -MT liblebiniou_so_0-btimer.obj -MD -MP -MF $(DEPDIR)/liblebiniou_so_0-btimer.Tpo -c -o liblebiniou_so_0-btimer.obj `if test -f 'btimer.c'; then $(CYGPATH_W) 'btimer.c'; else $(CYGPATH_W) '$(srcdir)/btimer.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblebiniou_so_0-btimer.Tpo $(DEPDIR)/liblebiniou_so_0-btimer.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='btimer.c' object='liblebiniou_so_0-btimer.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -c -o lebiniou-cmapfader_event.obj `if test -f 'cmapfader_event.c'; then $(CYGPATH_W) 'cmapfader_event.c'; else $(CYGPATH_W) '$(srcdir)/cmapfader_event.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -c -o liblebiniou_so_0-btimer.obj `if test -f 'btimer.c'; then $(CYGPATH_W) 'btimer.c'; else $(CYGPATH_W) '$(srcdir)/btimer.c'; fi` -lebiniou-colormaps.o: colormaps.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -MT lebiniou-colormaps.o -MD -MP -MF $(DEPDIR)/lebiniou-colormaps.Tpo -c -o lebiniou-colormaps.o `test -f 'colormaps.c' || echo '$(srcdir)/'`colormaps.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lebiniou-colormaps.Tpo $(DEPDIR)/lebiniou-colormaps.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='colormaps.c' object='lebiniou-colormaps.o' libtool=no @AMDEPBACKSLASH@ +liblebiniou_so_0-buffer_8bits.o: buffer_8bits.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -MT liblebiniou_so_0-buffer_8bits.o -MD -MP -MF $(DEPDIR)/liblebiniou_so_0-buffer_8bits.Tpo -c -o liblebiniou_so_0-buffer_8bits.o `test -f 'buffer_8bits.c' || echo '$(srcdir)/'`buffer_8bits.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblebiniou_so_0-buffer_8bits.Tpo $(DEPDIR)/liblebiniou_so_0-buffer_8bits.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='buffer_8bits.c' object='liblebiniou_so_0-buffer_8bits.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -c -o lebiniou-colormaps.o `test -f 'colormaps.c' || echo '$(srcdir)/'`colormaps.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -c -o liblebiniou_so_0-buffer_8bits.o `test -f 'buffer_8bits.c' || echo '$(srcdir)/'`buffer_8bits.c -lebiniou-colormaps.obj: colormaps.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -MT lebiniou-colormaps.obj -MD -MP -MF $(DEPDIR)/lebiniou-colormaps.Tpo -c -o lebiniou-colormaps.obj `if test -f 'colormaps.c'; then $(CYGPATH_W) 'colormaps.c'; else $(CYGPATH_W) '$(srcdir)/colormaps.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lebiniou-colormaps.Tpo $(DEPDIR)/lebiniou-colormaps.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='colormaps.c' object='lebiniou-colormaps.obj' libtool=no @AMDEPBACKSLASH@ +liblebiniou_so_0-buffer_8bits.obj: buffer_8bits.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -MT liblebiniou_so_0-buffer_8bits.obj -MD -MP -MF $(DEPDIR)/liblebiniou_so_0-buffer_8bits.Tpo -c -o liblebiniou_so_0-buffer_8bits.obj `if test -f 'buffer_8bits.c'; then $(CYGPATH_W) 'buffer_8bits.c'; else $(CYGPATH_W) '$(srcdir)/buffer_8bits.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblebiniou_so_0-buffer_8bits.Tpo $(DEPDIR)/liblebiniou_so_0-buffer_8bits.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='buffer_8bits.c' object='liblebiniou_so_0-buffer_8bits.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -c -o lebiniou-colormaps.obj `if test -f 'colormaps.c'; then $(CYGPATH_W) 'colormaps.c'; else $(CYGPATH_W) '$(srcdir)/colormaps.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -c -o liblebiniou_so_0-buffer_8bits.obj `if test -f 'buffer_8bits.c'; then $(CYGPATH_W) 'buffer_8bits.c'; else $(CYGPATH_W) '$(srcdir)/buffer_8bits.c'; fi` -lebiniou-context.o: context.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -MT lebiniou-context.o -MD -MP -MF $(DEPDIR)/lebiniou-context.Tpo -c -o lebiniou-context.o `test -f 'context.c' || echo '$(srcdir)/'`context.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lebiniou-context.Tpo $(DEPDIR)/lebiniou-context.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='context.c' object='lebiniou-context.o' libtool=no @AMDEPBACKSLASH@ +liblebiniou_so_0-buffer_RGBA.o: buffer_RGBA.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -MT liblebiniou_so_0-buffer_RGBA.o -MD -MP -MF $(DEPDIR)/liblebiniou_so_0-buffer_RGBA.Tpo -c -o liblebiniou_so_0-buffer_RGBA.o `test -f 'buffer_RGBA.c' || echo '$(srcdir)/'`buffer_RGBA.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblebiniou_so_0-buffer_RGBA.Tpo $(DEPDIR)/liblebiniou_so_0-buffer_RGBA.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='buffer_RGBA.c' object='liblebiniou_so_0-buffer_RGBA.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -c -o lebiniou-context.o `test -f 'context.c' || echo '$(srcdir)/'`context.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -c -o liblebiniou_so_0-buffer_RGBA.o `test -f 'buffer_RGBA.c' || echo '$(srcdir)/'`buffer_RGBA.c -lebiniou-context.obj: context.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -MT lebiniou-context.obj -MD -MP -MF $(DEPDIR)/lebiniou-context.Tpo -c -o lebiniou-context.obj `if test -f 'context.c'; then $(CYGPATH_W) 'context.c'; else $(CYGPATH_W) '$(srcdir)/context.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lebiniou-context.Tpo $(DEPDIR)/lebiniou-context.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='context.c' object='lebiniou-context.obj' libtool=no @AMDEPBACKSLASH@ +liblebiniou_so_0-buffer_RGBA.obj: buffer_RGBA.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -MT liblebiniou_so_0-buffer_RGBA.obj -MD -MP -MF $(DEPDIR)/liblebiniou_so_0-buffer_RGBA.Tpo -c -o liblebiniou_so_0-buffer_RGBA.obj `if test -f 'buffer_RGBA.c'; then $(CYGPATH_W) 'buffer_RGBA.c'; else $(CYGPATH_W) '$(srcdir)/buffer_RGBA.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblebiniou_so_0-buffer_RGBA.Tpo $(DEPDIR)/liblebiniou_so_0-buffer_RGBA.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='buffer_RGBA.c' object='liblebiniou_so_0-buffer_RGBA.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -c -o lebiniou-context.obj `if test -f 'context.c'; then $(CYGPATH_W) 'context.c'; else $(CYGPATH_W) '$(srcdir)/context.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -c -o liblebiniou_so_0-buffer_RGBA.obj `if test -f 'buffer_RGBA.c'; then $(CYGPATH_W) 'buffer_RGBA.c'; else $(CYGPATH_W) '$(srcdir)/buffer_RGBA.c'; fi` -lebiniou-context_banks.o: context_banks.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -MT lebiniou-context_banks.o -MD -MP -MF $(DEPDIR)/lebiniou-context_banks.Tpo -c -o lebiniou-context_banks.o `test -f 'context_banks.c' || echo '$(srcdir)/'`context_banks.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lebiniou-context_banks.Tpo $(DEPDIR)/lebiniou-context_banks.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='context_banks.c' object='lebiniou-context_banks.o' libtool=no @AMDEPBACKSLASH@ +liblebiniou_so_0-brandom.o: brandom.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -MT liblebiniou_so_0-brandom.o -MD -MP -MF $(DEPDIR)/liblebiniou_so_0-brandom.Tpo -c -o liblebiniou_so_0-brandom.o `test -f 'brandom.c' || echo '$(srcdir)/'`brandom.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblebiniou_so_0-brandom.Tpo $(DEPDIR)/liblebiniou_so_0-brandom.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='brandom.c' object='liblebiniou_so_0-brandom.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -c -o lebiniou-context_banks.o `test -f 'context_banks.c' || echo '$(srcdir)/'`context_banks.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -c -o liblebiniou_so_0-brandom.o `test -f 'brandom.c' || echo '$(srcdir)/'`brandom.c -lebiniou-context_banks.obj: context_banks.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -MT lebiniou-context_banks.obj -MD -MP -MF $(DEPDIR)/lebiniou-context_banks.Tpo -c -o lebiniou-context_banks.obj `if test -f 'context_banks.c'; then $(CYGPATH_W) 'context_banks.c'; else $(CYGPATH_W) '$(srcdir)/context_banks.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lebiniou-context_banks.Tpo $(DEPDIR)/lebiniou-context_banks.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='context_banks.c' object='lebiniou-context_banks.obj' libtool=no @AMDEPBACKSLASH@ +liblebiniou_so_0-brandom.obj: brandom.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -MT liblebiniou_so_0-brandom.obj -MD -MP -MF $(DEPDIR)/liblebiniou_so_0-brandom.Tpo -c -o liblebiniou_so_0-brandom.obj `if test -f 'brandom.c'; then $(CYGPATH_W) 'brandom.c'; else $(CYGPATH_W) '$(srcdir)/brandom.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblebiniou_so_0-brandom.Tpo $(DEPDIR)/liblebiniou_so_0-brandom.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='brandom.c' object='liblebiniou_so_0-brandom.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -c -o lebiniou-context_banks.obj `if test -f 'context_banks.c'; then $(CYGPATH_W) 'context_banks.c'; else $(CYGPATH_W) '$(srcdir)/context_banks.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -c -o liblebiniou_so_0-brandom.obj `if test -f 'brandom.c'; then $(CYGPATH_W) 'brandom.c'; else $(CYGPATH_W) '$(srcdir)/brandom.c'; fi` -lebiniou-context_event.o: context_event.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -MT lebiniou-context_event.o -MD -MP -MF $(DEPDIR)/lebiniou-context_event.Tpo -c -o lebiniou-context_event.o `test -f 'context_event.c' || echo '$(srcdir)/'`context_event.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lebiniou-context_event.Tpo $(DEPDIR)/lebiniou-context_event.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='context_event.c' object='lebiniou-context_event.o' libtool=no @AMDEPBACKSLASH@ +liblebiniou_so_0-cmap_8bits.o: cmap_8bits.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -MT liblebiniou_so_0-cmap_8bits.o -MD -MP -MF $(DEPDIR)/liblebiniou_so_0-cmap_8bits.Tpo -c -o liblebiniou_so_0-cmap_8bits.o `test -f 'cmap_8bits.c' || echo '$(srcdir)/'`cmap_8bits.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblebiniou_so_0-cmap_8bits.Tpo $(DEPDIR)/liblebiniou_so_0-cmap_8bits.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='cmap_8bits.c' object='liblebiniou_so_0-cmap_8bits.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -c -o lebiniou-context_event.o `test -f 'context_event.c' || echo '$(srcdir)/'`context_event.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -c -o liblebiniou_so_0-cmap_8bits.o `test -f 'cmap_8bits.c' || echo '$(srcdir)/'`cmap_8bits.c -lebiniou-context_event.obj: context_event.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -MT lebiniou-context_event.obj -MD -MP -MF $(DEPDIR)/lebiniou-context_event.Tpo -c -o lebiniou-context_event.obj `if test -f 'context_event.c'; then $(CYGPATH_W) 'context_event.c'; else $(CYGPATH_W) '$(srcdir)/context_event.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lebiniou-context_event.Tpo $(DEPDIR)/lebiniou-context_event.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='context_event.c' object='lebiniou-context_event.obj' libtool=no @AMDEPBACKSLASH@ +liblebiniou_so_0-cmap_8bits.obj: cmap_8bits.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -MT liblebiniou_so_0-cmap_8bits.obj -MD -MP -MF $(DEPDIR)/liblebiniou_so_0-cmap_8bits.Tpo -c -o liblebiniou_so_0-cmap_8bits.obj `if test -f 'cmap_8bits.c'; then $(CYGPATH_W) 'cmap_8bits.c'; else $(CYGPATH_W) '$(srcdir)/cmap_8bits.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblebiniou_so_0-cmap_8bits.Tpo $(DEPDIR)/liblebiniou_so_0-cmap_8bits.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='cmap_8bits.c' object='liblebiniou_so_0-cmap_8bits.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -c -o lebiniou-context_event.obj `if test -f 'context_event.c'; then $(CYGPATH_W) 'context_event.c'; else $(CYGPATH_W) '$(srcdir)/context_event.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -c -o liblebiniou_so_0-cmap_8bits.obj `if test -f 'cmap_8bits.c'; then $(CYGPATH_W) 'cmap_8bits.c'; else $(CYGPATH_W) '$(srcdir)/cmap_8bits.c'; fi` -lebiniou-context_export.o: context_export.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -MT lebiniou-context_export.o -MD -MP -MF $(DEPDIR)/lebiniou-context_export.Tpo -c -o lebiniou-context_export.o `test -f 'context_export.c' || echo '$(srcdir)/'`context_export.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lebiniou-context_export.Tpo $(DEPDIR)/lebiniou-context_export.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='context_export.c' object='lebiniou-context_export.o' libtool=no @AMDEPBACKSLASH@ +liblebiniou_so_0-cmapfader.o: cmapfader.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -MT liblebiniou_so_0-cmapfader.o -MD -MP -MF $(DEPDIR)/liblebiniou_so_0-cmapfader.Tpo -c -o liblebiniou_so_0-cmapfader.o `test -f 'cmapfader.c' || echo '$(srcdir)/'`cmapfader.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblebiniou_so_0-cmapfader.Tpo $(DEPDIR)/liblebiniou_so_0-cmapfader.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='cmapfader.c' object='liblebiniou_so_0-cmapfader.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -c -o lebiniou-context_export.o `test -f 'context_export.c' || echo '$(srcdir)/'`context_export.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -c -o liblebiniou_so_0-cmapfader.o `test -f 'cmapfader.c' || echo '$(srcdir)/'`cmapfader.c -lebiniou-context_export.obj: context_export.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -MT lebiniou-context_export.obj -MD -MP -MF $(DEPDIR)/lebiniou-context_export.Tpo -c -o lebiniou-context_export.obj `if test -f 'context_export.c'; then $(CYGPATH_W) 'context_export.c'; else $(CYGPATH_W) '$(srcdir)/context_export.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lebiniou-context_export.Tpo $(DEPDIR)/lebiniou-context_export.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='context_export.c' object='lebiniou-context_export.obj' libtool=no @AMDEPBACKSLASH@ +liblebiniou_so_0-cmapfader.obj: cmapfader.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -MT liblebiniou_so_0-cmapfader.obj -MD -MP -MF $(DEPDIR)/liblebiniou_so_0-cmapfader.Tpo -c -o liblebiniou_so_0-cmapfader.obj `if test -f 'cmapfader.c'; then $(CYGPATH_W) 'cmapfader.c'; else $(CYGPATH_W) '$(srcdir)/cmapfader.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblebiniou_so_0-cmapfader.Tpo $(DEPDIR)/liblebiniou_so_0-cmapfader.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='cmapfader.c' object='liblebiniou_so_0-cmapfader.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -c -o lebiniou-context_export.obj `if test -f 'context_export.c'; then $(CYGPATH_W) 'context_export.c'; else $(CYGPATH_W) '$(srcdir)/context_export.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -c -o liblebiniou_so_0-cmapfader.obj `if test -f 'cmapfader.c'; then $(CYGPATH_W) 'cmapfader.c'; else $(CYGPATH_W) '$(srcdir)/cmapfader.c'; fi` -lebiniou-context_run.o: context_run.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -MT lebiniou-context_run.o -MD -MP -MF $(DEPDIR)/lebiniou-context_run.Tpo -c -o lebiniou-context_run.o `test -f 'context_run.c' || echo '$(srcdir)/'`context_run.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lebiniou-context_run.Tpo $(DEPDIR)/lebiniou-context_run.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='context_run.c' object='lebiniou-context_run.o' libtool=no @AMDEPBACKSLASH@ +liblebiniou_so_0-cmapfader_event.o: cmapfader_event.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -MT liblebiniou_so_0-cmapfader_event.o -MD -MP -MF $(DEPDIR)/liblebiniou_so_0-cmapfader_event.Tpo -c -o liblebiniou_so_0-cmapfader_event.o `test -f 'cmapfader_event.c' || echo '$(srcdir)/'`cmapfader_event.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblebiniou_so_0-cmapfader_event.Tpo $(DEPDIR)/liblebiniou_so_0-cmapfader_event.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='cmapfader_event.c' object='liblebiniou_so_0-cmapfader_event.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -c -o lebiniou-context_run.o `test -f 'context_run.c' || echo '$(srcdir)/'`context_run.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -c -o liblebiniou_so_0-cmapfader_event.o `test -f 'cmapfader_event.c' || echo '$(srcdir)/'`cmapfader_event.c -lebiniou-context_run.obj: context_run.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -MT lebiniou-context_run.obj -MD -MP -MF $(DEPDIR)/lebiniou-context_run.Tpo -c -o lebiniou-context_run.obj `if test -f 'context_run.c'; then $(CYGPATH_W) 'context_run.c'; else $(CYGPATH_W) '$(srcdir)/context_run.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lebiniou-context_run.Tpo $(DEPDIR)/lebiniou-context_run.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='context_run.c' object='lebiniou-context_run.obj' libtool=no @AMDEPBACKSLASH@ +liblebiniou_so_0-cmapfader_event.obj: cmapfader_event.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -MT liblebiniou_so_0-cmapfader_event.obj -MD -MP -MF $(DEPDIR)/liblebiniou_so_0-cmapfader_event.Tpo -c -o liblebiniou_so_0-cmapfader_event.obj `if test -f 'cmapfader_event.c'; then $(CYGPATH_W) 'cmapfader_event.c'; else $(CYGPATH_W) '$(srcdir)/cmapfader_event.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblebiniou_so_0-cmapfader_event.Tpo $(DEPDIR)/liblebiniou_so_0-cmapfader_event.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='cmapfader_event.c' object='liblebiniou_so_0-cmapfader_event.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -c -o lebiniou-context_run.obj `if test -f 'context_run.c'; then $(CYGPATH_W) 'context_run.c'; else $(CYGPATH_W) '$(srcdir)/context_run.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -c -o liblebiniou_so_0-cmapfader_event.obj `if test -f 'cmapfader_event.c'; then $(CYGPATH_W) 'cmapfader_event.c'; else $(CYGPATH_W) '$(srcdir)/cmapfader_event.c'; fi` -lebiniou-fader.o: fader.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -MT lebiniou-fader.o -MD -MP -MF $(DEPDIR)/lebiniou-fader.Tpo -c -o lebiniou-fader.o `test -f 'fader.c' || echo '$(srcdir)/'`fader.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lebiniou-fader.Tpo $(DEPDIR)/lebiniou-fader.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='fader.c' object='lebiniou-fader.o' libtool=no @AMDEPBACKSLASH@ +liblebiniou_so_0-colormaps.o: colormaps.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -MT liblebiniou_so_0-colormaps.o -MD -MP -MF $(DEPDIR)/liblebiniou_so_0-colormaps.Tpo -c -o liblebiniou_so_0-colormaps.o `test -f 'colormaps.c' || echo '$(srcdir)/'`colormaps.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblebiniou_so_0-colormaps.Tpo $(DEPDIR)/liblebiniou_so_0-colormaps.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='colormaps.c' object='liblebiniou_so_0-colormaps.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -c -o lebiniou-fader.o `test -f 'fader.c' || echo '$(srcdir)/'`fader.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -c -o liblebiniou_so_0-colormaps.o `test -f 'colormaps.c' || echo '$(srcdir)/'`colormaps.c -lebiniou-fader.obj: fader.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -MT lebiniou-fader.obj -MD -MP -MF $(DEPDIR)/lebiniou-fader.Tpo -c -o lebiniou-fader.obj `if test -f 'fader.c'; then $(CYGPATH_W) 'fader.c'; else $(CYGPATH_W) '$(srcdir)/fader.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lebiniou-fader.Tpo $(DEPDIR)/lebiniou-fader.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='fader.c' object='lebiniou-fader.obj' libtool=no @AMDEPBACKSLASH@ +liblebiniou_so_0-colormaps.obj: colormaps.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -MT liblebiniou_so_0-colormaps.obj -MD -MP -MF $(DEPDIR)/liblebiniou_so_0-colormaps.Tpo -c -o liblebiniou_so_0-colormaps.obj `if test -f 'colormaps.c'; then $(CYGPATH_W) 'colormaps.c'; else $(CYGPATH_W) '$(srcdir)/colormaps.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblebiniou_so_0-colormaps.Tpo $(DEPDIR)/liblebiniou_so_0-colormaps.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='colormaps.c' object='liblebiniou_so_0-colormaps.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -c -o lebiniou-fader.obj `if test -f 'fader.c'; then $(CYGPATH_W) 'fader.c'; else $(CYGPATH_W) '$(srcdir)/fader.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -c -o liblebiniou_so_0-colormaps.obj `if test -f 'colormaps.c'; then $(CYGPATH_W) 'colormaps.c'; else $(CYGPATH_W) '$(srcdir)/colormaps.c'; fi` -lebiniou-globals.o: globals.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -MT lebiniou-globals.o -MD -MP -MF $(DEPDIR)/lebiniou-globals.Tpo -c -o lebiniou-globals.o `test -f 'globals.c' || echo '$(srcdir)/'`globals.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lebiniou-globals.Tpo $(DEPDIR)/lebiniou-globals.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='globals.c' object='lebiniou-globals.o' libtool=no @AMDEPBACKSLASH@ +liblebiniou_so_0-context.o: context.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -MT liblebiniou_so_0-context.o -MD -MP -MF $(DEPDIR)/liblebiniou_so_0-context.Tpo -c -o liblebiniou_so_0-context.o `test -f 'context.c' || echo '$(srcdir)/'`context.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblebiniou_so_0-context.Tpo $(DEPDIR)/liblebiniou_so_0-context.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='context.c' object='liblebiniou_so_0-context.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -c -o lebiniou-globals.o `test -f 'globals.c' || echo '$(srcdir)/'`globals.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -c -o liblebiniou_so_0-context.o `test -f 'context.c' || echo '$(srcdir)/'`context.c -lebiniou-globals.obj: globals.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -MT lebiniou-globals.obj -MD -MP -MF $(DEPDIR)/lebiniou-globals.Tpo -c -o lebiniou-globals.obj `if test -f 'globals.c'; then $(CYGPATH_W) 'globals.c'; else $(CYGPATH_W) '$(srcdir)/globals.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lebiniou-globals.Tpo $(DEPDIR)/lebiniou-globals.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='globals.c' object='lebiniou-globals.obj' libtool=no @AMDEPBACKSLASH@ +liblebiniou_so_0-context.obj: context.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -MT liblebiniou_so_0-context.obj -MD -MP -MF $(DEPDIR)/liblebiniou_so_0-context.Tpo -c -o liblebiniou_so_0-context.obj `if test -f 'context.c'; then $(CYGPATH_W) 'context.c'; else $(CYGPATH_W) '$(srcdir)/context.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblebiniou_so_0-context.Tpo $(DEPDIR)/liblebiniou_so_0-context.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='context.c' object='liblebiniou_so_0-context.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -c -o lebiniou-globals.obj `if test -f 'globals.c'; then $(CYGPATH_W) 'globals.c'; else $(CYGPATH_W) '$(srcdir)/globals.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -c -o liblebiniou_so_0-context.obj `if test -f 'context.c'; then $(CYGPATH_W) 'context.c'; else $(CYGPATH_W) '$(srcdir)/context.c'; fi` -lebiniou-input.o: input.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -MT lebiniou-input.o -MD -MP -MF $(DEPDIR)/lebiniou-input.Tpo -c -o lebiniou-input.o `test -f 'input.c' || echo '$(srcdir)/'`input.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lebiniou-input.Tpo $(DEPDIR)/lebiniou-input.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='input.c' object='lebiniou-input.o' libtool=no @AMDEPBACKSLASH@ +liblebiniou_so_0-context_banks.o: context_banks.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -MT liblebiniou_so_0-context_banks.o -MD -MP -MF $(DEPDIR)/liblebiniou_so_0-context_banks.Tpo -c -o liblebiniou_so_0-context_banks.o `test -f 'context_banks.c' || echo '$(srcdir)/'`context_banks.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblebiniou_so_0-context_banks.Tpo $(DEPDIR)/liblebiniou_so_0-context_banks.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='context_banks.c' object='liblebiniou_so_0-context_banks.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -c -o lebiniou-input.o `test -f 'input.c' || echo '$(srcdir)/'`input.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -c -o liblebiniou_so_0-context_banks.o `test -f 'context_banks.c' || echo '$(srcdir)/'`context_banks.c -lebiniou-input.obj: input.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -MT lebiniou-input.obj -MD -MP -MF $(DEPDIR)/lebiniou-input.Tpo -c -o lebiniou-input.obj `if test -f 'input.c'; then $(CYGPATH_W) 'input.c'; else $(CYGPATH_W) '$(srcdir)/input.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lebiniou-input.Tpo $(DEPDIR)/lebiniou-input.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='input.c' object='lebiniou-input.obj' libtool=no @AMDEPBACKSLASH@ +liblebiniou_so_0-context_banks.obj: context_banks.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -MT liblebiniou_so_0-context_banks.obj -MD -MP -MF $(DEPDIR)/liblebiniou_so_0-context_banks.Tpo -c -o liblebiniou_so_0-context_banks.obj `if test -f 'context_banks.c'; then $(CYGPATH_W) 'context_banks.c'; else $(CYGPATH_W) '$(srcdir)/context_banks.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblebiniou_so_0-context_banks.Tpo $(DEPDIR)/liblebiniou_so_0-context_banks.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='context_banks.c' object='liblebiniou_so_0-context_banks.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -c -o lebiniou-input.obj `if test -f 'input.c'; then $(CYGPATH_W) 'input.c'; else $(CYGPATH_W) '$(srcdir)/input.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -c -o liblebiniou_so_0-context_banks.obj `if test -f 'context_banks.c'; then $(CYGPATH_W) 'context_banks.c'; else $(CYGPATH_W) '$(srcdir)/context_banks.c'; fi` -lebiniou-keyfile.o: keyfile.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -MT lebiniou-keyfile.o -MD -MP -MF $(DEPDIR)/lebiniou-keyfile.Tpo -c -o lebiniou-keyfile.o `test -f 'keyfile.c' || echo '$(srcdir)/'`keyfile.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lebiniou-keyfile.Tpo $(DEPDIR)/lebiniou-keyfile.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='keyfile.c' object='lebiniou-keyfile.o' libtool=no @AMDEPBACKSLASH@ +liblebiniou_so_0-context_export.o: context_export.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -MT liblebiniou_so_0-context_export.o -MD -MP -MF $(DEPDIR)/liblebiniou_so_0-context_export.Tpo -c -o liblebiniou_so_0-context_export.o `test -f 'context_export.c' || echo '$(srcdir)/'`context_export.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblebiniou_so_0-context_export.Tpo $(DEPDIR)/liblebiniou_so_0-context_export.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='context_export.c' object='liblebiniou_so_0-context_export.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -c -o lebiniou-keyfile.o `test -f 'keyfile.c' || echo '$(srcdir)/'`keyfile.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -c -o liblebiniou_so_0-context_export.o `test -f 'context_export.c' || echo '$(srcdir)/'`context_export.c -lebiniou-keyfile.obj: keyfile.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -MT lebiniou-keyfile.obj -MD -MP -MF $(DEPDIR)/lebiniou-keyfile.Tpo -c -o lebiniou-keyfile.obj `if test -f 'keyfile.c'; then $(CYGPATH_W) 'keyfile.c'; else $(CYGPATH_W) '$(srcdir)/keyfile.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lebiniou-keyfile.Tpo $(DEPDIR)/lebiniou-keyfile.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='keyfile.c' object='lebiniou-keyfile.obj' libtool=no @AMDEPBACKSLASH@ +liblebiniou_so_0-context_export.obj: context_export.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -MT liblebiniou_so_0-context_export.obj -MD -MP -MF $(DEPDIR)/liblebiniou_so_0-context_export.Tpo -c -o liblebiniou_so_0-context_export.obj `if test -f 'context_export.c'; then $(CYGPATH_W) 'context_export.c'; else $(CYGPATH_W) '$(srcdir)/context_export.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblebiniou_so_0-context_export.Tpo $(DEPDIR)/liblebiniou_so_0-context_export.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='context_export.c' object='liblebiniou_so_0-context_export.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -c -o lebiniou-keyfile.obj `if test -f 'keyfile.c'; then $(CYGPATH_W) 'keyfile.c'; else $(CYGPATH_W) '$(srcdir)/keyfile.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -c -o liblebiniou_so_0-context_export.obj `if test -f 'context_export.c'; then $(CYGPATH_W) 'context_export.c'; else $(CYGPATH_W) '$(srcdir)/context_export.c'; fi` -lebiniou-layer.o: layer.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -MT lebiniou-layer.o -MD -MP -MF $(DEPDIR)/lebiniou-layer.Tpo -c -o lebiniou-layer.o `test -f 'layer.c' || echo '$(srcdir)/'`layer.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lebiniou-layer.Tpo $(DEPDIR)/lebiniou-layer.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='layer.c' object='lebiniou-layer.o' libtool=no @AMDEPBACKSLASH@ +liblebiniou_so_0-context_event.o: context_event.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -MT liblebiniou_so_0-context_event.o -MD -MP -MF $(DEPDIR)/liblebiniou_so_0-context_event.Tpo -c -o liblebiniou_so_0-context_event.o `test -f 'context_event.c' || echo '$(srcdir)/'`context_event.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblebiniou_so_0-context_event.Tpo $(DEPDIR)/liblebiniou_so_0-context_event.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='context_event.c' object='liblebiniou_so_0-context_event.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -c -o lebiniou-layer.o `test -f 'layer.c' || echo '$(srcdir)/'`layer.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -c -o liblebiniou_so_0-context_event.o `test -f 'context_event.c' || echo '$(srcdir)/'`context_event.c -lebiniou-layer.obj: layer.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -MT lebiniou-layer.obj -MD -MP -MF $(DEPDIR)/lebiniou-layer.Tpo -c -o lebiniou-layer.obj `if test -f 'layer.c'; then $(CYGPATH_W) 'layer.c'; else $(CYGPATH_W) '$(srcdir)/layer.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lebiniou-layer.Tpo $(DEPDIR)/lebiniou-layer.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='layer.c' object='lebiniou-layer.obj' libtool=no @AMDEPBACKSLASH@ +liblebiniou_so_0-context_event.obj: context_event.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -MT liblebiniou_so_0-context_event.obj -MD -MP -MF $(DEPDIR)/liblebiniou_so_0-context_event.Tpo -c -o liblebiniou_so_0-context_event.obj `if test -f 'context_event.c'; then $(CYGPATH_W) 'context_event.c'; else $(CYGPATH_W) '$(srcdir)/context_event.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblebiniou_so_0-context_event.Tpo $(DEPDIR)/liblebiniou_so_0-context_event.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='context_event.c' object='liblebiniou_so_0-context_event.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -c -o lebiniou-layer.obj `if test -f 'layer.c'; then $(CYGPATH_W) 'layer.c'; else $(CYGPATH_W) '$(srcdir)/layer.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -c -o liblebiniou_so_0-context_event.obj `if test -f 'context_event.c'; then $(CYGPATH_W) 'context_event.c'; else $(CYGPATH_W) '$(srcdir)/context_event.c'; fi` -lebiniou-options.o: options.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -MT lebiniou-options.o -MD -MP -MF $(DEPDIR)/lebiniou-options.Tpo -c -o lebiniou-options.o `test -f 'options.c' || echo '$(srcdir)/'`options.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lebiniou-options.Tpo $(DEPDIR)/lebiniou-options.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='options.c' object='lebiniou-options.o' libtool=no @AMDEPBACKSLASH@ +liblebiniou_so_0-events.o: events.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -MT liblebiniou_so_0-events.o -MD -MP -MF $(DEPDIR)/liblebiniou_so_0-events.Tpo -c -o liblebiniou_so_0-events.o `test -f 'events.c' || echo '$(srcdir)/'`events.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblebiniou_so_0-events.Tpo $(DEPDIR)/liblebiniou_so_0-events.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='events.c' object='liblebiniou_so_0-events.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -c -o lebiniou-options.o `test -f 'options.c' || echo '$(srcdir)/'`options.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -c -o liblebiniou_so_0-events.o `test -f 'events.c' || echo '$(srcdir)/'`events.c -lebiniou-options.obj: options.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -MT lebiniou-options.obj -MD -MP -MF $(DEPDIR)/lebiniou-options.Tpo -c -o lebiniou-options.obj `if test -f 'options.c'; then $(CYGPATH_W) 'options.c'; else $(CYGPATH_W) '$(srcdir)/options.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lebiniou-options.Tpo $(DEPDIR)/lebiniou-options.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='options.c' object='lebiniou-options.obj' libtool=no @AMDEPBACKSLASH@ +liblebiniou_so_0-events.obj: events.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -MT liblebiniou_so_0-events.obj -MD -MP -MF $(DEPDIR)/liblebiniou_so_0-events.Tpo -c -o liblebiniou_so_0-events.obj `if test -f 'events.c'; then $(CYGPATH_W) 'events.c'; else $(CYGPATH_W) '$(srcdir)/events.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblebiniou_so_0-events.Tpo $(DEPDIR)/liblebiniou_so_0-events.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='events.c' object='liblebiniou_so_0-events.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -c -o lebiniou-options.obj `if test -f 'options.c'; then $(CYGPATH_W) 'options.c'; else $(CYGPATH_W) '$(srcdir)/options.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -c -o liblebiniou_so_0-events.obj `if test -f 'events.c'; then $(CYGPATH_W) 'events.c'; else $(CYGPATH_W) '$(srcdir)/events.c'; fi` -lebiniou-oscillo.o: oscillo.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -MT lebiniou-oscillo.o -MD -MP -MF $(DEPDIR)/lebiniou-oscillo.Tpo -c -o lebiniou-oscillo.o `test -f 'oscillo.c' || echo '$(srcdir)/'`oscillo.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lebiniou-oscillo.Tpo $(DEPDIR)/lebiniou-oscillo.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='oscillo.c' object='lebiniou-oscillo.o' libtool=no @AMDEPBACKSLASH@ +liblebiniou_so_0-fader.o: fader.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -MT liblebiniou_so_0-fader.o -MD -MP -MF $(DEPDIR)/liblebiniou_so_0-fader.Tpo -c -o liblebiniou_so_0-fader.o `test -f 'fader.c' || echo '$(srcdir)/'`fader.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblebiniou_so_0-fader.Tpo $(DEPDIR)/liblebiniou_so_0-fader.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='fader.c' object='liblebiniou_so_0-fader.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -c -o lebiniou-oscillo.o `test -f 'oscillo.c' || echo '$(srcdir)/'`oscillo.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -c -o liblebiniou_so_0-fader.o `test -f 'fader.c' || echo '$(srcdir)/'`fader.c -lebiniou-oscillo.obj: oscillo.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -MT lebiniou-oscillo.obj -MD -MP -MF $(DEPDIR)/lebiniou-oscillo.Tpo -c -o lebiniou-oscillo.obj `if test -f 'oscillo.c'; then $(CYGPATH_W) 'oscillo.c'; else $(CYGPATH_W) '$(srcdir)/oscillo.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lebiniou-oscillo.Tpo $(DEPDIR)/lebiniou-oscillo.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='oscillo.c' object='lebiniou-oscillo.obj' libtool=no @AMDEPBACKSLASH@ +liblebiniou_so_0-fader.obj: fader.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -MT liblebiniou_so_0-fader.obj -MD -MP -MF $(DEPDIR)/liblebiniou_so_0-fader.Tpo -c -o liblebiniou_so_0-fader.obj `if test -f 'fader.c'; then $(CYGPATH_W) 'fader.c'; else $(CYGPATH_W) '$(srcdir)/fader.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblebiniou_so_0-fader.Tpo $(DEPDIR)/liblebiniou_so_0-fader.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='fader.c' object='liblebiniou_so_0-fader.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -c -o lebiniou-oscillo.obj `if test -f 'oscillo.c'; then $(CYGPATH_W) 'oscillo.c'; else $(CYGPATH_W) '$(srcdir)/oscillo.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -c -o liblebiniou_so_0-fader.obj `if test -f 'fader.c'; then $(CYGPATH_W) 'fader.c'; else $(CYGPATH_W) '$(srcdir)/fader.c'; fi` -lebiniou-params3d.o: params3d.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -MT lebiniou-params3d.o -MD -MP -MF $(DEPDIR)/lebiniou-params3d.Tpo -c -o lebiniou-params3d.o `test -f 'params3d.c' || echo '$(srcdir)/'`params3d.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lebiniou-params3d.Tpo $(DEPDIR)/lebiniou-params3d.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='params3d.c' object='lebiniou-params3d.o' libtool=no @AMDEPBACKSLASH@ +liblebiniou_so_0-globals.o: globals.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -MT liblebiniou_so_0-globals.o -MD -MP -MF $(DEPDIR)/liblebiniou_so_0-globals.Tpo -c -o liblebiniou_so_0-globals.o `test -f 'globals.c' || echo '$(srcdir)/'`globals.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblebiniou_so_0-globals.Tpo $(DEPDIR)/liblebiniou_so_0-globals.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='globals.c' object='liblebiniou_so_0-globals.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -c -o lebiniou-params3d.o `test -f 'params3d.c' || echo '$(srcdir)/'`params3d.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -c -o liblebiniou_so_0-globals.o `test -f 'globals.c' || echo '$(srcdir)/'`globals.c -lebiniou-params3d.obj: params3d.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -MT lebiniou-params3d.obj -MD -MP -MF $(DEPDIR)/lebiniou-params3d.Tpo -c -o lebiniou-params3d.obj `if test -f 'params3d.c'; then $(CYGPATH_W) 'params3d.c'; else $(CYGPATH_W) '$(srcdir)/params3d.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lebiniou-params3d.Tpo $(DEPDIR)/lebiniou-params3d.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='params3d.c' object='lebiniou-params3d.obj' libtool=no @AMDEPBACKSLASH@ +liblebiniou_so_0-globals.obj: globals.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -MT liblebiniou_so_0-globals.obj -MD -MP -MF $(DEPDIR)/liblebiniou_so_0-globals.Tpo -c -o liblebiniou_so_0-globals.obj `if test -f 'globals.c'; then $(CYGPATH_W) 'globals.c'; else $(CYGPATH_W) '$(srcdir)/globals.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblebiniou_so_0-globals.Tpo $(DEPDIR)/liblebiniou_so_0-globals.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='globals.c' object='liblebiniou_so_0-globals.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -c -o lebiniou-params3d.obj `if test -f 'params3d.c'; then $(CYGPATH_W) 'params3d.c'; else $(CYGPATH_W) '$(srcdir)/params3d.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -c -o liblebiniou_so_0-globals.obj `if test -f 'globals.c'; then $(CYGPATH_W) 'globals.c'; else $(CYGPATH_W) '$(srcdir)/globals.c'; fi` -lebiniou-particles.o: particles.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -MT lebiniou-particles.o -MD -MP -MF $(DEPDIR)/lebiniou-particles.Tpo -c -o lebiniou-particles.o `test -f 'particles.c' || echo '$(srcdir)/'`particles.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lebiniou-particles.Tpo $(DEPDIR)/lebiniou-particles.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='particles.c' object='lebiniou-particles.o' libtool=no @AMDEPBACKSLASH@ +liblebiniou_so_0-image_8bits.o: image_8bits.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -MT liblebiniou_so_0-image_8bits.o -MD -MP -MF $(DEPDIR)/liblebiniou_so_0-image_8bits.Tpo -c -o liblebiniou_so_0-image_8bits.o `test -f 'image_8bits.c' || echo '$(srcdir)/'`image_8bits.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblebiniou_so_0-image_8bits.Tpo $(DEPDIR)/liblebiniou_so_0-image_8bits.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='image_8bits.c' object='liblebiniou_so_0-image_8bits.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -c -o lebiniou-particles.o `test -f 'particles.c' || echo '$(srcdir)/'`particles.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -c -o liblebiniou_so_0-image_8bits.o `test -f 'image_8bits.c' || echo '$(srcdir)/'`image_8bits.c -lebiniou-particles.obj: particles.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -MT lebiniou-particles.obj -MD -MP -MF $(DEPDIR)/lebiniou-particles.Tpo -c -o lebiniou-particles.obj `if test -f 'particles.c'; then $(CYGPATH_W) 'particles.c'; else $(CYGPATH_W) '$(srcdir)/particles.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lebiniou-particles.Tpo $(DEPDIR)/lebiniou-particles.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='particles.c' object='lebiniou-particles.obj' libtool=no @AMDEPBACKSLASH@ +liblebiniou_so_0-image_8bits.obj: image_8bits.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -MT liblebiniou_so_0-image_8bits.obj -MD -MP -MF $(DEPDIR)/liblebiniou_so_0-image_8bits.Tpo -c -o liblebiniou_so_0-image_8bits.obj `if test -f 'image_8bits.c'; then $(CYGPATH_W) 'image_8bits.c'; else $(CYGPATH_W) '$(srcdir)/image_8bits.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblebiniou_so_0-image_8bits.Tpo $(DEPDIR)/liblebiniou_so_0-image_8bits.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='image_8bits.c' object='liblebiniou_so_0-image_8bits.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -c -o lebiniou-particles.obj `if test -f 'particles.c'; then $(CYGPATH_W) 'particles.c'; else $(CYGPATH_W) '$(srcdir)/particles.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -c -o liblebiniou_so_0-image_8bits.obj `if test -f 'image_8bits.c'; then $(CYGPATH_W) 'image_8bits.c'; else $(CYGPATH_W) '$(srcdir)/image_8bits.c'; fi` -lebiniou-pbar.o: pbar.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -MT lebiniou-pbar.o -MD -MP -MF $(DEPDIR)/lebiniou-pbar.Tpo -c -o lebiniou-pbar.o `test -f 'pbar.c' || echo '$(srcdir)/'`pbar.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lebiniou-pbar.Tpo $(DEPDIR)/lebiniou-pbar.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pbar.c' object='lebiniou-pbar.o' libtool=no @AMDEPBACKSLASH@ +liblebiniou_so_0-imagefader.o: imagefader.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -MT liblebiniou_so_0-imagefader.o -MD -MP -MF $(DEPDIR)/liblebiniou_so_0-imagefader.Tpo -c -o liblebiniou_so_0-imagefader.o `test -f 'imagefader.c' || echo '$(srcdir)/'`imagefader.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblebiniou_so_0-imagefader.Tpo $(DEPDIR)/liblebiniou_so_0-imagefader.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='imagefader.c' object='liblebiniou_so_0-imagefader.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -c -o lebiniou-pbar.o `test -f 'pbar.c' || echo '$(srcdir)/'`pbar.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -c -o liblebiniou_so_0-imagefader.o `test -f 'imagefader.c' || echo '$(srcdir)/'`imagefader.c -lebiniou-pbar.obj: pbar.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -MT lebiniou-pbar.obj -MD -MP -MF $(DEPDIR)/lebiniou-pbar.Tpo -c -o lebiniou-pbar.obj `if test -f 'pbar.c'; then $(CYGPATH_W) 'pbar.c'; else $(CYGPATH_W) '$(srcdir)/pbar.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lebiniou-pbar.Tpo $(DEPDIR)/lebiniou-pbar.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pbar.c' object='lebiniou-pbar.obj' libtool=no @AMDEPBACKSLASH@ +liblebiniou_so_0-imagefader.obj: imagefader.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -MT liblebiniou_so_0-imagefader.obj -MD -MP -MF $(DEPDIR)/liblebiniou_so_0-imagefader.Tpo -c -o liblebiniou_so_0-imagefader.obj `if test -f 'imagefader.c'; then $(CYGPATH_W) 'imagefader.c'; else $(CYGPATH_W) '$(srcdir)/imagefader.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblebiniou_so_0-imagefader.Tpo $(DEPDIR)/liblebiniou_so_0-imagefader.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='imagefader.c' object='liblebiniou_so_0-imagefader.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -c -o lebiniou-pbar.obj `if test -f 'pbar.c'; then $(CYGPATH_W) 'pbar.c'; else $(CYGPATH_W) '$(srcdir)/pbar.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -c -o liblebiniou_so_0-imagefader.obj `if test -f 'imagefader.c'; then $(CYGPATH_W) 'imagefader.c'; else $(CYGPATH_W) '$(srcdir)/imagefader.c'; fi` -lebiniou-imagefader.o: imagefader.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -MT lebiniou-imagefader.o -MD -MP -MF $(DEPDIR)/lebiniou-imagefader.Tpo -c -o lebiniou-imagefader.o `test -f 'imagefader.c' || echo '$(srcdir)/'`imagefader.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lebiniou-imagefader.Tpo $(DEPDIR)/lebiniou-imagefader.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='imagefader.c' object='lebiniou-imagefader.o' libtool=no @AMDEPBACKSLASH@ +liblebiniou_so_0-imagefader_event.o: imagefader_event.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -MT liblebiniou_so_0-imagefader_event.o -MD -MP -MF $(DEPDIR)/liblebiniou_so_0-imagefader_event.Tpo -c -o liblebiniou_so_0-imagefader_event.o `test -f 'imagefader_event.c' || echo '$(srcdir)/'`imagefader_event.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblebiniou_so_0-imagefader_event.Tpo $(DEPDIR)/liblebiniou_so_0-imagefader_event.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='imagefader_event.c' object='liblebiniou_so_0-imagefader_event.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -c -o lebiniou-imagefader.o `test -f 'imagefader.c' || echo '$(srcdir)/'`imagefader.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -c -o liblebiniou_so_0-imagefader_event.o `test -f 'imagefader_event.c' || echo '$(srcdir)/'`imagefader_event.c -lebiniou-imagefader.obj: imagefader.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -MT lebiniou-imagefader.obj -MD -MP -MF $(DEPDIR)/lebiniou-imagefader.Tpo -c -o lebiniou-imagefader.obj `if test -f 'imagefader.c'; then $(CYGPATH_W) 'imagefader.c'; else $(CYGPATH_W) '$(srcdir)/imagefader.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lebiniou-imagefader.Tpo $(DEPDIR)/lebiniou-imagefader.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='imagefader.c' object='lebiniou-imagefader.obj' libtool=no @AMDEPBACKSLASH@ +liblebiniou_so_0-imagefader_event.obj: imagefader_event.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -MT liblebiniou_so_0-imagefader_event.obj -MD -MP -MF $(DEPDIR)/liblebiniou_so_0-imagefader_event.Tpo -c -o liblebiniou_so_0-imagefader_event.obj `if test -f 'imagefader_event.c'; then $(CYGPATH_W) 'imagefader_event.c'; else $(CYGPATH_W) '$(srcdir)/imagefader_event.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblebiniou_so_0-imagefader_event.Tpo $(DEPDIR)/liblebiniou_so_0-imagefader_event.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='imagefader_event.c' object='liblebiniou_so_0-imagefader_event.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -c -o lebiniou-imagefader.obj `if test -f 'imagefader.c'; then $(CYGPATH_W) 'imagefader.c'; else $(CYGPATH_W) '$(srcdir)/imagefader.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -c -o liblebiniou_so_0-imagefader_event.obj `if test -f 'imagefader_event.c'; then $(CYGPATH_W) 'imagefader_event.c'; else $(CYGPATH_W) '$(srcdir)/imagefader_event.c'; fi` -lebiniou-imagefader_event.o: imagefader_event.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -MT lebiniou-imagefader_event.o -MD -MP -MF $(DEPDIR)/lebiniou-imagefader_event.Tpo -c -o lebiniou-imagefader_event.o `test -f 'imagefader_event.c' || echo '$(srcdir)/'`imagefader_event.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lebiniou-imagefader_event.Tpo $(DEPDIR)/lebiniou-imagefader_event.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='imagefader_event.c' object='lebiniou-imagefader_event.o' libtool=no @AMDEPBACKSLASH@ +liblebiniou_so_0-image_filter.o: image_filter.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -MT liblebiniou_so_0-image_filter.o -MD -MP -MF $(DEPDIR)/liblebiniou_so_0-image_filter.Tpo -c -o liblebiniou_so_0-image_filter.o `test -f 'image_filter.c' || echo '$(srcdir)/'`image_filter.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblebiniou_so_0-image_filter.Tpo $(DEPDIR)/liblebiniou_so_0-image_filter.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='image_filter.c' object='liblebiniou_so_0-image_filter.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -c -o lebiniou-imagefader_event.o `test -f 'imagefader_event.c' || echo '$(srcdir)/'`imagefader_event.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -c -o liblebiniou_so_0-image_filter.o `test -f 'image_filter.c' || echo '$(srcdir)/'`image_filter.c -lebiniou-imagefader_event.obj: imagefader_event.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -MT lebiniou-imagefader_event.obj -MD -MP -MF $(DEPDIR)/lebiniou-imagefader_event.Tpo -c -o lebiniou-imagefader_event.obj `if test -f 'imagefader_event.c'; then $(CYGPATH_W) 'imagefader_event.c'; else $(CYGPATH_W) '$(srcdir)/imagefader_event.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lebiniou-imagefader_event.Tpo $(DEPDIR)/lebiniou-imagefader_event.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='imagefader_event.c' object='lebiniou-imagefader_event.obj' libtool=no @AMDEPBACKSLASH@ +liblebiniou_so_0-image_filter.obj: image_filter.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -MT liblebiniou_so_0-image_filter.obj -MD -MP -MF $(DEPDIR)/liblebiniou_so_0-image_filter.Tpo -c -o liblebiniou_so_0-image_filter.obj `if test -f 'image_filter.c'; then $(CYGPATH_W) 'image_filter.c'; else $(CYGPATH_W) '$(srcdir)/image_filter.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblebiniou_so_0-image_filter.Tpo $(DEPDIR)/liblebiniou_so_0-image_filter.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='image_filter.c' object='liblebiniou_so_0-image_filter.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -c -o lebiniou-imagefader_event.obj `if test -f 'imagefader_event.c'; then $(CYGPATH_W) 'imagefader_event.c'; else $(CYGPATH_W) '$(srcdir)/imagefader_event.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -c -o liblebiniou_so_0-image_filter.obj `if test -f 'image_filter.c'; then $(CYGPATH_W) 'image_filter.c'; else $(CYGPATH_W) '$(srcdir)/image_filter.c'; fi` -lebiniou-image_8bits.o: image_8bits.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -MT lebiniou-image_8bits.o -MD -MP -MF $(DEPDIR)/lebiniou-image_8bits.Tpo -c -o lebiniou-image_8bits.o `test -f 'image_8bits.c' || echo '$(srcdir)/'`image_8bits.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lebiniou-image_8bits.Tpo $(DEPDIR)/lebiniou-image_8bits.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='image_8bits.c' object='lebiniou-image_8bits.o' libtool=no @AMDEPBACKSLASH@ +liblebiniou_so_0-images.o: images.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -MT liblebiniou_so_0-images.o -MD -MP -MF $(DEPDIR)/liblebiniou_so_0-images.Tpo -c -o liblebiniou_so_0-images.o `test -f 'images.c' || echo '$(srcdir)/'`images.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblebiniou_so_0-images.Tpo $(DEPDIR)/liblebiniou_so_0-images.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='images.c' object='liblebiniou_so_0-images.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -c -o lebiniou-image_8bits.o `test -f 'image_8bits.c' || echo '$(srcdir)/'`image_8bits.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -c -o liblebiniou_so_0-images.o `test -f 'images.c' || echo '$(srcdir)/'`images.c -lebiniou-image_8bits.obj: image_8bits.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -MT lebiniou-image_8bits.obj -MD -MP -MF $(DEPDIR)/lebiniou-image_8bits.Tpo -c -o lebiniou-image_8bits.obj `if test -f 'image_8bits.c'; then $(CYGPATH_W) 'image_8bits.c'; else $(CYGPATH_W) '$(srcdir)/image_8bits.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lebiniou-image_8bits.Tpo $(DEPDIR)/lebiniou-image_8bits.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='image_8bits.c' object='lebiniou-image_8bits.obj' libtool=no @AMDEPBACKSLASH@ +liblebiniou_so_0-images.obj: images.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -MT liblebiniou_so_0-images.obj -MD -MP -MF $(DEPDIR)/liblebiniou_so_0-images.Tpo -c -o liblebiniou_so_0-images.obj `if test -f 'images.c'; then $(CYGPATH_W) 'images.c'; else $(CYGPATH_W) '$(srcdir)/images.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblebiniou_so_0-images.Tpo $(DEPDIR)/liblebiniou_so_0-images.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='images.c' object='liblebiniou_so_0-images.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -c -o lebiniou-image_8bits.obj `if test -f 'image_8bits.c'; then $(CYGPATH_W) 'image_8bits.c'; else $(CYGPATH_W) '$(srcdir)/image_8bits.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -c -o liblebiniou_so_0-images.obj `if test -f 'images.c'; then $(CYGPATH_W) 'images.c'; else $(CYGPATH_W) '$(srcdir)/images.c'; fi` -lebiniou-images.o: images.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -MT lebiniou-images.o -MD -MP -MF $(DEPDIR)/lebiniou-images.Tpo -c -o lebiniou-images.o `test -f 'images.c' || echo '$(srcdir)/'`images.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lebiniou-images.Tpo $(DEPDIR)/lebiniou-images.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='images.c' object='lebiniou-images.o' libtool=no @AMDEPBACKSLASH@ +liblebiniou_so_0-input.o: input.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -MT liblebiniou_so_0-input.o -MD -MP -MF $(DEPDIR)/liblebiniou_so_0-input.Tpo -c -o liblebiniou_so_0-input.o `test -f 'input.c' || echo '$(srcdir)/'`input.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblebiniou_so_0-input.Tpo $(DEPDIR)/liblebiniou_so_0-input.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='input.c' object='liblebiniou_so_0-input.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -c -o lebiniou-images.o `test -f 'images.c' || echo '$(srcdir)/'`images.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -c -o liblebiniou_so_0-input.o `test -f 'input.c' || echo '$(srcdir)/'`input.c -lebiniou-images.obj: images.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -MT lebiniou-images.obj -MD -MP -MF $(DEPDIR)/lebiniou-images.Tpo -c -o lebiniou-images.obj `if test -f 'images.c'; then $(CYGPATH_W) 'images.c'; else $(CYGPATH_W) '$(srcdir)/images.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lebiniou-images.Tpo $(DEPDIR)/lebiniou-images.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='images.c' object='lebiniou-images.obj' libtool=no @AMDEPBACKSLASH@ +liblebiniou_so_0-input.obj: input.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -MT liblebiniou_so_0-input.obj -MD -MP -MF $(DEPDIR)/liblebiniou_so_0-input.Tpo -c -o liblebiniou_so_0-input.obj `if test -f 'input.c'; then $(CYGPATH_W) 'input.c'; else $(CYGPATH_W) '$(srcdir)/input.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblebiniou_so_0-input.Tpo $(DEPDIR)/liblebiniou_so_0-input.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='input.c' object='liblebiniou_so_0-input.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -c -o lebiniou-images.obj `if test -f 'images.c'; then $(CYGPATH_W) 'images.c'; else $(CYGPATH_W) '$(srcdir)/images.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -c -o liblebiniou_so_0-input.obj `if test -f 'input.c'; then $(CYGPATH_W) 'input.c'; else $(CYGPATH_W) '$(srcdir)/input.c'; fi` -lebiniou-plugin.o: plugin.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -MT lebiniou-plugin.o -MD -MP -MF $(DEPDIR)/lebiniou-plugin.Tpo -c -o lebiniou-plugin.o `test -f 'plugin.c' || echo '$(srcdir)/'`plugin.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lebiniou-plugin.Tpo $(DEPDIR)/lebiniou-plugin.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='plugin.c' object='lebiniou-plugin.o' libtool=no @AMDEPBACKSLASH@ +liblebiniou_so_0-layer.o: layer.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -MT liblebiniou_so_0-layer.o -MD -MP -MF $(DEPDIR)/liblebiniou_so_0-layer.Tpo -c -o liblebiniou_so_0-layer.o `test -f 'layer.c' || echo '$(srcdir)/'`layer.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblebiniou_so_0-layer.Tpo $(DEPDIR)/liblebiniou_so_0-layer.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='layer.c' object='liblebiniou_so_0-layer.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -c -o lebiniou-plugin.o `test -f 'plugin.c' || echo '$(srcdir)/'`plugin.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -c -o liblebiniou_so_0-layer.o `test -f 'layer.c' || echo '$(srcdir)/'`layer.c -lebiniou-plugin.obj: plugin.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -MT lebiniou-plugin.obj -MD -MP -MF $(DEPDIR)/lebiniou-plugin.Tpo -c -o lebiniou-plugin.obj `if test -f 'plugin.c'; then $(CYGPATH_W) 'plugin.c'; else $(CYGPATH_W) '$(srcdir)/plugin.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lebiniou-plugin.Tpo $(DEPDIR)/lebiniou-plugin.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='plugin.c' object='lebiniou-plugin.obj' libtool=no @AMDEPBACKSLASH@ +liblebiniou_so_0-layer.obj: layer.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -MT liblebiniou_so_0-layer.obj -MD -MP -MF $(DEPDIR)/liblebiniou_so_0-layer.Tpo -c -o liblebiniou_so_0-layer.obj `if test -f 'layer.c'; then $(CYGPATH_W) 'layer.c'; else $(CYGPATH_W) '$(srcdir)/layer.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblebiniou_so_0-layer.Tpo $(DEPDIR)/liblebiniou_so_0-layer.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='layer.c' object='liblebiniou_so_0-layer.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -c -o lebiniou-plugin.obj `if test -f 'plugin.c'; then $(CYGPATH_W) 'plugin.c'; else $(CYGPATH_W) '$(srcdir)/plugin.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -c -o liblebiniou_so_0-layer.obj `if test -f 'layer.c'; then $(CYGPATH_W) 'layer.c'; else $(CYGPATH_W) '$(srcdir)/layer.c'; fi` -lebiniou-plugins.o: plugins.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -MT lebiniou-plugins.o -MD -MP -MF $(DEPDIR)/lebiniou-plugins.Tpo -c -o lebiniou-plugins.o `test -f 'plugins.c' || echo '$(srcdir)/'`plugins.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lebiniou-plugins.Tpo $(DEPDIR)/lebiniou-plugins.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='plugins.c' object='lebiniou-plugins.o' libtool=no @AMDEPBACKSLASH@ +liblebiniou_so_0-options.o: options.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -MT liblebiniou_so_0-options.o -MD -MP -MF $(DEPDIR)/liblebiniou_so_0-options.Tpo -c -o liblebiniou_so_0-options.o `test -f 'options.c' || echo '$(srcdir)/'`options.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblebiniou_so_0-options.Tpo $(DEPDIR)/liblebiniou_so_0-options.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='options.c' object='liblebiniou_so_0-options.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -c -o lebiniou-plugins.o `test -f 'plugins.c' || echo '$(srcdir)/'`plugins.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -c -o liblebiniou_so_0-options.o `test -f 'options.c' || echo '$(srcdir)/'`options.c -lebiniou-plugins.obj: plugins.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -MT lebiniou-plugins.obj -MD -MP -MF $(DEPDIR)/lebiniou-plugins.Tpo -c -o lebiniou-plugins.obj `if test -f 'plugins.c'; then $(CYGPATH_W) 'plugins.c'; else $(CYGPATH_W) '$(srcdir)/plugins.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lebiniou-plugins.Tpo $(DEPDIR)/lebiniou-plugins.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='plugins.c' object='lebiniou-plugins.obj' libtool=no @AMDEPBACKSLASH@ +liblebiniou_so_0-options.obj: options.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -MT liblebiniou_so_0-options.obj -MD -MP -MF $(DEPDIR)/liblebiniou_so_0-options.Tpo -c -o liblebiniou_so_0-options.obj `if test -f 'options.c'; then $(CYGPATH_W) 'options.c'; else $(CYGPATH_W) '$(srcdir)/options.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblebiniou_so_0-options.Tpo $(DEPDIR)/liblebiniou_so_0-options.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='options.c' object='liblebiniou_so_0-options.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -c -o lebiniou-plugins.obj `if test -f 'plugins.c'; then $(CYGPATH_W) 'plugins.c'; else $(CYGPATH_W) '$(srcdir)/plugins.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -c -o liblebiniou_so_0-options.obj `if test -f 'options.c'; then $(CYGPATH_W) 'options.c'; else $(CYGPATH_W) '$(srcdir)/options.c'; fi` -lebiniou-plugins_event.o: plugins_event.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -MT lebiniou-plugins_event.o -MD -MP -MF $(DEPDIR)/lebiniou-plugins_event.Tpo -c -o lebiniou-plugins_event.o `test -f 'plugins_event.c' || echo '$(srcdir)/'`plugins_event.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lebiniou-plugins_event.Tpo $(DEPDIR)/lebiniou-plugins_event.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='plugins_event.c' object='lebiniou-plugins_event.o' libtool=no @AMDEPBACKSLASH@ +liblebiniou_so_0-oscillo.o: oscillo.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -MT liblebiniou_so_0-oscillo.o -MD -MP -MF $(DEPDIR)/liblebiniou_so_0-oscillo.Tpo -c -o liblebiniou_so_0-oscillo.o `test -f 'oscillo.c' || echo '$(srcdir)/'`oscillo.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblebiniou_so_0-oscillo.Tpo $(DEPDIR)/liblebiniou_so_0-oscillo.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='oscillo.c' object='liblebiniou_so_0-oscillo.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -c -o lebiniou-plugins_event.o `test -f 'plugins_event.c' || echo '$(srcdir)/'`plugins_event.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -c -o liblebiniou_so_0-oscillo.o `test -f 'oscillo.c' || echo '$(srcdir)/'`oscillo.c -lebiniou-plugins_event.obj: plugins_event.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -MT lebiniou-plugins_event.obj -MD -MP -MF $(DEPDIR)/lebiniou-plugins_event.Tpo -c -o lebiniou-plugins_event.obj `if test -f 'plugins_event.c'; then $(CYGPATH_W) 'plugins_event.c'; else $(CYGPATH_W) '$(srcdir)/plugins_event.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lebiniou-plugins_event.Tpo $(DEPDIR)/lebiniou-plugins_event.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='plugins_event.c' object='lebiniou-plugins_event.obj' libtool=no @AMDEPBACKSLASH@ +liblebiniou_so_0-oscillo.obj: oscillo.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -MT liblebiniou_so_0-oscillo.obj -MD -MP -MF $(DEPDIR)/liblebiniou_so_0-oscillo.Tpo -c -o liblebiniou_so_0-oscillo.obj `if test -f 'oscillo.c'; then $(CYGPATH_W) 'oscillo.c'; else $(CYGPATH_W) '$(srcdir)/oscillo.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblebiniou_so_0-oscillo.Tpo $(DEPDIR)/liblebiniou_so_0-oscillo.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='oscillo.c' object='liblebiniou_so_0-oscillo.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -c -o lebiniou-plugins_event.obj `if test -f 'plugins_event.c'; then $(CYGPATH_W) 'plugins_event.c'; else $(CYGPATH_W) '$(srcdir)/plugins_event.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -c -o liblebiniou_so_0-oscillo.obj `if test -f 'oscillo.c'; then $(CYGPATH_W) 'oscillo.c'; else $(CYGPATH_W) '$(srcdir)/oscillo.c'; fi` -lebiniou-pnglite.o: pnglite.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -MT lebiniou-pnglite.o -MD -MP -MF $(DEPDIR)/lebiniou-pnglite.Tpo -c -o lebiniou-pnglite.o `test -f 'pnglite.c' || echo '$(srcdir)/'`pnglite.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lebiniou-pnglite.Tpo $(DEPDIR)/lebiniou-pnglite.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pnglite.c' object='lebiniou-pnglite.o' libtool=no @AMDEPBACKSLASH@ +liblebiniou_so_0-params3d.o: params3d.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -MT liblebiniou_so_0-params3d.o -MD -MP -MF $(DEPDIR)/liblebiniou_so_0-params3d.Tpo -c -o liblebiniou_so_0-params3d.o `test -f 'params3d.c' || echo '$(srcdir)/'`params3d.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblebiniou_so_0-params3d.Tpo $(DEPDIR)/liblebiniou_so_0-params3d.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='params3d.c' object='liblebiniou_so_0-params3d.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -c -o lebiniou-pnglite.o `test -f 'pnglite.c' || echo '$(srcdir)/'`pnglite.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -c -o liblebiniou_so_0-params3d.o `test -f 'params3d.c' || echo '$(srcdir)/'`params3d.c -lebiniou-pnglite.obj: pnglite.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -MT lebiniou-pnglite.obj -MD -MP -MF $(DEPDIR)/lebiniou-pnglite.Tpo -c -o lebiniou-pnglite.obj `if test -f 'pnglite.c'; then $(CYGPATH_W) 'pnglite.c'; else $(CYGPATH_W) '$(srcdir)/pnglite.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lebiniou-pnglite.Tpo $(DEPDIR)/lebiniou-pnglite.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pnglite.c' object='lebiniou-pnglite.obj' libtool=no @AMDEPBACKSLASH@ +liblebiniou_so_0-params3d.obj: params3d.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -MT liblebiniou_so_0-params3d.obj -MD -MP -MF $(DEPDIR)/liblebiniou_so_0-params3d.Tpo -c -o liblebiniou_so_0-params3d.obj `if test -f 'params3d.c'; then $(CYGPATH_W) 'params3d.c'; else $(CYGPATH_W) '$(srcdir)/params3d.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblebiniou_so_0-params3d.Tpo $(DEPDIR)/liblebiniou_so_0-params3d.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='params3d.c' object='liblebiniou_so_0-params3d.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -c -o lebiniou-pnglite.obj `if test -f 'pnglite.c'; then $(CYGPATH_W) 'pnglite.c'; else $(CYGPATH_W) '$(srcdir)/pnglite.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -c -o liblebiniou_so_0-params3d.obj `if test -f 'params3d.c'; then $(CYGPATH_W) 'params3d.c'; else $(CYGPATH_W) '$(srcdir)/params3d.c'; fi` -lebiniou-schemes.o: schemes.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -MT lebiniou-schemes.o -MD -MP -MF $(DEPDIR)/lebiniou-schemes.Tpo -c -o lebiniou-schemes.o `test -f 'schemes.c' || echo '$(srcdir)/'`schemes.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lebiniou-schemes.Tpo $(DEPDIR)/lebiniou-schemes.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='schemes.c' object='lebiniou-schemes.o' libtool=no @AMDEPBACKSLASH@ +liblebiniou_so_0-particles.o: particles.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -MT liblebiniou_so_0-particles.o -MD -MP -MF $(DEPDIR)/liblebiniou_so_0-particles.Tpo -c -o liblebiniou_so_0-particles.o `test -f 'particles.c' || echo '$(srcdir)/'`particles.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblebiniou_so_0-particles.Tpo $(DEPDIR)/liblebiniou_so_0-particles.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='particles.c' object='liblebiniou_so_0-particles.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -c -o lebiniou-schemes.o `test -f 'schemes.c' || echo '$(srcdir)/'`schemes.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -c -o liblebiniou_so_0-particles.o `test -f 'particles.c' || echo '$(srcdir)/'`particles.c -lebiniou-schemes.obj: schemes.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -MT lebiniou-schemes.obj -MD -MP -MF $(DEPDIR)/lebiniou-schemes.Tpo -c -o lebiniou-schemes.obj `if test -f 'schemes.c'; then $(CYGPATH_W) 'schemes.c'; else $(CYGPATH_W) '$(srcdir)/schemes.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lebiniou-schemes.Tpo $(DEPDIR)/lebiniou-schemes.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='schemes.c' object='lebiniou-schemes.obj' libtool=no @AMDEPBACKSLASH@ +liblebiniou_so_0-particles.obj: particles.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -MT liblebiniou_so_0-particles.obj -MD -MP -MF $(DEPDIR)/liblebiniou_so_0-particles.Tpo -c -o liblebiniou_so_0-particles.obj `if test -f 'particles.c'; then $(CYGPATH_W) 'particles.c'; else $(CYGPATH_W) '$(srcdir)/particles.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblebiniou_so_0-particles.Tpo $(DEPDIR)/liblebiniou_so_0-particles.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='particles.c' object='liblebiniou_so_0-particles.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -c -o lebiniou-schemes.obj `if test -f 'schemes.c'; then $(CYGPATH_W) 'schemes.c'; else $(CYGPATH_W) '$(srcdir)/schemes.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -c -o liblebiniou_so_0-particles.obj `if test -f 'particles.c'; then $(CYGPATH_W) 'particles.c'; else $(CYGPATH_W) '$(srcdir)/particles.c'; fi` -lebiniou-schemes_random.o: schemes_random.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -MT lebiniou-schemes_random.o -MD -MP -MF $(DEPDIR)/lebiniou-schemes_random.Tpo -c -o lebiniou-schemes_random.o `test -f 'schemes_random.c' || echo '$(srcdir)/'`schemes_random.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lebiniou-schemes_random.Tpo $(DEPDIR)/lebiniou-schemes_random.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='schemes_random.c' object='lebiniou-schemes_random.o' libtool=no @AMDEPBACKSLASH@ +liblebiniou_so_0-plugin.o: plugin.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -MT liblebiniou_so_0-plugin.o -MD -MP -MF $(DEPDIR)/liblebiniou_so_0-plugin.Tpo -c -o liblebiniou_so_0-plugin.o `test -f 'plugin.c' || echo '$(srcdir)/'`plugin.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblebiniou_so_0-plugin.Tpo $(DEPDIR)/liblebiniou_so_0-plugin.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='plugin.c' object='liblebiniou_so_0-plugin.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -c -o lebiniou-schemes_random.o `test -f 'schemes_random.c' || echo '$(srcdir)/'`schemes_random.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -c -o liblebiniou_so_0-plugin.o `test -f 'plugin.c' || echo '$(srcdir)/'`plugin.c -lebiniou-schemes_random.obj: schemes_random.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -MT lebiniou-schemes_random.obj -MD -MP -MF $(DEPDIR)/lebiniou-schemes_random.Tpo -c -o lebiniou-schemes_random.obj `if test -f 'schemes_random.c'; then $(CYGPATH_W) 'schemes_random.c'; else $(CYGPATH_W) '$(srcdir)/schemes_random.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lebiniou-schemes_random.Tpo $(DEPDIR)/lebiniou-schemes_random.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='schemes_random.c' object='lebiniou-schemes_random.obj' libtool=no @AMDEPBACKSLASH@ +liblebiniou_so_0-plugin.obj: plugin.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -MT liblebiniou_so_0-plugin.obj -MD -MP -MF $(DEPDIR)/liblebiniou_so_0-plugin.Tpo -c -o liblebiniou_so_0-plugin.obj `if test -f 'plugin.c'; then $(CYGPATH_W) 'plugin.c'; else $(CYGPATH_W) '$(srcdir)/plugin.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblebiniou_so_0-plugin.Tpo $(DEPDIR)/liblebiniou_so_0-plugin.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='plugin.c' object='liblebiniou_so_0-plugin.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -c -o lebiniou-schemes_random.obj `if test -f 'schemes_random.c'; then $(CYGPATH_W) 'schemes_random.c'; else $(CYGPATH_W) '$(srcdir)/schemes_random.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -c -o liblebiniou_so_0-plugin.obj `if test -f 'plugin.c'; then $(CYGPATH_W) 'plugin.c'; else $(CYGPATH_W) '$(srcdir)/plugin.c'; fi` -lebiniou-screenshot.o: screenshot.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -MT lebiniou-screenshot.o -MD -MP -MF $(DEPDIR)/lebiniou-screenshot.Tpo -c -o lebiniou-screenshot.o `test -f 'screenshot.c' || echo '$(srcdir)/'`screenshot.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lebiniou-screenshot.Tpo $(DEPDIR)/lebiniou-screenshot.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='screenshot.c' object='lebiniou-screenshot.o' libtool=no @AMDEPBACKSLASH@ +liblebiniou_so_0-plugins.o: plugins.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -MT liblebiniou_so_0-plugins.o -MD -MP -MF $(DEPDIR)/liblebiniou_so_0-plugins.Tpo -c -o liblebiniou_so_0-plugins.o `test -f 'plugins.c' || echo '$(srcdir)/'`plugins.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblebiniou_so_0-plugins.Tpo $(DEPDIR)/liblebiniou_so_0-plugins.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='plugins.c' object='liblebiniou_so_0-plugins.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -c -o lebiniou-screenshot.o `test -f 'screenshot.c' || echo '$(srcdir)/'`screenshot.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -c -o liblebiniou_so_0-plugins.o `test -f 'plugins.c' || echo '$(srcdir)/'`plugins.c -lebiniou-screenshot.obj: screenshot.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -MT lebiniou-screenshot.obj -MD -MP -MF $(DEPDIR)/lebiniou-screenshot.Tpo -c -o lebiniou-screenshot.obj `if test -f 'screenshot.c'; then $(CYGPATH_W) 'screenshot.c'; else $(CYGPATH_W) '$(srcdir)/screenshot.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lebiniou-screenshot.Tpo $(DEPDIR)/lebiniou-screenshot.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='screenshot.c' object='lebiniou-screenshot.obj' libtool=no @AMDEPBACKSLASH@ +liblebiniou_so_0-plugins.obj: plugins.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -MT liblebiniou_so_0-plugins.obj -MD -MP -MF $(DEPDIR)/liblebiniou_so_0-plugins.Tpo -c -o liblebiniou_so_0-plugins.obj `if test -f 'plugins.c'; then $(CYGPATH_W) 'plugins.c'; else $(CYGPATH_W) '$(srcdir)/plugins.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblebiniou_so_0-plugins.Tpo $(DEPDIR)/liblebiniou_so_0-plugins.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='plugins.c' object='liblebiniou_so_0-plugins.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -c -o lebiniou-screenshot.obj `if test -f 'screenshot.c'; then $(CYGPATH_W) 'screenshot.c'; else $(CYGPATH_W) '$(srcdir)/screenshot.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -c -o liblebiniou_so_0-plugins.obj `if test -f 'plugins.c'; then $(CYGPATH_W) 'plugins.c'; else $(CYGPATH_W) '$(srcdir)/plugins.c'; fi` -lebiniou-sequence.o: sequence.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -MT lebiniou-sequence.o -MD -MP -MF $(DEPDIR)/lebiniou-sequence.Tpo -c -o lebiniou-sequence.o `test -f 'sequence.c' || echo '$(srcdir)/'`sequence.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lebiniou-sequence.Tpo $(DEPDIR)/lebiniou-sequence.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='sequence.c' object='lebiniou-sequence.o' libtool=no @AMDEPBACKSLASH@ +liblebiniou_so_0-plugins_event.o: plugins_event.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -MT liblebiniou_so_0-plugins_event.o -MD -MP -MF $(DEPDIR)/liblebiniou_so_0-plugins_event.Tpo -c -o liblebiniou_so_0-plugins_event.o `test -f 'plugins_event.c' || echo '$(srcdir)/'`plugins_event.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblebiniou_so_0-plugins_event.Tpo $(DEPDIR)/liblebiniou_so_0-plugins_event.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='plugins_event.c' object='liblebiniou_so_0-plugins_event.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -c -o lebiniou-sequence.o `test -f 'sequence.c' || echo '$(srcdir)/'`sequence.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -c -o liblebiniou_so_0-plugins_event.o `test -f 'plugins_event.c' || echo '$(srcdir)/'`plugins_event.c -lebiniou-sequence.obj: sequence.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -MT lebiniou-sequence.obj -MD -MP -MF $(DEPDIR)/lebiniou-sequence.Tpo -c -o lebiniou-sequence.obj `if test -f 'sequence.c'; then $(CYGPATH_W) 'sequence.c'; else $(CYGPATH_W) '$(srcdir)/sequence.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lebiniou-sequence.Tpo $(DEPDIR)/lebiniou-sequence.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='sequence.c' object='lebiniou-sequence.obj' libtool=no @AMDEPBACKSLASH@ +liblebiniou_so_0-plugins_event.obj: plugins_event.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -MT liblebiniou_so_0-plugins_event.obj -MD -MP -MF $(DEPDIR)/liblebiniou_so_0-plugins_event.Tpo -c -o liblebiniou_so_0-plugins_event.obj `if test -f 'plugins_event.c'; then $(CYGPATH_W) 'plugins_event.c'; else $(CYGPATH_W) '$(srcdir)/plugins_event.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblebiniou_so_0-plugins_event.Tpo $(DEPDIR)/liblebiniou_so_0-plugins_event.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='plugins_event.c' object='liblebiniou_so_0-plugins_event.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -c -o lebiniou-sequence.obj `if test -f 'sequence.c'; then $(CYGPATH_W) 'sequence.c'; else $(CYGPATH_W) '$(srcdir)/sequence.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -c -o liblebiniou_so_0-plugins_event.obj `if test -f 'plugins_event.c'; then $(CYGPATH_W) 'plugins_event.c'; else $(CYGPATH_W) '$(srcdir)/plugins_event.c'; fi` -lebiniou-sequence_load.o: sequence_load.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -MT lebiniou-sequence_load.o -MD -MP -MF $(DEPDIR)/lebiniou-sequence_load.Tpo -c -o lebiniou-sequence_load.o `test -f 'sequence_load.c' || echo '$(srcdir)/'`sequence_load.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lebiniou-sequence_load.Tpo $(DEPDIR)/lebiniou-sequence_load.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='sequence_load.c' object='lebiniou-sequence_load.o' libtool=no @AMDEPBACKSLASH@ +liblebiniou_so_0-pnglite.o: pnglite.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -MT liblebiniou_so_0-pnglite.o -MD -MP -MF $(DEPDIR)/liblebiniou_so_0-pnglite.Tpo -c -o liblebiniou_so_0-pnglite.o `test -f 'pnglite.c' || echo '$(srcdir)/'`pnglite.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblebiniou_so_0-pnglite.Tpo $(DEPDIR)/liblebiniou_so_0-pnglite.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pnglite.c' object='liblebiniou_so_0-pnglite.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -c -o lebiniou-sequence_load.o `test -f 'sequence_load.c' || echo '$(srcdir)/'`sequence_load.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -c -o liblebiniou_so_0-pnglite.o `test -f 'pnglite.c' || echo '$(srcdir)/'`pnglite.c -lebiniou-sequence_load.obj: sequence_load.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -MT lebiniou-sequence_load.obj -MD -MP -MF $(DEPDIR)/lebiniou-sequence_load.Tpo -c -o lebiniou-sequence_load.obj `if test -f 'sequence_load.c'; then $(CYGPATH_W) 'sequence_load.c'; else $(CYGPATH_W) '$(srcdir)/sequence_load.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lebiniou-sequence_load.Tpo $(DEPDIR)/lebiniou-sequence_load.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='sequence_load.c' object='lebiniou-sequence_load.obj' libtool=no @AMDEPBACKSLASH@ +liblebiniou_so_0-pnglite.obj: pnglite.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -MT liblebiniou_so_0-pnglite.obj -MD -MP -MF $(DEPDIR)/liblebiniou_so_0-pnglite.Tpo -c -o liblebiniou_so_0-pnglite.obj `if test -f 'pnglite.c'; then $(CYGPATH_W) 'pnglite.c'; else $(CYGPATH_W) '$(srcdir)/pnglite.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblebiniou_so_0-pnglite.Tpo $(DEPDIR)/liblebiniou_so_0-pnglite.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pnglite.c' object='liblebiniou_so_0-pnglite.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -c -o lebiniou-sequence_load.obj `if test -f 'sequence_load.c'; then $(CYGPATH_W) 'sequence_load.c'; else $(CYGPATH_W) '$(srcdir)/sequence_load.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -c -o liblebiniou_so_0-pnglite.obj `if test -f 'pnglite.c'; then $(CYGPATH_W) 'pnglite.c'; else $(CYGPATH_W) '$(srcdir)/pnglite.c'; fi` -lebiniou-sequence_save.o: sequence_save.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -MT lebiniou-sequence_save.o -MD -MP -MF $(DEPDIR)/lebiniou-sequence_save.Tpo -c -o lebiniou-sequence_save.o `test -f 'sequence_save.c' || echo '$(srcdir)/'`sequence_save.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lebiniou-sequence_save.Tpo $(DEPDIR)/lebiniou-sequence_save.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='sequence_save.c' object='lebiniou-sequence_save.o' libtool=no @AMDEPBACKSLASH@ +liblebiniou_so_0-schemes_random.o: schemes_random.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -MT liblebiniou_so_0-schemes_random.o -MD -MP -MF $(DEPDIR)/liblebiniou_so_0-schemes_random.Tpo -c -o liblebiniou_so_0-schemes_random.o `test -f 'schemes_random.c' || echo '$(srcdir)/'`schemes_random.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblebiniou_so_0-schemes_random.Tpo $(DEPDIR)/liblebiniou_so_0-schemes_random.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='schemes_random.c' object='liblebiniou_so_0-schemes_random.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -c -o lebiniou-sequence_save.o `test -f 'sequence_save.c' || echo '$(srcdir)/'`sequence_save.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -c -o liblebiniou_so_0-schemes_random.o `test -f 'schemes_random.c' || echo '$(srcdir)/'`schemes_random.c -lebiniou-sequence_save.obj: sequence_save.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -MT lebiniou-sequence_save.obj -MD -MP -MF $(DEPDIR)/lebiniou-sequence_save.Tpo -c -o lebiniou-sequence_save.obj `if test -f 'sequence_save.c'; then $(CYGPATH_W) 'sequence_save.c'; else $(CYGPATH_W) '$(srcdir)/sequence_save.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lebiniou-sequence_save.Tpo $(DEPDIR)/lebiniou-sequence_save.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='sequence_save.c' object='lebiniou-sequence_save.obj' libtool=no @AMDEPBACKSLASH@ +liblebiniou_so_0-schemes_random.obj: schemes_random.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -MT liblebiniou_so_0-schemes_random.obj -MD -MP -MF $(DEPDIR)/liblebiniou_so_0-schemes_random.Tpo -c -o liblebiniou_so_0-schemes_random.obj `if test -f 'schemes_random.c'; then $(CYGPATH_W) 'schemes_random.c'; else $(CYGPATH_W) '$(srcdir)/schemes_random.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblebiniou_so_0-schemes_random.Tpo $(DEPDIR)/liblebiniou_so_0-schemes_random.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='schemes_random.c' object='liblebiniou_so_0-schemes_random.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -c -o lebiniou-sequence_save.obj `if test -f 'sequence_save.c'; then $(CYGPATH_W) 'sequence_save.c'; else $(CYGPATH_W) '$(srcdir)/sequence_save.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -c -o liblebiniou_so_0-schemes_random.obj `if test -f 'schemes_random.c'; then $(CYGPATH_W) 'schemes_random.c'; else $(CYGPATH_W) '$(srcdir)/schemes_random.c'; fi` -lebiniou-sequencemanager.o: sequencemanager.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -MT lebiniou-sequencemanager.o -MD -MP -MF $(DEPDIR)/lebiniou-sequencemanager.Tpo -c -o lebiniou-sequencemanager.o `test -f 'sequencemanager.c' || echo '$(srcdir)/'`sequencemanager.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lebiniou-sequencemanager.Tpo $(DEPDIR)/lebiniou-sequencemanager.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='sequencemanager.c' object='lebiniou-sequencemanager.o' libtool=no @AMDEPBACKSLASH@ +liblebiniou_so_0-screenshot.o: screenshot.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -MT liblebiniou_so_0-screenshot.o -MD -MP -MF $(DEPDIR)/liblebiniou_so_0-screenshot.Tpo -c -o liblebiniou_so_0-screenshot.o `test -f 'screenshot.c' || echo '$(srcdir)/'`screenshot.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblebiniou_so_0-screenshot.Tpo $(DEPDIR)/liblebiniou_so_0-screenshot.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='screenshot.c' object='liblebiniou_so_0-screenshot.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -c -o lebiniou-sequencemanager.o `test -f 'sequencemanager.c' || echo '$(srcdir)/'`sequencemanager.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -c -o liblebiniou_so_0-screenshot.o `test -f 'screenshot.c' || echo '$(srcdir)/'`screenshot.c -lebiniou-sequencemanager.obj: sequencemanager.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -MT lebiniou-sequencemanager.obj -MD -MP -MF $(DEPDIR)/lebiniou-sequencemanager.Tpo -c -o lebiniou-sequencemanager.obj `if test -f 'sequencemanager.c'; then $(CYGPATH_W) 'sequencemanager.c'; else $(CYGPATH_W) '$(srcdir)/sequencemanager.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lebiniou-sequencemanager.Tpo $(DEPDIR)/lebiniou-sequencemanager.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='sequencemanager.c' object='lebiniou-sequencemanager.obj' libtool=no @AMDEPBACKSLASH@ +liblebiniou_so_0-screenshot.obj: screenshot.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -MT liblebiniou_so_0-screenshot.obj -MD -MP -MF $(DEPDIR)/liblebiniou_so_0-screenshot.Tpo -c -o liblebiniou_so_0-screenshot.obj `if test -f 'screenshot.c'; then $(CYGPATH_W) 'screenshot.c'; else $(CYGPATH_W) '$(srcdir)/screenshot.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblebiniou_so_0-screenshot.Tpo $(DEPDIR)/liblebiniou_so_0-screenshot.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='screenshot.c' object='liblebiniou_so_0-screenshot.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -c -o lebiniou-sequencemanager.obj `if test -f 'sequencemanager.c'; then $(CYGPATH_W) 'sequencemanager.c'; else $(CYGPATH_W) '$(srcdir)/sequencemanager.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -c -o liblebiniou_so_0-screenshot.obj `if test -f 'screenshot.c'; then $(CYGPATH_W) 'screenshot.c'; else $(CYGPATH_W) '$(srcdir)/screenshot.c'; fi` -lebiniou-sequencemanager_event.o: sequencemanager_event.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -MT lebiniou-sequencemanager_event.o -MD -MP -MF $(DEPDIR)/lebiniou-sequencemanager_event.Tpo -c -o lebiniou-sequencemanager_event.o `test -f 'sequencemanager_event.c' || echo '$(srcdir)/'`sequencemanager_event.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lebiniou-sequencemanager_event.Tpo $(DEPDIR)/lebiniou-sequencemanager_event.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='sequencemanager_event.c' object='lebiniou-sequencemanager_event.o' libtool=no @AMDEPBACKSLASH@ +liblebiniou_so_0-sequence.o: sequence.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -MT liblebiniou_so_0-sequence.o -MD -MP -MF $(DEPDIR)/liblebiniou_so_0-sequence.Tpo -c -o liblebiniou_so_0-sequence.o `test -f 'sequence.c' || echo '$(srcdir)/'`sequence.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblebiniou_so_0-sequence.Tpo $(DEPDIR)/liblebiniou_so_0-sequence.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='sequence.c' object='liblebiniou_so_0-sequence.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -c -o lebiniou-sequencemanager_event.o `test -f 'sequencemanager_event.c' || echo '$(srcdir)/'`sequencemanager_event.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -c -o liblebiniou_so_0-sequence.o `test -f 'sequence.c' || echo '$(srcdir)/'`sequence.c -lebiniou-sequencemanager_event.obj: sequencemanager_event.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -MT lebiniou-sequencemanager_event.obj -MD -MP -MF $(DEPDIR)/lebiniou-sequencemanager_event.Tpo -c -o lebiniou-sequencemanager_event.obj `if test -f 'sequencemanager_event.c'; then $(CYGPATH_W) 'sequencemanager_event.c'; else $(CYGPATH_W) '$(srcdir)/sequencemanager_event.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lebiniou-sequencemanager_event.Tpo $(DEPDIR)/lebiniou-sequencemanager_event.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='sequencemanager_event.c' object='lebiniou-sequencemanager_event.obj' libtool=no @AMDEPBACKSLASH@ +liblebiniou_so_0-sequence.obj: sequence.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -MT liblebiniou_so_0-sequence.obj -MD -MP -MF $(DEPDIR)/liblebiniou_so_0-sequence.Tpo -c -o liblebiniou_so_0-sequence.obj `if test -f 'sequence.c'; then $(CYGPATH_W) 'sequence.c'; else $(CYGPATH_W) '$(srcdir)/sequence.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblebiniou_so_0-sequence.Tpo $(DEPDIR)/liblebiniou_so_0-sequence.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='sequence.c' object='liblebiniou_so_0-sequence.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -c -o lebiniou-sequencemanager_event.obj `if test -f 'sequencemanager_event.c'; then $(CYGPATH_W) 'sequencemanager_event.c'; else $(CYGPATH_W) '$(srcdir)/sequencemanager_event.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -c -o liblebiniou_so_0-sequence.obj `if test -f 'sequence.c'; then $(CYGPATH_W) 'sequence.c'; else $(CYGPATH_W) '$(srcdir)/sequence.c'; fi` -lebiniou-sequences.o: sequences.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -MT lebiniou-sequences.o -MD -MP -MF $(DEPDIR)/lebiniou-sequences.Tpo -c -o lebiniou-sequences.o `test -f 'sequences.c' || echo '$(srcdir)/'`sequences.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lebiniou-sequences.Tpo $(DEPDIR)/lebiniou-sequences.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='sequences.c' object='lebiniou-sequences.o' libtool=no @AMDEPBACKSLASH@ +liblebiniou_so_0-sequencemanager.o: sequencemanager.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -MT liblebiniou_so_0-sequencemanager.o -MD -MP -MF $(DEPDIR)/liblebiniou_so_0-sequencemanager.Tpo -c -o liblebiniou_so_0-sequencemanager.o `test -f 'sequencemanager.c' || echo '$(srcdir)/'`sequencemanager.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblebiniou_so_0-sequencemanager.Tpo $(DEPDIR)/liblebiniou_so_0-sequencemanager.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='sequencemanager.c' object='liblebiniou_so_0-sequencemanager.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -c -o lebiniou-sequences.o `test -f 'sequences.c' || echo '$(srcdir)/'`sequences.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -c -o liblebiniou_so_0-sequencemanager.o `test -f 'sequencemanager.c' || echo '$(srcdir)/'`sequencemanager.c -lebiniou-sequences.obj: sequences.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -MT lebiniou-sequences.obj -MD -MP -MF $(DEPDIR)/lebiniou-sequences.Tpo -c -o lebiniou-sequences.obj `if test -f 'sequences.c'; then $(CYGPATH_W) 'sequences.c'; else $(CYGPATH_W) '$(srcdir)/sequences.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lebiniou-sequences.Tpo $(DEPDIR)/lebiniou-sequences.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='sequences.c' object='lebiniou-sequences.obj' libtool=no @AMDEPBACKSLASH@ +liblebiniou_so_0-sequencemanager.obj: sequencemanager.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -MT liblebiniou_so_0-sequencemanager.obj -MD -MP -MF $(DEPDIR)/liblebiniou_so_0-sequencemanager.Tpo -c -o liblebiniou_so_0-sequencemanager.obj `if test -f 'sequencemanager.c'; then $(CYGPATH_W) 'sequencemanager.c'; else $(CYGPATH_W) '$(srcdir)/sequencemanager.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblebiniou_so_0-sequencemanager.Tpo $(DEPDIR)/liblebiniou_so_0-sequencemanager.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='sequencemanager.c' object='liblebiniou_so_0-sequencemanager.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -c -o lebiniou-sequences.obj `if test -f 'sequences.c'; then $(CYGPATH_W) 'sequences.c'; else $(CYGPATH_W) '$(srcdir)/sequences.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -c -o liblebiniou_so_0-sequencemanager.obj `if test -f 'sequencemanager.c'; then $(CYGPATH_W) 'sequencemanager.c'; else $(CYGPATH_W) '$(srcdir)/sequencemanager.c'; fi` -lebiniou-shuffler.o: shuffler.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -MT lebiniou-shuffler.o -MD -MP -MF $(DEPDIR)/lebiniou-shuffler.Tpo -c -o lebiniou-shuffler.o `test -f 'shuffler.c' || echo '$(srcdir)/'`shuffler.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lebiniou-shuffler.Tpo $(DEPDIR)/lebiniou-shuffler.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='shuffler.c' object='lebiniou-shuffler.o' libtool=no @AMDEPBACKSLASH@ +liblebiniou_so_0-sequencemanager_event.o: sequencemanager_event.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -MT liblebiniou_so_0-sequencemanager_event.o -MD -MP -MF $(DEPDIR)/liblebiniou_so_0-sequencemanager_event.Tpo -c -o liblebiniou_so_0-sequencemanager_event.o `test -f 'sequencemanager_event.c' || echo '$(srcdir)/'`sequencemanager_event.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblebiniou_so_0-sequencemanager_event.Tpo $(DEPDIR)/liblebiniou_so_0-sequencemanager_event.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='sequencemanager_event.c' object='liblebiniou_so_0-sequencemanager_event.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -c -o lebiniou-shuffler.o `test -f 'shuffler.c' || echo '$(srcdir)/'`shuffler.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -c -o liblebiniou_so_0-sequencemanager_event.o `test -f 'sequencemanager_event.c' || echo '$(srcdir)/'`sequencemanager_event.c -lebiniou-shuffler.obj: shuffler.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -MT lebiniou-shuffler.obj -MD -MP -MF $(DEPDIR)/lebiniou-shuffler.Tpo -c -o lebiniou-shuffler.obj `if test -f 'shuffler.c'; then $(CYGPATH_W) 'shuffler.c'; else $(CYGPATH_W) '$(srcdir)/shuffler.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lebiniou-shuffler.Tpo $(DEPDIR)/lebiniou-shuffler.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='shuffler.c' object='lebiniou-shuffler.obj' libtool=no @AMDEPBACKSLASH@ +liblebiniou_so_0-sequencemanager_event.obj: sequencemanager_event.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -MT liblebiniou_so_0-sequencemanager_event.obj -MD -MP -MF $(DEPDIR)/liblebiniou_so_0-sequencemanager_event.Tpo -c -o liblebiniou_so_0-sequencemanager_event.obj `if test -f 'sequencemanager_event.c'; then $(CYGPATH_W) 'sequencemanager_event.c'; else $(CYGPATH_W) '$(srcdir)/sequencemanager_event.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblebiniou_so_0-sequencemanager_event.Tpo $(DEPDIR)/liblebiniou_so_0-sequencemanager_event.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='sequencemanager_event.c' object='liblebiniou_so_0-sequencemanager_event.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -c -o lebiniou-shuffler.obj `if test -f 'shuffler.c'; then $(CYGPATH_W) 'shuffler.c'; else $(CYGPATH_W) '$(srcdir)/shuffler.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -c -o liblebiniou_so_0-sequencemanager_event.obj `if test -f 'sequencemanager_event.c'; then $(CYGPATH_W) 'sequencemanager_event.c'; else $(CYGPATH_W) '$(srcdir)/sequencemanager_event.c'; fi` -lebiniou-spline.o: spline.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -MT lebiniou-spline.o -MD -MP -MF $(DEPDIR)/lebiniou-spline.Tpo -c -o lebiniou-spline.o `test -f 'spline.c' || echo '$(srcdir)/'`spline.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lebiniou-spline.Tpo $(DEPDIR)/lebiniou-spline.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='spline.c' object='lebiniou-spline.o' libtool=no @AMDEPBACKSLASH@ +liblebiniou_so_0-sequence_load.o: sequence_load.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -MT liblebiniou_so_0-sequence_load.o -MD -MP -MF $(DEPDIR)/liblebiniou_so_0-sequence_load.Tpo -c -o liblebiniou_so_0-sequence_load.o `test -f 'sequence_load.c' || echo '$(srcdir)/'`sequence_load.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblebiniou_so_0-sequence_load.Tpo $(DEPDIR)/liblebiniou_so_0-sequence_load.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='sequence_load.c' object='liblebiniou_so_0-sequence_load.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -c -o lebiniou-spline.o `test -f 'spline.c' || echo '$(srcdir)/'`spline.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -c -o liblebiniou_so_0-sequence_load.o `test -f 'sequence_load.c' || echo '$(srcdir)/'`sequence_load.c -lebiniou-spline.obj: spline.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -MT lebiniou-spline.obj -MD -MP -MF $(DEPDIR)/lebiniou-spline.Tpo -c -o lebiniou-spline.obj `if test -f 'spline.c'; then $(CYGPATH_W) 'spline.c'; else $(CYGPATH_W) '$(srcdir)/spline.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lebiniou-spline.Tpo $(DEPDIR)/lebiniou-spline.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='spline.c' object='lebiniou-spline.obj' libtool=no @AMDEPBACKSLASH@ +liblebiniou_so_0-sequence_load.obj: sequence_load.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -MT liblebiniou_so_0-sequence_load.obj -MD -MP -MF $(DEPDIR)/liblebiniou_so_0-sequence_load.Tpo -c -o liblebiniou_so_0-sequence_load.obj `if test -f 'sequence_load.c'; then $(CYGPATH_W) 'sequence_load.c'; else $(CYGPATH_W) '$(srcdir)/sequence_load.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblebiniou_so_0-sequence_load.Tpo $(DEPDIR)/liblebiniou_so_0-sequence_load.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='sequence_load.c' object='liblebiniou_so_0-sequence_load.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -c -o lebiniou-spline.obj `if test -f 'spline.c'; then $(CYGPATH_W) 'spline.c'; else $(CYGPATH_W) '$(srcdir)/spline.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -c -o liblebiniou_so_0-sequence_load.obj `if test -f 'sequence_load.c'; then $(CYGPATH_W) 'sequence_load.c'; else $(CYGPATH_W) '$(srcdir)/sequence_load.c'; fi` -lebiniou-translation.o: translation.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -MT lebiniou-translation.o -MD -MP -MF $(DEPDIR)/lebiniou-translation.Tpo -c -o lebiniou-translation.o `test -f 'translation.c' || echo '$(srcdir)/'`translation.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lebiniou-translation.Tpo $(DEPDIR)/lebiniou-translation.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='translation.c' object='lebiniou-translation.o' libtool=no @AMDEPBACKSLASH@ +liblebiniou_so_0-sequence_save.o: sequence_save.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -MT liblebiniou_so_0-sequence_save.o -MD -MP -MF $(DEPDIR)/liblebiniou_so_0-sequence_save.Tpo -c -o liblebiniou_so_0-sequence_save.o `test -f 'sequence_save.c' || echo '$(srcdir)/'`sequence_save.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblebiniou_so_0-sequence_save.Tpo $(DEPDIR)/liblebiniou_so_0-sequence_save.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='sequence_save.c' object='liblebiniou_so_0-sequence_save.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -c -o lebiniou-translation.o `test -f 'translation.c' || echo '$(srcdir)/'`translation.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -c -o liblebiniou_so_0-sequence_save.o `test -f 'sequence_save.c' || echo '$(srcdir)/'`sequence_save.c -lebiniou-translation.obj: translation.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -MT lebiniou-translation.obj -MD -MP -MF $(DEPDIR)/lebiniou-translation.Tpo -c -o lebiniou-translation.obj `if test -f 'translation.c'; then $(CYGPATH_W) 'translation.c'; else $(CYGPATH_W) '$(srcdir)/translation.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lebiniou-translation.Tpo $(DEPDIR)/lebiniou-translation.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='translation.c' object='lebiniou-translation.obj' libtool=no @AMDEPBACKSLASH@ +liblebiniou_so_0-sequence_save.obj: sequence_save.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -MT liblebiniou_so_0-sequence_save.obj -MD -MP -MF $(DEPDIR)/liblebiniou_so_0-sequence_save.Tpo -c -o liblebiniou_so_0-sequence_save.obj `if test -f 'sequence_save.c'; then $(CYGPATH_W) 'sequence_save.c'; else $(CYGPATH_W) '$(srcdir)/sequence_save.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblebiniou_so_0-sequence_save.Tpo $(DEPDIR)/liblebiniou_so_0-sequence_save.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='sequence_save.c' object='liblebiniou_so_0-sequence_save.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -c -o lebiniou-translation.obj `if test -f 'translation.c'; then $(CYGPATH_W) 'translation.c'; else $(CYGPATH_W) '$(srcdir)/translation.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -c -o liblebiniou_so_0-sequence_save.obj `if test -f 'sequence_save.c'; then $(CYGPATH_W) 'sequence_save.c'; else $(CYGPATH_W) '$(srcdir)/sequence_save.c'; fi` -lebiniou-utils.o: utils.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -MT lebiniou-utils.o -MD -MP -MF $(DEPDIR)/lebiniou-utils.Tpo -c -o lebiniou-utils.o `test -f 'utils.c' || echo '$(srcdir)/'`utils.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lebiniou-utils.Tpo $(DEPDIR)/lebiniou-utils.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='utils.c' object='lebiniou-utils.o' libtool=no @AMDEPBACKSLASH@ +liblebiniou_so_0-sequences.o: sequences.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -MT liblebiniou_so_0-sequences.o -MD -MP -MF $(DEPDIR)/liblebiniou_so_0-sequences.Tpo -c -o liblebiniou_so_0-sequences.o `test -f 'sequences.c' || echo '$(srcdir)/'`sequences.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblebiniou_so_0-sequences.Tpo $(DEPDIR)/liblebiniou_so_0-sequences.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='sequences.c' object='liblebiniou_so_0-sequences.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -c -o lebiniou-utils.o `test -f 'utils.c' || echo '$(srcdir)/'`utils.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -c -o liblebiniou_so_0-sequences.o `test -f 'sequences.c' || echo '$(srcdir)/'`sequences.c -lebiniou-utils.obj: utils.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -MT lebiniou-utils.obj -MD -MP -MF $(DEPDIR)/lebiniou-utils.Tpo -c -o lebiniou-utils.obj `if test -f 'utils.c'; then $(CYGPATH_W) 'utils.c'; else $(CYGPATH_W) '$(srcdir)/utils.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lebiniou-utils.Tpo $(DEPDIR)/lebiniou-utils.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='utils.c' object='lebiniou-utils.obj' libtool=no @AMDEPBACKSLASH@ +liblebiniou_so_0-sequences.obj: sequences.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -MT liblebiniou_so_0-sequences.obj -MD -MP -MF $(DEPDIR)/liblebiniou_so_0-sequences.Tpo -c -o liblebiniou_so_0-sequences.obj `if test -f 'sequences.c'; then $(CYGPATH_W) 'sequences.c'; else $(CYGPATH_W) '$(srcdir)/sequences.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblebiniou_so_0-sequences.Tpo $(DEPDIR)/liblebiniou_so_0-sequences.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='sequences.c' object='liblebiniou_so_0-sequences.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -c -o lebiniou-utils.obj `if test -f 'utils.c'; then $(CYGPATH_W) 'utils.c'; else $(CYGPATH_W) '$(srcdir)/utils.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -c -o liblebiniou_so_0-sequences.obj `if test -f 'sequences.c'; then $(CYGPATH_W) 'sequences.c'; else $(CYGPATH_W) '$(srcdir)/sequences.c'; fi` -lebiniou-xmlutils.o: xmlutils.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -MT lebiniou-xmlutils.o -MD -MP -MF $(DEPDIR)/lebiniou-xmlutils.Tpo -c -o lebiniou-xmlutils.o `test -f 'xmlutils.c' || echo '$(srcdir)/'`xmlutils.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lebiniou-xmlutils.Tpo $(DEPDIR)/lebiniou-xmlutils.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xmlutils.c' object='lebiniou-xmlutils.o' libtool=no @AMDEPBACKSLASH@ +liblebiniou_so_0-shuffler.o: shuffler.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -MT liblebiniou_so_0-shuffler.o -MD -MP -MF $(DEPDIR)/liblebiniou_so_0-shuffler.Tpo -c -o liblebiniou_so_0-shuffler.o `test -f 'shuffler.c' || echo '$(srcdir)/'`shuffler.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblebiniou_so_0-shuffler.Tpo $(DEPDIR)/liblebiniou_so_0-shuffler.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='shuffler.c' object='liblebiniou_so_0-shuffler.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -c -o lebiniou-xmlutils.o `test -f 'xmlutils.c' || echo '$(srcdir)/'`xmlutils.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -c -o liblebiniou_so_0-shuffler.o `test -f 'shuffler.c' || echo '$(srcdir)/'`shuffler.c -lebiniou-xmlutils.obj: xmlutils.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -MT lebiniou-xmlutils.obj -MD -MP -MF $(DEPDIR)/lebiniou-xmlutils.Tpo -c -o lebiniou-xmlutils.obj `if test -f 'xmlutils.c'; then $(CYGPATH_W) 'xmlutils.c'; else $(CYGPATH_W) '$(srcdir)/xmlutils.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lebiniou-xmlutils.Tpo $(DEPDIR)/lebiniou-xmlutils.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xmlutils.c' object='lebiniou-xmlutils.obj' libtool=no @AMDEPBACKSLASH@ +liblebiniou_so_0-shuffler.obj: shuffler.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -MT liblebiniou_so_0-shuffler.obj -MD -MP -MF $(DEPDIR)/liblebiniou_so_0-shuffler.Tpo -c -o liblebiniou_so_0-shuffler.obj `if test -f 'shuffler.c'; then $(CYGPATH_W) 'shuffler.c'; else $(CYGPATH_W) '$(srcdir)/shuffler.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblebiniou_so_0-shuffler.Tpo $(DEPDIR)/liblebiniou_so_0-shuffler.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='shuffler.c' object='liblebiniou_so_0-shuffler.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -c -o lebiniou-xmlutils.obj `if test -f 'xmlutils.c'; then $(CYGPATH_W) 'xmlutils.c'; else $(CYGPATH_W) '$(srcdir)/xmlutils.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -c -o liblebiniou_so_0-shuffler.obj `if test -f 'shuffler.c'; then $(CYGPATH_W) 'shuffler.c'; else $(CYGPATH_W) '$(srcdir)/shuffler.c'; fi` -lebiniou-webcam_start_stop.o: webcam_start_stop.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -MT lebiniou-webcam_start_stop.o -MD -MP -MF $(DEPDIR)/lebiniou-webcam_start_stop.Tpo -c -o lebiniou-webcam_start_stop.o `test -f 'webcam_start_stop.c' || echo '$(srcdir)/'`webcam_start_stop.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lebiniou-webcam_start_stop.Tpo $(DEPDIR)/lebiniou-webcam_start_stop.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='webcam_start_stop.c' object='lebiniou-webcam_start_stop.o' libtool=no @AMDEPBACKSLASH@ +liblebiniou_so_0-spline.o: spline.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -MT liblebiniou_so_0-spline.o -MD -MP -MF $(DEPDIR)/liblebiniou_so_0-spline.Tpo -c -o liblebiniou_so_0-spline.o `test -f 'spline.c' || echo '$(srcdir)/'`spline.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblebiniou_so_0-spline.Tpo $(DEPDIR)/liblebiniou_so_0-spline.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='spline.c' object='liblebiniou_so_0-spline.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -c -o lebiniou-webcam_start_stop.o `test -f 'webcam_start_stop.c' || echo '$(srcdir)/'`webcam_start_stop.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -c -o liblebiniou_so_0-spline.o `test -f 'spline.c' || echo '$(srcdir)/'`spline.c -lebiniou-webcam_start_stop.obj: webcam_start_stop.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -MT lebiniou-webcam_start_stop.obj -MD -MP -MF $(DEPDIR)/lebiniou-webcam_start_stop.Tpo -c -o lebiniou-webcam_start_stop.obj `if test -f 'webcam_start_stop.c'; then $(CYGPATH_W) 'webcam_start_stop.c'; else $(CYGPATH_W) '$(srcdir)/webcam_start_stop.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lebiniou-webcam_start_stop.Tpo $(DEPDIR)/lebiniou-webcam_start_stop.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='webcam_start_stop.c' object='lebiniou-webcam_start_stop.obj' libtool=no @AMDEPBACKSLASH@ +liblebiniou_so_0-spline.obj: spline.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -MT liblebiniou_so_0-spline.obj -MD -MP -MF $(DEPDIR)/liblebiniou_so_0-spline.Tpo -c -o liblebiniou_so_0-spline.obj `if test -f 'spline.c'; then $(CYGPATH_W) 'spline.c'; else $(CYGPATH_W) '$(srcdir)/spline.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblebiniou_so_0-spline.Tpo $(DEPDIR)/liblebiniou_so_0-spline.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='spline.c' object='liblebiniou_so_0-spline.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -c -o lebiniou-webcam_start_stop.obj `if test -f 'webcam_start_stop.c'; then $(CYGPATH_W) 'webcam_start_stop.c'; else $(CYGPATH_W) '$(srcdir)/webcam_start_stop.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -c -o liblebiniou_so_0-spline.obj `if test -f 'spline.c'; then $(CYGPATH_W) 'spline.c'; else $(CYGPATH_W) '$(srcdir)/spline.c'; fi` -lebiniou-webcam_init_uninit.o: webcam_init_uninit.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -MT lebiniou-webcam_init_uninit.o -MD -MP -MF $(DEPDIR)/lebiniou-webcam_init_uninit.Tpo -c -o lebiniou-webcam_init_uninit.o `test -f 'webcam_init_uninit.c' || echo '$(srcdir)/'`webcam_init_uninit.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lebiniou-webcam_init_uninit.Tpo $(DEPDIR)/lebiniou-webcam_init_uninit.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='webcam_init_uninit.c' object='lebiniou-webcam_init_uninit.o' libtool=no @AMDEPBACKSLASH@ +liblebiniou_so_0-translation.o: translation.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -MT liblebiniou_so_0-translation.o -MD -MP -MF $(DEPDIR)/liblebiniou_so_0-translation.Tpo -c -o liblebiniou_so_0-translation.o `test -f 'translation.c' || echo '$(srcdir)/'`translation.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblebiniou_so_0-translation.Tpo $(DEPDIR)/liblebiniou_so_0-translation.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='translation.c' object='liblebiniou_so_0-translation.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -c -o lebiniou-webcam_init_uninit.o `test -f 'webcam_init_uninit.c' || echo '$(srcdir)/'`webcam_init_uninit.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -c -o liblebiniou_so_0-translation.o `test -f 'translation.c' || echo '$(srcdir)/'`translation.c -lebiniou-webcam_init_uninit.obj: webcam_init_uninit.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -MT lebiniou-webcam_init_uninit.obj -MD -MP -MF $(DEPDIR)/lebiniou-webcam_init_uninit.Tpo -c -o lebiniou-webcam_init_uninit.obj `if test -f 'webcam_init_uninit.c'; then $(CYGPATH_W) 'webcam_init_uninit.c'; else $(CYGPATH_W) '$(srcdir)/webcam_init_uninit.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lebiniou-webcam_init_uninit.Tpo $(DEPDIR)/lebiniou-webcam_init_uninit.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='webcam_init_uninit.c' object='lebiniou-webcam_init_uninit.obj' libtool=no @AMDEPBACKSLASH@ +liblebiniou_so_0-translation.obj: translation.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -MT liblebiniou_so_0-translation.obj -MD -MP -MF $(DEPDIR)/liblebiniou_so_0-translation.Tpo -c -o liblebiniou_so_0-translation.obj `if test -f 'translation.c'; then $(CYGPATH_W) 'translation.c'; else $(CYGPATH_W) '$(srcdir)/translation.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblebiniou_so_0-translation.Tpo $(DEPDIR)/liblebiniou_so_0-translation.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='translation.c' object='liblebiniou_so_0-translation.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -c -o lebiniou-webcam_init_uninit.obj `if test -f 'webcam_init_uninit.c'; then $(CYGPATH_W) 'webcam_init_uninit.c'; else $(CYGPATH_W) '$(srcdir)/webcam_init_uninit.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -c -o liblebiniou_so_0-translation.obj `if test -f 'translation.c'; then $(CYGPATH_W) 'translation.c'; else $(CYGPATH_W) '$(srcdir)/translation.c'; fi` -lebiniou-webcam_loop.o: webcam_loop.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -MT lebiniou-webcam_loop.o -MD -MP -MF $(DEPDIR)/lebiniou-webcam_loop.Tpo -c -o lebiniou-webcam_loop.o `test -f 'webcam_loop.c' || echo '$(srcdir)/'`webcam_loop.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lebiniou-webcam_loop.Tpo $(DEPDIR)/lebiniou-webcam_loop.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='webcam_loop.c' object='lebiniou-webcam_loop.o' libtool=no @AMDEPBACKSLASH@ +liblebiniou_so_0-utils.o: utils.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -MT liblebiniou_so_0-utils.o -MD -MP -MF $(DEPDIR)/liblebiniou_so_0-utils.Tpo -c -o liblebiniou_so_0-utils.o `test -f 'utils.c' || echo '$(srcdir)/'`utils.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblebiniou_so_0-utils.Tpo $(DEPDIR)/liblebiniou_so_0-utils.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='utils.c' object='liblebiniou_so_0-utils.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -c -o lebiniou-webcam_loop.o `test -f 'webcam_loop.c' || echo '$(srcdir)/'`webcam_loop.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -c -o liblebiniou_so_0-utils.o `test -f 'utils.c' || echo '$(srcdir)/'`utils.c -lebiniou-webcam_loop.obj: webcam_loop.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -MT lebiniou-webcam_loop.obj -MD -MP -MF $(DEPDIR)/lebiniou-webcam_loop.Tpo -c -o lebiniou-webcam_loop.obj `if test -f 'webcam_loop.c'; then $(CYGPATH_W) 'webcam_loop.c'; else $(CYGPATH_W) '$(srcdir)/webcam_loop.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lebiniou-webcam_loop.Tpo $(DEPDIR)/lebiniou-webcam_loop.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='webcam_loop.c' object='lebiniou-webcam_loop.obj' libtool=no @AMDEPBACKSLASH@ +liblebiniou_so_0-utils.obj: utils.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -MT liblebiniou_so_0-utils.obj -MD -MP -MF $(DEPDIR)/liblebiniou_so_0-utils.Tpo -c -o liblebiniou_so_0-utils.obj `if test -f 'utils.c'; then $(CYGPATH_W) 'utils.c'; else $(CYGPATH_W) '$(srcdir)/utils.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblebiniou_so_0-utils.Tpo $(DEPDIR)/liblebiniou_so_0-utils.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='utils.c' object='liblebiniou_so_0-utils.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -c -o lebiniou-webcam_loop.obj `if test -f 'webcam_loop.c'; then $(CYGPATH_W) 'webcam_loop.c'; else $(CYGPATH_W) '$(srcdir)/webcam_loop.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -c -o liblebiniou_so_0-utils.obj `if test -f 'utils.c'; then $(CYGPATH_W) 'utils.c'; else $(CYGPATH_W) '$(srcdir)/utils.c'; fi` -lebiniou-webcam_open_close.o: webcam_open_close.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -MT lebiniou-webcam_open_close.o -MD -MP -MF $(DEPDIR)/lebiniou-webcam_open_close.Tpo -c -o lebiniou-webcam_open_close.o `test -f 'webcam_open_close.c' || echo '$(srcdir)/'`webcam_open_close.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lebiniou-webcam_open_close.Tpo $(DEPDIR)/lebiniou-webcam_open_close.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='webcam_open_close.c' object='lebiniou-webcam_open_close.o' libtool=no @AMDEPBACKSLASH@ +liblebiniou_so_0-xmlutils.o: xmlutils.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -MT liblebiniou_so_0-xmlutils.o -MD -MP -MF $(DEPDIR)/liblebiniou_so_0-xmlutils.Tpo -c -o liblebiniou_so_0-xmlutils.o `test -f 'xmlutils.c' || echo '$(srcdir)/'`xmlutils.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblebiniou_so_0-xmlutils.Tpo $(DEPDIR)/liblebiniou_so_0-xmlutils.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xmlutils.c' object='liblebiniou_so_0-xmlutils.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -c -o lebiniou-webcam_open_close.o `test -f 'webcam_open_close.c' || echo '$(srcdir)/'`webcam_open_close.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -c -o liblebiniou_so_0-xmlutils.o `test -f 'xmlutils.c' || echo '$(srcdir)/'`xmlutils.c -lebiniou-webcam_open_close.obj: webcam_open_close.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -MT lebiniou-webcam_open_close.obj -MD -MP -MF $(DEPDIR)/lebiniou-webcam_open_close.Tpo -c -o lebiniou-webcam_open_close.obj `if test -f 'webcam_open_close.c'; then $(CYGPATH_W) 'webcam_open_close.c'; else $(CYGPATH_W) '$(srcdir)/webcam_open_close.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lebiniou-webcam_open_close.Tpo $(DEPDIR)/lebiniou-webcam_open_close.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='webcam_open_close.c' object='lebiniou-webcam_open_close.obj' libtool=no @AMDEPBACKSLASH@ +liblebiniou_so_0-xmlutils.obj: xmlutils.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -MT liblebiniou_so_0-xmlutils.obj -MD -MP -MF $(DEPDIR)/liblebiniou_so_0-xmlutils.Tpo -c -o liblebiniou_so_0-xmlutils.obj `if test -f 'xmlutils.c'; then $(CYGPATH_W) 'xmlutils.c'; else $(CYGPATH_W) '$(srcdir)/xmlutils.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblebiniou_so_0-xmlutils.Tpo $(DEPDIR)/liblebiniou_so_0-xmlutils.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xmlutils.c' object='liblebiniou_so_0-xmlutils.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -c -o lebiniou-webcam_open_close.obj `if test -f 'webcam_open_close.c'; then $(CYGPATH_W) 'webcam_open_close.c'; else $(CYGPATH_W) '$(srcdir)/webcam_open_close.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -c -o liblebiniou_so_0-xmlutils.obj `if test -f 'xmlutils.c'; then $(CYGPATH_W) 'xmlutils.c'; else $(CYGPATH_W) '$(srcdir)/xmlutils.c'; fi` -lebiniou-webcam_controls.o: webcam_controls.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -MT lebiniou-webcam_controls.o -MD -MP -MF $(DEPDIR)/lebiniou-webcam_controls.Tpo -c -o lebiniou-webcam_controls.o `test -f 'webcam_controls.c' || echo '$(srcdir)/'`webcam_controls.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lebiniou-webcam_controls.Tpo $(DEPDIR)/lebiniou-webcam_controls.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='webcam_controls.c' object='lebiniou-webcam_controls.o' libtool=no @AMDEPBACKSLASH@ +liblebiniou_so_0-webcam_start_stop.o: webcam_start_stop.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -MT liblebiniou_so_0-webcam_start_stop.o -MD -MP -MF $(DEPDIR)/liblebiniou_so_0-webcam_start_stop.Tpo -c -o liblebiniou_so_0-webcam_start_stop.o `test -f 'webcam_start_stop.c' || echo '$(srcdir)/'`webcam_start_stop.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblebiniou_so_0-webcam_start_stop.Tpo $(DEPDIR)/liblebiniou_so_0-webcam_start_stop.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='webcam_start_stop.c' object='liblebiniou_so_0-webcam_start_stop.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -c -o lebiniou-webcam_controls.o `test -f 'webcam_controls.c' || echo '$(srcdir)/'`webcam_controls.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -c -o liblebiniou_so_0-webcam_start_stop.o `test -f 'webcam_start_stop.c' || echo '$(srcdir)/'`webcam_start_stop.c -lebiniou-webcam_controls.obj: webcam_controls.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -MT lebiniou-webcam_controls.obj -MD -MP -MF $(DEPDIR)/lebiniou-webcam_controls.Tpo -c -o lebiniou-webcam_controls.obj `if test -f 'webcam_controls.c'; then $(CYGPATH_W) 'webcam_controls.c'; else $(CYGPATH_W) '$(srcdir)/webcam_controls.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lebiniou-webcam_controls.Tpo $(DEPDIR)/lebiniou-webcam_controls.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='webcam_controls.c' object='lebiniou-webcam_controls.obj' libtool=no @AMDEPBACKSLASH@ +liblebiniou_so_0-webcam_start_stop.obj: webcam_start_stop.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -MT liblebiniou_so_0-webcam_start_stop.obj -MD -MP -MF $(DEPDIR)/liblebiniou_so_0-webcam_start_stop.Tpo -c -o liblebiniou_so_0-webcam_start_stop.obj `if test -f 'webcam_start_stop.c'; then $(CYGPATH_W) 'webcam_start_stop.c'; else $(CYGPATH_W) '$(srcdir)/webcam_start_stop.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblebiniou_so_0-webcam_start_stop.Tpo $(DEPDIR)/liblebiniou_so_0-webcam_start_stop.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='webcam_start_stop.c' object='liblebiniou_so_0-webcam_start_stop.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -c -o lebiniou-webcam_controls.obj `if test -f 'webcam_controls.c'; then $(CYGPATH_W) 'webcam_controls.c'; else $(CYGPATH_W) '$(srcdir)/webcam_controls.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -c -o liblebiniou_so_0-webcam_start_stop.obj `if test -f 'webcam_start_stop.c'; then $(CYGPATH_W) 'webcam_start_stop.c'; else $(CYGPATH_W) '$(srcdir)/webcam_start_stop.c'; fi` -lebiniou-webcam_options.o: webcam_options.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -MT lebiniou-webcam_options.o -MD -MP -MF $(DEPDIR)/lebiniou-webcam_options.Tpo -c -o lebiniou-webcam_options.o `test -f 'webcam_options.c' || echo '$(srcdir)/'`webcam_options.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lebiniou-webcam_options.Tpo $(DEPDIR)/lebiniou-webcam_options.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='webcam_options.c' object='lebiniou-webcam_options.o' libtool=no @AMDEPBACKSLASH@ +liblebiniou_so_0-webcam_init_uninit.o: webcam_init_uninit.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -MT liblebiniou_so_0-webcam_init_uninit.o -MD -MP -MF $(DEPDIR)/liblebiniou_so_0-webcam_init_uninit.Tpo -c -o liblebiniou_so_0-webcam_init_uninit.o `test -f 'webcam_init_uninit.c' || echo '$(srcdir)/'`webcam_init_uninit.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblebiniou_so_0-webcam_init_uninit.Tpo $(DEPDIR)/liblebiniou_so_0-webcam_init_uninit.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='webcam_init_uninit.c' object='liblebiniou_so_0-webcam_init_uninit.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -c -o lebiniou-webcam_options.o `test -f 'webcam_options.c' || echo '$(srcdir)/'`webcam_options.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -c -o liblebiniou_so_0-webcam_init_uninit.o `test -f 'webcam_init_uninit.c' || echo '$(srcdir)/'`webcam_init_uninit.c -lebiniou-webcam_options.obj: webcam_options.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -MT lebiniou-webcam_options.obj -MD -MP -MF $(DEPDIR)/lebiniou-webcam_options.Tpo -c -o lebiniou-webcam_options.obj `if test -f 'webcam_options.c'; then $(CYGPATH_W) 'webcam_options.c'; else $(CYGPATH_W) '$(srcdir)/webcam_options.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lebiniou-webcam_options.Tpo $(DEPDIR)/lebiniou-webcam_options.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='webcam_options.c' object='lebiniou-webcam_options.obj' libtool=no @AMDEPBACKSLASH@ +liblebiniou_so_0-webcam_init_uninit.obj: webcam_init_uninit.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -MT liblebiniou_so_0-webcam_init_uninit.obj -MD -MP -MF $(DEPDIR)/liblebiniou_so_0-webcam_init_uninit.Tpo -c -o liblebiniou_so_0-webcam_init_uninit.obj `if test -f 'webcam_init_uninit.c'; then $(CYGPATH_W) 'webcam_init_uninit.c'; else $(CYGPATH_W) '$(srcdir)/webcam_init_uninit.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblebiniou_so_0-webcam_init_uninit.Tpo $(DEPDIR)/liblebiniou_so_0-webcam_init_uninit.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='webcam_init_uninit.c' object='liblebiniou_so_0-webcam_init_uninit.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -c -o lebiniou-webcam_options.obj `if test -f 'webcam_options.c'; then $(CYGPATH_W) 'webcam_options.c'; else $(CYGPATH_W) '$(srcdir)/webcam_options.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -c -o liblebiniou_so_0-webcam_init_uninit.obj `if test -f 'webcam_init_uninit.c'; then $(CYGPATH_W) 'webcam_init_uninit.c'; else $(CYGPATH_W) '$(srcdir)/webcam_init_uninit.c'; fi` -lebiniou-context_gl.o: context_gl.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -MT lebiniou-context_gl.o -MD -MP -MF $(DEPDIR)/lebiniou-context_gl.Tpo -c -o lebiniou-context_gl.o `test -f 'context_gl.c' || echo '$(srcdir)/'`context_gl.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lebiniou-context_gl.Tpo $(DEPDIR)/lebiniou-context_gl.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='context_gl.c' object='lebiniou-context_gl.o' libtool=no @AMDEPBACKSLASH@ +liblebiniou_so_0-webcam_loop.o: webcam_loop.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -MT liblebiniou_so_0-webcam_loop.o -MD -MP -MF $(DEPDIR)/liblebiniou_so_0-webcam_loop.Tpo -c -o liblebiniou_so_0-webcam_loop.o `test -f 'webcam_loop.c' || echo '$(srcdir)/'`webcam_loop.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblebiniou_so_0-webcam_loop.Tpo $(DEPDIR)/liblebiniou_so_0-webcam_loop.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='webcam_loop.c' object='liblebiniou_so_0-webcam_loop.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -c -o lebiniou-context_gl.o `test -f 'context_gl.c' || echo '$(srcdir)/'`context_gl.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -c -o liblebiniou_so_0-webcam_loop.o `test -f 'webcam_loop.c' || echo '$(srcdir)/'`webcam_loop.c -lebiniou-context_gl.obj: context_gl.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -MT lebiniou-context_gl.obj -MD -MP -MF $(DEPDIR)/lebiniou-context_gl.Tpo -c -o lebiniou-context_gl.obj `if test -f 'context_gl.c'; then $(CYGPATH_W) 'context_gl.c'; else $(CYGPATH_W) '$(srcdir)/context_gl.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lebiniou-context_gl.Tpo $(DEPDIR)/lebiniou-context_gl.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='context_gl.c' object='lebiniou-context_gl.obj' libtool=no @AMDEPBACKSLASH@ +liblebiniou_so_0-webcam_loop.obj: webcam_loop.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -MT liblebiniou_so_0-webcam_loop.obj -MD -MP -MF $(DEPDIR)/liblebiniou_so_0-webcam_loop.Tpo -c -o liblebiniou_so_0-webcam_loop.obj `if test -f 'webcam_loop.c'; then $(CYGPATH_W) 'webcam_loop.c'; else $(CYGPATH_W) '$(srcdir)/webcam_loop.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblebiniou_so_0-webcam_loop.Tpo $(DEPDIR)/liblebiniou_so_0-webcam_loop.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='webcam_loop.c' object='liblebiniou_so_0-webcam_loop.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -c -o lebiniou-context_gl.obj `if test -f 'context_gl.c'; then $(CYGPATH_W) 'context_gl.c'; else $(CYGPATH_W) '$(srcdir)/context_gl.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -c -o liblebiniou_so_0-webcam_loop.obj `if test -f 'webcam_loop.c'; then $(CYGPATH_W) 'webcam_loop.c'; else $(CYGPATH_W) '$(srcdir)/webcam_loop.c'; fi` -lebiniou-events.o: events.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -MT lebiniou-events.o -MD -MP -MF $(DEPDIR)/lebiniou-events.Tpo -c -o lebiniou-events.o `test -f 'events.c' || echo '$(srcdir)/'`events.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lebiniou-events.Tpo $(DEPDIR)/lebiniou-events.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='events.c' object='lebiniou-events.o' libtool=no @AMDEPBACKSLASH@ +liblebiniou_so_0-webcam_open_close.o: webcam_open_close.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -MT liblebiniou_so_0-webcam_open_close.o -MD -MP -MF $(DEPDIR)/liblebiniou_so_0-webcam_open_close.Tpo -c -o liblebiniou_so_0-webcam_open_close.o `test -f 'webcam_open_close.c' || echo '$(srcdir)/'`webcam_open_close.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblebiniou_so_0-webcam_open_close.Tpo $(DEPDIR)/liblebiniou_so_0-webcam_open_close.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='webcam_open_close.c' object='liblebiniou_so_0-webcam_open_close.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -c -o lebiniou-events.o `test -f 'events.c' || echo '$(srcdir)/'`events.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -c -o liblebiniou_so_0-webcam_open_close.o `test -f 'webcam_open_close.c' || echo '$(srcdir)/'`webcam_open_close.c -lebiniou-events.obj: events.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -MT lebiniou-events.obj -MD -MP -MF $(DEPDIR)/lebiniou-events.Tpo -c -o lebiniou-events.obj `if test -f 'events.c'; then $(CYGPATH_W) 'events.c'; else $(CYGPATH_W) '$(srcdir)/events.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lebiniou-events.Tpo $(DEPDIR)/lebiniou-events.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='events.c' object='lebiniou-events.obj' libtool=no @AMDEPBACKSLASH@ +liblebiniou_so_0-webcam_open_close.obj: webcam_open_close.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -MT liblebiniou_so_0-webcam_open_close.obj -MD -MP -MF $(DEPDIR)/liblebiniou_so_0-webcam_open_close.Tpo -c -o liblebiniou_so_0-webcam_open_close.obj `if test -f 'webcam_open_close.c'; then $(CYGPATH_W) 'webcam_open_close.c'; else $(CYGPATH_W) '$(srcdir)/webcam_open_close.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblebiniou_so_0-webcam_open_close.Tpo $(DEPDIR)/liblebiniou_so_0-webcam_open_close.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='webcam_open_close.c' object='liblebiniou_so_0-webcam_open_close.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lebiniou_CFLAGS) $(CFLAGS) -c -o lebiniou-events.obj `if test -f 'events.c'; then $(CYGPATH_W) 'events.c'; else $(CYGPATH_W) '$(srcdir)/events.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -c -o liblebiniou_so_0-webcam_open_close.obj `if test -f 'webcam_open_close.c'; then $(CYGPATH_W) 'webcam_open_close.c'; else $(CYGPATH_W) '$(srcdir)/webcam_open_close.c'; fi` + +liblebiniou_so_0-webcam_controls.o: webcam_controls.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -MT liblebiniou_so_0-webcam_controls.o -MD -MP -MF $(DEPDIR)/liblebiniou_so_0-webcam_controls.Tpo -c -o liblebiniou_so_0-webcam_controls.o `test -f 'webcam_controls.c' || echo '$(srcdir)/'`webcam_controls.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblebiniou_so_0-webcam_controls.Tpo $(DEPDIR)/liblebiniou_so_0-webcam_controls.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='webcam_controls.c' object='liblebiniou_so_0-webcam_controls.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -c -o liblebiniou_so_0-webcam_controls.o `test -f 'webcam_controls.c' || echo '$(srcdir)/'`webcam_controls.c + +liblebiniou_so_0-webcam_controls.obj: webcam_controls.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -MT liblebiniou_so_0-webcam_controls.obj -MD -MP -MF $(DEPDIR)/liblebiniou_so_0-webcam_controls.Tpo -c -o liblebiniou_so_0-webcam_controls.obj `if test -f 'webcam_controls.c'; then $(CYGPATH_W) 'webcam_controls.c'; else $(CYGPATH_W) '$(srcdir)/webcam_controls.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblebiniou_so_0-webcam_controls.Tpo $(DEPDIR)/liblebiniou_so_0-webcam_controls.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='webcam_controls.c' object='liblebiniou_so_0-webcam_controls.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -c -o liblebiniou_so_0-webcam_controls.obj `if test -f 'webcam_controls.c'; then $(CYGPATH_W) 'webcam_controls.c'; else $(CYGPATH_W) '$(srcdir)/webcam_controls.c'; fi` + +liblebiniou_so_0-webcam_options.o: webcam_options.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -MT liblebiniou_so_0-webcam_options.o -MD -MP -MF $(DEPDIR)/liblebiniou_so_0-webcam_options.Tpo -c -o liblebiniou_so_0-webcam_options.o `test -f 'webcam_options.c' || echo '$(srcdir)/'`webcam_options.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblebiniou_so_0-webcam_options.Tpo $(DEPDIR)/liblebiniou_so_0-webcam_options.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='webcam_options.c' object='liblebiniou_so_0-webcam_options.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -c -o liblebiniou_so_0-webcam_options.o `test -f 'webcam_options.c' || echo '$(srcdir)/'`webcam_options.c + +liblebiniou_so_0-webcam_options.obj: webcam_options.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -MT liblebiniou_so_0-webcam_options.obj -MD -MP -MF $(DEPDIR)/liblebiniou_so_0-webcam_options.Tpo -c -o liblebiniou_so_0-webcam_options.obj `if test -f 'webcam_options.c'; then $(CYGPATH_W) 'webcam_options.c'; else $(CYGPATH_W) '$(srcdir)/webcam_options.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblebiniou_so_0-webcam_options.Tpo $(DEPDIR)/liblebiniou_so_0-webcam_options.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='webcam_options.c' object='liblebiniou_so_0-webcam_options.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -c -o liblebiniou_so_0-webcam_options.obj `if test -f 'webcam_options.c'; then $(CYGPATH_W) 'webcam_options.c'; else $(CYGPATH_W) '$(srcdir)/webcam_options.c'; fi` + +liblebiniou_so_0-bulfius_get.o: bulfius_get.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -MT liblebiniou_so_0-bulfius_get.o -MD -MP -MF $(DEPDIR)/liblebiniou_so_0-bulfius_get.Tpo -c -o liblebiniou_so_0-bulfius_get.o `test -f 'bulfius_get.c' || echo '$(srcdir)/'`bulfius_get.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblebiniou_so_0-bulfius_get.Tpo $(DEPDIR)/liblebiniou_so_0-bulfius_get.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='bulfius_get.c' object='liblebiniou_so_0-bulfius_get.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -c -o liblebiniou_so_0-bulfius_get.o `test -f 'bulfius_get.c' || echo '$(srcdir)/'`bulfius_get.c + +liblebiniou_so_0-bulfius_get.obj: bulfius_get.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -MT liblebiniou_so_0-bulfius_get.obj -MD -MP -MF $(DEPDIR)/liblebiniou_so_0-bulfius_get.Tpo -c -o liblebiniou_so_0-bulfius_get.obj `if test -f 'bulfius_get.c'; then $(CYGPATH_W) 'bulfius_get.c'; else $(CYGPATH_W) '$(srcdir)/bulfius_get.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblebiniou_so_0-bulfius_get.Tpo $(DEPDIR)/liblebiniou_so_0-bulfius_get.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='bulfius_get.c' object='liblebiniou_so_0-bulfius_get.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -c -o liblebiniou_so_0-bulfius_get.obj `if test -f 'bulfius_get.c'; then $(CYGPATH_W) 'bulfius_get.c'; else $(CYGPATH_W) '$(srcdir)/bulfius_get.c'; fi` + +liblebiniou_so_0-bulfius_post.o: bulfius_post.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -MT liblebiniou_so_0-bulfius_post.o -MD -MP -MF $(DEPDIR)/liblebiniou_so_0-bulfius_post.Tpo -c -o liblebiniou_so_0-bulfius_post.o `test -f 'bulfius_post.c' || echo '$(srcdir)/'`bulfius_post.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblebiniou_so_0-bulfius_post.Tpo $(DEPDIR)/liblebiniou_so_0-bulfius_post.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='bulfius_post.c' object='liblebiniou_so_0-bulfius_post.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -c -o liblebiniou_so_0-bulfius_post.o `test -f 'bulfius_post.c' || echo '$(srcdir)/'`bulfius_post.c + +liblebiniou_so_0-bulfius_post.obj: bulfius_post.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -MT liblebiniou_so_0-bulfius_post.obj -MD -MP -MF $(DEPDIR)/liblebiniou_so_0-bulfius_post.Tpo -c -o liblebiniou_so_0-bulfius_post.obj `if test -f 'bulfius_post.c'; then $(CYGPATH_W) 'bulfius_post.c'; else $(CYGPATH_W) '$(srcdir)/bulfius_post.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblebiniou_so_0-bulfius_post.Tpo $(DEPDIR)/liblebiniou_so_0-bulfius_post.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='bulfius_post.c' object='liblebiniou_so_0-bulfius_post.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblebiniou_so_0_CFLAGS) $(CFLAGS) -c -o liblebiniou_so_0-bulfius_post.obj `if test -f 'bulfius_post.c'; then $(CYGPATH_W) 'bulfius_post.c'; else $(CYGPATH_W) '$(srcdir)/bulfius_post.c'; fi` ID: $(am__tagged_files) $(am__define_uniq_tagged_files); mkid -fID $$unique @@ -1552,7 +1694,7 @@ $(MAKE) $(AM_MAKEFLAGS) check-am all-am: Makefile $(PROGRAMS) installdirs: - for dir in "$(DESTDIR)$(bindir)"; do \ + for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(lebinioudir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: $(BUILT_SOURCES) @@ -1590,68 +1732,72 @@ -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) clean: clean-am -clean-am: clean-binPROGRAMS clean-generic mostlyclean-am +clean-am: clean-binPROGRAMS clean-generic clean-lebiniouPROGRAMS \ + mostlyclean-am distclean: distclean-am - -rm -f ./$(DEPDIR)/lebiniou-alarm.Po - -rm -f ./$(DEPDIR)/lebiniou-biniou.Po - -rm -f ./$(DEPDIR)/lebiniou-brandom.Po - -rm -f ./$(DEPDIR)/lebiniou-btimer.Po - -rm -f ./$(DEPDIR)/lebiniou-buffer_8bits.Po - -rm -f ./$(DEPDIR)/lebiniou-buffer_RGBA.Po + -rm -f ./$(DEPDIR)/lebiniou-biniou.Po -rm -f ./$(DEPDIR)/lebiniou-circle.Po - -rm -f ./$(DEPDIR)/lebiniou-cmap_8bits.Po - -rm -f ./$(DEPDIR)/lebiniou-cmapfader.Po - -rm -f ./$(DEPDIR)/lebiniou-cmapfader_event.Po -rm -f ./$(DEPDIR)/lebiniou-cmdline.Po - -rm -f ./$(DEPDIR)/lebiniou-colormaps.Po - -rm -f ./$(DEPDIR)/lebiniou-context.Po - -rm -f ./$(DEPDIR)/lebiniou-context_banks.Po - -rm -f ./$(DEPDIR)/lebiniou-context_event.Po - -rm -f ./$(DEPDIR)/lebiniou-context_export.Po -rm -f ./$(DEPDIR)/lebiniou-context_gl.Po -rm -f ./$(DEPDIR)/lebiniou-context_run.Po -rm -f ./$(DEPDIR)/lebiniou-events.Po - -rm -f ./$(DEPDIR)/lebiniou-fader.Po - -rm -f ./$(DEPDIR)/lebiniou-globals.Po - -rm -f ./$(DEPDIR)/lebiniou-image_8bits.Po - -rm -f ./$(DEPDIR)/lebiniou-imagefader.Po - -rm -f ./$(DEPDIR)/lebiniou-imagefader_event.Po - -rm -f ./$(DEPDIR)/lebiniou-images.Po - -rm -f ./$(DEPDIR)/lebiniou-input.Po -rm -f ./$(DEPDIR)/lebiniou-keyfile.Po - -rm -f ./$(DEPDIR)/lebiniou-layer.Po -rm -f ./$(DEPDIR)/lebiniou-main.Po - -rm -f ./$(DEPDIR)/lebiniou-options.Po - -rm -f ./$(DEPDIR)/lebiniou-oscillo.Po - -rm -f ./$(DEPDIR)/lebiniou-params3d.Po - -rm -f ./$(DEPDIR)/lebiniou-particles.Po - -rm -f ./$(DEPDIR)/lebiniou-pbar.Po - -rm -f ./$(DEPDIR)/lebiniou-plugin.Po - -rm -f ./$(DEPDIR)/lebiniou-plugins.Po - -rm -f ./$(DEPDIR)/lebiniou-plugins_event.Po - -rm -f ./$(DEPDIR)/lebiniou-pnglite.Po -rm -f ./$(DEPDIR)/lebiniou-schemes.Po - -rm -f ./$(DEPDIR)/lebiniou-schemes_random.Po - -rm -f ./$(DEPDIR)/lebiniou-screenshot.Po - -rm -f ./$(DEPDIR)/lebiniou-sequence.Po - -rm -f ./$(DEPDIR)/lebiniou-sequence_load.Po - -rm -f ./$(DEPDIR)/lebiniou-sequence_save.Po - -rm -f ./$(DEPDIR)/lebiniou-sequencemanager.Po - -rm -f ./$(DEPDIR)/lebiniou-sequencemanager_event.Po - -rm -f ./$(DEPDIR)/lebiniou-sequences.Po - -rm -f ./$(DEPDIR)/lebiniou-shuffler.Po -rm -f ./$(DEPDIR)/lebiniou-signals.Po - -rm -f ./$(DEPDIR)/lebiniou-spline.Po - -rm -f ./$(DEPDIR)/lebiniou-translation.Po - -rm -f ./$(DEPDIR)/lebiniou-utils.Po - -rm -f ./$(DEPDIR)/lebiniou-webcam_controls.Po - -rm -f ./$(DEPDIR)/lebiniou-webcam_init_uninit.Po - -rm -f ./$(DEPDIR)/lebiniou-webcam_loop.Po - -rm -f ./$(DEPDIR)/lebiniou-webcam_open_close.Po - -rm -f ./$(DEPDIR)/lebiniou-webcam_options.Po - -rm -f ./$(DEPDIR)/lebiniou-webcam_start_stop.Po - -rm -f ./$(DEPDIR)/lebiniou-xmlutils.Po + -rm -f ./$(DEPDIR)/liblebiniou_so_0-alarm.Po + -rm -f ./$(DEPDIR)/liblebiniou_so_0-brandom.Po + -rm -f ./$(DEPDIR)/liblebiniou_so_0-btimer.Po + -rm -f ./$(DEPDIR)/liblebiniou_so_0-buffer_8bits.Po + -rm -f ./$(DEPDIR)/liblebiniou_so_0-buffer_RGBA.Po + -rm -f ./$(DEPDIR)/liblebiniou_so_0-bulfius_get.Po + -rm -f ./$(DEPDIR)/liblebiniou_so_0-bulfius_post.Po + -rm -f ./$(DEPDIR)/liblebiniou_so_0-cmap_8bits.Po + -rm -f ./$(DEPDIR)/liblebiniou_so_0-cmapfader.Po + -rm -f ./$(DEPDIR)/liblebiniou_so_0-cmapfader_event.Po + -rm -f ./$(DEPDIR)/liblebiniou_so_0-colormaps.Po + -rm -f ./$(DEPDIR)/liblebiniou_so_0-context.Po + -rm -f ./$(DEPDIR)/liblebiniou_so_0-context_banks.Po + -rm -f ./$(DEPDIR)/liblebiniou_so_0-context_event.Po + -rm -f ./$(DEPDIR)/liblebiniou_so_0-context_export.Po + -rm -f ./$(DEPDIR)/liblebiniou_so_0-events.Po + -rm -f ./$(DEPDIR)/liblebiniou_so_0-fader.Po + -rm -f ./$(DEPDIR)/liblebiniou_so_0-globals.Po + -rm -f ./$(DEPDIR)/liblebiniou_so_0-image_8bits.Po + -rm -f ./$(DEPDIR)/liblebiniou_so_0-image_filter.Po + -rm -f ./$(DEPDIR)/liblebiniou_so_0-imagefader.Po + -rm -f ./$(DEPDIR)/liblebiniou_so_0-imagefader_event.Po + -rm -f ./$(DEPDIR)/liblebiniou_so_0-images.Po + -rm -f ./$(DEPDIR)/liblebiniou_so_0-input.Po + -rm -f ./$(DEPDIR)/liblebiniou_so_0-layer.Po + -rm -f ./$(DEPDIR)/liblebiniou_so_0-options.Po + -rm -f ./$(DEPDIR)/liblebiniou_so_0-oscillo.Po + -rm -f ./$(DEPDIR)/liblebiniou_so_0-params3d.Po + -rm -f ./$(DEPDIR)/liblebiniou_so_0-particles.Po + -rm -f ./$(DEPDIR)/liblebiniou_so_0-plugin.Po + -rm -f ./$(DEPDIR)/liblebiniou_so_0-plugins.Po + -rm -f ./$(DEPDIR)/liblebiniou_so_0-plugins_event.Po + -rm -f ./$(DEPDIR)/liblebiniou_so_0-pnglite.Po + -rm -f ./$(DEPDIR)/liblebiniou_so_0-schemes_random.Po + -rm -f ./$(DEPDIR)/liblebiniou_so_0-screenshot.Po + -rm -f ./$(DEPDIR)/liblebiniou_so_0-sequence.Po + -rm -f ./$(DEPDIR)/liblebiniou_so_0-sequence_load.Po + -rm -f ./$(DEPDIR)/liblebiniou_so_0-sequence_save.Po + -rm -f ./$(DEPDIR)/liblebiniou_so_0-sequencemanager.Po + -rm -f ./$(DEPDIR)/liblebiniou_so_0-sequencemanager_event.Po + -rm -f ./$(DEPDIR)/liblebiniou_so_0-sequences.Po + -rm -f ./$(DEPDIR)/liblebiniou_so_0-shuffler.Po + -rm -f ./$(DEPDIR)/liblebiniou_so_0-spline.Po + -rm -f ./$(DEPDIR)/liblebiniou_so_0-translation.Po + -rm -f ./$(DEPDIR)/liblebiniou_so_0-utils.Po + -rm -f ./$(DEPDIR)/liblebiniou_so_0-webcam_controls.Po + -rm -f ./$(DEPDIR)/liblebiniou_so_0-webcam_init_uninit.Po + -rm -f ./$(DEPDIR)/liblebiniou_so_0-webcam_loop.Po + -rm -f ./$(DEPDIR)/liblebiniou_so_0-webcam_open_close.Po + -rm -f ./$(DEPDIR)/liblebiniou_so_0-webcam_options.Po + -rm -f ./$(DEPDIR)/liblebiniou_so_0-webcam_start_stop.Po + -rm -f ./$(DEPDIR)/liblebiniou_so_0-xmlutils.Po -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags @@ -1668,7 +1814,7 @@ info-am: -install-data-am: +install-data-am: install-lebiniouPROGRAMS install-dvi: install-dvi-am @@ -1697,65 +1843,68 @@ installcheck-am: maintainer-clean: maintainer-clean-am - -rm -f ./$(DEPDIR)/lebiniou-alarm.Po - -rm -f ./$(DEPDIR)/lebiniou-biniou.Po - -rm -f ./$(DEPDIR)/lebiniou-brandom.Po - -rm -f ./$(DEPDIR)/lebiniou-btimer.Po - -rm -f ./$(DEPDIR)/lebiniou-buffer_8bits.Po - -rm -f ./$(DEPDIR)/lebiniou-buffer_RGBA.Po + -rm -f ./$(DEPDIR)/lebiniou-biniou.Po -rm -f ./$(DEPDIR)/lebiniou-circle.Po - -rm -f ./$(DEPDIR)/lebiniou-cmap_8bits.Po - -rm -f ./$(DEPDIR)/lebiniou-cmapfader.Po - -rm -f ./$(DEPDIR)/lebiniou-cmapfader_event.Po -rm -f ./$(DEPDIR)/lebiniou-cmdline.Po - -rm -f ./$(DEPDIR)/lebiniou-colormaps.Po - -rm -f ./$(DEPDIR)/lebiniou-context.Po - -rm -f ./$(DEPDIR)/lebiniou-context_banks.Po - -rm -f ./$(DEPDIR)/lebiniou-context_event.Po - -rm -f ./$(DEPDIR)/lebiniou-context_export.Po -rm -f ./$(DEPDIR)/lebiniou-context_gl.Po -rm -f ./$(DEPDIR)/lebiniou-context_run.Po -rm -f ./$(DEPDIR)/lebiniou-events.Po - -rm -f ./$(DEPDIR)/lebiniou-fader.Po - -rm -f ./$(DEPDIR)/lebiniou-globals.Po - -rm -f ./$(DEPDIR)/lebiniou-image_8bits.Po - -rm -f ./$(DEPDIR)/lebiniou-imagefader.Po - -rm -f ./$(DEPDIR)/lebiniou-imagefader_event.Po - -rm -f ./$(DEPDIR)/lebiniou-images.Po - -rm -f ./$(DEPDIR)/lebiniou-input.Po -rm -f ./$(DEPDIR)/lebiniou-keyfile.Po - -rm -f ./$(DEPDIR)/lebiniou-layer.Po -rm -f ./$(DEPDIR)/lebiniou-main.Po - -rm -f ./$(DEPDIR)/lebiniou-options.Po - -rm -f ./$(DEPDIR)/lebiniou-oscillo.Po - -rm -f ./$(DEPDIR)/lebiniou-params3d.Po - -rm -f ./$(DEPDIR)/lebiniou-particles.Po - -rm -f ./$(DEPDIR)/lebiniou-pbar.Po - -rm -f ./$(DEPDIR)/lebiniou-plugin.Po - -rm -f ./$(DEPDIR)/lebiniou-plugins.Po - -rm -f ./$(DEPDIR)/lebiniou-plugins_event.Po - -rm -f ./$(DEPDIR)/lebiniou-pnglite.Po -rm -f ./$(DEPDIR)/lebiniou-schemes.Po - -rm -f ./$(DEPDIR)/lebiniou-schemes_random.Po - -rm -f ./$(DEPDIR)/lebiniou-screenshot.Po - -rm -f ./$(DEPDIR)/lebiniou-sequence.Po - -rm -f ./$(DEPDIR)/lebiniou-sequence_load.Po - -rm -f ./$(DEPDIR)/lebiniou-sequence_save.Po - -rm -f ./$(DEPDIR)/lebiniou-sequencemanager.Po - -rm -f ./$(DEPDIR)/lebiniou-sequencemanager_event.Po - -rm -f ./$(DEPDIR)/lebiniou-sequences.Po - -rm -f ./$(DEPDIR)/lebiniou-shuffler.Po -rm -f ./$(DEPDIR)/lebiniou-signals.Po - -rm -f ./$(DEPDIR)/lebiniou-spline.Po - -rm -f ./$(DEPDIR)/lebiniou-translation.Po - -rm -f ./$(DEPDIR)/lebiniou-utils.Po - -rm -f ./$(DEPDIR)/lebiniou-webcam_controls.Po - -rm -f ./$(DEPDIR)/lebiniou-webcam_init_uninit.Po - -rm -f ./$(DEPDIR)/lebiniou-webcam_loop.Po - -rm -f ./$(DEPDIR)/lebiniou-webcam_open_close.Po - -rm -f ./$(DEPDIR)/lebiniou-webcam_options.Po - -rm -f ./$(DEPDIR)/lebiniou-webcam_start_stop.Po - -rm -f ./$(DEPDIR)/lebiniou-xmlutils.Po + -rm -f ./$(DEPDIR)/liblebiniou_so_0-alarm.Po + -rm -f ./$(DEPDIR)/liblebiniou_so_0-brandom.Po + -rm -f ./$(DEPDIR)/liblebiniou_so_0-btimer.Po + -rm -f ./$(DEPDIR)/liblebiniou_so_0-buffer_8bits.Po + -rm -f ./$(DEPDIR)/liblebiniou_so_0-buffer_RGBA.Po + -rm -f ./$(DEPDIR)/liblebiniou_so_0-bulfius_get.Po + -rm -f ./$(DEPDIR)/liblebiniou_so_0-bulfius_post.Po + -rm -f ./$(DEPDIR)/liblebiniou_so_0-cmap_8bits.Po + -rm -f ./$(DEPDIR)/liblebiniou_so_0-cmapfader.Po + -rm -f ./$(DEPDIR)/liblebiniou_so_0-cmapfader_event.Po + -rm -f ./$(DEPDIR)/liblebiniou_so_0-colormaps.Po + -rm -f ./$(DEPDIR)/liblebiniou_so_0-context.Po + -rm -f ./$(DEPDIR)/liblebiniou_so_0-context_banks.Po + -rm -f ./$(DEPDIR)/liblebiniou_so_0-context_event.Po + -rm -f ./$(DEPDIR)/liblebiniou_so_0-context_export.Po + -rm -f ./$(DEPDIR)/liblebiniou_so_0-events.Po + -rm -f ./$(DEPDIR)/liblebiniou_so_0-fader.Po + -rm -f ./$(DEPDIR)/liblebiniou_so_0-globals.Po + -rm -f ./$(DEPDIR)/liblebiniou_so_0-image_8bits.Po + -rm -f ./$(DEPDIR)/liblebiniou_so_0-image_filter.Po + -rm -f ./$(DEPDIR)/liblebiniou_so_0-imagefader.Po + -rm -f ./$(DEPDIR)/liblebiniou_so_0-imagefader_event.Po + -rm -f ./$(DEPDIR)/liblebiniou_so_0-images.Po + -rm -f ./$(DEPDIR)/liblebiniou_so_0-input.Po + -rm -f ./$(DEPDIR)/liblebiniou_so_0-layer.Po + -rm -f ./$(DEPDIR)/liblebiniou_so_0-options.Po + -rm -f ./$(DEPDIR)/liblebiniou_so_0-oscillo.Po + -rm -f ./$(DEPDIR)/liblebiniou_so_0-params3d.Po + -rm -f ./$(DEPDIR)/liblebiniou_so_0-particles.Po + -rm -f ./$(DEPDIR)/liblebiniou_so_0-plugin.Po + -rm -f ./$(DEPDIR)/liblebiniou_so_0-plugins.Po + -rm -f ./$(DEPDIR)/liblebiniou_so_0-plugins_event.Po + -rm -f ./$(DEPDIR)/liblebiniou_so_0-pnglite.Po + -rm -f ./$(DEPDIR)/liblebiniou_so_0-schemes_random.Po + -rm -f ./$(DEPDIR)/liblebiniou_so_0-screenshot.Po + -rm -f ./$(DEPDIR)/liblebiniou_so_0-sequence.Po + -rm -f ./$(DEPDIR)/liblebiniou_so_0-sequence_load.Po + -rm -f ./$(DEPDIR)/liblebiniou_so_0-sequence_save.Po + -rm -f ./$(DEPDIR)/liblebiniou_so_0-sequencemanager.Po + -rm -f ./$(DEPDIR)/liblebiniou_so_0-sequencemanager_event.Po + -rm -f ./$(DEPDIR)/liblebiniou_so_0-sequences.Po + -rm -f ./$(DEPDIR)/liblebiniou_so_0-shuffler.Po + -rm -f ./$(DEPDIR)/liblebiniou_so_0-spline.Po + -rm -f ./$(DEPDIR)/liblebiniou_so_0-translation.Po + -rm -f ./$(DEPDIR)/liblebiniou_so_0-utils.Po + -rm -f ./$(DEPDIR)/liblebiniou_so_0-webcam_controls.Po + -rm -f ./$(DEPDIR)/liblebiniou_so_0-webcam_init_uninit.Po + -rm -f ./$(DEPDIR)/liblebiniou_so_0-webcam_loop.Po + -rm -f ./$(DEPDIR)/liblebiniou_so_0-webcam_open_close.Po + -rm -f ./$(DEPDIR)/liblebiniou_so_0-webcam_options.Po + -rm -f ./$(DEPDIR)/liblebiniou_so_0-webcam_start_stop.Po + -rm -f ./$(DEPDIR)/liblebiniou_so_0-xmlutils.Po -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -1771,23 +1920,24 @@ ps-am: -uninstall-am: uninstall-binPROGRAMS +uninstall-am: uninstall-binPROGRAMS uninstall-lebiniouPROGRAMS .MAKE: all check install install-am install-strip .PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \ - clean-binPROGRAMS clean-generic cscopelist-am ctags ctags-am \ - distclean distclean-compile distclean-generic distclean-tags \ - distdir dvi dvi-am html html-am info info-am install \ - install-am install-binPROGRAMS install-data install-data-am \ - install-dvi install-dvi-am install-exec install-exec-am \ - install-html install-html-am install-info install-info-am \ + clean-binPROGRAMS clean-generic clean-lebiniouPROGRAMS \ + cscopelist-am ctags ctags-am distclean distclean-compile \ + distclean-generic distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-binPROGRAMS \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-lebiniouPROGRAMS \ install-man install-pdf install-pdf-am install-ps \ install-ps-am install-strip installcheck installcheck-am \ installdirs maintainer-clean maintainer-clean-generic \ mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \ ps ps-am tags tags-am uninstall uninstall-am \ - uninstall-binPROGRAMS + uninstall-binPROGRAMS uninstall-lebiniouPROGRAMS .PRECIOUS: Makefile diff -Nru lebiniou-3.31/src/options.c lebiniou-3.40/src/options.c --- lebiniou-3.31/src/options.c 2019-02-19 12:45:00.000000000 +0000 +++ lebiniou-3.40/src/options.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -51,7 +51,6 @@ { BEQ_THREAD, "- Thread -", "BEQ_THREAD", 0 }, { BEQ_IMAGE, "- Image -", "BEQ_IMAGE", 0 }, { BEQ_NORANDOM, "- No random -", "BEQ_NORANDOM", 0 }, - { BEQ_DISABLED, "- Disabled -", "BEQ_DISABLED", 0 }, { BEQ_UNIQUE, "- Unique -", "BEQ_UNIQUE", 0 }, { BEQ_FIRST, "- First plugin -", "BEQ_FIRST", 0 }, { BEQ_LAST, "- Last plugin -", "BEQ_LAST", 0 }, diff -Nru lebiniou-3.31/src/options.h lebiniou-3.40/src/options.h --- lebiniou-3.31/src/options.h 2019-04-05 20:39:16.000000000 +0000 +++ lebiniou-3.40/src/options.h 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -38,7 +38,6 @@ BE_CLEAN = 1 << 10, /* obvious */ /* BEQ_ stands for "Biniou Effect Qualifier" */ - /* --- Those MUST NOT be selectable */ BEQ_HOR = 1 << 11, BEQ_VER = 1 << 12, BEQ_DIAG = 1 << 13, @@ -52,16 +51,14 @@ BEQ_THREAD = 1 << 21, /* thread, do not use in sequences */ BEQ_IMAGE = 1 << 22, /* uses background image */ BEQ_NORANDOM = 1 << 23, /* don't select at random */ - BEQ_DISABLED = 1 << 24, /* unusable plugin: no selection or random possible */ - BEQ_WEBCAM = 1 << 25, /* uses a webcam input */ - BEQ_UNIQUE = 1 << 26, /* plugin must be alone to be cool */ - BEQ_FIRST = 1 << 27, /* insert plugin at the begining */ - BEQ_LAST = 1 << 28, /* insert plugin at the end */ - BEQ_MUTE_CAM = 1 << 29 /* some plugins (eg webcams) can be muted */ + BEQ_WEBCAM = 1 << 24, /* uses a webcam input */ + BEQ_UNIQUE = 1 << 25, /* plugin must be alone to be cool */ + BEQ_FIRST = 1 << 26, /* insert plugin at the begining */ + BEQ_LAST = 1 << 27, /* insert plugin at the end */ + BEQ_MUTE_CAM = 1 << 28 /* some plugins (eg webcams) can be muted */ } PluginOptions_e; -#define MAX_STYPES 11 /* user-selectable types */ -#define MAX_TYPES 30 /* all types available */ +#define MAX_TYPES 29 /* all types available */ /* -- PluginType -- */ @@ -74,6 +71,6 @@ } PluginType_t; -PluginType_t pTypes[MAX_TYPES]; +extern PluginType_t pTypes[MAX_TYPES]; #endif /* __BINIOU_OPTIONS_H */ diff -Nru lebiniou-3.31/src/oscillo.c lebiniou-3.40/src/oscillo.c --- lebiniou-3.31/src/oscillo.c 2019-04-05 20:39:16.000000000 +0000 +++ lebiniou-3.40/src/oscillo.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -37,11 +37,13 @@ Porteuse_t *p = xcalloc(1, sizeof(Porteuse_t)); p->size = size; + p->color = xcalloc(p->size, sizeof(Pixel_t)); p->trans = xcalloc(size, sizeof(Transform_t)); p->channel = channel; for (i = 0; i < size; i++) { Transform_init(&p->trans[i]); + p->color[i] = PIXEL_MAXVAL; } return p; @@ -51,7 +53,10 @@ void Porteuse_delete(Porteuse_t *p) { - xfree(p->trans); + if (p) { + xfree(p->color); + xfree(p->trans); + } xfree(p); } @@ -90,7 +95,6 @@ Transform_t *t = &p->trans[i]; Point2d_t sigval; float vy, sina, cosa, x, y, xi, yi; - static const Pixel_t color = 250; Buffer8_t *dst = passive_buffer(ctx); @@ -126,7 +130,7 @@ origin = p2d_add(&origin, &t->v_after); for (i = 1; i < p->size; i++) { - /* Pixel_t color = b_rand_int_range(1, 254); */ + Pixel_t color = p->color[i]; t = &p->trans[i]; diff -Nru lebiniou-3.31/src/oscillo.h lebiniou-3.40/src/oscillo.h --- lebiniou-3.31/src/oscillo.h 2019-02-02 00:30:11.000000000 +0000 +++ lebiniou-3.40/src/oscillo.h 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -40,6 +40,7 @@ Point2d_t origin; Transform_t *trans; u_char channel; + Pixel_t *color; } Porteuse_t; Porteuse_t *Porteuse_new(uint32_t, u_char); diff -Nru lebiniou-3.31/src/params3d.c lebiniou-3.40/src/params3d.c --- lebiniou-3.31/src/params3d.c 2019-04-05 20:39:16.000000000 +0000 +++ lebiniou-3.40/src/params3d.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -70,7 +70,7 @@ void Params3d_init(Params3d_t *p, const float rotate_amount, const double scale_factor, - const uint8_t rotation_factor) + const uint8_t rotation_factor) { int i; @@ -115,7 +115,7 @@ // XXX poor random sign changing for (i = X_AXIS; i <= Z_AXIS; i++) { if (b_rand_boolean()) { - p->rotate_factor[i] = -p->rotate_factor[i]; + p->rotate_factor[i] = -p->rotate_factor[i]; } } } while (!Params3d_is_rotating(p)); diff -Nru lebiniou-3.31/src/params3d.h lebiniou-3.40/src/params3d.h --- lebiniou-3.31/src/params3d.h 2019-04-05 20:39:16.000000000 +0000 +++ lebiniou-3.40/src/params3d.h 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * diff -Nru lebiniou-3.31/src/particles.c lebiniou-3.40/src/particles.c --- lebiniou-3.31/src/particles.c 2019-04-05 20:39:16.000000000 +0000 +++ lebiniou-3.40/src/particles.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * diff -Nru lebiniou-3.31/src/particles.h lebiniou-3.40/src/particles.h --- lebiniou-3.31/src/particles.h 2019-04-05 20:39:16.000000000 +0000 +++ lebiniou-3.40/src/particles.h 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * diff -Nru lebiniou-3.31/src/pbar.c lebiniou-3.40/src/pbar.c --- lebiniou-3.31/src/pbar.c 2019-04-05 20:39:16.000000000 +0000 +++ lebiniou-3.40/src/pbar.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,54 +0,0 @@ -/* - * Copyright 1994-2019 Olivier Girondel - * - * This file is part of lebiniou. - * - * lebiniou 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 of the License, or - * (at your option) any later version. - * - * lebiniou 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 lebiniou. If not, see . - */ - -#include "utils.h" -#include "pbar.h" - - -PBar_t * -pbar_new() -{ - PBar_t *pb; - - pb = xcalloc(1, sizeof(PBar_t)); - - return pb; -} - - -void -pbar_delete(PBar_t *pb) -{ - xfree(pb); -} - - -void -pbar_step(PBar_t *pb) -{ - if (pb != NULL) { - static char progress[] = "/-\\|"; - - printf("%c%c", progress[(int)pb->step++], 8); - fflush(stdout); - if (pb->step == 4) { - pb->step = 0; - } - } -} diff -Nru lebiniou-3.31/src/pbar.h lebiniou-3.40/src/pbar.h --- lebiniou-3.31/src/pbar.h 2019-02-02 00:30:11.000000000 +0000 +++ lebiniou-3.40/src/pbar.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,33 +0,0 @@ -/* - * Copyright 1994-2019 Olivier Girondel - * - * This file is part of lebiniou. - * - * lebiniou 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 of the License, or - * (at your option) any later version. - * - * lebiniou 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 lebiniou. If not, see . - */ - -#ifndef __BINIOU_PBAR_H -#define __BINIOU_PBAR_H - - -typedef struct PBar_s { - char step; -} PBar_t; - - -PBar_t *pbar_new(); -void pbar_delete(PBar_t *); -void pbar_step(PBar_t *); - -#endif /* __BINIOU_PBAR_H */ diff -Nru lebiniou-3.31/src/plugin.c lebiniou-3.40/src/plugin.c --- lebiniou-3.31/src/plugin.c 2019-04-05 20:39:16.000000000 +0000 +++ lebiniou-3.40/src/plugin.c 2020-01-23 13:56:18.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -26,14 +26,14 @@ */ #ifdef DEBUG -#define B_DLSYM(VAR, SYM) \ - (VAR) = (void (*)(struct Context_s *)) dlsym(p->handle, (SYM)); \ - if (libbiniou_verbose && ((VAR) != NULL)) \ +#define B_DLSYM(VAR, SYM) \ + (VAR) = (void (*)(struct Context_s *)) dlsym(p->handle, (SYM)); \ + if (libbiniou_verbose && ((VAR) != NULL)) \ printf("[p] >> %s has '%s'\n", p->name, (SYM)) -#define B_GOTSYM(VAR, SYM) if ((VAR) != NULL) \ +#define B_GOTSYM(VAR, SYM) if ((VAR) != NULL) \ printf("[p] >> %s has '%s'\n", p->name, (SYM)); #else -#define B_DLSYM(VAR, SYM) \ +#define B_DLSYM(VAR, SYM) \ (VAR) = (void (*)(struct Context_s *)) dlsym(p->handle, (SYM)) #define B_GOTSYM(VAR, SYM) { } #endif @@ -77,6 +77,12 @@ #endif } + uint32_t *version_ptr = (uint32_t *) dlsym(p->handle, "version"); + if (version_ptr != NULL) { + p->version = *version_ptr; + printf("plugin version: %d\n", p->version); + } + _tmp = (u_long *) dlsym(p->handle, "options"); if (_tmp == NULL) { error = dlerror(); @@ -99,8 +105,9 @@ p->desc = (char *) dlsym(p->handle, "desc"); B_GOTSYM(p->desc, "desc"); - B_DLSYM(p->create, "create"); + p->create = (int8_t (*)(struct Context_s *)) dlsym(p->handle, "create"); B_DLSYM(p->destroy, "destroy"); + p->check_version = (int8_t (*)(uint32_t)) dlsym(p->handle, "check_version"); B_DLSYM(p->run, "run"); B_DLSYM(p->on_switch_on, "on_switch_on"); B_DLSYM(p->on_switch_off, "on_switch_off"); @@ -115,6 +122,8 @@ p->jthread = (void *(*)(void *)) dlsym(p->handle, "jthread"); B_GOTSYM(p->jthread, "jthread"); + p->parameters = (json_t *(*)(json_t *)) dlsym(p->handle, "parameters"); + return p; } @@ -194,20 +203,23 @@ } -void +int8_t Plugin_init(Plugin_t *p) { + int8_t res = 1; assert(p != NULL); if (p->create != NULL) { VERBOSE(printf("[+] Initializing plugin %s\n", p->name)); - p->create(context); + res = p->create(context); } - if (p->jthread != NULL) { + if ((p->jthread != NULL) && res) { pthread_create(&p->thread, NULL, p->jthread, (void *)context); VERBOSE(printf("[p] Launched thread %s\n", p->name)); } + + return res; } @@ -241,3 +253,294 @@ assert(p != NULL); return Plugin_uppercase(p->dname); } + + +uint8_t +plugin_parameter_number(json_t *in_parameters) +{ + uint8_t n = 0; + for (void *iter = json_object_iter(in_parameters); iter != NULL; n++) { + iter = json_object_iter_next(in_parameters, iter); + } + return n; +} + + +void +plugin_parameters_add_int(json_t *params, const char *name, int v, int dec, int inc) +{ + json_t *param = json_object(); + json_object_set_new(param, "value", json_integer(v)); + json_object_set_new(param, "dec", json_integer(dec)); + json_object_set_new(param, "inc", json_integer(inc)); + json_object_set_new(params, name, param); +} + + +void +plugin_parameters_add_double(json_t *params, const char *name, double v, double dec, double inc) +{ + json_t *param = json_object(); + json_object_set_new(param, "value", json_real(v)); + json_object_set_new(param, "dec", json_real(dec)); + json_object_set_new(param, "inc", json_real(inc)); + json_object_set_new(params, name, param); +} + + +void +plugin_parameters_add_string_list(json_t *params, const char *name, uint32_t nb_elems, const char **elems, uint32_t elem_id) +{ + json_t *param = json_object(); + json_object_set_new(param, "value", json_string(elems[elem_id])); + json_object_set_new(param, "dec", json_integer(-1)); + json_object_set_new(param, "inc", json_integer(1)); + + json_t *value_list = json_array(); + for (uint32_t n = 0; n < nb_elems; n++) { + json_array_append_new(value_list, json_string(elems[n])); + } + json_object_set_new(param, "value_list", value_list); + + json_object_set_new(params, name, param); +} + + +uint8_t +plugin_parameter_parse_int(const json_t *in_parameters, const char *name, int *value) +{ + json_t *p = json_object_get(in_parameters, name); + + if (p != NULL) { + json_t *j_value = json_object_get(p, "value"); + if (json_is_integer(j_value)) { + *value = json_integer_value(j_value); + return 1; + } + } + + return 0; +} + + +uint8_t +plugin_parameter_parse_int_range(const json_t *in_parameters, const char *name, int *value, int vmin, int vmax) +{ + int new_value = 0; + uint8_t ret = plugin_parameter_parse_int(in_parameters, name, &new_value); + + if (new_value >= vmin && new_value <= vmax && ret == 1) { + if (*value != new_value) { + ret |= PLUGIN_PARAMETER_CHANGED; + } + + *value = new_value; + } + + return ret; +} + + +uint8_t +plugin_parameter_parse_double(const json_t *in_parameters, const char *name, double *value) +{ + json_t *p = json_object_get(in_parameters, name); + + if (p != NULL) { + json_t *j_value = json_object_get(p, "value"); + if (json_is_real(j_value)) { + *value = json_real_value(j_value); + return 1; + } + } + + return 0; +} + + +uint8_t +plugin_parameter_parse_float(const json_t *in_parameters, const char *name, float *value) +{ + double new_value; + uint8_t ret = plugin_parameter_parse_double(in_parameters, name, &new_value); + if (ret) { + *value = new_value; + } + + return ret; +} + + +uint8_t +plugin_parameter_parse_float_range(const json_t *in_parameters, const char *name, float *value, float vmin, float vmax) +{ + float new_value = 0; + uint8_t ret = plugin_parameter_parse_float(in_parameters, name, &new_value); + + if (new_value >= vmin && new_value <= vmax && ret == 1) { + if (*value != new_value) { + ret |= PLUGIN_PARAMETER_CHANGED; + } + + *value = new_value; + } + + return ret; +} + + +uint8_t +plugin_parameter_parse_string(const json_t *in_parameters, const char *name, char **value) +{ + json_t *p = json_object_get(in_parameters, name); + + if (p != NULL) { + json_t *j_value = json_object_get(p, "value"); + if (json_is_string(j_value)) { + const char *str = json_string_value(j_value); + *value = (char *)str; + return 1; + } + } + + return 0; +} + + +uint8_t +plugin_parameter_parse_string_list_as_int_range(const json_t *in_parameters, const char *name, + uint32_t nb_elems, const char **elems, int *value, int vmin, int vmax) +{ + uint8_t ret = 0; + int new_value = 0; + char *str = NULL; + + if (plugin_parameter_parse_string(in_parameters, name, &str)) { + for (uint32_t n = 0; n < nb_elems; n++) { + if (strcmp(elems[n], str) == 0) { + new_value = n; + + if (new_value >= vmin && new_value <= vmax) { + ret = 1; + if (*value != new_value) { + ret |= PLUGIN_PARAMETER_CHANGED; + } + + *value = new_value; + } + } + } + } + + return ret; +} + + +uint8_t +plugin_parameter_find_string_in_list(const json_t *in_parameters, const char *name, int *value) +{ + uint8_t ret = 0; + + json_t *j_value = json_object_get(in_parameters, "value"); + const char *str = json_string_value(j_value); + + json_t *j_value_list = json_object_get(in_parameters, "value_list"); + if (json_is_array(j_value_list) && (str != NULL)) { + for (uint32_t n = 0; n < (uint32_t)json_array_size(j_value_list); n++) { + const char *list_str = json_string_value(json_array_get(j_value_list, n)); + + if (strcmp(list_str, str) == 0) { + *value = n; + ret = 1; + break; + } + } + } + + return ret; +} + + +json_t * +plugin_parameter_change_selected(const char *delta, const float factor) +{ + json_t *ret = NULL; + + if (plugins->selected->parameters != NULL) { + json_t *j_params = plugins->selected->parameters(NULL); + void *params_iter = json_object_iter(j_params); + for (uint8_t n = 0; n < plugins->selected->selected_param; n++) { + params_iter = json_object_iter_next(j_params, params_iter); + } + json_t *p = json_object_iter_value(params_iter); + json_t *j_delta = json_object_get(p, delta); + json_t *j_value = json_object_get(p, "value"); + + if ((NULL != j_delta) && (NULL != j_value)) { + if (json_is_integer(j_delta) && json_is_integer(j_value)) { + int delta = json_integer_value(j_delta) * factor; + int value = json_integer_value(j_value); + + json_object_del(p, "value"); + json_object_set_new(p, "value", json_integer(value + delta)); + ret = plugins->selected->parameters(j_params); + + } else if (json_is_real(j_delta) && json_is_real(j_value)) { + double delta = json_real_value(j_delta) * factor; + double value = json_real_value(j_value); + + json_object_del(p, "value"); + json_object_set_new(p, "value", json_real(value + delta)); + ret = plugins->selected->parameters(j_params); + + } else if (json_is_integer(j_delta) && json_is_string(j_value)) { + int delta = json_integer_value(j_delta) * factor; + int list_index = 0; + + if (plugin_parameter_find_string_in_list(p, "value", &list_index)) { + json_t *j_value_list = json_object_get(p, "value_list"); + int N = (int)json_array_size(j_value_list); + + int new_value = list_index + delta; + if (new_value >= N) { + new_value = new_value % N; + } else if (new_value < 0) { + new_value = N + new_value % N; + } + + const char *str = json_string_value(json_array_get(j_value_list, new_value)); + json_object_del(p, "value"); + json_object_set_new(p, "value", json_string(str)); + ret = plugins->selected->parameters(j_params); + } + } + } + + json_decref(j_params); + } + + return ret; +} + + +json_t * +plugin_parameters_to_saved_parameters(json_t *in_parameters) +{ + json_t *out_parameters = json_object(); + + const char *in_name; + json_t *in_param; + json_object_foreach(in_parameters, in_name, in_param) { +#ifdef DEBUG + printf("param name : %s\n", in_name); +#endif + json_t *value = json_object_get(in_param, "value"); + if (NULL != value) { + json_t *param = json_object(); + json_object_set(param, "value", value); + json_object_set_new(out_parameters, in_name, param); + } + } + + return out_parameters; +} diff -Nru lebiniou-3.31/src/plugin.h lebiniou-3.40/src/plugin.h --- lebiniou-3.31/src/plugin.h 2019-04-05 20:39:16.000000000 +0000 +++ lebiniou-3.40/src/plugin.h 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -20,38 +20,45 @@ #ifndef __BINIOU_PLUGIN_H #define __BINIOU_PLUGIN_H +#include #include "options.h" +#define PLUGIN_PARAMETER_CHANGED 2 + enum PluginType { PL_INPUT, PL_MAIN, PL_OUTPUT }; struct Context_s; typedef struct Plugin_s { - void *handle; /* .so handle */ + void *handle; /* .so handle */ - uint32_t id; + uint32_t id; /* creation date */ + uint32_t version; /* version to increase when exposed parameters change */ u_long *options; u_long *mode; char *name; - char *file; /* to unload/reload */ - char *dname; /* display name */ - char *desc; /* plugin description */ + char *file; /* to unload/reload */ + char *dname; /* display name */ + char *desc; /* plugin description */ pthread_t thread; - u_long calls; /* number of times this plugin was run */ + u_long calls; /* number of times this plugin was run */ + uint8_t selected_param; /* TODO a struct callbacks */ /* callbacks */ - void (*create)(struct Context_s *); /* constructor */ - void (*destroy)(struct Context_s *); /* destructor */ - - void (*run)(struct Context_s *); /* run function */ - void * (*jthread)(void *); /* joinable thread */ + int8_t (*create)(struct Context_s *); /* constructor */ + void (*destroy)(struct Context_s *); /* destructor */ + int8_t (*check_version)(uint32_t version); /* returns 0 if plugin is not compatible with version */ + + void (*run)(struct Context_s *); /* run function */ + json_t * (*parameters)(json_t *); /* parameters managment */ + void * (*jthread)(void *); /* joinable thread */ - void (*on_switch_on)(struct Context_s *); /* switching on */ - void (*on_switch_off)(struct Context_s *); /* switching off */ + void (*on_switch_on)(struct Context_s *); /* switching on */ + void (*on_switch_off)(struct Context_s *); /* switching off */ /* Output plugin stuff */ void (*fullscreen)(const int); @@ -62,9 +69,24 @@ void Plugin_delete(Plugin_t *); void Plugin_reload(Plugin_t *); -void Plugin_init(Plugin_t *); +int8_t Plugin_init(Plugin_t *); char *Plugin_name(const Plugin_t *); char *Plugin_dname(const Plugin_t *); +uint8_t plugin_parameter_number(json_t *in_parameters); +void plugin_parameters_add_int(json_t *params_array, const char *name, int v, int dec, int inc); +void plugin_parameters_add_double(json_t *params, const char *name, double v, double dec, double inc); +void plugin_parameters_add_string_list(json_t *params_array, const char *name, uint32_t nb_elems, const char **elems, uint32_t elem_id); +uint8_t plugin_parameter_parse_int(const json_t *in_parameters, const char *name, int *value); +uint8_t plugin_parameter_parse_int_range(const json_t *in_parameters, const char *name, int *value, int vmin, int vmax); +uint8_t plugin_parameter_parse_double(const json_t *in_parameters, const char *name, double *value); +uint8_t plugin_parameter_parse_float(const json_t *in_parameters, const char *name, float *value); +uint8_t plugin_parameter_parse_float_range(const json_t *in_parameters, const char *name, float *value, float vmin, float vmax); +uint8_t plugin_parameter_find_string_in_list(const json_t *in_parameters, const char *name, int *value); +uint8_t plugin_parameter_parse_string_list_as_int_range(const json_t *in_parameters, const char *name, uint32_t nb_elems, const char **elems, int *value, int vmin, int vmax); +uint8_t plugin_parameter_parse_string(const json_t *in_parameters, const char *name, char **value); +json_t *plugin_parameter_change_selected(const char *delta, const float factor); +json_t *plugin_parameters_to_saved_parameters(json_t *in); + #endif /* __BINIOU_PLUGIN_H */ diff -Nru lebiniou-3.31/src/plugins.c lebiniou-3.40/src/plugins.c --- lebiniou-3.31/src/plugins.c 2019-04-05 20:39:16.000000000 +0000 +++ lebiniou-3.40/src/plugins.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -88,24 +88,48 @@ void Plugins_init(Plugins_t *ps) { - short i; + uint16_t i; + uint16_t old_size = ps->size; - if (libbiniou_verbose) { - printf("[+] Initializing %d plugin%c\n", ps->size, (ps->size == 1) ? ' ' : 's'); - } - for (i = 0; i < ps->size; i++) { + VERBOSE(printf("[+] Initializing %d plugin%c\n", ps->size, (ps->size == 1) ? ' ' : 's')); + for (i = 0; i < old_size; i++) { Plugin_t *p = ps->plugins[i]; - u_short t; - Plugin_init(p); + if (!Plugin_init(p)) { + VERBOSE(printf("[!] Failed to initialize %s\n", p->name)); - /* re-adjust on-boot B_DISABLED plugins */ - for (t = 0; t < MAX_TYPES; t++) - if (*p->options & (1 << t)) - if (*p->options & BEQ_DISABLED) - if (pTypes[t].count > 0) { /* XXX should not need this test */ - pTypes[t].count--; - } + /* plugin types stuff */ + for (int t = 0; t < MAX_TYPES; t++) + if (*p->options & (1 << t)) { +#ifdef DEBUG + printf("[T] Has type %s\n", pTypes[t].name); +#endif + pTypes[t].count--; + } + + if (plugins->selected == p) { + plugins->selected = NULL; + plugins->selected_idx = 0; + } + Plugin_delete(p); + ps->plugins[i] = NULL; + ps->size--; + } + } + + // clean up disabled plugins + if (ps->size != old_size) { + Plugin_t **res = xcalloc(ps->size, sizeof(Plugin_t *)); + uint16_t idx = 0; + + for (i = 0; i < old_size; i++) { + if (ps->plugins[i] != NULL) { + res[idx++] = ps->plugins[i]; + } + } + + xfree(ps->plugins); + ps->plugins = res; } } @@ -170,17 +194,15 @@ void -Plugins_load(Plugins_t *ps) +Plugins_load(Plugins_t *ps, const Context_t *ctx) { DIR *da_dir; struct dirent *da_ent; - int i; + uint16_t i, old_size; gchar *blah; blah = g_strdup_printf("%s/main", ps->path); - if (libbiniou_verbose) { - printf("[i] Loading plugins from %s\n", blah); - } + VERBOSE(printf("[i] Loading plugins from %s\n", blah)); if ((da_dir = opendir(blah)) == NULL) { xperror("opendir"); @@ -196,6 +218,7 @@ xerror("Won't do anything without a plugin, stupid\n"); } ps->plugins = xcalloc(ps->size, sizeof(Plugin_t *)); + old_size = ps->size; rewinddir(da_dir); i = 0; @@ -222,39 +245,63 @@ /* load the plugin */ p = ps->plugins[i] = Plugin_new(ps->path, name, PL_MAIN); if (NULL != p) { - if (libbiniou_verbose) { - if (NULL != p->desc) { - printf(" %s\n", p->desc); - } else { - printf("!!! FIXME: %s has no description\n", name); - } - } - - for (j = 0; j < i; j++) - if (p->id == ps->plugins[j]->id) { - xerror("Duplicated plugin id: %li\n", p->id); + if ( + ((ctx->input != NULL) || + ((ctx->input == NULL) && (!(*p->options & BE_SFX2D) && !(*p->options & BE_SFX3D)))) + // check if plugin needs input + && + // check if plugin needs images + ((ctx->imgf != NULL) || + ((ctx->imgf == NULL) && (!(*p->options & BEQ_IMAGE)))) + && + // check if plugin needs webcam + ((ctx->webcams > 0) || + (!ctx->webcams && (!(*p->options & BEQ_MUTE_CAM)))) + ) { + if (libbiniou_verbose) { + if (NULL != p->desc) { + printf(" %s\n", p->desc); + } else { + printf("!!! FIXME: %s has no description\n", name); + } } - - /* plugin types stuff */ - for (t = 0; t < MAX_TYPES; t++) - if (*p->options & (1 << t)) { + for (j = 0; j < i; j++) + if (p->id == ps->plugins[j]->id) { + xerror("Duplicated plugin id: %li\n", p->id); + } + /* plugin types stuff */ + for (t = 0; t < MAX_TYPES; t++) + if (*p->options & (1 << t)) { #ifdef DEBUG - printf("[T] Has type %s\n", pTypes[t].name); + printf("[T] Has type %s\n", pTypes[t].name); #endif - if (!(*p->options & BEQ_NORANDOM)) { pTypes[t].count++; } - } #ifdef DEBUG - printf("\n"); + printf("\n"); #endif - i++; + i++; + } else { + ps->plugins[i] = NULL; + Plugin_delete(p); + ps->size--; + } } else { ps->size--; } } closedir(da_dir); + Plugin_t **res = xcalloc(ps->size, sizeof(Plugin_t *)); + int idx = 0; + for (i = 0; i < old_size; i++) { + if (ps->plugins[i] != NULL) { + res[idx++] = ps->plugins[i]; + } + } + xfree(ps->plugins); + ps->plugins = res; + /* sort the plugins array */ qsort((void *)ps->plugins, (size_t)ps->size, (size_t)sizeof(Plugin_t *), &Plugins_compare); @@ -282,10 +329,25 @@ Plugin_t * -Plugins_get_random(const enum PluginOptions feat) +Plugins_find_by_name(const char *name) +{ + short i; + + for (i = 0; i < plugins->size; i++) + if (!strcmp(plugins->plugins[i]->name, name)) { + return plugins->plugins[i]; + } + + return NULL; +} + + +Plugin_t * +Plugins_get_random(const enum PluginOptions feat, const Plugin_t *locked) { int i; u_short rand = 0; + Plugin_t *chosen = NULL; /* check if we can select at random or not */ for (i = 0; i < MAX_TYPES; i++) @@ -300,39 +362,45 @@ } // else printf("pTypes[%d].count= %d\n", i, pTypes[i].count); + uint8_t ignore_beq_norandom = (getenv("LEBINIOU_IGNORE_BEQ_NORANDOM") != NULL); + + int retry; do { + retry = 0; rand = b_rand_int_range(0, plugins->size); - } while (!(*plugins->plugins[rand]->options & feat) - || (*plugins->plugins[rand]->options & BEQ_NORANDOM) - || (*plugins->plugins[rand]->options & BEQ_DISABLED)); + chosen = plugins->plugins[rand]; + if (!(*chosen->options & feat)) { + retry = 1; + } else { + if (!ignore_beq_norandom && (*chosen->options & BEQ_NORANDOM) && (chosen != locked)) { + retry = 1; + } + } + } while (retry); - return plugins->plugins[rand]; + return chosen; } void Plugins_next() { - do { - if (++plugins->selected_idx == plugins->size) { - plugins->selected_idx = 0; - } - plugins->selected = plugins->plugins[plugins->selected_idx]; - } while (*plugins->selected->options & BEQ_DISABLED); - printf("[i] Selected plugin: '%s' (%s)\n", plugins->selected->name, plugins->selected->dname); + if (++plugins->selected_idx == plugins->size) { + plugins->selected_idx = 0; + } + plugins->selected = plugins->plugins[plugins->selected_idx]; + VERBOSE(printf("[i] Selected plugin: '%s' (%s)\n", plugins->selected->name, plugins->selected->dname)); } void Plugins_prev() { - do { - if (--plugins->selected_idx == -1) { - plugins->selected_idx = plugins->size-1; - } - plugins->selected = plugins->plugins[plugins->selected_idx]; - } while (*plugins->selected->options & BEQ_DISABLED); - printf("[i] Selected plugin: '%s' (%s)\n", plugins->selected->name, plugins->selected->dname); + if (--plugins->selected_idx == -1) { + plugins->selected_idx = plugins->size - 1; + } + plugins->selected = plugins->plugins[plugins->selected_idx]; + VERBOSE(printf("[i] Selected plugin: '%s' (%s)\n", plugins->selected->name, plugins->selected->dname)); } diff -Nru lebiniou-3.31/src/plugins_event.c lebiniou-3.40/src/plugins_event.c --- lebiniou-3.31/src/plugins_event.c 2019-02-19 12:45:00.000000000 +0000 +++ lebiniou-3.40/src/plugins_event.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -29,35 +29,35 @@ int rc = 0; switch (e->cmd) { - case BC_NEXT: - Plugins_next(); - rc = 1; - break; - - case BC_PREV: - Plugins_prev(); - rc = 1; - break; - - case BC_SELECT: - if (e->arg0 == BA_DOWN) { - Plugins_next_n(SKIP); + case BC_NEXT: + Plugins_next(); rc = 1; - } else if (e->arg0 == BA_UP) { - Plugins_prev_n(SKIP); - rc = 1; - } - break; + break; - case BC_RELOAD: - if (e->arg0 == BA_SELECTED) { - Plugins_reload_selected(plugins); + case BC_PREV: + Plugins_prev(); rc = 1; - } - break; + break; + + case BC_SELECT: + if (e->arg0 == BA_DOWN) { + Plugins_next_n(SKIP); + rc = 1; + } else if (e->arg0 == BA_UP) { + Plugins_prev_n(SKIP); + rc = 1; + } + break; + + case BC_RELOAD: + if (e->arg0 == BA_SELECTED) { + Plugins_reload_selected(plugins); + rc = 1; + } + break; - default: - break; + default: + break; } return rc; diff -Nru lebiniou-3.31/src/plugins.h lebiniou-3.40/src/plugins.h --- lebiniou-3.31/src/plugins.h 2019-02-02 00:30:11.000000000 +0000 +++ lebiniou-3.40/src/plugins.h 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -22,6 +22,7 @@ #include "plugin.h" #include "event.h" +#include "context.h" typedef struct Plugins_s { @@ -36,12 +37,13 @@ Plugins_t *Plugins_new(const char *); void Plugins_delete(Plugins_t *); -void Plugins_load(Plugins_t *); +void Plugins_load(Plugins_t *, const Context_t *); void Plugins_init(Plugins_t *); void Plugins_reload_selected(Plugins_t *); Plugin_t *Plugins_find(const u_long); -Plugin_t *Plugins_get_random(const enum PluginOptions); +Plugin_t *Plugins_find_by_name(const char *); +Plugin_t *Plugins_get_random(const enum PluginOptions, const Plugin_t *); void Plugins_select(Plugins_t *, const Plugin_t *); diff -Nru lebiniou-3.31/src/pnglite.c lebiniou-3.40/src/pnglite.c --- lebiniou-3.31/src/pnglite.c 2019-04-05 20:39:16.000000000 +0000 +++ lebiniou-3.40/src/pnglite.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -139,23 +139,23 @@ int bpp; switch(png->color_type) { - case PNG_GREYSCALE: - bpp = 1; - break; - case PNG_TRUECOLOR: - bpp = 3; - break; - case PNG_INDEXED: - bpp = 1; - break; - case PNG_GREYSCALE_ALPHA: - bpp = 2; - break; - case PNG_TRUECOLOR_ALPHA: - bpp = 4; - break; - default: - return PNG_FILE_ERROR; + case PNG_GREYSCALE: + bpp = 1; + break; + case PNG_TRUECOLOR: + bpp = 3; + break; + case PNG_INDEXED: + bpp = 1; + break; + case PNG_GREYSCALE_ALPHA: + bpp = 2; + break; + case PNG_TRUECOLOR_ALPHA: + bpp = 4; + break; + default: + return PNG_FILE_ERROR; } bpp *= png->depth/8; @@ -170,7 +170,7 @@ unsigned orig_crc = 0; unsigned calc_crc = 0; #endif - unsigned char ihdr[13+4]; /* length should be 13, make room for type (IHDR) */ + unsigned char ihdr[13+4]; /* length should be 13, make room for type (IHDR) */ file_read_ul(png, &length); @@ -270,29 +270,29 @@ printf("\tcolor:\t\t"); switch(png->color_type) { - case PNG_GREYSCALE: - printf("greyscale\n"); - break; - case PNG_TRUECOLOR: - printf("truecolor\n"); - break; - case PNG_INDEXED: - printf("palette\n"); - break; - case PNG_GREYSCALE_ALPHA: - printf("greyscale with alpha\n"); - break; - case PNG_TRUECOLOR_ALPHA: - printf("truecolor with alpha\n"); - break; - default: - printf("unknown, this is not good\n"); - break; - } - - printf("\tcompression:\t%s\n", png->compression_method?"unknown, this is not good":"inflate/deflate"); - printf("\tfilter:\t\t%s\n", png->filter_method?"unknown, this is not good":"adaptive"); - printf("\tinterlace:\t%s\n", png->interlace_method?"interlace":"no interlace"); + case PNG_GREYSCALE: + printf("greyscale\n"); + break; + case PNG_TRUECOLOR: + printf("truecolor\n"); + break; + case PNG_INDEXED: + printf("palette\n"); + break; + case PNG_GREYSCALE_ALPHA: + printf("greyscale with alpha\n"); + break; + case PNG_TRUECOLOR_ALPHA: + printf("truecolor with alpha\n"); + break; + default: + printf("unknown, this is not good\n"); + break; + } + + printf("\tcompression:\t%s\n", png->compression_method?"unknown, this is not good":"inflate/deflate"); + printf("\tfilter:\t\t%s\n", png->filter_method?"unknown, this is not good":"adaptive"); + printf("\tinterlace:\t%s\n", png->interlace_method?"interlace":"no interlace"); } int png_open_read(png_t* png, png_read_callback_t read_fun, void* user_pointer) @@ -656,7 +656,7 @@ return PNG_FILE_ERROR; } - if(type == *(unsigned int*)"IDAT") { /* if we found an idat, all other idats should be followed with no other chunks in between */ + if(type == *(unsigned int*)"IDAT") { /* if we found an idat, all other idats should be followed with no other chunks in between */ png->png_datalen = png->width * png->height * png->bpp + png->height; png->png_data = png_alloc(png->png_datalen); @@ -668,7 +668,7 @@ } else if(type == *(unsigned int*)"IEND") { return PNG_DONE; } else { - file_read(png, 0, 1, length + 4); /* unknown chunk */ + file_read(png, 0, 1, length + 4); /* unknown chunk */ } return result; @@ -798,35 +798,35 @@ } switch(filter) { - case 0: /* none */ - memcpy(data+outpos, filtered+pos, png->width * stride); - break; - case 1: /* sub */ - png_filter_sub(stride, filtered+pos, data+outpos, png->width * stride); - break; - case 2: /* up */ - if(outpos) { - png_filter_up(filtered+pos, data+outpos, data + outpos - (png->width*stride), png->width*stride); - } else { - png_filter_up(filtered+pos, data+outpos, 0, png->width*stride); - } - break; - case 3: /* average */ - if(outpos) { - png_filter_average(stride, filtered+pos, data+outpos, data + outpos - (png->width*stride), png->width*stride); - } else { - png_filter_average(stride, filtered+pos, data+outpos, 0, png->width*stride); - } - break; - case 4: /* paeth */ - if(outpos) { - png_filter_paeth(stride, filtered+pos, data+outpos, data + outpos - (png->width*stride), png->width*stride); - } else { - png_filter_paeth(stride, filtered+pos, data+outpos, 0, png->width*stride); - } - break; - default: - return PNG_UNKNOWN_FILTER; + case 0: /* none */ + memcpy(data+outpos, filtered+pos, png->width * stride); + break; + case 1: /* sub */ + png_filter_sub(stride, filtered+pos, data+outpos, png->width * stride); + break; + case 2: /* up */ + if(outpos) { + png_filter_up(filtered+pos, data+outpos, data + outpos - (png->width*stride), png->width*stride); + } else { + png_filter_up(filtered+pos, data+outpos, 0, png->width*stride); + } + break; + case 3: /* average */ + if(outpos) { + png_filter_average(stride, filtered+pos, data+outpos, data + outpos - (png->width*stride), png->width*stride); + } else { + png_filter_average(stride, filtered+pos, data+outpos, 0, png->width*stride); + } + break; + case 4: /* paeth */ + if(outpos) { + png_filter_paeth(stride, filtered+pos, data+outpos, data + outpos - (png->width*stride), png->width*stride); + } else { + png_filter_paeth(stride, filtered+pos, data+outpos, 0, png->width*stride); + } + break; + default: + return PNG_UNKNOWN_FILTER; } outpos += png->width * stride; @@ -884,31 +884,31 @@ char* png_error_string(int error) { switch(error) { - case PNG_NO_ERROR: - return "No error"; - case PNG_FILE_ERROR: - return "Unknown file error."; - case PNG_HEADER_ERROR: - return "No PNG header found. Are you sure this is a PNG?"; - case PNG_IO_ERROR: - return "Failure while reading file."; - case PNG_EOF_ERROR: - return "Reached end of file."; - case PNG_CRC_ERROR: - return "CRC or chunk length error."; - case PNG_MEMORY_ERROR: - return "Could not allocate memory."; - case PNG_ZLIB_ERROR: - return "zlib reported an error."; - case PNG_UNKNOWN_FILTER: - return "Unknown filter method used in scanline."; - case PNG_DONE: - return "PNG done"; - case PNG_NOT_SUPPORTED: - return "The PNG is unsupported by pnglite, too bad for you!"; - case PNG_WRONG_ARGUMENTS: - return "Wrong combination of arguments passed to png_open. You must use either a read_function or supply a file pointer to use."; - default: - return "Unknown error."; + case PNG_NO_ERROR: + return "No error"; + case PNG_FILE_ERROR: + return "Unknown file error."; + case PNG_HEADER_ERROR: + return "No PNG header found. Are you sure this is a PNG?"; + case PNG_IO_ERROR: + return "Failure while reading file."; + case PNG_EOF_ERROR: + return "Reached end of file."; + case PNG_CRC_ERROR: + return "CRC or chunk length error."; + case PNG_MEMORY_ERROR: + return "Could not allocate memory."; + case PNG_ZLIB_ERROR: + return "zlib reported an error."; + case PNG_UNKNOWN_FILTER: + return "Unknown filter method used in scanline."; + case PNG_DONE: + return "PNG done"; + case PNG_NOT_SUPPORTED: + return "The PNG is unsupported by pnglite, too bad for you!"; + case PNG_WRONG_ARGUMENTS: + return "Wrong combination of arguments passed to png_open. You must use either a read_function or supply a file pointer to use."; + default: + return "Unknown error."; }; } diff -Nru lebiniou-3.31/src/pnglite.h lebiniou-3.40/src/pnglite.h --- lebiniou-3.31/src/pnglite.h 2019-04-05 20:39:16.000000000 +0000 +++ lebiniou-3.40/src/pnglite.h 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -18,29 +18,29 @@ */ /* pnglite.h - Interface for pnglite library - Copyright (c) 2007 Daniel Karling + Copyright (c) 2007 Daniel Karling - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. - 3. This notice may not be removed or altered from any source - distribution. + 3. This notice may not be removed or altered from any source + distribution. - Daniel Karling - daniel.karling@gmail.com + Daniel Karling + daniel.karling@gmail.com */ @@ -52,39 +52,39 @@ #endif /* - Enumerations for pnglite. - Negative numbers are error codes and 0 and up are okay responses. + Enumerations for pnglite. + Negative numbers are error codes and 0 and up are okay responses. */ enum { - PNG_DONE = 1, - PNG_NO_ERROR = 0, - PNG_FILE_ERROR = -1, - PNG_HEADER_ERROR = -2, - PNG_IO_ERROR = -3, - PNG_EOF_ERROR = -4, - PNG_CRC_ERROR = -5, - PNG_MEMORY_ERROR = -6, - PNG_ZLIB_ERROR = -7, - PNG_UNKNOWN_FILTER = -8, - PNG_NOT_SUPPORTED = -9, - PNG_WRONG_ARGUMENTS = -10 + PNG_DONE = 1, + PNG_NO_ERROR = 0, + PNG_FILE_ERROR = -1, + PNG_HEADER_ERROR = -2, + PNG_IO_ERROR = -3, + PNG_EOF_ERROR = -4, + PNG_CRC_ERROR = -5, + PNG_MEMORY_ERROR = -6, + PNG_ZLIB_ERROR = -7, + PNG_UNKNOWN_FILTER = -8, + PNG_NOT_SUPPORTED = -9, + PNG_WRONG_ARGUMENTS = -10 }; /* - The five different kinds of color storage in PNG files. + The five different kinds of color storage in PNG files. */ enum { - PNG_GREYSCALE = 0, - PNG_TRUECOLOR = 2, - PNG_INDEXED = 3, - PNG_GREYSCALE_ALPHA = 4, - PNG_TRUECOLOR_ALPHA = 6 + PNG_GREYSCALE = 0, + PNG_TRUECOLOR = 2, + PNG_INDEXED = 3, + PNG_GREYSCALE_ALPHA = 4, + PNG_TRUECOLOR_ALPHA = 6 }; /* - Typedefs for callbacks. + Typedefs for callbacks. */ typedef unsigned (*png_write_callback_t)(void* input, size_t size, size_t numel, void* user_pointer); @@ -93,53 +93,53 @@ typedef void * (*png_alloc_t)(size_t s); typedef struct { - void* zs; /* pointer to z_stream */ - png_read_callback_t read_fun; - png_write_callback_t write_fun; - void* user_pointer; - - unsigned char* png_data; - unsigned png_datalen; - - unsigned width; - unsigned height; - unsigned char depth; - unsigned char color_type; - unsigned char compression_method; - unsigned char filter_method; - unsigned char interlace_method; - unsigned char bpp; + void* zs; /* pointer to z_stream */ + png_read_callback_t read_fun; + png_write_callback_t write_fun; + void* user_pointer; + + unsigned char* png_data; + unsigned png_datalen; + + unsigned width; + unsigned height; + unsigned char depth; + unsigned char color_type; + unsigned char compression_method; + unsigned char filter_method; + unsigned char interlace_method; + unsigned char bpp; } png_t; /* - Function: png_init + Function: png_init - This function initializes pnglite. The parameters can be used to set your own memory allocation routines following these formats: + This function initializes pnglite. The parameters can be used to set your own memory allocation routines following these formats: - > void* (*custom_alloc)(size_t s) - > void (*custom_free)(void* p) - Parameters: - pngalloc - Pointer to custom allocation routine. If 0 is passed, malloc from libc will be used. - pngfree - Pointer to custom free routine. If 0 is passed, free from libc will be used. + > void* (*custom_alloc)(size_t s) + > void (*custom_free)(void* p) + Parameters: + pngalloc - Pointer to custom allocation routine. If 0 is passed, malloc from libc will be used. + pngfree - Pointer to custom free routine. If 0 is passed, free from libc will be used. - Returns: - Always returns PNG_NO_ERROR. + Returns: + Always returns PNG_NO_ERROR. */ int png_init(png_alloc_t pngalloc, png_free_t pngfree); /* - Function: png_open_file + Function: png_open_file - This function is used to open a png file with the internal file IO system. This function should be used instead of - png_open if no custom read function is used. + This function is used to open a png file with the internal file IO system. This function should be used instead of + png_open if no custom read function is used. - Parameters: - png - Empty png_t struct. - filename - Filename of the file to be opened. + Parameters: + png - Empty png_t struct. + filename - Filename of the file to be opened. - Returns: - PNG_NO_ERROR on success, otherwise an error code. + Returns: + PNG_NO_ERROR on success, otherwise an error code. */ int png_open_file(png_t *png, const char* filename); @@ -148,31 +148,31 @@ int png_open_file_write(png_t *png, const char* filename); /* - Function: png_open + Function: png_open - This function reads or writes a png from/to the specified callback. The callbacks should be of the format: + This function reads or writes a png from/to the specified callback. The callbacks should be of the format: - > size_t (*png_write_callback_t)(void* input, size_t size, size_t numel, void* user_pointer); - > size_t (*png_read_callback_t)(void* output, size_t size, size_t numel, void* user_pointer). + > size_t (*png_write_callback_t)(void* input, size_t size, size_t numel, void* user_pointer); + > size_t (*png_read_callback_t)(void* output, size_t size, size_t numel, void* user_pointer). - Only one callback has to be specified. The read callback in case of PNG reading, otherwise the write callback. + Only one callback has to be specified. The read callback in case of PNG reading, otherwise the write callback. - Writing: - The callback will be called like fwrite. + Writing: + The callback will be called like fwrite. - Reading: - The callback will be called each time pnglite needs more data. The callback should read as much data as requested, - or return 0. This should always be possible if the PNG is sane. If the output-buffer is a null-pointer the callback - should only skip ahead the specified number of elements. If the callback is a null-pointer the user_pointer will be - treated as a file pointer (use png_open_file instead). + Reading: + The callback will be called each time pnglite needs more data. The callback should read as much data as requested, + or return 0. This should always be possible if the PNG is sane. If the output-buffer is a null-pointer the callback + should only skip ahead the specified number of elements. If the callback is a null-pointer the user_pointer will be + treated as a file pointer (use png_open_file instead). - Parameters: - png - png_t struct - read_fun - Callback function for reading. - user_pointer - User pointer to be passed to read_fun. + Parameters: + png - png_t struct + read_fun - Callback function for reading. + user_pointer - User pointer to be passed to read_fun. - Returns: - PNG_NO_ERROR on success, otherwise an error code. + Returns: + PNG_NO_ERROR on success, otherwise an error code. */ int png_open(png_t* png, png_read_callback_t read_fun, void* user_pointer); @@ -181,42 +181,42 @@ int png_open_write(png_t* png, png_write_callback_t write_fun, void* user_pointer); /* - Function: png_print_info + Function: png_print_info - This function prints some info about the opened png file to stdout. + This function prints some info about the opened png file to stdout. - Parameters: - png - png struct to get info from. + Parameters: + png - png struct to get info from. */ void png_print_info(png_t* png); /* - Function: png_error_string + Function: png_error_string - This function translates an error code to a human readable string. + This function translates an error code to a human readable string. - Parameters: - error - Error code. + Parameters: + error - Error code. - Returns: - Pointer to string. + Returns: + Pointer to string. */ char* png_error_string(int error); /* - Function: png_get_data + Function: png_get_data - This function decodes the opened png file and stores the result in data. data should be big enough to hold the decoded png. Required size will be: + This function decodes the opened png file and stores the result in data. data should be big enough to hold the decoded png. Required size will be: - > width*height*(bytes per pixel) + > width*height*(bytes per pixel) - Parameters: - data - Where to store result. + Parameters: + data - Where to store result. - Returns: - PNG_NO_ERROR on success, otherwise an error code. + Returns: + PNG_NO_ERROR on success, otherwise an error code. */ int png_get_data(png_t* png, unsigned char* data); @@ -224,15 +224,15 @@ int png_set_data(png_t* png, unsigned width, unsigned height, char depth, int color, unsigned char* data); /* - Function: png_close_file + Function: png_close_file - Closes an open png file pointer. Should only be used when the png has been opened with png_open_file. + Closes an open png file pointer. Should only be used when the png has been opened with png_open_file. - Parameters: - png - png to close. + Parameters: + png - png to close. - Returns: - PNG_NO_ERROR + Returns: + PNG_NO_ERROR */ int png_close_file(png_t* png); diff -Nru lebiniou-3.31/src/point2d.h lebiniou-3.40/src/point2d.h --- lebiniou-3.31/src/point2d.h 2019-02-02 00:30:11.000000000 +0000 +++ lebiniou-3.40/src/point2d.h 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * diff -Nru lebiniou-3.31/src/point3d.h lebiniou-3.40/src/point3d.h --- lebiniou-3.31/src/point3d.h 2019-04-05 20:39:16.000000000 +0000 +++ lebiniou-3.40/src/point3d.h 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * diff -Nru lebiniou-3.31/src/rgba.h lebiniou-3.40/src/rgba.h --- lebiniou-3.31/src/rgba.h 2019-02-02 00:30:11.000000000 +0000 +++ lebiniou-3.40/src/rgba.h 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * diff -Nru lebiniou-3.31/src/schemes.c lebiniou-3.40/src/schemes.c --- lebiniou-3.31/src/schemes.c 2019-04-05 20:39:16.000000000 +0000 +++ lebiniou-3.40/src/schemes.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * diff -Nru lebiniou-3.31/src/schemes.h lebiniou-3.40/src/schemes.h --- lebiniou-3.31/src/schemes.h 2019-02-02 00:30:11.000000000 +0000 +++ lebiniou-3.40/src/schemes.h 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * diff -Nru lebiniou-3.31/src/schemes_random.c lebiniou-3.40/src/schemes_random.c --- lebiniou-3.31/src/schemes_random.c 2019-04-05 20:39:16.000000000 +0000 +++ lebiniou-3.40/src/schemes_random.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -57,7 +57,7 @@ /* check if we should insert a lens or a normal plugin */ if (drand48() <= schemes->schemes[random][i].p) { const int not_lens = ((short)schemes->schemes[random][i].type < 0) ? 1 : 0; - const int res = Context_add_rand(new, (enum PluginOptions)(schemes->schemes[random][i].type), not_lens); + const int res = Context_add_rand(new, (enum PluginOptions)(schemes->schemes[random][i].type), not_lens, ctx->locked); /* if ((res == -1) && (schemes->schemes[random][i].p == 1.0)) { */ /* this is the correct way to check with floats: */ diff -Nru lebiniou-3.31/src/screenshot.c lebiniou-3.40/src/screenshot.c --- lebiniou-3.31/src/screenshot.c 2019-04-05 20:39:16.000000000 +0000 +++ lebiniou-3.40/src/screenshot.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * diff -Nru lebiniou-3.31/src/sequence.c lebiniou-3.40/src/sequence.c --- lebiniou-3.31/src/sequence.c 2019-04-05 20:39:16.000000000 +0000 +++ lebiniou-3.40/src/sequence.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -258,9 +258,11 @@ { Layer_t *layer = Layer_new(p); + assert(p != NULL); /* set layer mode */ if (p->mode != NULL) { - layer->mode = (enum LayerMode)*p->mode; + assert(*(p->mode) < NB_LAYER_MODES); + layer->mode = (enum LayerMode)*(p->mode); } /* insert plugin in sequence */ diff -Nru lebiniou-3.31/src/sequence.h lebiniou-3.40/src/sequence.h --- lebiniou-3.31/src/sequence.h 2019-02-02 00:30:11.000000000 +0000 +++ lebiniou-3.40/src/sequence.h 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -62,4 +62,6 @@ uint8_t Sequence_size(const Sequence_t *); +json_t *Sequence_to_json(const Sequence_t *, const uint8_t); + #endif /* __BINIOU_SEQUENCE_H */ diff -Nru lebiniou-3.31/src/sequence_load.c lebiniou-3.40/src/sequence_load.c --- lebiniou-3.31/src/sequence_load.c 2019-04-05 20:39:16.000000000 +0000 +++ lebiniou-3.40/src/sequence_load.c 2020-01-23 13:56:18.000000000 +0000 @@ -1,5 +1,6 @@ /* * Copyright 1994-2019 Olivier Girondel + * Copyright 2019 Laurent Marsac * * This file is part of lebiniou. * @@ -22,6 +23,187 @@ #include "images.h" #include "colormaps.h" +#define SEQ_VERSION_MIN 0 +#define SEQ_VERSION_MAX 0 + +Sequence_t * +Sequence_load_json(const char *file) +{ + if (file == NULL) { + xerror("Attempt to load a sequence with a NULL filename\n"); + } + + char *dot = strrchr(file, '.'); + if ((dot == NULL) || strcasecmp(dot, ".json")) { +#ifdef DEBUG + VERBOSE(printf("[!] Not a sequence filename: '%s'\n", file)); +#endif + return NULL; + } + +#ifdef DEBUG + VERBOSE(printf("[i] Loading sequence from file '%s'\n", file)); +#endif + + gchar *file_with_path = g_strdup_printf("%s/%s", Sequences_get_dir(), file); + json_t *parsed_json = json_load_file(file_with_path, 0, NULL); + g_free(file_with_path); + + if (NULL == parsed_json) { + VERBOSE(printf("[!] Failed to parse JSON from '%s'\n", file)); + return NULL; + } + + Sequence_t *s = NULL; + json_t *j_plugins; + + json_t *j_sequence_version = json_object_get(parsed_json, "version"); + assert(NULL != j_sequence_version); + int sequence_version = json_integer_value(j_sequence_version); + if ((sequence_version < SEQ_VERSION_MIN) || (sequence_version > SEQ_VERSION_MAX)) { + VERBOSE(printf("[!] Sequence version '%d' not supported\n", sequence_version)); + goto error; + } + + json_t *j_id = json_object_get(parsed_json, "id"); + assert(NULL != j_id); + s = Sequence_new(json_integer_value(j_id)); + *dot = '\0'; + s->name = strdup(file); + + /* get auto_colormaps */ + json_t *j_auto_colormaps = json_object_get(parsed_json, "auto_colormaps"); + if (NULL != j_auto_colormaps) { + s->auto_colormaps = json_is_boolean(j_auto_colormaps) ? + json_boolean_value(j_auto_colormaps) : json_integer_value(j_auto_colormaps); + } else { + s->auto_colormaps = 0; + goto bare_sequence; + } + assert((s->auto_colormaps == 0) || (s->auto_colormaps == 1)); +#ifdef DEBUG + printf("[i] Random colormaps: %s\n", (s->auto_colormaps ? "on" : "off")); +#endif + + /* if not auto*, get colormap name */ + if (!s->auto_colormaps) { + json_t *j_cmap = json_object_get(parsed_json, "colormap"); + assert(NULL != j_cmap); + const char *cmap = json_string_value(j_cmap); +#ifdef DEBUG + printf("[i] Need colormap: '%s'\n", cmap); +#endif + s->cmap_id = Colormaps_find(cmap); + // xfree(cmap); + } else { + s->cmap_id = Colormaps_random_id(); + } + + /* get auto_images */ + json_t *j_auto_images = json_object_get(parsed_json, "auto_images"); + if (NULL != j_auto_images) { + s->auto_images = json_is_boolean(j_auto_images) ? + json_boolean_value(j_auto_images) : json_integer_value(j_auto_colormaps);; + } else { + s->auto_images = 0; + } + assert((s->auto_images == 0) || (s->auto_images == 1)); +#ifdef DEBUG + printf("[i] Random images: %s\n", (s->auto_images ? "on" : "off")); +#endif + + /* if not auto*, get image name */ + if (!s->auto_images) { + json_t *j_image = json_object_get(parsed_json, "image"); + assert(NULL != j_image); + const char *image = json_string_value(j_image); +#ifdef DEBUG + printf("[i] Need image: '%s'\n", image); +#endif + if (images == NULL) { + VERBOSE(printf("[!] No images are loaded, won't find '%s'\n", image)); + goto error; + } else { + s->image_id = Images_find(image); + if (s->image_id == 0) { + VERBOSE(printf("[!] Image '%s' not found, using default\n", image)); + } + } + } else { + if (images == NULL) { + s->broken = 1; + s->image_id = -1; + s->auto_images = 0; + } else { + s->image_id = Images_random_id(); + } + } + +bare_sequence: + + /* get plugins */ + j_plugins = json_object_get(parsed_json, "plugins"); + assert(NULL != j_plugins); + unsigned n_plugins = json_array_size(j_plugins); + + for (u_short n = 0; n < n_plugins; n++) { + json_t *j_p = json_array_get(j_plugins, n); + + json_t *j_p_id = json_object_get(j_p, "id"); + assert(NULL != j_p_id); + int id = json_integer_value(j_p_id); + if (!id) { + goto error; + } + + json_t *j_p_version = json_object_get(j_p, "version"); + assert(NULL != j_p_version); + uint32_t version = json_integer_value(j_p_version); + + Plugin_t *p = Plugins_find((u_long)id); + if (p == NULL) { + goto error; + } + + if (p->version != version) { + if (p->check_version != NULL && p->check_version(version) == 0) { + VERBOSE(printf("[!] Plugin %s version is %d but trying to load from incompatible version %d\n", + p->name, p->version, version)); + goto error; + } + } + + json_t *j_p_mode = json_object_get(j_p, "mode"); + assert(NULL != j_p_mode); + const char *mode_str = json_string_value(j_p_mode); + + Layer_t *layer = Layer_new(p); + layer->mode = LayerMode_from_string(mode_str); + + json_t *j_p_lens = json_object_get(j_p, "lens"); + assert(NULL != j_p_lens); + if (json_is_boolean(j_p_lens) && (json_is_true(j_p_lens))) { + s->lens = p; + } + if (json_is_integer(j_p_lens) && (json_integer_value(j_p_lens))) { + s->lens = p; + } + + layer->plugin_parameters = json_deep_copy(json_object_get(j_p, "parameters")); + + s->layers = g_list_append(s->layers, (gpointer)layer); + } + + json_decref(parsed_json); + return s; + +error: + VERBOSE(printf("[!] Failed to load sequence from file '%s'\n", file)); + Sequence_delete(s); + json_decref(parsed_json); + + return NULL; +} /* * Left as an exercise to the reader: this code is not robust at all @@ -29,15 +211,13 @@ * But we are talibans and are not kind with wrong inputs. */ Sequence_t * -Sequence_load(const char *file) +Sequence_load_xml(const char *file) { Sequence_t *s = NULL; xmlDocPtr doc = NULL; /* XmlTree */ xmlNodePtr sequence_node = NULL, sequence_node_save = NULL, plugins_node = NULL; int res; long tmp; - char *dot = NULL; - gchar *blah = NULL; xmlChar *youhou; int legacy = 0; @@ -45,7 +225,7 @@ xerror("Attempt to load a sequence with a NULL filename\n"); } - dot = strrchr(file, '.'); + char *dot = strrchr(file, '.'); if ((dot == NULL) || strcasecmp(dot, ".xml")) { #ifdef DEBUG printf("[!] Not a sequence filename: '%s'\n", file); @@ -64,7 +244,7 @@ /* * build an XML tree from the file */ - blah = g_strdup_printf("%s/%s", Sequences_get_dir(), file); + gchar *blah = g_strdup_printf("%s/%s", Sequences_get_dir(), file); doc = xmlParseFile(blah); g_free(blah); @@ -85,7 +265,7 @@ } youhou = xmlGetProp(sequence_node, (const xmlChar *)"id"); - tmp = getintfield(youhou); + tmp = getintfield(youhou); xmlFree(youhou); if (tmp <= 0) { @@ -169,8 +349,8 @@ } } else { if (images == NULL) { - s->broken = 1; - s->image_id = -1; + s->broken = 1; + s->image_id = -1; s->auto_images = 0; } else { s->image_id = Images_random_id(); @@ -191,7 +371,7 @@ } while (plugins_node != NULL) { - u_char lens; + u_char lens; Layer_t *layer; Plugin_t *p; @@ -199,7 +379,7 @@ lens = !xmlStrcmp(plugins_node->name, (const xmlChar *)"lens"); youhou = xmlGetProp(plugins_node, (const xmlChar *)"id"); - tmp = getintfield(youhou); + tmp = getintfield(youhou); xmlFree(youhou); if (!tmp) { goto error; @@ -210,25 +390,23 @@ goto error; } - if (!(*p->options & BEQ_DISABLED)) { - enum LayerMode mode; + enum LayerMode mode; - layer = Layer_new(p); + layer = Layer_new(p); - youhou = xmlGetProp(plugins_node, (const xmlChar *)"mode"); - if (youhou != NULL) { - mode = LayerMode_from_string((const char *)youhou); - xmlFree(youhou); - } else { - mode = NORMAL; - } - layer->mode = mode; + youhou = xmlGetProp(plugins_node, (const xmlChar *)"mode"); + if (youhou != NULL) { + mode = LayerMode_from_string((const char *)youhou); + xmlFree(youhou); + } else { + mode = NORMAL; + } + layer->mode = mode; - s->layers = g_list_append(s->layers, (gpointer)layer); + s->layers = g_list_append(s->layers, (gpointer)layer); - if (lens) { - s->lens = (Plugin_t *)p; - } + if (lens) { + s->lens = (Plugin_t *)p; } plugins_node = plugins_node->next; @@ -257,3 +435,20 @@ return NULL; } + +Sequence_t * +Sequence_load(const char *filename) +{ + char *dot = strrchr(filename, '.'); + if (dot != NULL) { + if (strncasecmp(dot, ".json", 5 * sizeof(char)) == 0) { + return Sequence_load_json(filename); + } + + if (strncasecmp(dot, ".xml", 4 * sizeof(char)) == 0) { + return Sequence_load_xml(filename); + } + } + + return NULL; +} diff -Nru lebiniou-3.31/src/sequencemanager.c lebiniou-3.40/src/sequencemanager.c --- lebiniou-3.31/src/sequencemanager.c 2019-04-05 20:39:16.000000000 +0000 +++ lebiniou-3.40/src/sequencemanager.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * diff -Nru lebiniou-3.31/src/sequencemanager_event.c lebiniou-3.40/src/sequencemanager_event.c --- lebiniou-3.31/src/sequencemanager_event.c 2019-04-05 20:39:16.000000000 +0000 +++ lebiniou-3.40/src/sequencemanager_event.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -20,99 +20,156 @@ #include "globals.h" #include "sequencemanager.h" +void +plugins_parameters_change(SequenceManager_t *sm, const char *delta, const float factor) +{ + json_t *params = plugin_parameter_change_selected(delta, factor); + const GList *ptr = Sequence_find(sm->cur, plugins->selected); + if (ptr != NULL) { + Layer_t *layer = (Layer_t *)ptr->data; + json_decref(layer->plugin_parameters); + layer->plugin_parameters = params; + } else { + json_decref(params); + } +} + int SequenceManager_event(SequenceManager_t *sm, const Event_t *e, const char auto_colormaps, const char auto_images) { switch (e->cmd) { - case BC_SWITCH: - if (e->arg0 == BA_LENS) { - SequenceManager_toggle_lens(sm->cur); - return 1; - } - break; - - case BC_MOVE: - if (e->arg0 == BA_UP) { - SequenceManager_move_selected_front(sm->cur); - return 1; - } else if (e->arg0 == BA_DOWN) { - SequenceManager_move_selected_back(sm->cur); - return 1; - } else { - return 0; - } - break; - - case BC_PREV: - if (e->arg0 == BA_LAYER_MODE) { - SequenceManager_prev_layer_mode(sm->cur); - } else { - SequenceManager_select_previous_plugin(sm->cur); - } - return 1; - break; - - case BC_NEXT: - if (e->arg0 == BA_LAYER_MODE) { - SequenceManager_next_layer_mode(sm->cur); - } else { - SequenceManager_select_next_plugin(sm->cur); - } - return 1; - break; - - case BC_RESET: - if (e->arg0 == BA_LAYER_MODE) { - SequenceManager_default_layer_mode(sm->cur); - return 1; - } else if (e->arg0 == BA_SEQUENCE) { - Sequence_clear(sm->cur, 0); - return 1; - } else { - return 0; - } - break; + case BC_SWITCH: + if (e->arg0 == BA_LENS) { + SequenceManager_toggle_lens(sm->cur); + return 1; + } + break; + + case BC_MOVE: + if (e->arg0 == BA_UP) { + SequenceManager_move_selected_front(sm->cur); + return 1; + } else if (e->arg0 == BA_DOWN) { + SequenceManager_move_selected_back(sm->cur); + return 1; + } else { + return 0; + } + break; + + case BC_PREV: + if (e->arg0 == BA_LAYER_MODE) { + SequenceManager_prev_layer_mode(sm->cur); + } else { + SequenceManager_select_previous_plugin(sm->cur); + } + return 1; + break; + + case BC_NEXT: + if (e->arg0 == BA_LAYER_MODE) { + SequenceManager_next_layer_mode(sm->cur); + } else { + SequenceManager_select_next_plugin(sm->cur); + } + return 1; + break; + + case BC_PARAM_PREV: + if (plugins->selected->parameters != NULL) { + json_t *j_params = plugins->selected->parameters(NULL); + uint8_t nb_params = plugin_parameter_number(j_params); + json_decref(j_params); + + /* authorised underlow */ + plugins->selected->selected_param = MIN((uint8_t)(plugins->selected->selected_param-1), nb_params-1); + } + return 1; + break; + + case BC_PARAM_NEXT: + if (plugins->selected->parameters != NULL) { + json_t *j_params = plugins->selected->parameters(NULL); + uint8_t nb_params = plugin_parameter_number(j_params); + json_decref(j_params); + + plugins->selected->selected_param = (plugins->selected->selected_param + 1) % nb_params; + } + return 1; + break; + + case BC_PARAM_DEC: + plugins_parameters_change(sm, "dec", 1); + return 1; + break; + + case BC_PARAM_INC: + plugins_parameters_change(sm, "inc", 1); + return 1; + break; + + case BC_PARAM_DEC_FAST: + plugins_parameters_change(sm, "dec", 10); + return 1; + break; + + case BC_PARAM_INC_FAST: + plugins_parameters_change(sm, "inc", 10); + return 1; + break; + + case BC_RESET: + if (e->arg0 == BA_LAYER_MODE) { + SequenceManager_default_layer_mode(sm->cur); + return 1; + } else if (e->arg0 == BA_SEQUENCE) { + Sequence_clear(sm->cur, 0); + return 1; + } else { + return 0; + } + break; - case BC_SAVE: - if (e->arg0 == BA_SEQUENCE_FULL) { + case BC_SAVE: + if (e->arg0 == BA_SEQUENCE_FULL) { #ifdef DEBUG - printf("[i] Save full sequence\n"); + printf("[i] Save full sequence\n"); #endif - Sequence_save(sm->cur, 0, SequenceManager_is_transient(sm, sm->cur), - TRUE, auto_colormaps, auto_images); - sm->curseq = sequences->seqs; - Shuffler_grow_one_left(sequences->shuffler); - return 1; - } else if (e->arg0 == BA_OVERWRITE_FULL) { + Sequence_save(sm->cur, 0, SequenceManager_is_transient(sm, sm->cur), + TRUE, auto_colormaps, auto_images); + sm->curseq = sequences->seqs; + Shuffler_grow_one_left(sequences->shuffler); + return 1; + } else if (e->arg0 == BA_OVERWRITE_FULL) { #ifdef DEBUG - printf("[i] Update full sequence\n"); + printf("[i] Update full sequence\n"); #endif - Sequence_save(sm->cur, 1, SequenceManager_is_transient(sm, sm->cur), - TRUE, auto_colormaps, auto_images); - return 1; - } else if (e->arg0 == BA_SEQUENCE_BARE) { + Sequence_save(sm->cur, 1, SequenceManager_is_transient(sm, sm->cur), + TRUE, auto_colormaps, auto_images); + return 1; + } else if (e->arg0 == BA_SEQUENCE_BARE) { #ifdef DEBUG - printf("[i] Save bare sequence\n"); + printf("[i] Save bare sequence\n"); #endif - Sequence_save(sm->cur, 0, SequenceManager_is_transient(sm, sm->cur), - FALSE, auto_colormaps, auto_images); - sm->curseq = sequences->seqs; - Shuffler_grow_one_left(sequences->shuffler); - return 1; - } else if (e->arg0 == BA_OVERWRITE_BARE) { + Sequence_save(sm->cur, 0, SequenceManager_is_transient(sm, sm->cur), + FALSE, auto_colormaps, auto_images); + sm->curseq = sequences->seqs; + Shuffler_grow_one_left(sequences->shuffler); + return 1; + } else if (e->arg0 == BA_OVERWRITE_BARE) { #ifdef DEBUG - printf("[i] Update bare sequence\n"); + printf("[i] Update bare sequence\n"); #endif - Sequence_save(sm->cur, 1, SequenceManager_is_transient(sm, sm->cur), - FALSE, auto_colormaps, auto_images); - return 1; - } - break; + Sequence_save(sm->cur, 1, SequenceManager_is_transient(sm, sm->cur), + FALSE, auto_colormaps, auto_images); + return 1; + } + break; - default: - break; + default: + break; } return 0; diff -Nru lebiniou-3.31/src/sequencemanager.h lebiniou-3.40/src/sequencemanager.h --- lebiniou-3.31/src/sequencemanager.h 2019-02-02 00:30:12.000000000 +0000 +++ lebiniou-3.40/src/sequencemanager.h 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * diff -Nru lebiniou-3.31/src/sequence_save.c lebiniou-3.40/src/sequence_save.c --- lebiniou-3.31/src/sequence_save.c 2019-04-05 20:39:16.000000000 +0000 +++ lebiniou-3.40/src/sequence_save.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -19,73 +19,68 @@ #include #include "globals.h" -#include "xmlutils.h" #include "sequence.h" #include "images.h" #include "colormaps.h" +#define SEQUENCE_VERSION 0 -static void -Sequence_write(const Sequence_t *s, const char *filename, - const uint8_t full) + +json_t * +Sequence_to_json(const Sequence_t *s, const uint8_t full) { - xmlDoc *doc; - GList *layers; - xmlNode *node, *plugins_node; - - /* FIXME check return code of xml* functions */ - doc = xmlNewDoc((const xmlChar *)"1.0"); - node = doc->children = xmlNewDocNode(doc, NULL, (const xmlChar *)"sequence", NULL); - xml_set_id(node, s->id); + json_t *sequence_j = json_object(); + json_object_set_new(sequence_j, "version", json_integer(SEQUENCE_VERSION)); + json_object_set_new(sequence_j, "id", json_integer(s->id)); if (full) { - /* here auto_colormaps and auto_images are 0 or 1, not -1 */ - xmlNewChild(node, NULL, (const xmlChar *)"auto_colormaps", - (const xmlChar *)((s->auto_colormaps) ? "1" : "0")); + json_object_set_new(sequence_j, "auto_colormaps", json_boolean(s->auto_colormaps)); if (!s->auto_colormaps) { - xmlNewTextChild(node, NULL, (const xmlChar *)"colormap", (const xmlChar *)Colormaps_name(s->cmap_id)); + json_object_set_new(sequence_j, "colormap", json_string(Colormaps_name(s->cmap_id))); } - xmlNewChild(node, NULL, (const xmlChar *)"auto_images", - (const xmlChar *)((s->auto_images) ? "1" : "0")); + json_object_set_new(sequence_j, "auto_images", json_boolean(s->auto_images)); if (!s->auto_images) { - xmlNewTextChild(node, NULL, (const xmlChar *)"image", (const xmlChar *)Images_name(s->image_id)); + json_object_set_new(sequence_j, "image", json_string(Images_name(s->image_id))); } } - /* create block */ - plugins_node = xmlNewChild(node, NULL, (const xmlChar *)"plugins", NULL); + json_t *plugins_j = json_array(); /* iterate over plugins list */ - for (layers = g_list_first(s->layers); layers != NULL; layers = g_list_next(layers)) { + for (GList *layers = g_list_first(s->layers); layers != NULL; layers = g_list_next(layers)) { Layer_t *layer = (Layer_t *)layers->data; Plugin_t *p = layer->plugin; - xmlNode *nd; - const char *tmp; - /* decide whether block is or */ - if ((s->lens != NULL) && (p == s->lens)) { - tmp = "lens"; - } else { - tmp = "plugin"; + json_t *j_plugin = json_object(); + json_object_set_new(j_plugin, "lens", json_boolean((s->lens != NULL) && (p == s->lens))); + json_object_set_new(j_plugin, "name", json_string(p->name)); + json_object_set_new(j_plugin, "id", json_integer(p->id)); + json_object_set_new(j_plugin, "version", json_integer(p->version)); + json_object_set_new(j_plugin, "mode", json_string(LayerMode_to_string(layer->mode))); + + if (NULL != p->parameters) { + json_t *j_params = (json_t *)p->parameters(NULL); + json_object_set_new(j_plugin, "parameters", plugin_parameters_to_saved_parameters(j_params)); + json_decref(j_params); } - nd = xmlNewChild(plugins_node, NULL, (const xmlChar *)tmp, NULL); + json_array_append_new(plugins_j, j_plugin); + } - /* we store the name, but only for informational purposes */ - xmlSetProp(nd, (const xmlChar *)"name", (const xmlChar *)p->name); + json_object_set_new(sequence_j, "plugins", plugins_j); - /* store id */ - xml_set_id(nd, p->id); + return sequence_j; +} - /* store layer mode */ - tmp = LayerMode_to_string(layer->mode); - xmlSetProp(nd, (const xmlChar *)"mode", (const xmlChar *)tmp); - } - xmlKeepBlanksDefault(0); - xmlSaveFormatFile(filename, doc, 1); - xmlFreeDoc(doc); +static int +Sequence_write_json(const Sequence_t *s, const char *filename, const uint8_t full) +{ + json_t *sequence_j = Sequence_to_json(s, full); + int ret = json_dump_file(sequence_j, filename, JSON_INDENT(4)); + json_decref(sequence_j); + return ret; } @@ -93,7 +88,6 @@ Sequence_save(Sequence_t *s, int overwrite, const int is_transient, const uint8_t bare, const char auto_colormaps, const char auto_images) { - char *filename = NULL; Sequence_t *store = NULL; if (g_list_length(s->layers) == 0) { @@ -115,24 +109,15 @@ s->id = unix_timestamp(); } - if (s->name != NULL) { - xfree(s->name); + if (s->name == NULL) { + s->name = g_strdup_printf("%" PRIu32, s->id); } - s->name = g_strdup_printf("%"PRIu32, s->id); - printf("[s] Saving sequence %"PRIu32"\n", s->id); + printf("[s] Saving sequence %" PRIu32 "\n", s->id); const gchar *blah = Sequences_get_dir(); rmkdir(blah); // g_free(blah); - if (overwrite) { - filename = g_strdup_printf("%s/%s.xml", blah, s->name); - } else { - filename = g_strdup_printf("%s/%"PRIu32".xml", blah, s->id); - } - - printf("[s] Filename: %s\n", filename); - /* set auto_colormaps from context if needed */ if (s->auto_colormaps == -1) { s->auto_colormaps = auto_colormaps; @@ -142,9 +127,29 @@ s->auto_images = auto_images; } - Sequence_write(s, filename, bare); + char *filename_json = NULL; + char *filename_xml = NULL; + if (overwrite) { + filename_json = g_strdup_printf("%s/%s.json", blah, s->name); + filename_xml = g_strdup_printf("%s/%s.xml", blah, s->name); + } else { + filename_json = g_strdup_printf("%s/%" PRIu32 ".json", blah, s->id); + } + + printf("[s] Filename: %s\n", filename_json); - g_free(filename); + if (Sequence_write_json(s, filename_json, bare) == 0 && overwrite) { + /* Erase old XML sequence */ + FILE *fp = fopen(filename_xml, "r"); + if (fp != NULL) { + fclose(fp); + if (remove(filename_xml) == 0) { + printf("[s] Removed old XML sequence %s\n", filename_xml); + } + } + } + g_free(filename_json); + g_free(filename_xml); s->changed = 0; diff -Nru lebiniou-3.31/src/sequences.c lebiniou-3.40/src/sequences.c --- lebiniou-3.31/src/sequences.c 2019-04-05 20:39:16.000000000 +0000 +++ lebiniou-3.40/src/sequences.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * diff -Nru lebiniou-3.31/src/sequences.h lebiniou-3.40/src/sequences.h --- lebiniou-3.31/src/sequences.h 2019-02-02 00:30:12.000000000 +0000 +++ lebiniou-3.40/src/sequences.h 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * diff -Nru lebiniou-3.31/src/shuffler.c lebiniou-3.40/src/shuffler.c --- lebiniou-3.31/src/shuffler.c 2019-04-05 20:39:16.000000000 +0000 +++ lebiniou-3.40/src/shuffler.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -181,26 +181,26 @@ } switch (s->mode) { - case BS_NONE: - VERBOSE(printf("[!] WARNING tried to get a value from a shuffler in BS_NONE mode\n")); - new = 0; - break; - - case BS_SHUFFLE: - new = Shuffler_get_shuffle(s); - break; - - case BS_CYCLE: - new = Shuffler_get_cycle(s); - break; - - case BS_RANDOM: - new = Shuffler_get_random(s); - break; - - default: - xerror("Bad shuffler mode %d\n", s->mode); - break; + case BS_NONE: + VERBOSE(printf("[!] WARNING tried to get a value from a shuffler in BS_NONE mode\n")); + new = 0; + break; + + case BS_SHUFFLE: + new = Shuffler_get_shuffle(s); + break; + + case BS_CYCLE: + new = Shuffler_get_cycle(s); + break; + + case BS_RANDOM: + new = Shuffler_get_random(s); + break; + + default: + xerror("Bad shuffler mode %d\n", s->mode); + break; } if (s->verbose) { diff -Nru lebiniou-3.31/src/shuffler.h lebiniou-3.40/src/shuffler.h --- lebiniou-3.31/src/shuffler.h 2019-02-02 00:30:12.000000000 +0000 +++ lebiniou-3.40/src/shuffler.h 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * diff -Nru lebiniou-3.31/src/signals.c lebiniou-3.40/src/signals.c --- lebiniou-3.31/src/signals.c 2019-04-05 20:39:16.000000000 +0000 +++ lebiniou-3.40/src/signals.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -27,18 +27,18 @@ printf("\n[+] Got signal %d !\n", sig); switch (sig) { - case SIGTERM: - case SIGHUP: - case SIGINT: - exit(1); - if (!biniou_stop()) { - exit(0); - } - break; - - default: - printf("\n[!] Unhandled signal %d\n", sig); - break; + case SIGTERM: + case SIGHUP: + case SIGINT: + exit(1); + if (!biniou_stop()) { + exit(0); + } + break; + + default: + printf("\n[!] Unhandled signal %d\n", sig); + break; } } diff -Nru lebiniou-3.31/src/spline.c lebiniou-3.40/src/spline.c --- lebiniou-3.31/src/spline.c 2019-04-05 20:39:16.000000000 +0000 +++ lebiniou-3.40/src/spline.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * diff -Nru lebiniou-3.31/src/spline.h lebiniou-3.40/src/spline.h --- lebiniou-3.31/src/spline.h 2019-04-05 20:39:16.000000000 +0000 +++ lebiniou-3.40/src/spline.h 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * diff -Nru lebiniou-3.31/src/translation.c lebiniou-3.40/src/translation.c --- lebiniou-3.31/src/translation.c 2019-04-05 20:39:16.000000000 +0000 +++ lebiniou-3.40/src/translation.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -41,7 +41,7 @@ Translation_t * -Translation_new(Map_t(*f)(const u_short, const u_short), void (*init)()) +Translation_new(Map_t (*f)(const short, const short), void (*init)()) { Translation_t *t = NULL; @@ -75,14 +75,11 @@ M_wPoint_t *p = t->point; u_short i, j; - /* printf("Translation_idle\n"); */ - for (j = 0; j < HEIGHT; j++) for (i = 0; i < WIDTH; i++) { set_pixel_nc(dst, i, j, - get_pixel_nc(src, - (u_short)p[j*WIDTH+i].x, - (u_short)p[j*WIDTH+i].y)); + get_pixel_nc(src, (u_short)p[j * WIDTH + i].x, + (u_short)p[j * WIDTH + i].y)); } } @@ -95,20 +92,23 @@ M_wPoint_t *p = t->point; u_short i, j; - /* printf("Translation_fade\n"); */ - for (j = 0; j < HEIGHT; j++) for (i = 0; i < WIDTH; i++) { - p[j*WIDTH+i].x += p[j*WIDTH+i].dx; - p[j*WIDTH+i].y += p[j*WIDTH+i].dy; - /* FIXME using get_pixel_nc here causes a segfault when compiled - with --disable-sanity-checks */ + p[j * WIDTH + i].x += p[j * WIDTH + i].dx; + p[j * WIDTH + i].y += p[j * WIDTH + i].dy; + set_pixel_nc(dst, i, j, get_pixel_nc(src, - (u_short)p[j*WIDTH+i].x, - (u_short)p[j*WIDTH+i].y)); + (u_short)(p[j * WIDTH + i].x + WIDTH ) % WIDTH, + (u_short)(p[j * WIDTH + i].y + HEIGHT) % HEIGHT)); } - --t->fading; + /* save coordinages cropped to screen size */ + if (--t->fading == 0) + for (j = 0; j < HEIGHT; j++) + for (i = 0; i < WIDTH; i++) { + p[j * WIDTH + i].x = (u_short)(p[j * WIDTH + i].x + WIDTH) % WIDTH; + p[j * WIDTH + i].y = (u_short)(p[j * WIDTH + i].y + HEIGHT) % HEIGHT; + } } @@ -164,13 +164,12 @@ u_char Translation_batch_line(Translation_t *t) { - u_short i; M_wPoint_t *wp = &t->point[t->line * WIDTH]; - for (i = 0; i < WIDTH; i++) { + for (u_short i = 0; i < WIDTH; i++) { Map_t m = t->f(wp->x, wp->y); - wp->dx = (float)((float)m.map_x - (float)wp->x) / FADE_STEPS; - wp->dy = (float)((float)m.map_y - (float)wp->y) / FADE_STEPS; + wp->dx = (float)((float)m.map_x - (float)wp->x) / FADE_STEPS; + wp->dy = (float)((float)m.map_y - (float)wp->y) / FADE_STEPS; wp++; } diff -Nru lebiniou-3.31/src/translation.h lebiniou-3.40/src/translation.h --- lebiniou-3.31/src/translation.h 2019-02-02 00:30:12.000000000 +0000 +++ lebiniou-3.40/src/translation.h 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -33,7 +33,7 @@ /* -- Map -- */ typedef struct Map_s { - u_short map_x, map_y; + short map_x, map_y; } Map_t; @@ -46,7 +46,7 @@ /* -- Translation -- */ typedef struct Translation_s { - Map_t (*f)(const u_short, const u_short); + Map_t (*f)(const short, const short); M_wPoint_t *point; int line; u_char fading; @@ -54,7 +54,7 @@ } Translation_t; -Translation_t *Translation_new(Map_t (*)(const u_short, const u_short), void (*)()); +Translation_t *Translation_new(Map_t (*)(const short, const short), void (*)()); void Translation_delete(Translation_t *); int Translation_run(Translation_t *, const Context_t *); diff -Nru lebiniou-3.31/src/utils.c lebiniou-3.40/src/utils.c --- lebiniou-3.31/src/utils.c 2019-04-05 20:39:16.000000000 +0000 +++ lebiniou-3.40/src/utils.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -95,6 +95,21 @@ } +double +xatof(const char *value) +{ + double f; + + errno = 0; + f = strtod(value, NULL); + if (errno != 0) { + xperror("strtod"); + } + + return f; +} + + long xatol(const char *value) { diff -Nru lebiniou-3.31/src/utils.h lebiniou-3.40/src/utils.h --- lebiniou-3.31/src/utils.h 2019-02-02 00:30:12.000000000 +0000 +++ lebiniou-3.40/src/utils.h 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -50,6 +50,7 @@ #define xfree(ptr) do { free(ptr); ptr = NULL; } while (0) void *xrealloc(void *, size_t); +double xatof(const char *); long xatol(const char *); void rmkdir(const char *); @@ -58,7 +59,7 @@ int parse_two_shorts(const char *, const int, short *, short *); extern u_char libbiniou_verbose; -#define VERBOSE(X) if (libbiniou_verbose) X +#define VERBOSE(X) if (libbiniou_verbose) { X; fflush(stdout); } int check_command(const char *); diff -Nru lebiniou-3.31/src/webcam_controls.c lebiniou-3.40/src/webcam_controls.c --- lebiniou-3.31/src/webcam_controls.c 2019-04-05 20:39:16.000000000 +0000 +++ lebiniou-3.40/src/webcam_controls.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * diff -Nru lebiniou-3.31/src/webcam.h lebiniou-3.40/src/webcam.h --- lebiniou-3.31/src/webcam.h 2019-02-02 00:30:12.000000000 +0000 +++ lebiniou-3.40/src/webcam.h 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * diff -Nru lebiniou-3.31/src/webcam_init_uninit.c lebiniou-3.40/src/webcam_init_uninit.c --- lebiniou-3.31/src/webcam_init_uninit.c 2019-04-05 20:39:16.000000000 +0000 +++ lebiniou-3.40/src/webcam_init_uninit.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -122,19 +122,19 @@ } switch (cam->io) { - case IO_METHOD_READ: - if (!(cap.capabilities & V4L2_CAP_READWRITE)) { - fprintf(stderr, "[!] %s%d does not support read i/o\n", video_base, cam->cam_no); - return -1; - } - break; + case IO_METHOD_READ: + if (!(cap.capabilities & V4L2_CAP_READWRITE)) { + fprintf(stderr, "[!] %s%d does not support read i/o\n", video_base, cam->cam_no); + return -1; + } + break; - case IO_METHOD_MMAP: - if (!(cap.capabilities & V4L2_CAP_STREAMING)) { - fprintf(stderr, "[!] %s%d does not support streaming i/o\n", video_base, cam->cam_no); - return -1; - } - break; + case IO_METHOD_MMAP: + if (!(cap.capabilities & V4L2_CAP_STREAMING)) { + fprintf(stderr, "[!] %s%d does not support streaming i/o\n", video_base, cam->cam_no); + return -1; + } + break; } /* Select video input, video standard and tune here. */ @@ -152,13 +152,13 @@ if (-1 == xioctl(cam->fd, VIDIOC_S_CROP, &crop)) { switch (errno) { - case EINVAL: - /* Cropping not supported. */ - break; - - default: - /* Errors ignored. */ - break; + case EINVAL: + /* Cropping not supported. */ + break; + + default: + /* Errors ignored. */ + break; } } } else { @@ -193,13 +193,13 @@ #endif switch (cam->io) { - case IO_METHOD_READ: - init_read(fmt.fmt.pix.sizeimage, cam); - break; - - case IO_METHOD_MMAP: - init_mmap(cam); - break; + case IO_METHOD_READ: + init_read(fmt.fmt.pix.sizeimage, cam); + break; + + case IO_METHOD_MMAP: + init_mmap(cam); + break; } #ifdef DEBUG printf("[i] Webcam %d initialized\n", cam->cam_no); @@ -215,16 +215,16 @@ int i; switch (cam->io) { - case IO_METHOD_READ: - xfree(cam->buffers[0].start); - break; - - case IO_METHOD_MMAP: - for (i = 0; i < cam->n_buffers; ++i) - if (-1 == munmap(cam->buffers[i].start, cam->buffers[i].length)) { - xperror("munmap"); - } - break; + case IO_METHOD_READ: + xfree(cam->buffers[0].start); + break; + + case IO_METHOD_MMAP: + for (i = 0; i < cam->n_buffers; ++i) + if (-1 == munmap(cam->buffers[i].start, cam->buffers[i].length)) { + xperror("munmap"); + } + break; } xfree(cam->buffers); diff -Nru lebiniou-3.31/src/webcam_loop.c lebiniou-3.40/src/webcam_loop.c --- lebiniou-3.31/src/webcam_loop.c 2019-04-05 20:39:16.000000000 +0000 +++ lebiniou-3.40/src/webcam_loop.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -74,58 +74,58 @@ struct v4l2_buffer buf; switch (cam->io) { - case IO_METHOD_READ: - if (-1 == read(cam->fd, - cam->buffers[0].start, - cam->buffers[0].length)) { - switch (errno) { - case EAGAIN: - return 0; - - case EIO: - /* Could ignore EIO, see spec. */ - - /* fall through */ - - default: - xperror("read"); + case IO_METHOD_READ: + if (-1 == read(cam->fd, + cam->buffers[0].start, + cam->buffers[0].length)) { + switch (errno) { + case EAGAIN: + return 0; + + case EIO: + /* Could ignore EIO, see spec. */ + + /* fall through */ + + default: + xperror("read"); + } } - } - process_image(cam, cam->buffers[0].start); + process_image(cam, cam->buffers[0].start); - break; + break; - case IO_METHOD_MMAP: - CLEAR(buf); + case IO_METHOD_MMAP: + CLEAR(buf); - buf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; - buf.memory = V4L2_MEMORY_MMAP; + buf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; + buf.memory = V4L2_MEMORY_MMAP; - if (-1 == xioctl(cam->fd, VIDIOC_DQBUF, &buf)) { - switch (errno) { - case EAGAIN: - return 0; + if (-1 == xioctl(cam->fd, VIDIOC_DQBUF, &buf)) { + switch (errno) { + case EAGAIN: + return 0; - case EIO: - /* Could ignore EIO, see spec. */ + case EIO: + /* Could ignore EIO, see spec. */ - /* fall through */ + /* fall through */ - default: - xperror("VIDIOC_DQBUF"); + default: + xperror("VIDIOC_DQBUF"); + } } - } - assert((int)buf.index < cam->n_buffers); + assert((int)buf.index < cam->n_buffers); - // printf("index %d, process_image(%d) bytes\n", buf.index, (int)cam->buffers[buf.index].length); - process_image(cam, cam->buffers[buf.index].start); - // printf("process_image done cam #%d\n", cam->cam_no); - if (-1 == xioctl(cam->fd, VIDIOC_QBUF, &buf)) { - xperror("VIDIOC_QBUF"); - } + // printf("index %d, process_image(%d) bytes\n", buf.index, (int)cam->buffers[buf.index].length); + process_image(cam, cam->buffers[buf.index].start); + // printf("process_image done cam #%d\n", cam->cam_no); + if (-1 == xioctl(cam->fd, VIDIOC_QBUF, &buf)) { + xperror("VIDIOC_QBUF"); + } - break; + break; } return 1; diff -Nru lebiniou-3.31/src/webcam_open_close.c lebiniou-3.40/src/webcam_open_close.c --- lebiniou-3.31/src/webcam_open_close.c 2019-04-05 20:39:16.000000000 +0000 +++ lebiniou-3.40/src/webcam_open_close.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * diff -Nru lebiniou-3.31/src/webcam_options.c lebiniou-3.40/src/webcam_options.c --- lebiniou-3.31/src/webcam_options.c 2019-04-05 20:39:16.000000000 +0000 +++ lebiniou-3.40/src/webcam_options.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * diff -Nru lebiniou-3.31/src/webcam_start_stop.c lebiniou-3.40/src/webcam_start_stop.c --- lebiniou-3.31/src/webcam_start_stop.c 2019-04-05 20:39:16.000000000 +0000 +++ lebiniou-3.40/src/webcam_start_stop.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -27,32 +27,32 @@ enum v4l2_buf_type type; switch (cam->io) { - case IO_METHOD_READ: - /* Nothing to do. */ - break; - - case IO_METHOD_MMAP: - for (i = 0; i < cam->n_buffers; ++i) { - struct v4l2_buffer buf; - - CLEAR(buf); - - buf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; - buf.memory = V4L2_MEMORY_MMAP; - buf.index = i; - - if (-1 == xioctl(cam->fd, VIDIOC_QBUF, &buf)) { - xperror("VIDIOC_QBUF"); + case IO_METHOD_READ: + /* Nothing to do. */ + break; + + case IO_METHOD_MMAP: + for (i = 0; i < cam->n_buffers; ++i) { + struct v4l2_buffer buf; + + CLEAR(buf); + + buf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; + buf.memory = V4L2_MEMORY_MMAP; + buf.index = i; + + if (-1 == xioctl(cam->fd, VIDIOC_QBUF, &buf)) { + xperror("VIDIOC_QBUF"); + } } - } - type = V4L2_BUF_TYPE_VIDEO_CAPTURE; + type = V4L2_BUF_TYPE_VIDEO_CAPTURE; - if (-1 == xioctl(cam->fd, VIDIOC_STREAMON, &type)) { - xperror("VIDIOC_STREAMON"); - } + if (-1 == xioctl(cam->fd, VIDIOC_STREAMON, &type)) { + xperror("VIDIOC_STREAMON"); + } - break; + break; } } @@ -63,17 +63,17 @@ enum v4l2_buf_type type; switch (cam->io) { - case IO_METHOD_READ: - /* Nothing to do. */ - break; - - case IO_METHOD_MMAP: - type = V4L2_BUF_TYPE_VIDEO_CAPTURE; - - if (-1 == xioctl(cam->fd, VIDIOC_STREAMOFF, &type)) { - xperror("VIDIOC_STREAMOFF"); - } + case IO_METHOD_READ: + /* Nothing to do. */ + break; + + case IO_METHOD_MMAP: + type = V4L2_BUF_TYPE_VIDEO_CAPTURE; + + if (-1 == xioctl(cam->fd, VIDIOC_STREAMOFF, &type)) { + xperror("VIDIOC_STREAMOFF"); + } - break; + break; } } diff -Nru lebiniou-3.31/src/xmlutils.c lebiniou-3.40/src/xmlutils.c --- lebiniou-3.31/src/xmlutils.c 2019-04-05 20:39:16.000000000 +0000 +++ lebiniou-3.40/src/xmlutils.c 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * diff -Nru lebiniou-3.31/src/xmlutils.h lebiniou-3.40/src/xmlutils.h --- lebiniou-3.31/src/xmlutils.h 2019-02-02 00:30:12.000000000 +0000 +++ lebiniou-3.40/src/xmlutils.h 2020-01-22 18:33:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 1994-2019 Olivier Girondel + * Copyright 1994-2020 Olivier Girondel * * This file is part of lebiniou. * @@ -34,12 +34,12 @@ long getintfield(xmlChar *); int getfloatfield_optional(xmlChar *, float *); -#define xml_set_id(node, id) \ - do { \ - char idstr[20]; \ - idstr[19] = '\0'; \ - g_snprintf(idstr, 19, "%lu", (unsigned long)(id)); \ - xmlSetProp((node), (const xmlChar *)"id", (const xmlChar *)idstr); \ +#define xml_set_id(node, id) \ + do { \ + char idstr[20]; \ + idstr[19] = '\0'; \ + g_snprintf(idstr, 19, "%lu", (unsigned long)(id)); \ + xmlSetProp((node), (const xmlChar *)"id", (const xmlChar *)idstr); \ } while (0) #endif /* __BINIOU_XMLUTILS_H */ diff -Nru lebiniou-3.31/THANKS lebiniou-3.40/THANKS --- lebiniou-3.31/THANKS 2019-01-20 19:59:25.000000000 +0000 +++ lebiniou-3.40/THANKS 2019-12-14 03:24:32.000000000 +0000 @@ -10,3 +10,4 @@ Erwan "r1" Lerale Marco "Lilith 93" Neumaier Tavasti "tavasti" +Laurent "jko" Marsac