diff --git a/compiling.txt b/compiling.txt index 4d09bd5..52225fc 100644 --- a/compiling.txt +++ b/compiling.txt @@ -29,6 +29,7 @@ If you have troubles, or you are in another distro, you can try compiling from t configure gcc g++ + libtiff-dev -> ola2jpg 1. Building pd $./autogen.sh @@ -72,19 +73,21 @@ cd ola2pd $ cd ImageMagick $ ./configure $ make - $ make install - + $ sudo make install + Build Gem and pix2jpg: - Crear enlace /usr/local/lib/libMagick++6-Q16.so apuntando a /usr/local/lib/libMagick++-6.Q16.so.1.0.0 - copiar includes al dir de pix2jpg - $ cd Gem + + Make a simbolic link in /usr/local/lib named libMagick++6-Q16.so pointing to libMagick++6.Q16.so.1.0.0 + or rename this file to that name. + $ cd Gem $ ./autogen.sh - $ ./configure --with-pd=./ --prefix=$HOME/pd-externals - $ make + $ ./configure --with-pd=/path/to/pd/source --prefix=$HOME/pd-externals + comment the line 65 in the Makefile in /plugins/ImageMagick. It fails compiling. + $ make $ make install $ cd .. - $ cp $HOME/pd-externals/* ./pd + $ cp $HOME/pd-externals/* ./../bin 3.3 fileselector @@ -102,7 +105,9 @@ cd ola2pd $ qmake-qt4 libremediaserver.pro -r -spec linux-g++ $ make -w - +5. Putting all together. + + .......... diff --git a/externals/libMagick++-6.Q16.so.1.0.0 b/externals/libMagick++-6.Q16.so.1.0.0 deleted file mode 100755 index 64acb62..0000000 Binary files a/externals/libMagick++-6.Q16.so.1.0.0 and /dev/null differ diff --git a/patches/lms-video.pd b/patches/lms-video.pd index df99732..172685e 100644 --- a/patches/lms-video.pd +++ b/patches/lms-video.pd @@ -1,4 +1,4 @@ -#N canvas 752 106 611 318 10; +#N canvas 576 176 611 318 10; #N canvas 315 169 952 599 dmx 0; #X obj -7 437 list split; #X obj 99 444 list split; diff --git a/src/Gem/autom4te.cache/output.1 b/src/Gem/autom4te.cache/output.1 index b8d97ee..6d055bd 100644 --- a/src/Gem/autom4te.cache/output.1 +++ b/src/Gem/autom4te.cache/output.1 @@ -4082,8 +4082,6 @@ am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' - -# ac_config_files="$ac_config_files Makefile abstractions/Makefile" @@ -4177,8 +4175,13 @@ ac_config_files="$ac_config_files plugins/videoVLC/Makefile" # some of them have their own build system #AC_CONFIG_FILES([extra/Makefile]) # some do not -ac_config_files="$ac_config_files extra/pix2jpg/Makefile" +ac_config_files="$ac_config_files extra/pix_drum/Makefile extra/pix_mano/Makefile" +ac_config_files="$ac_config_files extra/pix_fiducialtrack/Makefile" + +ac_config_files="$ac_config_files extra/pix_hit/Makefile" + +ac_config_files="$ac_config_files extra/pix2jpg/Makefile" # other stuff ac_config_files="$ac_config_files build/Makefile Gem.pc Gem-meta.pd" @@ -31594,6 +31597,10 @@ do "plugins/videoV4L2/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/videoV4L2/Makefile" ;; "plugins/videoVFW/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/videoVFW/Makefile" ;; "plugins/videoVLC/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/videoVLC/Makefile" ;; + "extra/pix_drum/Makefile") CONFIG_FILES="$CONFIG_FILES extra/pix_drum/Makefile" ;; + "extra/pix_mano/Makefile") CONFIG_FILES="$CONFIG_FILES extra/pix_mano/Makefile" ;; + "extra/pix_fiducialtrack/Makefile") CONFIG_FILES="$CONFIG_FILES extra/pix_fiducialtrack/Makefile" ;; + "extra/pix_hit/Makefile") CONFIG_FILES="$CONFIG_FILES extra/pix_hit/Makefile" ;; "extra/pix2jpg/Makefile") CONFIG_FILES="$CONFIG_FILES extra/pix2jpg/Makefile" ;; "build/Makefile") CONFIG_FILES="$CONFIG_FILES build/Makefile" ;; "Gem.pc") CONFIG_FILES="$CONFIG_FILES Gem.pc" ;; diff --git a/src/Gem/autom4te.cache/output.2 b/src/Gem/autom4te.cache/output.2 index b8d97ee..6d055bd 100644 --- a/src/Gem/autom4te.cache/output.2 +++ b/src/Gem/autom4te.cache/output.2 @@ -4082,8 +4082,6 @@ am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' - -# ac_config_files="$ac_config_files Makefile abstractions/Makefile" @@ -4177,8 +4175,13 @@ ac_config_files="$ac_config_files plugins/videoVLC/Makefile" # some of them have their own build system #AC_CONFIG_FILES([extra/Makefile]) # some do not -ac_config_files="$ac_config_files extra/pix2jpg/Makefile" +ac_config_files="$ac_config_files extra/pix_drum/Makefile extra/pix_mano/Makefile" +ac_config_files="$ac_config_files extra/pix_fiducialtrack/Makefile" + +ac_config_files="$ac_config_files extra/pix_hit/Makefile" + +ac_config_files="$ac_config_files extra/pix2jpg/Makefile" # other stuff ac_config_files="$ac_config_files build/Makefile Gem.pc Gem-meta.pd" @@ -31594,6 +31597,10 @@ do "plugins/videoV4L2/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/videoV4L2/Makefile" ;; "plugins/videoVFW/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/videoVFW/Makefile" ;; "plugins/videoVLC/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/videoVLC/Makefile" ;; + "extra/pix_drum/Makefile") CONFIG_FILES="$CONFIG_FILES extra/pix_drum/Makefile" ;; + "extra/pix_mano/Makefile") CONFIG_FILES="$CONFIG_FILES extra/pix_mano/Makefile" ;; + "extra/pix_fiducialtrack/Makefile") CONFIG_FILES="$CONFIG_FILES extra/pix_fiducialtrack/Makefile" ;; + "extra/pix_hit/Makefile") CONFIG_FILES="$CONFIG_FILES extra/pix_hit/Makefile" ;; "extra/pix2jpg/Makefile") CONFIG_FILES="$CONFIG_FILES extra/pix2jpg/Makefile" ;; "build/Makefile") CONFIG_FILES="$CONFIG_FILES build/Makefile" ;; "Gem.pc") CONFIG_FILES="$CONFIG_FILES Gem.pc" ;; diff --git a/src/Gem/autom4te.cache/traces.1 b/src/Gem/autom4te.cache/traces.1 index 643dd4a..1e42259 100644 --- a/src/Gem/autom4te.cache/traces.1 +++ b/src/Gem/autom4te.cache/traces.1 @@ -246,46 +246,49 @@ m4trace:configure.ac:7: -1- m4_pattern_allow([^am__tar$]) m4trace:configure.ac:7: -1- AC_SUBST([am__untar]) m4trace:configure.ac:7: -1- AC_SUBST_TRACE([am__untar]) m4trace:configure.ac:7: -1- m4_pattern_allow([^am__untar$]) -m4trace:configure.ac:11: -1- AC_CONFIG_FILES([Makefile abstractions/Makefile]) -m4trace:configure.ac:14: -1- AC_CONFIG_FILES([help/Makefile doc/Makefile examples/Makefile]) -m4trace:configure.ac:17: -1- AC_CONFIG_FILES([src/Makefile src/Gem/Makefile src/Utils/Makefile]) -m4trace:configure.ac:18: -1- AC_CONFIG_FILES([src/RTE/Makefile src/Base/Makefile src/plugins/Makefile ]) -m4trace:configure.ac:19: -1- AC_CONFIG_FILES([src/Output/Makefile ]) -m4trace:configure.ac:20: -1- AC_CONFIG_FILES([src/deprecated/Makefile ]) -m4trace:configure.ac:23: -1- AC_CONFIG_FILES([plugins/Makefile]) -m4trace:configure.ac:24: -1- AC_CONFIG_FILES([plugins/imageQT/Makefile]) -m4trace:configure.ac:25: -1- AC_CONFIG_FILES([plugins/imageMAGICK/Makefile]) -m4trace:configure.ac:26: -1- AC_CONFIG_FILES([plugins/imageTIFF/Makefile]) -m4trace:configure.ac:27: -1- AC_CONFIG_FILES([plugins/imageJPEG/Makefile]) -m4trace:configure.ac:28: -1- AC_CONFIG_FILES([plugins/imageSGI/Makefile]) -m4trace:configure.ac:30: -1- AC_CONFIG_FILES([plugins/filmAVI/Makefile]) -m4trace:configure.ac:31: -1- AC_CONFIG_FILES([plugins/filmAVIPLAY/Makefile]) -m4trace:configure.ac:32: -1- AC_CONFIG_FILES([plugins/filmDS/Makefile]) -m4trace:configure.ac:33: -1- AC_CONFIG_FILES([plugins/filmDarwin/Makefile]) -m4trace:configure.ac:34: -1- AC_CONFIG_FILES([plugins/filmGMERLIN/Makefile]) -m4trace:configure.ac:35: -1- AC_CONFIG_FILES([plugins/filmMPEG1/Makefile]) -m4trace:configure.ac:36: -1- AC_CONFIG_FILES([plugins/filmMPEG3/Makefile]) -m4trace:configure.ac:37: -1- AC_CONFIG_FILES([plugins/filmQT/Makefile]) -m4trace:configure.ac:38: -1- AC_CONFIG_FILES([plugins/filmQT4L/Makefile]) -m4trace:configure.ac:39: -1- AC_CONFIG_FILES([plugins/filmTEST/Makefile]) -m4trace:configure.ac:41: -1- AC_CONFIG_FILES([plugins/modelOBJ/Makefile]) -m4trace:configure.ac:42: -1- AC_CONFIG_FILES([plugins/modelASSIMP2/Makefile]) -m4trace:configure.ac:44: -1- AC_CONFIG_FILES([plugins/recordQT/Makefile]) -m4trace:configure.ac:45: -1- AC_CONFIG_FILES([plugins/recordQT4L/Makefile]) -m4trace:configure.ac:46: -1- AC_CONFIG_FILES([plugins/recordV4L/Makefile]) -m4trace:configure.ac:47: -1- AC_CONFIG_FILES([plugins/recordV4L2/Makefile]) -m4trace:configure.ac:49: -1- AC_CONFIG_FILES([plugins/videoDC1394/Makefile]) -m4trace:configure.ac:50: -1- AC_CONFIG_FILES([plugins/videoDS/Makefile]) -m4trace:configure.ac:51: -1- AC_CONFIG_FILES([plugins/videoDV4L/Makefile]) -m4trace:configure.ac:52: -1- AC_CONFIG_FILES([plugins/videoDarwin/Makefile]) -m4trace:configure.ac:53: -1- AC_CONFIG_FILES([plugins/videoSGI/Makefile]) -m4trace:configure.ac:54: -1- AC_CONFIG_FILES([plugins/videoTEST/Makefile]) -m4trace:configure.ac:55: -1- AC_CONFIG_FILES([plugins/videoUNICAP/Makefile]) -m4trace:configure.ac:56: -1- AC_CONFIG_FILES([plugins/videoV4L/Makefile]) -m4trace:configure.ac:57: -1- AC_CONFIG_FILES([plugins/videoV4L2/Makefile]) -m4trace:configure.ac:58: -1- AC_CONFIG_FILES([plugins/videoVFW/Makefile]) -m4trace:configure.ac:59: -1- AC_CONFIG_FILES([plugins/videoVLC/Makefile]) -m4trace:configure.ac:65: -1- AC_CONFIG_FILES([extra/pix2jpg/Makefile]) +m4trace:configure.ac:9: -1- AC_CONFIG_FILES([Makefile abstractions/Makefile]) +m4trace:configure.ac:12: -1- AC_CONFIG_FILES([help/Makefile doc/Makefile examples/Makefile]) +m4trace:configure.ac:15: -1- AC_CONFIG_FILES([src/Makefile src/Gem/Makefile src/Utils/Makefile]) +m4trace:configure.ac:16: -1- AC_CONFIG_FILES([src/RTE/Makefile src/Base/Makefile src/plugins/Makefile ]) +m4trace:configure.ac:17: -1- AC_CONFIG_FILES([src/Output/Makefile ]) +m4trace:configure.ac:18: -1- AC_CONFIG_FILES([src/deprecated/Makefile ]) +m4trace:configure.ac:21: -1- AC_CONFIG_FILES([plugins/Makefile]) +m4trace:configure.ac:22: -1- AC_CONFIG_FILES([plugins/imageQT/Makefile]) +m4trace:configure.ac:23: -1- AC_CONFIG_FILES([plugins/imageMAGICK/Makefile]) +m4trace:configure.ac:24: -1- AC_CONFIG_FILES([plugins/imageTIFF/Makefile]) +m4trace:configure.ac:25: -1- AC_CONFIG_FILES([plugins/imageJPEG/Makefile]) +m4trace:configure.ac:26: -1- AC_CONFIG_FILES([plugins/imageSGI/Makefile]) +m4trace:configure.ac:28: -1- AC_CONFIG_FILES([plugins/filmAVI/Makefile]) +m4trace:configure.ac:29: -1- AC_CONFIG_FILES([plugins/filmAVIPLAY/Makefile]) +m4trace:configure.ac:30: -1- AC_CONFIG_FILES([plugins/filmDS/Makefile]) +m4trace:configure.ac:31: -1- AC_CONFIG_FILES([plugins/filmDarwin/Makefile]) +m4trace:configure.ac:32: -1- AC_CONFIG_FILES([plugins/filmGMERLIN/Makefile]) +m4trace:configure.ac:33: -1- AC_CONFIG_FILES([plugins/filmMPEG1/Makefile]) +m4trace:configure.ac:34: -1- AC_CONFIG_FILES([plugins/filmMPEG3/Makefile]) +m4trace:configure.ac:35: -1- AC_CONFIG_FILES([plugins/filmQT/Makefile]) +m4trace:configure.ac:36: -1- AC_CONFIG_FILES([plugins/filmQT4L/Makefile]) +m4trace:configure.ac:37: -1- AC_CONFIG_FILES([plugins/filmTEST/Makefile]) +m4trace:configure.ac:39: -1- AC_CONFIG_FILES([plugins/modelOBJ/Makefile]) +m4trace:configure.ac:40: -1- AC_CONFIG_FILES([plugins/modelASSIMP2/Makefile]) +m4trace:configure.ac:42: -1- AC_CONFIG_FILES([plugins/recordQT/Makefile]) +m4trace:configure.ac:43: -1- AC_CONFIG_FILES([plugins/recordQT4L/Makefile]) +m4trace:configure.ac:44: -1- AC_CONFIG_FILES([plugins/recordV4L/Makefile]) +m4trace:configure.ac:45: -1- AC_CONFIG_FILES([plugins/recordV4L2/Makefile]) +m4trace:configure.ac:47: -1- AC_CONFIG_FILES([plugins/videoDC1394/Makefile]) +m4trace:configure.ac:48: -1- AC_CONFIG_FILES([plugins/videoDS/Makefile]) +m4trace:configure.ac:49: -1- AC_CONFIG_FILES([plugins/videoDV4L/Makefile]) +m4trace:configure.ac:50: -1- AC_CONFIG_FILES([plugins/videoDarwin/Makefile]) +m4trace:configure.ac:51: -1- AC_CONFIG_FILES([plugins/videoSGI/Makefile]) +m4trace:configure.ac:52: -1- AC_CONFIG_FILES([plugins/videoTEST/Makefile]) +m4trace:configure.ac:53: -1- AC_CONFIG_FILES([plugins/videoUNICAP/Makefile]) +m4trace:configure.ac:54: -1- AC_CONFIG_FILES([plugins/videoV4L/Makefile]) +m4trace:configure.ac:55: -1- AC_CONFIG_FILES([plugins/videoV4L2/Makefile]) +m4trace:configure.ac:56: -1- AC_CONFIG_FILES([plugins/videoVFW/Makefile]) +m4trace:configure.ac:57: -1- AC_CONFIG_FILES([plugins/videoVLC/Makefile]) +m4trace:configure.ac:63: -1- AC_CONFIG_FILES([extra/pix_drum/Makefile extra/pix_mano/Makefile]) +m4trace:configure.ac:64: -1- AC_CONFIG_FILES([extra/pix_fiducialtrack/Makefile]) +m4trace:configure.ac:65: -1- AC_CONFIG_FILES([extra/pix_hit/Makefile]) +m4trace:configure.ac:66: -1- AC_CONFIG_FILES([extra/pix2jpg/Makefile]) m4trace:configure.ac:68: -1- AC_CONFIG_FILES([build/Makefile Gem.pc Gem-meta.pd]) m4trace:configure.ac:75: -1- AC_CONFIG_HEADERS([src/config.h]) m4trace:configure.ac:78: -1- AC_CONFIG_SUBDIRS([extra]) diff --git a/src/Gem/configure b/src/Gem/configure index 5ffd18a..0880742 100755 --- a/src/Gem/configure +++ b/src/Gem/configure @@ -4082,8 +4082,6 @@ am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' - -# ac_config_files="$ac_config_files Makefile abstractions/Makefile" @@ -4177,8 +4175,13 @@ ac_config_files="$ac_config_files plugins/videoVLC/Makefile" # some of them have their own build system #AC_CONFIG_FILES([extra/Makefile]) # some do not -ac_config_files="$ac_config_files extra/pix2jpg/Makefile" +ac_config_files="$ac_config_files extra/pix_drum/Makefile extra/pix_mano/Makefile" +ac_config_files="$ac_config_files extra/pix_fiducialtrack/Makefile" + +ac_config_files="$ac_config_files extra/pix_hit/Makefile" + +ac_config_files="$ac_config_files extra/pix2jpg/Makefile" # other stuff ac_config_files="$ac_config_files build/Makefile Gem.pc Gem-meta.pd" @@ -31594,6 +31597,10 @@ do "plugins/videoV4L2/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/videoV4L2/Makefile" ;; "plugins/videoVFW/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/videoVFW/Makefile" ;; "plugins/videoVLC/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/videoVLC/Makefile" ;; + "extra/pix_drum/Makefile") CONFIG_FILES="$CONFIG_FILES extra/pix_drum/Makefile" ;; + "extra/pix_mano/Makefile") CONFIG_FILES="$CONFIG_FILES extra/pix_mano/Makefile" ;; + "extra/pix_fiducialtrack/Makefile") CONFIG_FILES="$CONFIG_FILES extra/pix_fiducialtrack/Makefile" ;; + "extra/pix_hit/Makefile") CONFIG_FILES="$CONFIG_FILES extra/pix_hit/Makefile" ;; "extra/pix2jpg/Makefile") CONFIG_FILES="$CONFIG_FILES extra/pix2jpg/Makefile" ;; "build/Makefile") CONFIG_FILES="$CONFIG_FILES build/Makefile" ;; "Gem.pc") CONFIG_FILES="$CONFIG_FILES Gem.pc" ;; diff --git a/src/Gem/configure.ac b/src/Gem/configure.ac index 34dbd72..0b4c682 100644 --- a/src/Gem/configure.ac +++ b/src/Gem/configure.ac @@ -6,12 +6,10 @@ AC_INIT([Gem],[0.93],[zmoelnig@iem.at],[Gem],[http://gem.iem.at]) AM_INIT_AUTOMAKE([1.10 foreign]) - -# AC_CONFIG_FILES([Makefile abstractions/Makefile]) # documentation -#AC_CONFIG_FILES([help/Makefile doc/Makefile examples/Makefile]) +AC_CONFIG_FILES([help/Makefile doc/Makefile examples/Makefile]) # src AC_CONFIG_FILES([src/Makefile src/Gem/Makefile src/Utils/Makefile]) @@ -30,7 +28,7 @@ AC_CONFIG_FILES([plugins/imageSGI/Makefile]) AC_CONFIG_FILES([plugins/filmAVI/Makefile]) AC_CONFIG_FILES([plugins/filmAVIPLAY/Makefile]) AC_CONFIG_FILES([plugins/filmDS/Makefile]) -#AC_CONFIG_FILES([plugins/filmDarwin/Makefile]) +AC_CONFIG_FILES([plugins/filmDarwin/Makefile]) AC_CONFIG_FILES([plugins/filmGMERLIN/Makefile]) AC_CONFIG_FILES([plugins/filmMPEG1/Makefile]) AC_CONFIG_FILES([plugins/filmMPEG3/Makefile]) @@ -49,7 +47,7 @@ AC_CONFIG_FILES([plugins/recordV4L2/Makefile]) AC_CONFIG_FILES([plugins/videoDC1394/Makefile]) AC_CONFIG_FILES([plugins/videoDS/Makefile]) AC_CONFIG_FILES([plugins/videoDV4L/Makefile]) -#AC_CONFIG_FILES([plugins/videoDarwin/Makefile]) +AC_CONFIG_FILES([plugins/videoDarwin/Makefile]) AC_CONFIG_FILES([plugins/videoSGI/Makefile]) AC_CONFIG_FILES([plugins/videoTEST/Makefile]) AC_CONFIG_FILES([plugins/videoUNICAP/Makefile]) @@ -62,10 +60,10 @@ AC_CONFIG_FILES([plugins/videoVLC/Makefile]) # some of them have their own build system #AC_CONFIG_FILES([extra/Makefile]) # some do not +AC_CONFIG_FILES([extra/pix_drum/Makefile extra/pix_mano/Makefile]) +AC_CONFIG_FILES([extra/pix_fiducialtrack/Makefile]) +AC_CONFIG_FILES([extra/pix_hit/Makefile]) AC_CONFIG_FILES([extra/pix2jpg/Makefile]) -#AC_CONFIG_FILES([extra/pix_fiducialtrack/Makefile]) -#AC_CONFIG_FILES([extra/pix_hit/Makefile]) - # other stuff AC_CONFIG_FILES([build/Makefile Gem.pc Gem-meta.pd]) diff --git a/src/Gem/extra/Makefile.am b/src/Gem/extra/Makefile.am index ee9be34..20821ae 100644 --- a/src/Gem/extra/Makefile.am +++ b/src/Gem/extra/Makefile.am @@ -4,6 +4,10 @@ ACLOCAL_AMFLAGS = -I ../m4 SUBDIRS = +SUBDIRS += pix_mano pix_drum +#SUBDIRS += pix_artoolkit +SUBDIRS += pix_fiducialtrack +SUBDIRS += pix_hit SUBDIRS += pix2jpg EXTRA_DIST = \ diff --git a/src/Gem/extra/Makefile.in b/src/Gem/extra/Makefile.in index 7e81724..124566e 100644 --- a/src/Gem/extra/Makefile.in +++ b/src/Gem/extra/Makefile.in @@ -50,8 +50,8 @@ PRE_UNINSTALL = : POST_UNINSTALL = : subdir = . DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(top_srcdir)/configure install-sh \ - missing + $(srcdir)/Makefile.in $(top_srcdir)/configure config.guess \ + config.sub depcomp install-sh missing ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -210,7 +210,8 @@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign AM_CPPFLAGS = -I$(top_srcdir)/src ACLOCAL_AMFLAGS = -I ../m4 -SUBDIRS = pix2jpg +#SUBDIRS += pix_artoolkit +SUBDIRS = pix_mano pix_drum pix_fiducialtrack pix_hit pix2jpg EXTRA_DIST = \ README-EXTRA.txt diff --git a/src/Gem/extra/autom4te.cache/requests b/src/Gem/extra/autom4te.cache/requests index 68effa9..25a7869 100644 --- a/src/Gem/extra/autom4te.cache/requests +++ b/src/Gem/extra/autom4te.cache/requests @@ -64,8 +64,8 @@ 'AM_SET_LEADING_DOT' => 1, 'AM_SET_DEPDIR' => 1, '_AM_DEPENDENCIES' => 1, - 'AM_PROG_INSTALL_SH' => 1, 'm4_include' => 1, + 'AM_PROG_INSTALL_SH' => 1, '_AC_AM_CONFIG_HEADER_HOOK' => 1, 'AU_DEFUN' => 1, 'AM_MAKE_INCLUDE' => 1 @@ -83,57 +83,57 @@ 'configure.ac' ], { - '_LT_AC_TAGCONFIG' => 1, 'AM_PROG_F77_C_O' => 1, - 'm4_pattern_forbid' => 1, + '_LT_AC_TAGCONFIG' => 1, 'AC_INIT' => 1, - '_AM_COND_IF' => 1, + 'm4_pattern_forbid' => 1, 'AC_CANONICAL_TARGET' => 1, - 'AC_SUBST' => 1, + '_AM_COND_IF' => 1, 'AC_CONFIG_LIBOBJ_DIR' => 1, - 'AC_FC_SRCEXT' => 1, + 'AC_SUBST' => 1, 'AC_CANONICAL_HOST' => 1, + 'AC_FC_SRCEXT' => 1, 'AC_PROG_LIBTOOL' => 1, 'AM_INIT_AUTOMAKE' => 1, - 'AM_PATH_GUILE' => 1, 'AC_CONFIG_SUBDIRS' => 1, + 'AM_PATH_GUILE' => 1, 'AM_AUTOMAKE_VERSION' => 1, 'LT_CONFIG_LTDL_DIR' => 1, - 'AC_REQUIRE_AUX_FILE' => 1, 'AC_CONFIG_LINKS' => 1, - 'm4_sinclude' => 1, + 'AC_REQUIRE_AUX_FILE' => 1, 'LT_SUPPORTED_TAG' => 1, + 'm4_sinclude' => 1, 'AM_MAINTAINER_MODE' => 1, 'AM_NLS' => 1, 'AC_FC_PP_DEFINE' => 1, 'AM_GNU_GETTEXT_INTL_SUBDIR' => 1, - 'AM_MAKEFILE_INCLUDE' => 1, '_m4_warn' => 1, + 'AM_MAKEFILE_INCLUDE' => 1, 'AM_PROG_CXX_C_O' => 1, - '_AM_COND_ENDIF' => 1, '_AM_MAKEFILE_INCLUDE' => 1, + '_AM_COND_ENDIF' => 1, 'AM_ENABLE_MULTILIB' => 1, 'AM_SILENT_RULES' => 1, 'AM_PROG_MOC' => 1, 'AC_CONFIG_FILES' => 1, - 'LT_INIT' => 1, 'include' => 1, - 'AM_PROG_AR' => 1, + 'LT_INIT' => 1, 'AM_GNU_GETTEXT' => 1, + 'AM_PROG_AR' => 1, 'AC_LIBSOURCE' => 1, - 'AM_PROG_FC_C_O' => 1, 'AC_CANONICAL_BUILD' => 1, + 'AM_PROG_FC_C_O' => 1, 'AC_FC_FREEFORM' => 1, - 'AH_OUTPUT' => 1, 'AC_FC_PP_SRCEXT' => 1, - '_AM_SUBST_NOTMAKE' => 1, + 'AH_OUTPUT' => 1, 'AC_CONFIG_AUX_DIR' => 1, - 'sinclude' => 1, - 'AM_PROG_CC_C_O' => 1, + '_AM_SUBST_NOTMAKE' => 1, 'm4_pattern_allow' => 1, - 'AM_XGETTEXT_OPTION' => 1, - 'AC_CANONICAL_SYSTEM' => 1, + 'AM_PROG_CC_C_O' => 1, + 'sinclude' => 1, 'AM_CONDITIONAL' => 1, + 'AC_CANONICAL_SYSTEM' => 1, + 'AM_XGETTEXT_OPTION' => 1, 'AC_CONFIG_HEADERS' => 1, 'AC_DEFINE_TRACE_LITERAL' => 1, 'AM_POT_TOOLS' => 1, diff --git a/src/Gem/extra/configure.ac b/src/Gem/extra/configure.ac index 906463d..8b915c1 100644 --- a/src/Gem/extra/configure.ac +++ b/src/Gem/extra/configure.ac @@ -15,9 +15,9 @@ AC_PROG_CXX AC_SUBST(CXX) ## pix_artoolkit -#if test -d "$srcdir/pix_artoolkit"; then -# AC_CONFIG_SUBDIRS([pix_artoolkit]) -#fi +if test -d "$srcdir/pix_artoolkit"; then + AC_CONFIG_SUBDIRS([pix_artoolkit]) +fi ## pix_drum (Jaime Oliver) #if test -d "$srcdir/pix_drum"; then diff --git a/src/Gem/extra/pix2jpg/Makefile.am b/src/Gem/extra/pix2jpg/Makefile.am index 51f895a..025aad5 100644 --- a/src/Gem/extra/pix2jpg/Makefile.am +++ b/src/Gem/extra/pix2jpg/Makefile.am @@ -1,6 +1,6 @@ AUTOMAKE_OPTIONS = foreign ACLOCAL_AMFLAGS = -I $(top_srcdir)/src/m4 -AM_CPPFLAGS = -I$(top_srcdir)/src -I/usr/local/lib/ +AM_CPPFLAGS = -I$(top_srcdir)/src -fopenmp -I/usr/local/include/ImageMagick EXTRA_DIST = extradir=$(libdir)/pix2jpg @@ -11,12 +11,9 @@ dist_extra_DATA = LICENSE.txt dist_extra_DATA += pix2jpg-help.pd ## some default flags -pix2jpg_la_CXXFLAGS = -pix2jpg_la_LDFLAGS = -L/usr/local/include/ImageMagick -Wl,-Bsymbolic-functions -Wl,-z,relro -L/usr/lib/X11 -module -avoid-version -shared -shrext .@GEM_RTE_EXTENSION@ -if WINDOWS -pix2jpg_la_LDFLAGS += -no-undefined -endif -pix2jpg_la_LIBADD = +pix2jpg_la_CXXFLAGS = -fopenmp -I/usr/include/ImageMagick +pix2jpg_la_LDFLAGS = -lMagick++ -lMagickCore -module -avoid-version -shared -shrext .@GEM_RTE_EXTENSION@ +pix2jpg_la_LIBADD = -lMagickCore # RTE flags pix2jpg_la_CXXFLAGS += @GEM_RTE_CFLAGS@ @GEM_ARCH_CXXFLAGS@ @@ -26,7 +23,7 @@ pix2jpg_la_LDFLAGS += @GEM_ARCH_LDFLAGS@ # special flags for building externals pix2jpg_la_CXXFLAGS += -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security -pthread .@GEM_EXTERNAL_CFLAGS@ -pix2jpg_la_LIBADD += -L/usr/local/lib/ImageMagick -lMagick++ -lMagickWand -lMagickCore -llcms -ltiff -lfreetype -ljpeg -llqr-1 -lglib-2.0 -lfontconfig -lXext -lSM -lICE -lX11 -lXt -lbz2 -lz -lm -lgomp -lpthread -lltdl -L$(top_builddir) @GEM_EXTERNAL_LIBS@ +pix2jpg_la_LIBADD += -L$(top_builddir) @GEM_EXTERNAL_LIBS@ # convenience symlinks ## uha, this is ugly diff --git a/src/Gem/extra/pix2jpg/Makefile.in b/src/Gem/extra/pix2jpg/Makefile.in index cb9fdf4..15d325f 100644 --- a/src/Gem/extra/pix2jpg/Makefile.in +++ b/src/Gem/extra/pix2jpg/Makefile.in @@ -52,7 +52,6 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -@WINDOWS_TRUE@am__append_1 = -no-undefined subdir = extra/pix2jpg DIST_COMMON = $(dist_extra_DATA) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in @@ -413,7 +412,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign ACLOCAL_AMFLAGS = -I $(top_srcdir)/src/m4 -AM_CPPFLAGS = -I$(top_srcdir)/src -I/usr/include/ImageMagick +AM_CPPFLAGS = -I$(top_srcdir)/src -fopenmp -I/usr/local/include/ImageMagick EXTRA_DIST = extradir = $(libdir)/pix2jpg extra_LTLIBRARIES = pix2jpg.la @@ -422,16 +421,13 @@ dist_extra_DATA = LICENSE.txt pix2jpg-help.pd # RTE flags # special flags for building externals -pix2jpg_la_CXXFLAGS = @GEM_RTE_CFLAGS@ @GEM_ARCH_CXXFLAGS@ -g -O2 \ - -fstack-protector --param=ssp-buffer-size=4 -Wformat \ - -Wformat-security -pthread .@GEM_EXTERNAL_CFLAGS@ -pix2jpg_la_LDFLAGS = -L/usr/lib -Wl,-Bsymbolic-functions -Wl,-z,relro \ - -L/usr/lib/X11 -module -avoid-version -shared -shrext \ - .@GEM_RTE_EXTENSION@ $(am__append_1) @GEM_ARCH_LDFLAGS@ -pix2jpg_la_LIBADD = @GEM_RTE_LIBS@ -L/usr/lib -lMagick++ -lMagickWand \ - -lMagickCore -llcms -ltiff -lfreetype -ljpeg -llqr-1 \ - -lglib-2.0 -lfontconfig -lXext -lSM -lICE -lX11 -lXt -lbz2 -lz \ - -lm -lgomp -lpthread -lltdl -L$(top_builddir) \ +pix2jpg_la_CXXFLAGS = -fopenmp -I/usr/include/ImageMagick \ + @GEM_RTE_CFLAGS@ @GEM_ARCH_CXXFLAGS@ -g -O2 -fstack-protector \ + --param=ssp-buffer-size=4 -Wformat -Wformat-security -pthread \ + .@GEM_EXTERNAL_CFLAGS@ +pix2jpg_la_LDFLAGS = -lMagick++ -lMagickCore -module -avoid-version \ + -shared -shrext .@GEM_RTE_EXTENSION@ @GEM_ARCH_LDFLAGS@ +pix2jpg_la_LIBADD = -lMagickCore @GEM_RTE_LIBS@ -L$(top_builddir) \ @GEM_EXTERNAL_LIBS@ $(am__empty) ### SOURCES diff --git a/src/Gem/extra/pix2jpg/pix2jpg.cpp b/src/Gem/extra/pix2jpg/pix2jpg.cpp index 3ce36b1..18192d0 100644 --- a/src/Gem/extra/pix2jpg/pix2jpg.cpp +++ b/src/Gem/extra/pix2jpg/pix2jpg.cpp @@ -26,23 +26,21 @@ CPPEXTERN_NEW_WITH_ONE_ARG(pix2jpg, t_symbol *, A_DEFSYM); pix2jpg :: pix2jpg(t_symbol *s) : m_banged(false), m_automatic(false), - m_layer(0) + m_layer(0) { - post("pix2jpg v0.02 Convert pix to jpeg and send to Unix Local Socket"); - post("(c) 2012-2013 Santi Noreña libremediaserver@gmail.com"); - post("GPL License"); +// post("pix2jpg 2012-2013 Santi Noreña libremediaserver@gmail.com"); outlet1 = outlet_new(this->x_obj, 0); // Saca todos los canales mediante una lista // Init the Unix Socket socket_fd = socket(PF_UNIX, SOCK_STREAM, 0); if(socket_fd < 0) { - post("pix2jpg:create socket() failed\n"); + post("pix2jpg:create socket() failed"); return; } /* start with a clean address structure */ memset(&address, 0, sizeof(struct sockaddr_un)); address.sun_family = PF_UNIX; - strcpy(address.sun_path,SOCK_PATH); + strcpy(address.sun_path,SOCK_PATH); if(connect(socket_fd,(struct sockaddr *) &address,sizeof(struct sockaddr_un)) != 0) { post("pix2jpg:connect() failed"); @@ -66,20 +64,20 @@ void pix2jpg :: processImage(imageStruct &image) { if (m_automatic || m_banged) { - m_banged =false; - int counter = 0; - Image imagem(image.xsize, image.ysize, "RGBA", CharPixel, image.data); - imagem.resize("64x46"); - // Write to BLOB in png format + m_banged =false; + int counter = 0; + Image imagem(image.xsize, image.ysize, "RGBA", CharPixel, image.data); + imagem.resize("64x46"); + // Write to BLOB in png format Blob blob; imagem.magick( "jpg" ); // Set JPEG output format imagem.write( &blob ); // Enviamos al GUI x Unix Domain Sockets - int size = blob.length() +2; - char buffer[size]; - memcpy(buffer+2, blob.data(), blob.length()); - memcpy(buffer,&m_layer, 2); - write(socket_fd, buffer, size); + int size = blob.length() +2; + char buffer[size]; + memcpy(buffer+2, blob.data(), blob.length()); + memcpy(buffer,&m_layer, 2); + write(socket_fd, buffer, size); } } @@ -92,8 +90,7 @@ void pix2jpg :: obj_setupCallback(t_class *classPtr) class_addbang(classPtr, reinterpret_cast(&pix2jpg::bangMessCallback)); class_addmethod(classPtr, reinterpret_cast(&pix2jpg::startMessCallback),gensym("start"), A_NULL); class_addmethod(classPtr, reinterpret_cast(&pix2jpg::stopMessCallback),gensym("stop"), A_NULL); - class_addmethod(classPtr, reinterpret_cast(&pix2jpg::layerimageMessCallback),gensym("layerimage"), A_FLOAT,A_NULL); - class_addmethod(classPtr, reinterpret_cast(&pix2jpg::layernameMessCallback),gensym("layername"), A_GIMME,A_NULL); + class_addmethod(classPtr, reinterpret_cast(&pix2jpg::layerimageMessCallback),gensym("layerimage"), A_FLOAT,A_NULL); } void pix2jpg :: startMessCallback(void *data) { @@ -112,27 +109,4 @@ void pix2jpg :: layerimageMessCallback (void *data, t_float f) GetMyClass(data)->m_layer=f; printf("layer: %d", GetMyClass(data)->m_layer); } -void pix2jpg :: layernameMessCallback(void *data, t_symbol *s, int argc, t_atom *argv) -{ - /* int n, length; - t_symbol *c; -// check for correct number of arguments - n = atom_getint(argv++); - c = atom_getsymbol(argv++); - - length = 2 + sizeof(c); - char *buffer; - post - memcpy(buffer+2, c, sizeof(c)); - memcpy(buffer,&n, 2); */ - t_binbuf *b = binbuf_new(); - char *buf; - int length; - // t_atom at; - binbuf_add(b, argc, argv); - // SETSEMI(&at); - // binbuf_add(b, 1, &at); - binbuf_gettext(b, &buf, &length); - write(socket_fd, buf, length); -} diff --git a/src/Gem/extra/pix2jpg/pix2jpg.h b/src/Gem/extra/pix2jpg/pix2jpg.h index 62d6a68..dd3ff01 100644 --- a/src/Gem/extra/pix2jpg/pix2jpg.h +++ b/src/Gem/extra/pix2jpg/pix2jpg.h @@ -1,9 +1,9 @@ /*----------------------------------------------------------------- - pix2jpg v0.01 + pix2jpg v0.02 External for Gem and Pure Data to convert an image to jpg and send it via Unix Domain Sockets - (c) 2012-2013 Santi Noreña. libremediaserver@gmail.com + (c) 2012-2013 Santi Noreña libremediaserver@gmail.com GPL License. -----------------------------------------------------------------*/ @@ -22,7 +22,7 @@ #include #include #include -#include "m_pd.h" +#include using namespace Magick; /*----------------------------------------------------------------- @@ -30,7 +30,7 @@ using namespace Magick; CLASS pix2jpg - Convert a image to jpgw and outputs in a Unix Domain Socket + Convert a image to jpg and outputs in a Unix Domain Socket KEYWORDS pix @@ -93,9 +93,9 @@ class GEM_EXPORT pix2jpg : public GemPixObj ////////// // static member functions static void startMessCallback(void *data); - static void stopMessCallback(void *data); - static void bangMessCallback(void *data); - static void layerimageMessCallback(void *data, t_float f); - void layernameMessCallback(void *data, t_symbol *s,int argc, t_atom *argv); + static void stopMessCallback(void *data); + static void bangMessCallback(void *data); + static void layerimageMessCallback(void *data, t_float f); + }; #endif // for header file diff --git a/src/Gem/help/pix_film-help.pd b/src/Gem/help/pix_film-help.pd index 15d7ec5..3b4035e 100644 --- a/src/Gem/help/pix_film-help.pd +++ b/src/Gem/help/pix_film-help.pd @@ -78,9 +78,9 @@ reached. (or: an illegal frame would have been decoded); #X text 13 104 You can open a specified film via the "open" message \, which takes an optional argument for the colorspace \, to which the movie should be decoded (RGBA \, YUV or Grey).; -#X text 17 471 Outlet 2: list: : gets the -dimensions (in fps and pixels) of a film when it gets loaded. if length -is not available (video-streams) -1 is returned.; +#X text 17 471 Outlet 2: list: : gets +the dimensions (in frames and pixels) of a film when it gets loaded. +if length is not available (video-streams) -1 is returned.; #X text 14 144 Normally \, you will only get one specified (via the second inlet) frame of the film \, To play back a complete film \, you have to change the frame accordingly \, OR use the "auto" message @@ -154,7 +154,7 @@ files; for OS-X only; #X restore 485 464 pd :: FORMATS; #X obj 473 275 unpack 0 0 0 0; -#X floatatom 571 276 5 0 0 3 fps - -; +#X floatatom 581 276 5 0 0 3 fps - -; #X obj 451 251 pix_film; #X connect 10 0 11 0; #X connect 11 0 10 0; diff --git a/src/Gem/help/pix_movie-help.pd b/src/Gem/help/pix_movie-help.pd index ec7e036..b8b0d84 100644 --- a/src/Gem/help/pix_movie-help.pd +++ b/src/Gem/help/pix_movie-help.pd @@ -33,7 +33,7 @@ #X connect 7 1 6 0; #X connect 7 1 5 0; #X restore 599 469 pd gemwin; -#X msg 599 450 destroy; +#X msg 599 450 create; #X text 595 429 Create window:; #X obj 451 78 cnv 15 155 200 empty empty empty 20 12 0 14 -24198 -66577 0; @@ -44,11 +44,11 @@ -1; #X text 505 47 open a supported; #X text 506 58 movie-clip; -#X obj 480 367 unpack 0 0 0; +#X obj 471 367 unpack 0 0 0 0; #X floatatom 466 390 5 0 0 3 length - -; #X floatatom 515 390 5 0 0 3 width - -; #X floatatom 565 390 5 0 0 3 height - -; -#X obj 520 348 bng 15 250 50 0 empty empty end_reached 20 7 0 10 -262144 +#X obj 530 348 bng 15 250 50 0 empty empty end_reached 20 7 0 10 -262144 -1 -1; #X text 71 21 Class: pix object (pix source); #X text 29 47 Description: load in a movie-file; @@ -67,9 +67,9 @@ reached; #X text 13 94 You can open a specified film via the "open" message \, which takes an optional argument for the colorspace \, to which the movie should be decoded (RGBA \, YUV or Grey).; -#X text 17 507 Outlet 2: list: : gets the -dimensions (in fps and pixels) of a film when it gets loaded. if length -is not available (video-streams) -1 is returned.; +#X text 17 507 Outlet 2: list: : gets +the dimensions (in frames and pixels) of a film when it gets loaded. +if length is not available (video-streams) -1 is returned.; #X text 14 134 Normally \, you will only get one specified (via the second inlet) frame of the film \, To play back a complete film \, you have to change the frame accordingly \, OR use the "auto" message @@ -131,6 +131,7 @@ is a combination of [pix_film] and [pix_texture]; #X text 23 419 Inlet 1: rectangle 0|1 : use rectangle-texturing when available (default=1); #X msg 513 256 rectangle \$1; +#X floatatom 615 390 5 0 0 3 fps - -; #X connect 10 0 11 0; #X connect 11 0 10 0; #X connect 14 0 41 0; @@ -138,6 +139,7 @@ available (default=1); #X connect 20 0 21 0; #X connect 20 1 22 0; #X connect 20 2 23 0; +#X connect 20 3 59 0; #X connect 27 0 28 0; #X connect 28 0 41 0; #X connect 33 0 41 0; diff --git a/src/Gem/plugins/Makefile.am b/src/Gem/plugins/Makefile.am index 291b66a..d970298 100644 --- a/src/Gem/plugins/Makefile.am +++ b/src/Gem/plugins/Makefile.am @@ -8,7 +8,7 @@ SUBDIRS += imageMAGICK imageTIFF imageJPEG imageSGI imageQT ## film loading plugins -SUBDIRS += filmAVI filmAVIPLAY filmDS filmGMERLIN filmMPEG1 filmMPEG3 filmQT filmQT4L +SUBDIRS += filmAVI filmAVIPLAY filmDS filmDarwin filmGMERLIN filmMPEG1 filmMPEG3 filmQT filmQT4L if DISABLED SUBDIRS += filmTEST SUBDIRS += videoTEST @@ -18,7 +18,7 @@ endif SUBDIRS += recordQT recordQT4L recordV4L recordV4L2 ## video capture plugins -SUBDIRS += videoDC1394 videoDS videoDV4L videoSGI videoUNICAP +SUBDIRS += videoDC1394 videoDS videoDV4L videoDarwin videoSGI videoUNICAP SUBDIRS += videoV4L videoV4L2 videoVFW videoVLC ## proprietary video capture plugins diff --git a/src/Gem/plugins/Makefile.in b/src/Gem/plugins/Makefile.in index b11ed31..980440a 100644 --- a/src/Gem/plugins/Makefile.in +++ b/src/Gem/plugins/Makefile.in @@ -390,8 +390,8 @@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign AM_CPPFLAGS = -I$(top_srcdir)/src SUBDIRS = imageMAGICK imageTIFF imageJPEG imageSGI imageQT filmAVI \ - filmAVIPLAY filmDS filmGMERLIN filmMPEG1 filmMPEG3 filmQT \ - filmQT4L $(am__append_1) recordQT recordQT4L recordV4L \ + filmAVIPLAY filmDS filmDarwin filmGMERLIN filmMPEG1 filmMPEG3 \ + filmQT filmQT4L $(am__append_1) recordQT recordQT4L recordV4L \ recordV4L2 videoDC1394 videoDS videoDV4L videoDarwin videoSGI \ videoUNICAP videoV4L videoV4L2 videoVFW videoVLC videoAVT \ videoHALCON videoPYLON modelOBJ modelASSIMP2 diff --git a/src/Gem/plugins/filmDarwin/.deps/gem_filmDarwin_la-filmDarwin.Plo b/src/Gem/plugins/filmDarwin/.deps/gem_filmDarwin_la-filmDarwin.Plo deleted file mode 100644 index 9ce06a8..0000000 --- a/src/Gem/plugins/filmDarwin/.deps/gem_filmDarwin_la-filmDarwin.Plo +++ /dev/null @@ -1 +0,0 @@ -# dummy diff --git a/src/Gem/plugins/filmDarwin/Makefile b/src/Gem/plugins/filmDarwin/Makefile deleted file mode 100644 index 0b768ff..0000000 --- a/src/Gem/plugins/filmDarwin/Makefile +++ /dev/null @@ -1,783 +0,0 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. -# plugins/filmDarwin/Makefile. Generated from Makefile.in by configure. - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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. - - - -# convenience links: symlink the plugin-binary into top_builddir -# include this makefile snippet in your plugin's Makefile.am to automatically -# create symlinks to all pkglib_LTLIBRARIES binaries into your top builddir - - -am__make_dryrun = \ - { \ - am__dry=no; \ - case $$MAKEFLAGS in \ - *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ - esac; \ - test $$am__dry = yes; \ - } -pkgdatadir = $(datadir)/Gem -pkgincludedir = $(includedir)/Gem -pkglibdir = $(libdir)/Gem -pkglibexecdir = $(libexecdir)/Gem -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 = i686-pc-linux-gnu -host_triplet = i686-pc-linux-gnu -#am__append_1 = gem_filmDarwin.la -#am__append_2 = -no-undefined -DIST_COMMON = $(srcdir)/../symlink_ltlib.mk $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in -subdir = plugins/filmDarwin -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_gl.m4 \ - $(top_srcdir)/m4/ax_check_glu.m4 \ - $(top_srcdir)/m4/ax_check_glut.m4 \ - $(top_srcdir)/m4/ax_compiler_vendor.m4 \ - $(top_srcdir)/m4/ax_pthread.m4 $(top_srcdir)/m4/gem.m4 \ - $(top_srcdir)/m4/iem_ftgl.m4 $(top_srcdir)/m4/iem_opengl.m4 \ - $(top_srcdir)/m4/iem_operatingsystem.m4 \ - $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/src/config.h -CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; -am__install_max = 40 -am__nobase_strip_setup = \ - srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` -am__nobase_strip = \ - for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" -am__nobase_list = $(am__nobase_strip_setup); \ - for p in $$list; do echo "$$p $$p"; done | \ - sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ - $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ - if (++n[$$2] == $(am__install_max)) \ - { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ - END { for (dir in files) print dir, files[dir] }' -am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__uninstall_files_from_dir = { \ - test -z "$$files" \ - || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ - || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ - $(am__cd) "$$dir" && rm -f $$files; }; \ - } -am__installdirs = "$(DESTDIR)$(pkglibdir)" -LTLIBRARIES = $(pkglib_LTLIBRARIES) -gem_filmDarwin_la_DEPENDENCIES = -am_gem_filmDarwin_la_OBJECTS = gem_filmDarwin_la-filmDarwin.lo -gem_filmDarwin_la_OBJECTS = $(am_gem_filmDarwin_la_OBJECTS) -gem_filmDarwin_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ - $(gem_filmDarwin_la_CXXFLAGS) $(CXXFLAGS) \ - $(gem_filmDarwin_la_LDFLAGS) $(LDFLAGS) -o $@ -#am_gem_filmDarwin_la_rpath = -rpath $(pkglibdir) -DEFAULT_INCLUDES = -I. -I$(top_builddir)/src -depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles -am__mv = mv -f -CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ -SOURCES = $(gem_filmDarwin_la_SOURCES) -DIST_SOURCES = $(gem_filmDarwin_la_SOURCES) -am__can_run_installinfo = \ - case $$AM_UPDATE_INFO_DIR in \ - n|no|NO) false;; \ - *) (install-info --version) >/dev/null 2>&1;; \ - esac -ETAGS = etags -CTAGS = ctags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = ${SHELL} /home/santi/LMS/git/libremediaserver/Gem/missing --run aclocal-1.11 -AGL_CFLAGS = -AGL_LIBS = -AMTAR = $${TAR-tar} -AR = ar -AS = as -AUTOCONF = ${SHELL} /home/santi/LMS/git/libremediaserver/Gem/missing --run autoconf -AUTOHEADER = ${SHELL} /home/santi/LMS/git/libremediaserver/Gem/missing --run autoheader -AUTOMAKE = ${SHELL} /home/santi/LMS/git/libremediaserver/Gem/missing --run automake-1.11 -AWK = gawk -CC = gcc -CCDEPMODE = depmode=gcc3 -CFLAGS = -g -O2 -CPP = gcc -E -CPPFLAGS = -CXX = g++ -CXXCPP = g++ -E -CXXDEPMODE = depmode=gcc3 -CXXFLAGS = -g -O2 -freg-struct-return -O3 -falign-loops -falign-functions -falign-jumps -funroll-loops -ffast-math -mmmx -CYGPATH_W = echo -DEFINES = -DEFS = -DHAVE_CONFIG_H -DEPDIR = .deps -DLLTOOL = dlltool -DSYMUTIL = -DUMPBIN = -ECHO_C = -ECHO_N = -n -ECHO_T = -EGREP = /bin/grep -E -EXEEXT = -EXT = pd_linux -FGREP = /bin/grep -F -GEM_ARCH_CXXFLAGS = -GEM_ARCH_LDFLAGS = -GEM_CFLAGS = -GEM_CPPFLAGS = -DGEM_INTERNAL -DGLEW_BUILD -GEM_CXXFLAGS = -GEM_DEFAULT_WINDOW = gemglxwindow -GEM_EXTERNAL_CFLAGS = -GEM_EXTERNAL_CPPFLAGS = -GEM_EXTERNAL_LIBS = -GEM_FRAMEWORK_AGL = -GEM_FRAMEWORK_CARBON = -GEM_FRAMEWORK_COCOA = -GEM_FRAMEWORK_QUICKTIME = -GEM_LIBS = -GEM_LIB_ASSIMP_CFLAGS = -GEM_LIB_ASSIMP_LIBS = -GEM_LIB_AVIFILE_CFLAGS = -I/usr/include/avifile-0.7 -GEM_LIB_AVIFILE_LIBS = -laviplay -GEM_LIB_FRIBIDI_CFLAGS = -GEM_LIB_FRIBIDI_LIBS = -GEM_LIB_FTGL_CFLAGS = -I/usr/include/freetype2 -I/usr/include/FTGL -GEM_LIB_FTGL_LIBS = -lftgl -GEM_LIB_GLEW_CFLAGS = -GEM_LIB_GLEW_LIBS = -GEM_LIB_GMERLIN_AVDEC_CFLAGS = -GEM_LIB_GMERLIN_AVDEC_LIBS = -lgmerlin_avdec -lgavl -GEM_LIB_IMAGEMAGICK___CFLAGS = -GEM_LIB_IMAGEMAGICK___LIBS = -GEM_LIB_JPEG_CFLAGS = -GEM_LIB_JPEG_LIBS = -ljpeg -GEM_LIB_LIBDC1394_2_CFLAGS = -GEM_LIB_LIBDC1394_2_LIBS = -GEM_LIB_LIBDV_CFLAGS = -GEM_LIB_LIBDV_LIBS = -GEM_LIB_LIBIEC61883_CFLAGS = -GEM_LIB_LIBIEC61883_LIBS = -GEM_LIB_LIBMPEG3_CFLAGS = -GEM_LIB_LIBMPEG3_LIBS = -lmpeg3 -GEM_LIB_LIBQUICKTIME_CFLAGS = -I/usr/include/lqt -GEM_LIB_LIBQUICKTIME_LIBS = -lquicktime -lpthread -lm -lz -ldl -GEM_LIB_LIBRAW1394_CFLAGS = -GEM_LIB_LIBRAW1394_LIBS = -GEM_LIB_LIBUNICAP_CFLAGS = -GEM_LIB_LIBUNICAP_LIBS = -GEM_LIB_LIBV4L1_CFLAGS = -GEM_LIB_LIBV4L1_LIBS = -lv4l1 -GEM_LIB_LIBV4L2_CFLAGS = -GEM_LIB_LIBV4L2_LIBS = -lv4l2 -GEM_LIB_LIBVLC_CFLAGS = -GEM_LIB_LIBVLC_LIBS = -GEM_LIB_LQT_CFLAGS = -GEM_LIB_LQT_LIBS = -GEM_LIB_MAGICKCORE_CFLAGS = -GEM_LIB_MAGICKCORE_LIBS = -GEM_LIB_MPEG_CFLAGS = -GEM_LIB_MPEG_LIBS = -GEM_LIB_SDL_CFLAGS = -D_GNU_SOURCE=1 -D_REENTRANT -I/usr/include/SDL -GEM_LIB_SDL_LIBS = -lSDL -GEM_LIB_TIFF_CFLAGS = -GEM_LIB_TIFF_LIBS = -GEM_LIB_VFW32_CFLAGS = -GEM_LIB_VFW32_LIBS = -GEM_PTHREAD_CFLAGS = -GEM_PTHREAD_LIBS = -GEM_RTE = Pure Data -GEM_RTE_CFLAGS = -DPD -I.//src -GEM_RTE_EXTENSION = pd_linux -GEM_RTE_LIBS = -L./ -GEM_TARGETS = -GLUT_CFLAGS = -pthread -GLUT_LIBS = -lglut -lSM -lICE -lXmu -lXi -lGLU -lGL -lm -GLU_CFLAGS = -pthread -GLU_LIBS = -lGLU -lGL -lm -GLX_CFLAGS = -GLX_LIBS = -GL_CFLAGS = -pthread -GL_LIBS = -lGL -lm -GREP = /bin/grep -INSTALL = /usr/bin/install -c -INSTALL_DATA = ${INSTALL} -m 644 -INSTALL_PROGRAM = ${INSTALL} -INSTALL_SCRIPT = ${INSTALL} -INSTALL_STRIP_PROGRAM = $(install_sh) -c -s -LD = /usr/bin/ld -LDFLAGS = -LIBOBJS = -LIBS = -lXxf86vm -ldl -lz -lm -LIBTOOL = $(SHELL) $(top_builddir)/libtool -LIPO = -LN_S = ln -s -LTLIBOBJS = -MAKEDEP_FLAGS = -MM -MAKEINFO = ${SHELL} /home/santi/LMS/git/libremediaserver/Gem/missing --run makeinfo -MANIFEST_TOOL = : -MKDIR_P = /bin/mkdir -p -NM = /usr/bin/nm -B -NMEDIT = -OBJC = gcc -OBJCDEPMODE = depmode=gcc3 -OBJCFLAGS = -g -O2 -OBJCXX = g++ -OBJCXXFLAGS = -OBJDUMP = objdump -OBJEXT = o -OTOOL = -OTOOL64 = -PACKAGE = Gem -PACKAGE_BUGREPORT = zmoelnig@iem.at -PACKAGE_NAME = Gem -PACKAGE_STRING = Gem 0.93 -PACKAGE_TARNAME = Gem -PACKAGE_URL = http://gem.iem.at -PACKAGE_VERSION = 0.93 -PATH_SEPARATOR = : -PKG_ASSIMP_CFLAGS = -PKG_ASSIMP_LIBS = -lassimp -PKG_AVIFILE_CFLAGS = -I/usr/include/avifile-0.7 -PKG_AVIFILE_LIBS = -laviplay -PKG_CFLAGS = -D_GNU_SOURCE=1 -D_REENTRANT -I/usr/include/SDL -I/usr/include/freetype2 -I/usr/include/FTGL -I/usr/include/avifile-0.7 -I/usr/include/lqt -PKG_CONFIG = /usr/bin/pkg-config -PKG_FRIBIDI_CFLAGS = -PKG_FRIBIDI_LIBS = -lfribidi -PKG_FTGL_CFLAGS = -I/usr/include/freetype2 -I/usr/include/FTGL -PKG_FTGL_LIBS = -lftgl -PKG_GLEW_CFLAGS = -PKG_GLEW_LIBS = -PKG_GMERLIN_AVDEC_CFLAGS = -PKG_GMERLIN_AVDEC_LIBS = -lgmerlin_avdec -lgavl -PKG_IMAGEMAGICK___CFLAGS = -PKG_IMAGEMAGICK___LIBS = -lMagick++ -PKG_JPEG_CFLAGS = -PKG_JPEG_LIBS = -ljpeg -PKG_LIBDC1394_2_CFLAGS = -PKG_LIBDC1394_2_LIBS = -ldc1394 -PKG_LIBDV_CFLAGS = -PKG_LIBDV_LIBS = -ldv -PKG_LIBIEC61883_CFLAGS = -PKG_LIBIEC61883_LIBS = -liec61883 -PKG_LIBMPEG3_CFLAGS = -PKG_LIBMPEG3_LIBS = -lmpeg3 -PKG_LIBQUICKTIME_CFLAGS = -I/usr/include/lqt -PKG_LIBQUICKTIME_LIBS = -lquicktime -lpthread -lm -lz -ldl -PKG_LIBRAW1394_CFLAGS = -PKG_LIBRAW1394_LIBS = -lraw1394 -PKG_LIBS = -lv4l2 -lv4l1 -lquicktime -lpthread -lm -lz -ldl -lgmerlin_avdec -lgavl -laviplay -lftgl -lSDL -PKG_LIBUNICAP_CFLAGS = -PKG_LIBUNICAP_LIBS = -lunicap -PKG_LIBV4L1_CFLAGS = -PKG_LIBV4L1_LIBS = -lv4l1 -PKG_LIBV4L2_CFLAGS = -PKG_LIBV4L2_LIBS = -lv4l2 -PKG_LIBVLC_CFLAGS = -PKG_LIBVLC_LIBS = -lvlc -PKG_LQT_CFLAGS = -PKG_LQT_LIBS = -lquicktime -PKG_MAGICKCORE_CFLAGS = -PKG_MAGICKCORE_LIBS = -lMagick -PKG_MPEG_CFLAGS = -PKG_MPEG_LIBS = -lmpeg -PKG_SDL_CFLAGS = -D_GNU_SOURCE=1 -D_REENTRANT -I/usr/include/SDL -PKG_SDL_LIBS = -lSDL -PKG_TIFF_CFLAGS = -PKG_TIFF_LIBS = -ltiff -PKG_VFW32_CFLAGS = -PKG_VFW32_LIBS = -lvfw32 -PTHREAD_CC = gcc -PTHREAD_CFLAGS = -pthread -PTHREAD_LIBS = -RANLIB = ranlib -SED = /bin/sed -SET_MAKE = -SHELL = /bin/bash -STRIP = strip -VERSION = 0.93 -XMKMF = -X_CFLAGS = -X_EXTRA_LIBS = -X_LIBS = -X_PRE_LIBS = -lSM -lICE -abs_builddir = /home/santi/LMS/git/libremediaserver/Gem/plugins/filmDarwin -abs_srcdir = /home/santi/LMS/git/libremediaserver/Gem/plugins/filmDarwin -abs_top_builddir = /home/santi/LMS/git/libremediaserver/Gem -abs_top_srcdir = /home/santi/LMS/git/libremediaserver/Gem -ac_ct_AR = ar -ac_ct_CC = gcc -ac_ct_CXX = g++ -ac_ct_DUMPBIN = -ac_ct_OBJC = gcc -ac_ct_OBJCXX = g++ -am__include = include -am__leading_dot = . -am__quote = -am__tar = $${TAR-tar} chof - "$$tardir" -am__untar = $${TAR-tar} xf - -ax_pthread_config = -bindir = ${exec_prefix}/bin -build = i686-pc-linux-gnu -build_alias = -build_cpu = i686 -build_os = linux-gnu -build_vendor = pc -builddir = . -datadir = ${datarootdir} -datarootdir = ${prefix}/share -docdir = ${datarootdir}/doc/${PACKAGE_TARNAME} -dvidir = ${docdir} -exec_prefix = ${prefix} -host = i686-pc-linux-gnu -host_alias = -host_cpu = i686 -host_os = linux-gnu -host_vendor = pc -htmldir = ${docdir} -includedir = ${prefix}/include -infodir = ${datarootdir}/info -install_sh = ${SHELL} /home/santi/LMS/git/libremediaserver/Gem/install-sh -libdir = ${exec_prefix}/lib/pd/extra -libexecdir = ${exec_prefix}/libexec -localedir = ${datarootdir}/locale -localstatedir = ${prefix}/var -mandir = ${datarootdir}/man -mkdir_p = /bin/mkdir -p -oldincludedir = /usr/include -pdfdir = ${docdir} -prefix = /home/santi/pd-externals -program_transform_name = s,x,x, -psdir = ${docdir} -sbindir = ${exec_prefix}/sbin -sharedstatedir = ${prefix}/com -srcdir = . -subdirs = extra plugins/videoAVT plugins/videoHALCON plugins/videoPYLON -sysconfdir = ${prefix}/etc -target_alias = -top_build_prefix = ../../ -top_builddir = ../.. -top_srcdir = ../.. -ACLOCAL_AMFLAGS = -I $(top_srcdir)/m4 -AM_CPPFLAGS = -I$(top_srcdir)/src -pkglib_LTLIBRARIES = $(am__append_1) - -# RTE -# flags for building Gem externals -# gem_filmDarwin_la @MOREFLAGS@ - -# Dependencies -gem_filmDarwin_la_CXXFLAGS = -DPD -I.//src \ - \ - $(am__empty) -gem_filmDarwin_la_LDFLAGS = -module -avoid-version -shared \ - $(am__append_2) -L./ -gem_filmDarwin_la_LIBADD = -L$(top_builddir) \ - $(am__empty) - -# convenience symlinks - -### SOURCES -gem_filmDarwin_la_SOURCES = filmDarwin.cpp filmDarwin.h -all: all-am - -.SUFFIXES: -.SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(srcdir)/../symlink_ltlib.mk $(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/filmDarwin/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign plugins/filmDarwin/Makefile -.PRECIOUS: 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__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; -$(srcdir)/../symlink_ltlib.mk: - -$(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-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - @$(NORMAL_INSTALL) - @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ - list2=; for p in $$list; do \ - if test -f $$p; then \ - list2="$$list2 $$p"; \ - else :; fi; \ - done; \ - test -z "$$list2" || { \ - echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \ - } - -uninstall-pkglibLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ - for p in $$list; do \ - $(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$f'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$f"; \ - done - -clean-pkglibLTLIBRARIES: - -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES) - @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -gem_filmDarwin.la: $(gem_filmDarwin_la_OBJECTS) $(gem_filmDarwin_la_DEPENDENCIES) $(EXTRA_gem_filmDarwin_la_DEPENDENCIES) - $(gem_filmDarwin_la_LINK) $(am_gem_filmDarwin_la_rpath) $(gem_filmDarwin_la_OBJECTS) $(gem_filmDarwin_la_LIBADD) $(LIBS) - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -include ./$(DEPDIR)/gem_filmDarwin_la-filmDarwin.Plo - -.cpp.o: - $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< - $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -# source='$<' object='$@' libtool=no \ -# DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \ -# $(CXXCOMPILE) -c -o $@ $< - -.cpp.obj: - $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` - $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -# source='$<' object='$@' libtool=no \ -# DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \ -# $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - -.cpp.lo: - $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< - $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -# source='$<' object='$@' libtool=yes \ -# DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \ -# $(LTCXXCOMPILE) -c -o $@ $< - -gem_filmDarwin_la-filmDarwin.lo: filmDarwin.cpp - $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gem_filmDarwin_la_CXXFLAGS) $(CXXFLAGS) -MT gem_filmDarwin_la-filmDarwin.lo -MD -MP -MF $(DEPDIR)/gem_filmDarwin_la-filmDarwin.Tpo -c -o gem_filmDarwin_la-filmDarwin.lo `test -f 'filmDarwin.cpp' || echo '$(srcdir)/'`filmDarwin.cpp - $(am__mv) $(DEPDIR)/gem_filmDarwin_la-filmDarwin.Tpo $(DEPDIR)/gem_filmDarwin_la-filmDarwin.Plo -# source='filmDarwin.cpp' object='gem_filmDarwin_la-filmDarwin.lo' libtool=yes \ -# DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \ -# $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gem_filmDarwin_la_CXXFLAGS) $(CXXFLAGS) -c -o gem_filmDarwin_la-filmDarwin.lo `test -f 'filmDarwin.cpp' || echo '$(srcdir)/'`filmDarwin.cpp - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - set x; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - 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 -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - 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" - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(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 $(LTLIBRARIES) all-local -installdirs: - for dir in "$(DESTDIR)$(pkglibdir)"; 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-libtool clean-local \ - clean-pkglibLTLIBRARIES mostlyclean-am - -distclean: distclean-am - -rm -rf ./$(DEPDIR) - -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-dvi: install-dvi-am - -install-dvi-am: - -install-exec-am: install-pkglibLTLIBRARIES - -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 -rf ./$(DEPDIR) - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-pkglibLTLIBRARIES - -.MAKE: install-am install-strip - -.PHONY: CTAGS GTAGS all all-am all-local check check-am clean \ - clean-generic clean-libtool clean-local \ - clean-pkglibLTLIBRARIES ctags distclean distclean-compile \ - distclean-generic distclean-libtool 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-pkglibLTLIBRARIES install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ - uninstall-am uninstall-pkglibLTLIBRARIES - - -.PHONY: convenience-link clean-convenience-link - -convenience-link: $(pkglib_LTLIBRARIES) - @for soname in `echo | $(EGREP) "^dlname=" $^ | $(SED) -e "s|^dlname='\(.*\)'|\1|"`; do \ - echo "$$soname: creating convenience link from $(abs_builddir)/.libs to $(top_builddir)"; \ - rm -f $(top_builddir)/$$soname ; \ - test -e $(abs_builddir)/.libs/$$soname && \ - cd $(top_builddir) && \ - $(LN_S) $(abs_builddir)/.libs/$$soname $$soname || true;\ - done - -clean-convenience-link: - @for soname in `echo | $(EGREP) "^dlname=" $(pkglib_LTLIBRARIES) | $(SED) -e "s|^dlname='\(.*\)'|\1|"`; do \ - echo "$$soname: cleaning convenience links"; \ - test -L $(top_builddir)/$$soname && rm -f $(top_builddir)/$$soname || true; \ - done - -all-local:: convenience-link - -clean-local:: clean-convenience-link - -# 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 --git a/src/Gem/plugins/videoAVT/autom4te.cache/requests b/src/Gem/plugins/videoAVT/autom4te.cache/requests index 7c317f7..e75082b 100644 --- a/src/Gem/plugins/videoAVT/autom4te.cache/requests +++ b/src/Gem/plugins/videoAVT/autom4te.cache/requests @@ -62,8 +62,8 @@ '_m4_warn' => 1, 'AC_LIBTOOL_OBJDIR' => 1, 'gl_FUNC_ARGZ' => 1, - 'AM_SANITY_CHECK' => 1, 'LTOBSOLETE_VERSION' => 1, + 'AM_SANITY_CHECK' => 1, 'AC_LIBTOOL_LANG_GCJ_CONFIG' => 1, 'AC_LIBTOOL_PROG_COMPILER_PIC' => 1, 'LT_LIB_M' => 1, @@ -75,22 +75,22 @@ '_AM_PROG_TAR' => 1, 'AC_LIBTOOL_GCJ' => 1, '_LT_WITH_SYSROOT' => 1, - 'LT_SYS_DLOPEN_DEPLIBS' => 1, 'LT_FUNC_DLSYM_USCORE' => 1, - '_LT_AC_LANG_F77' => 1, - 'AC_LIBTOOL_CONFIG' => 1, + 'LT_SYS_DLOPEN_DEPLIBS' => 1, 'AC_LIB_ARG_WITH' => 1, - '_AM_SUBST_NOTMAKE' => 1, + 'AC_LIBTOOL_CONFIG' => 1, + '_LT_AC_LANG_F77' => 1, 'AC_LTDL_DLLIB' => 1, + '_AM_SUBST_NOTMAKE' => 1, '_AM_AUTOCONF_VERSION' => 1, 'AM_DISABLE_SHARED' => 1, '_LT_PROG_ECHO_BACKSLASH' => 1, '_LTDL_SETUP' => 1, - '_LT_AC_LANG_CXX' => 1, 'AM_PROG_LIBTOOL' => 1, - 'AC_LIB_LTDL' => 1, - '_LT_AC_FILE_LTDLL_C' => 1, + '_LT_AC_LANG_CXX' => 1, 'AM_PROG_LD' => 1, + '_LT_AC_FILE_LTDLL_C' => 1, + 'AC_LIB_LTDL' => 1, 'GEM_TARGET_DISABLED' => 1, 'GEM_CHECK_RTE' => 1, 'AU_DEFUN' => 1, @@ -111,24 +111,24 @@ 'AC_LIBTOOL_LANG_CXX_CONFIG' => 1, 'gl_PREREQ_ARGZ' => 1, 'AC_LIB_PREFIX' => 1, - 'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1, 'LT_SUPPORTED_TAG' => 1, - 'LT_SYS_MODULE_EXT' => 1, + 'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1, 'LT_PROG_RC' => 1, + 'LT_SYS_MODULE_EXT' => 1, 'AC_DEFUN_ONCE' => 1, '_LT_AC_LANG_GCJ' => 1, - 'GEM_ARG_DISABLE' => 1, 'AC_' => 1, + 'GEM_ARG_DISABLE' => 1, 'AC_LTDL_OBJDIR' => 1, - '_LT_PATH_TOOL_PREFIX' => 1, 'GEM_ARG_WITH' => 1, + '_LT_PATH_TOOL_PREFIX' => 1, 'AC_LIBTOOL_RC' => 1, - 'AM_SILENT_RULES' => 1, - 'AC_DISABLE_FAST_INSTALL' => 1, '_LT_AC_PROG_ECHO_BACKSLASH' => 1, - '_LT_AC_SYS_LIBPATH_AIX' => 1, - '_LT_AC_TRY_DLOPEN_SELF' => 1, + 'AC_DISABLE_FAST_INSTALL' => 1, + 'AM_SILENT_RULES' => 1, 'include' => 1, + '_LT_AC_TRY_DLOPEN_SELF' => 1, + '_LT_AC_SYS_LIBPATH_AIX' => 1, 'LT_AC_PROG_SED' => 1, 'AM_ENABLE_SHARED' => 1, 'AC_LIB_APPENDTOVAR' => 1, @@ -136,22 +136,22 @@ '_LT_AC_LANG_GCJ_CONFIG' => 1, 'AC_ENABLE_SHARED' => 1, 'AC_LIB_WITH_FINAL_PREFIX' => 1, - 'AC_ENABLE_STATIC' => 1, - 'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1, '_LT_REQUIRED_DARWIN_CHECKS' => 1, + 'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1, + 'AC_ENABLE_STATIC' => 1, '_LT_AC_TAGVAR' => 1, 'AC_LIBTOOL_LANG_F77_CONFIG' => 1, 'AM_CONDITIONAL' => 1, 'LT_LIB_DLLOAD' => 1, - 'LTDL_INIT' => 1, - '_LT_PROG_F77' => 1, - '_LT_PROG_CXX' => 1, 'LTVERSION_VERSION' => 1, - 'AM_PROG_INSTALL_SH' => 1, + '_LT_PROG_CXX' => 1, + '_LT_PROG_F77' => 1, + 'LTDL_INIT' => 1, 'm4_include' => 1, + 'AM_PROG_INSTALL_SH' => 1, 'AC_PROG_EGREP' => 1, - '_AC_AM_CONFIG_HEADER_HOOK' => 1, 'AC_PATH_MAGIC' => 1, + '_AC_AM_CONFIG_HEADER_HOOK' => 1, 'AC_LTDL_SYSSEARCHPATH' => 1, 'AM_MAKE_INCLUDE' => 1, 'LT_CMD_MAX_LEN' => 1, @@ -171,81 +171,81 @@ 'LT_LANG' => 1, 'LT_SYS_DLSEARCH_PATH' => 1, 'LT_CONFIG_LTDL_DIR' => 1, - 'LT_OUTPUT' => 1, 'AC_LIBTOOL_DLOPEN_SELF' => 1, + 'LT_OUTPUT' => 1, 'GEM_CHECK_LDFLAGS' => 1, 'AC_LIB_PROG_LD_GNU' => 1, 'AC_LIBTOOL_PROG_LD_SHLIBS' => 1, - 'AC_LIBTOOL_LINKER_OPTION' => 1, 'AC_WITH_LTDL' => 1, - 'AC_LIBTOOL_CXX' => 1, + 'AC_LIBTOOL_LINKER_OPTION' => 1, 'LT_AC_PROG_RC' => 1, + 'AC_LIBTOOL_CXX' => 1, 'LT_INIT' => 1, - 'LT_SYS_DLOPEN_SELF' => 1, 'LT_AC_PROG_GCJ' => 1, - '_LT_AC_PROG_CXXCPP' => 1, - 'AM_DISABLE_STATIC' => 1, + 'LT_SYS_DLOPEN_SELF' => 1, 'AM_DEP_TRACK' => 1, + 'AM_DISABLE_STATIC' => 1, + '_LT_AC_PROG_CXXCPP' => 1, '_AC_PROG_LIBTOOL' => 1, '_AM_IF_OPTION' => 1, 'AC_PATH_TOOL_PREFIX' => 1, - 'AC_LIBTOOL_F77' => 1, 'm4_pattern_allow' => 1, + 'AC_LIBTOOL_F77' => 1, 'AM_SET_LEADING_DOT' => 1, 'GEM_CHECK_FRAMEWORK' => 1, - 'LT_AC_PROG_EGREP' => 1, '_LT_PROG_FC' => 1, + 'LT_AC_PROG_EGREP' => 1, '_AM_DEPENDENCIES' => 1, 'AC_LIBTOOL_LANG_C_CONFIG' => 1, 'LTOPTIONS_VERSION' => 1, - '_LT_AC_SYS_COMPILER' => 1, 'AC_LIB_LINKFLAGS' => 1, + '_LT_AC_SYS_COMPILER' => 1, 'AM_PROG_NM' => 1, - 'GEM_CHECK_LIB' => 1, 'PKG_CHECK_MODULES' => 1, + 'GEM_CHECK_LIB' => 1, 'AC_LIBLTDL_CONVENIENCE' => 1, 'AC_DEPLIBS_CHECK_METHOD' => 1, - 'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1, 'AC_LIBLTDL_INSTALLABLE' => 1, + 'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1, 'AC_LTDL_ENABLE_INSTALL' => 1, - 'AC_LIBTOOL_SYS_DYNAMIC_LINKER' => 1, 'LT_PROG_GCJ' => 1, + 'AC_LIBTOOL_SYS_DYNAMIC_LINKER' => 1, 'AM_INIT_AUTOMAKE' => 1, 'AC_DISABLE_STATIC' => 1, 'LT_PATH_NM' => 1, 'AC_LTDL_SHLIBEXT' => 1, '_LT_AC_LOCK' => 1, - '_LT_AC_LANG_RC_CONFIG' => 1, 'GEM_ARG_ENABLE' => 1, + '_LT_AC_LANG_RC_CONFIG' => 1, 'LT_PROG_GO' => 1, 'LT_SYS_MODULE_PATH' => 1, - 'AC_LIBTOOL_POSTDEP_PREDEP' => 1, 'LT_WITH_LTDL' => 1, + 'AC_LIBTOOL_POSTDEP_PREDEP' => 1, 'AC_LTDL_SHLIBPATH' => 1, 'AM_AUX_DIR_EXPAND' => 1, 'GEM_TARGET' => 1, - '_LT_AC_LANG_F77_CONFIG' => 1, 'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1, - '_AM_SET_OPTIONS' => 1, + '_LT_AC_LANG_F77_CONFIG' => 1, '_LT_COMPILER_OPTION' => 1, - '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1, - 'AM_RUN_LOG' => 1, + '_AM_SET_OPTIONS' => 1, 'IEM_OPERATING_SYSTEM' => 1, - 'AC_LIBTOOL_SYS_OLD_ARCHIVE' => 1, - 'AC_LTDL_SYS_DLOPEN_DEPLIBS' => 1, + 'AM_RUN_LOG' => 1, + '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1, 'AC_LIBTOOL_PICMODE' => 1, + 'AC_LTDL_SYS_DLOPEN_DEPLIBS' => 1, + 'AC_LIBTOOL_SYS_OLD_ARCHIVE' => 1, 'AC_LIB_LINKFLAGS_BODY' => 1, - 'LT_PATH_LD' => 1, - 'AC_CHECK_LIBM' => 1, - 'AX_PTHREAD' => 1, 'ACX_PTHREAD' => 1, + 'AX_PTHREAD' => 1, + 'AC_CHECK_LIBM' => 1, + 'LT_PATH_LD' => 1, 'AC_LIBTOOL_SYS_LIB_STRIP' => 1, '_AM_MANGLE_OPTION' => 1, - 'AC_LTDL_SYMBOL_USCORE' => 1, 'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1, + 'AC_LTDL_SYMBOL_USCORE' => 1, 'AM_SET_DEPDIR' => 1, - '_LT_CC_BASENAME' => 1, 'PKG_PROG_PKG_CONFIG' => 1, + '_LT_CC_BASENAME' => 1, 'GEM_CHECK_THREADS' => 1, '_LT_LIBOBJ' => 1, 'AC_LIB_PROG_LD' => 1 @@ -263,57 +263,57 @@ 'configure.ac' ], { - '_LT_AC_TAGCONFIG' => 1, 'AM_PROG_F77_C_O' => 1, - 'm4_pattern_forbid' => 1, + '_LT_AC_TAGCONFIG' => 1, 'AC_INIT' => 1, - '_AM_COND_IF' => 1, + 'm4_pattern_forbid' => 1, 'AC_CANONICAL_TARGET' => 1, - 'AC_SUBST' => 1, + '_AM_COND_IF' => 1, 'AC_CONFIG_LIBOBJ_DIR' => 1, - 'AC_FC_SRCEXT' => 1, + 'AC_SUBST' => 1, 'AC_CANONICAL_HOST' => 1, + 'AC_FC_SRCEXT' => 1, 'AC_PROG_LIBTOOL' => 1, 'AM_INIT_AUTOMAKE' => 1, - 'AM_PATH_GUILE' => 1, 'AC_CONFIG_SUBDIRS' => 1, + 'AM_PATH_GUILE' => 1, 'AM_AUTOMAKE_VERSION' => 1, 'LT_CONFIG_LTDL_DIR' => 1, - 'AC_REQUIRE_AUX_FILE' => 1, 'AC_CONFIG_LINKS' => 1, - 'm4_sinclude' => 1, + 'AC_REQUIRE_AUX_FILE' => 1, 'LT_SUPPORTED_TAG' => 1, + 'm4_sinclude' => 1, 'AM_MAINTAINER_MODE' => 1, 'AM_NLS' => 1, 'AC_FC_PP_DEFINE' => 1, 'AM_GNU_GETTEXT_INTL_SUBDIR' => 1, - 'AM_MAKEFILE_INCLUDE' => 1, '_m4_warn' => 1, + 'AM_MAKEFILE_INCLUDE' => 1, 'AM_PROG_CXX_C_O' => 1, - '_AM_COND_ENDIF' => 1, '_AM_MAKEFILE_INCLUDE' => 1, + '_AM_COND_ENDIF' => 1, 'AM_ENABLE_MULTILIB' => 1, 'AM_SILENT_RULES' => 1, 'AM_PROG_MOC' => 1, 'AC_CONFIG_FILES' => 1, - 'LT_INIT' => 1, 'include' => 1, - 'AM_PROG_AR' => 1, + 'LT_INIT' => 1, 'AM_GNU_GETTEXT' => 1, + 'AM_PROG_AR' => 1, 'AC_LIBSOURCE' => 1, - 'AM_PROG_FC_C_O' => 1, 'AC_CANONICAL_BUILD' => 1, + 'AM_PROG_FC_C_O' => 1, 'AC_FC_FREEFORM' => 1, - 'AH_OUTPUT' => 1, 'AC_FC_PP_SRCEXT' => 1, - '_AM_SUBST_NOTMAKE' => 1, + 'AH_OUTPUT' => 1, 'AC_CONFIG_AUX_DIR' => 1, - 'sinclude' => 1, - 'AM_PROG_CC_C_O' => 1, + '_AM_SUBST_NOTMAKE' => 1, 'm4_pattern_allow' => 1, - 'AM_XGETTEXT_OPTION' => 1, - 'AC_CANONICAL_SYSTEM' => 1, + 'AM_PROG_CC_C_O' => 1, + 'sinclude' => 1, 'AM_CONDITIONAL' => 1, + 'AC_CANONICAL_SYSTEM' => 1, + 'AM_XGETTEXT_OPTION' => 1, 'AC_CONFIG_HEADERS' => 1, 'AC_DEFINE_TRACE_LITERAL' => 1, 'AM_POT_TOOLS' => 1, @@ -381,8 +381,8 @@ '_m4_warn' => 1, 'AC_LIBTOOL_OBJDIR' => 1, 'gl_FUNC_ARGZ' => 1, - 'AM_SANITY_CHECK' => 1, 'LTOBSOLETE_VERSION' => 1, + 'AM_SANITY_CHECK' => 1, 'AC_LIBTOOL_LANG_GCJ_CONFIG' => 1, 'AC_LIBTOOL_PROG_COMPILER_PIC' => 1, 'LT_LIB_M' => 1, @@ -394,22 +394,22 @@ '_AM_PROG_TAR' => 1, 'AC_LIBTOOL_GCJ' => 1, '_LT_WITH_SYSROOT' => 1, - 'LT_SYS_DLOPEN_DEPLIBS' => 1, 'LT_FUNC_DLSYM_USCORE' => 1, - '_LT_AC_LANG_F77' => 1, - 'AC_LIBTOOL_CONFIG' => 1, + 'LT_SYS_DLOPEN_DEPLIBS' => 1, 'AC_LIB_ARG_WITH' => 1, - '_AM_SUBST_NOTMAKE' => 1, + 'AC_LIBTOOL_CONFIG' => 1, + '_LT_AC_LANG_F77' => 1, 'AC_LTDL_DLLIB' => 1, + '_AM_SUBST_NOTMAKE' => 1, '_AM_AUTOCONF_VERSION' => 1, 'AM_DISABLE_SHARED' => 1, '_LT_PROG_ECHO_BACKSLASH' => 1, '_LTDL_SETUP' => 1, - '_LT_AC_LANG_CXX' => 1, 'AM_PROG_LIBTOOL' => 1, - 'AC_LIB_LTDL' => 1, - '_LT_AC_FILE_LTDLL_C' => 1, + '_LT_AC_LANG_CXX' => 1, 'AM_PROG_LD' => 1, + '_LT_AC_FILE_LTDLL_C' => 1, + 'AC_LIB_LTDL' => 1, 'GEM_TARGET_DISABLED' => 1, 'GEM_CHECK_RTE' => 1, 'AU_DEFUN' => 1, @@ -430,24 +430,24 @@ '_LT_PREPARE_SED_QUOTE_VARS' => 1, 'gl_PREREQ_ARGZ' => 1, 'AC_LIB_PREFIX' => 1, - 'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1, 'LT_SUPPORTED_TAG' => 1, - 'LT_SYS_MODULE_EXT' => 1, + 'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1, 'LT_PROG_RC' => 1, + 'LT_SYS_MODULE_EXT' => 1, 'AC_DEFUN_ONCE' => 1, '_LT_AC_LANG_GCJ' => 1, - 'GEM_ARG_DISABLE' => 1, 'AC_' => 1, + 'GEM_ARG_DISABLE' => 1, 'AC_LTDL_OBJDIR' => 1, - '_LT_PATH_TOOL_PREFIX' => 1, 'GEM_ARG_WITH' => 1, + '_LT_PATH_TOOL_PREFIX' => 1, 'AC_LIBTOOL_RC' => 1, - 'AM_SILENT_RULES' => 1, - 'AC_DISABLE_FAST_INSTALL' => 1, '_LT_AC_PROG_ECHO_BACKSLASH' => 1, - '_LT_AC_SYS_LIBPATH_AIX' => 1, - '_LT_AC_TRY_DLOPEN_SELF' => 1, + 'AC_DISABLE_FAST_INSTALL' => 1, + 'AM_SILENT_RULES' => 1, 'include' => 1, + '_LT_AC_TRY_DLOPEN_SELF' => 1, + '_LT_AC_SYS_LIBPATH_AIX' => 1, 'LT_AC_PROG_SED' => 1, 'AM_ENABLE_SHARED' => 1, 'AC_LIB_APPENDTOVAR' => 1, @@ -455,22 +455,22 @@ '_LT_AC_LANG_GCJ_CONFIG' => 1, 'AC_ENABLE_SHARED' => 1, 'AC_LIB_WITH_FINAL_PREFIX' => 1, - 'AC_ENABLE_STATIC' => 1, - 'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1, '_LT_REQUIRED_DARWIN_CHECKS' => 1, + 'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1, + 'AC_ENABLE_STATIC' => 1, '_LT_AC_TAGVAR' => 1, 'AC_LIBTOOL_LANG_F77_CONFIG' => 1, 'AM_CONDITIONAL' => 1, 'LT_LIB_DLLOAD' => 1, - 'LTDL_INIT' => 1, - '_LT_PROG_F77' => 1, - '_LT_PROG_CXX' => 1, 'LTVERSION_VERSION' => 1, - 'AM_PROG_INSTALL_SH' => 1, + '_LT_PROG_CXX' => 1, + '_LT_PROG_F77' => 1, + 'LTDL_INIT' => 1, 'm4_include' => 1, + 'AM_PROG_INSTALL_SH' => 1, 'AC_PROG_EGREP' => 1, - '_AC_AM_CONFIG_HEADER_HOOK' => 1, 'AC_PATH_MAGIC' => 1, + '_AC_AM_CONFIG_HEADER_HOOK' => 1, 'AC_LTDL_SYSSEARCHPATH' => 1, 'AM_MAKE_INCLUDE' => 1, 'LT_CMD_MAX_LEN' => 1, @@ -490,81 +490,81 @@ 'LT_LANG' => 1, 'LT_SYS_DLSEARCH_PATH' => 1, 'LT_CONFIG_LTDL_DIR' => 1, - 'LT_OUTPUT' => 1, 'AC_LIBTOOL_DLOPEN_SELF' => 1, + 'LT_OUTPUT' => 1, 'GEM_CHECK_LDFLAGS' => 1, 'AC_LIB_PROG_LD_GNU' => 1, 'AC_LIBTOOL_PROG_LD_SHLIBS' => 1, - 'AC_LIBTOOL_LINKER_OPTION' => 1, 'AC_WITH_LTDL' => 1, - 'AC_LIBTOOL_CXX' => 1, + 'AC_LIBTOOL_LINKER_OPTION' => 1, 'LT_AC_PROG_RC' => 1, + 'AC_LIBTOOL_CXX' => 1, 'LT_INIT' => 1, - 'LT_SYS_DLOPEN_SELF' => 1, 'LT_AC_PROG_GCJ' => 1, - '_LT_AC_PROG_CXXCPP' => 1, - 'AM_DISABLE_STATIC' => 1, + 'LT_SYS_DLOPEN_SELF' => 1, 'AM_DEP_TRACK' => 1, + 'AM_DISABLE_STATIC' => 1, + '_LT_AC_PROG_CXXCPP' => 1, '_AC_PROG_LIBTOOL' => 1, '_AM_IF_OPTION' => 1, 'AC_PATH_TOOL_PREFIX' => 1, - 'AC_LIBTOOL_F77' => 1, 'm4_pattern_allow' => 1, + 'AC_LIBTOOL_F77' => 1, 'AM_SET_LEADING_DOT' => 1, 'GEM_CHECK_FRAMEWORK' => 1, - 'LT_AC_PROG_EGREP' => 1, '_LT_PROG_FC' => 1, + 'LT_AC_PROG_EGREP' => 1, '_AM_DEPENDENCIES' => 1, 'AC_LIBTOOL_LANG_C_CONFIG' => 1, 'LTOPTIONS_VERSION' => 1, - '_LT_AC_SYS_COMPILER' => 1, 'AC_LIB_LINKFLAGS' => 1, + '_LT_AC_SYS_COMPILER' => 1, 'AM_PROG_NM' => 1, - 'GEM_CHECK_LIB' => 1, 'PKG_CHECK_MODULES' => 1, + 'GEM_CHECK_LIB' => 1, 'AC_LIBLTDL_CONVENIENCE' => 1, 'AC_DEPLIBS_CHECK_METHOD' => 1, - 'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1, 'AC_LIBLTDL_INSTALLABLE' => 1, + 'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1, 'AC_LTDL_ENABLE_INSTALL' => 1, - 'AC_LIBTOOL_SYS_DYNAMIC_LINKER' => 1, 'LT_PROG_GCJ' => 1, + 'AC_LIBTOOL_SYS_DYNAMIC_LINKER' => 1, 'AM_INIT_AUTOMAKE' => 1, 'AC_DISABLE_STATIC' => 1, 'LT_PATH_NM' => 1, 'AC_LTDL_SHLIBEXT' => 1, '_LT_AC_LOCK' => 1, - '_LT_AC_LANG_RC_CONFIG' => 1, 'GEM_ARG_ENABLE' => 1, + '_LT_AC_LANG_RC_CONFIG' => 1, 'LT_PROG_GO' => 1, 'LT_SYS_MODULE_PATH' => 1, - 'AC_LIBTOOL_POSTDEP_PREDEP' => 1, 'LT_WITH_LTDL' => 1, + 'AC_LIBTOOL_POSTDEP_PREDEP' => 1, 'AC_LTDL_SHLIBPATH' => 1, 'AM_AUX_DIR_EXPAND' => 1, 'GEM_TARGET' => 1, - '_LT_AC_LANG_F77_CONFIG' => 1, 'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1, - '_AM_SET_OPTIONS' => 1, + '_LT_AC_LANG_F77_CONFIG' => 1, '_LT_COMPILER_OPTION' => 1, - '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1, - 'AM_RUN_LOG' => 1, + '_AM_SET_OPTIONS' => 1, 'IEM_OPERATING_SYSTEM' => 1, - 'AC_LIBTOOL_SYS_OLD_ARCHIVE' => 1, - 'AC_LTDL_SYS_DLOPEN_DEPLIBS' => 1, + 'AM_RUN_LOG' => 1, + '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1, 'AC_LIBTOOL_PICMODE' => 1, + 'AC_LTDL_SYS_DLOPEN_DEPLIBS' => 1, + 'AC_LIBTOOL_SYS_OLD_ARCHIVE' => 1, 'AC_LIB_LINKFLAGS_BODY' => 1, - 'LT_PATH_LD' => 1, - 'AC_CHECK_LIBM' => 1, - 'AX_PTHREAD' => 1, 'ACX_PTHREAD' => 1, + 'AX_PTHREAD' => 1, + 'AC_CHECK_LIBM' => 1, + 'LT_PATH_LD' => 1, 'AC_LIBTOOL_SYS_LIB_STRIP' => 1, '_AM_MANGLE_OPTION' => 1, - 'AC_LTDL_SYMBOL_USCORE' => 1, 'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1, + 'AC_LTDL_SYMBOL_USCORE' => 1, 'AM_SET_DEPDIR' => 1, - '_LT_CC_BASENAME' => 1, 'PKG_PROG_PKG_CONFIG' => 1, + '_LT_CC_BASENAME' => 1, 'GEM_CHECK_THREADS' => 1, '_LT_LIBOBJ' => 1, 'AC_LIB_PROG_LD' => 1 diff --git a/src/Gem/plugins/videoHALCON/autom4te.cache/requests b/src/Gem/plugins/videoHALCON/autom4te.cache/requests index 4308fd0..e94b458 100644 --- a/src/Gem/plugins/videoHALCON/autom4te.cache/requests +++ b/src/Gem/plugins/videoHALCON/autom4te.cache/requests @@ -107,9 +107,9 @@ '_AM_SET_OPTION' => 1, 'AC_LTDL_PREOPEN' => 1, '_LT_LINKER_BOILERPLATE' => 1, + 'AC_LIBTOOL_LANG_CXX_CONFIG' => 1, 'AC_LIBTOOL_PROG_CC_C_O' => 1, '_LT_PREPARE_SED_QUOTE_VARS' => 1, - 'AC_LIBTOOL_LANG_CXX_CONFIG' => 1, 'gl_PREREQ_ARGZ' => 1, 'AC_LIB_PREFIX' => 1, 'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1, diff --git a/src/Gem/src/Output/gemglutwindow.cpp b/src/Gem/src/Output/gemglutwindow.cpp index 39853ef..bf5f532 100644 --- a/src/Gem/src/Output/gemglutwindow.cpp +++ b/src/Gem/src/Output/gemglutwindow.cpp @@ -277,7 +277,7 @@ void gemglutwindow :: destroyMess(void) int window=m_window; m_window=0; // so that we no longer receive any event - glutWMCloseFunc (NULL); + glutCloseFunc (NULL); glutDestroyWindow(window); glutMainLoopEvent(); glutMainLoopEvent(); diff --git a/src/Gem/src/Pixes/pix_film.cpp b/src/Gem/src/Pixes/pix_film.cpp index fa6b0bb..87ff677 100644 --- a/src/Gem/src/Pixes/pix_film.cpp +++ b/src/Gem/src/Pixes/pix_film.cpp @@ -206,14 +206,13 @@ pix_film :: pix_film(t_symbol *filename) : if(m_handle) { - std::string backends; gem::Properties props; gem::any value; - value=backends; + value=m_ids; props.set("backends", value); m_handle->getProperties(props); - if(props.get("backends", backends)) { - m_ids=split(backends, ' ', m_ids); + if(props.get("backends", m_ids)) { + // } } unsigned int i; @@ -297,7 +296,7 @@ void pix_film :: openMess(std::string filename, int format, unsigned int backend void pix_film :: openMess(std::string filename, int format, std::string backend) { gem::Properties wantProps, gotProps; - + std::vectorbackends; closeMess(); char buff[MAXPDSTRING]; @@ -321,7 +320,12 @@ void pix_film :: openMess(std::string filename, int format, std::string backend) } if(!backend.empty()) { - wantProps.set("backends", backend); + // FIXXME: check whether using vector works on all platforms + std::vectorbackends; + backends.push_back(backend); + wantProps.set("backends", backends); + } else if (!m_backends.empty()) { + wantProps.set("backends", m_backends); } if(!m_handle->open(fname, wantProps)) { @@ -540,8 +544,29 @@ void pix_film :: autoMess(double speed) m_handle->setProperties(props); } +void pix_film :: backendMess(t_symbol*s, int argc, t_atom*argv) +{ + int i; + m_backends.clear(); + for(i=0; is_name); + } +} +void pix_film :: backendMess(const std::string&backend) +{ + m_backends.clear(); + m_backends.push_back(backend); +} +void pix_film :: backendMess(int backendNum) +{ + std::string backend; + if(backendNum>=0 && m_ids.size()>0) + backend=m_ids[backendNum%m_ids.size()]; + backendMess(backend); +} ///////////////////////////////////////////////////////// // static member function @@ -566,6 +591,7 @@ void pix_film :: obj_setupCallback(t_class *classPtr) CPPEXTERN_MSG1(classPtr, "auto", autoMess, t_float); CPPEXTERN_MSG1(classPtr, "colorspace", csMess, t_symbol*); CPPEXTERN_MSG1(classPtr, "thread", threadMess, bool); + CPPEXTERN_MSG (classPtr, "driver", backendMess); } void pix_film :: openMessCallback(void *data, t_symbol*s,int argc, t_atom*argv) { diff --git a/src/Gem/src/Pixes/pix_film.h b/src/Gem/src/Pixes/pix_film.h index 80316e7..bcb6eec 100644 --- a/src/Gem/src/Pixes/pix_film.h +++ b/src/Gem/src/Pixes/pix_film.h @@ -87,9 +87,18 @@ class GEM_EXTERN pix_film : public GemBase // turn on/off threaded reading virtual void threadMess(int); - + ////////// + // automatic frame increment virtual void autoMess(double state); + ////////// + // which backend to use (exclusively) + std::vectorm_backends; + virtual void backendMess(t_symbol*,int,t_atom*); + virtual void backendMess(const std::string&); + virtual void backendMess(int); + + //----------------------------------- // GROUP: Movie data diff --git a/src/Gem/src/plugins/film.cpp b/src/Gem/src/plugins/film.cpp index 154adb4..1c5bbcb 100644 --- a/src/Gem/src/plugins/film.cpp +++ b/src/Gem/src/plugins/film.cpp @@ -36,7 +36,7 @@ namespace gem { namespace plugins { m_handle(gem::plugins::imageloader::getInstance()) { if(!m_handle) - throw(GemException("no 'image' backends")); + throw(GemException("no 'image' backends")); } virtual ~filmIMAGE(void) { @@ -61,10 +61,10 @@ namespace gem { namespace plugins { virtual bool isThreadable(void) { return false; } virtual bool enumProperties(gem::Properties&readable, - gem::Properties&writeable) { + gem::Properties&writeable) { writeable.clear(); readable.clear(); - return false; + return false; } virtual void setProperties(gem::Properties&props) { } @@ -72,14 +72,14 @@ namespace gem { namespace plugins { std::vectorkeys=props.keys(); unsigned int i=0; for(i=0; iids=gem::PluginFactory::getIDs(); if(!addPlugin(ids, "DirectShow")) - addPlugin(ids, "AVI"); + addPlugin(ids, "AVI"); addPlugin(ids, "gmerlin"); addPlugin(ids, "QuickTime"); @@ -154,17 +154,17 @@ namespace gem { namespace plugins { unsigned int i; for(i=0; iisThreadable()) { - m_canThread=false; - break; - } + if(!m_handles[i]->isThreadable()) { + m_canThread=false; + break; + } } try { - gem::plugins::film*filmImage=new filmIMAGE(); - if(NULL!=filmImage) { - m_handles.push_back(filmImage); - m_ids.push_back("image"); - } + gem::plugins::film*filmImage=new filmIMAGE(); + if(NULL!=filmImage) { + m_handles.push_back(filmImage); + m_ids.push_back("image"); + } } catch (GemException&) { } @@ -181,64 +181,70 @@ namespace gem { namespace plugins { virtual bool open(const std::string name, const gem::Properties&requestprops) { if(m_handle)close(); - std::string ids; + std::vector backends; if(requestprops.type("backends")!=gem::Properties::UNSET) { - requestprops.get("backends", ids); + requestprops.get("backends", backends); } // requestprops.erase("backends"); - - if(!ids.empty()) { - // LATER: allow multiple IDs to be passed via 'backend' - unsigned int i=0; - for(i=0; iopen(name, requestprops)) { - m_handle=m_handles[i]; - } - } + bool tried=false; + if(!backends.empty()) { + unsigned int i, j; + for(j=0; !m_handle && jopen(name, requestprops)) { + m_handle=m_handles[i]; + break; + } + } + } } - if(!m_handle) { - unsigned int i=0; - for(i=0; iopen(name, requestprops)) { - m_handle=m_handles[i]; - break; - } else { + if(!tried) { + if(!backends.empty() && !m_handles.empty()) { + verbose(2, "no available backend selected, fall back to valid ones"); + } + unsigned int i=0; + for(i=0; iopen(name, requestprops)) { + m_handle=m_handles[i]; + break; + } else { - } - } + } + } } return (NULL!=m_handle); } virtual errCode changeImage(int imgNum, int trackNum=-1){ if(m_handle) - return m_handle->changeImage(imgNum, trackNum); + return m_handle->changeImage(imgNum, trackNum); return FAILURE; } virtual pixBlock* getFrame(void) { if(m_handle) - return m_handle->getFrame(); + return m_handle->getFrame(); return NULL; } virtual void close(void) { if(m_handle) - m_handle->close(); + m_handle->close(); m_handle=NULL; } virtual bool isThreadable(void) { if(m_handle) - return m_handle->isThreadable(); + return m_handle->isThreadable(); return m_canThread; } virtual bool enumProperties(gem::Properties&readable, - gem::Properties&writeable) { + gem::Properties&writeable) { // LATER: shouldn't we merge properties of all handles? // post("enumProperties stub"); #ifdef __GNUC__ @@ -249,34 +255,32 @@ namespace gem { namespace plugins { writeable.clear(); if(m_handle) - return m_handle->enumProperties(readable, writeable); + return m_handle->enumProperties(readable, writeable); return false; } virtual void setProperties(gem::Properties&props) { if(m_handle) - m_handle->setProperties(props); + m_handle->setProperties(props); } virtual void getProperties(gem::Properties&props) { - std::string ids; + std::vector ids; if(props.type("backends")!=gem::Properties::UNSET) { - unsigned int i; - for(i=0; igetProperties(props); + m_handle->getProperties(props); else - props.clear(); + props.clear(); if(!ids.empty()) { - props.set("backends", ids); + props.set("backends", ids); } } }; @@ -288,4 +292,3 @@ gem::plugins::film*gem::plugins::film::getInstance(void) { gem::plugins::film*result=new filmMeta(); return result; } - diff --git a/src/libremediaserver.cpp b/src/libremediaserver.cpp index 7ee1a11..66115b9 100644 --- a/src/libremediaserver.cpp +++ b/src/libremediaserver.cpp @@ -868,6 +868,7 @@ void libreMediaServer::pdrestart() return; } save_finish(); + qDebug()<<"**************************************************************************"; qDebug()<<"Starting PD Video:" << ++m_startvideo; ui.textEdit->appendPlainText("PD Video Restarting."); disconnect(m_pd_video, SIGNAL(finished(int)), this, SLOT(pdrestart())); diff --git a/src/libremediaserver.pro.user b/src/libremediaserver.pro.user index f0682de..54eea1c 100644 --- a/src/libremediaserver.pro.user +++ b/src/libremediaserver.pro.user @@ -1,6 +1,6 @@ - + ProjectExplorer.Project.ActiveTarget @@ -54,7 +54,7 @@ Desktop Desktop Qt4ProjectManager.Target.DesktopTarget - 0 + 1 0 0 @@ -218,7 +218,7 @@ false false - /home/santi/LMS/git/libremediaserver/pd + /home/santi/LMS/git/libremediaserver 3768 true false diff --git a/src/main.cpp b/src/main.cpp index a67c54c..2a17ef8 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -20,6 +20,10 @@ #include "libremediaserver.h" // Handler for pipe the stderr to a log file + +bool initMessageHandler = 0; +QFile outFile; + void MessageHandler(QtMsgType type, const char *msg) { QString txt; @@ -37,15 +41,23 @@ void MessageHandler(QtMsgType type, const char *msg) txt = QString("Fatal: %1").arg(msg); abort(); } - QString filename; - QDate date = QDate::currentDate(); - QTime time = QTime::currentTime(); - filename.append("./logs/log_"); - filename.append(date.toString("dd_MM_yy-")); - filename.append(time.toString("hh-mm-ss")); - filename.append(".txt"); - QFile outFile(filename); - outFile.open(QIODevice::WriteOnly | QIODevice::Append); + if (!initMessageHandler) + { + QString filename; + QDate date = QDate::currentDate(); + QTime time = QTime::currentTime(); + filename.append("./logs/log_"); + filename.append(date.toString("dd_MM_yy-")); + filename.append(time.toString("hh-mm-ss")); + filename.append(".txt"); + outFile.setFileName(filename); + if (!outFile.open(QIODevice::WriteOnly | QIODevice::Append)) + { + qDebug()<<"main/MessageHandler/Qfile::open: can not open log file"; + return; + } + initMessageHandler = 1; + } QTextStream ts(&outFile); ts << txt << endl; }