Pd-cvs November 2004

pd-cvs@lists.iem.at

12 participants
283 discussions

externals/pidip CHANGES.LOG,1.14,1.15 INSTALL,1.5,1.6 Makefile,1.6,1.7 Makefile.in,1.5,1.6 acinclude.m4,1.7,1.8 aclocal.m4,1.7,1.8 configure,1.7,1.8 configure.ac,1.9,1.10 configure.in,1.4,1.5
by Yves Degoyon 14 Nov '04

14 Nov '04

Update of /cvsroot/pure-data/externals/pidip In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21582 Modified Files: CHANGES.LOG INSTALL Makefile Makefile.in acinclude.m4 aclocal.m4 configure configure.ac configure.in Log Message: PiDiP v 0.12.17 Index: configure =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/configure,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** configure 18 May 2004 00:59:44 -0000 1.7 --- configure 14 Nov 2004 22:52:19 -0000 1.8 *************** *** 272,276 **** PACKAGE_BUGREPORT= ! ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA SET_MAKE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT IMLIB2_CONFIG IMLIB_LIBS IMLIB_CFLAGS IMLIB2_CFLAGS IMLIB2_LIBS PDP_PIDIP_VERSION MAGICK_LIBS MAGICK_CFLAGS PD_DIR PDP_DIR FFMPEG_SOURCE_DIR MPEG4IP_SOURCE_DIR MPEG4IP_CFLAGS PDP_STREAMING_OBJECTS PDP_PIDIP_LIBS PDP_PIDIP_INCLUDES LIBOBJS LTLIBOBJS' ac_subst_files='' --- 272,276 ---- PACKAGE_BUGREPORT= ! ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA SET_MAKE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT IMLIB2_CONFIG IMLIB_LIBS IMLIB_CFLAGS IMLIB2_CFLAGS IMLIB2_LIBS PDP_PIDIP_VERSION MAGICK_LIBS MAGICK_CFLAGS THEORA_LIBS PD_DIR PDP_DIR FFMPEG_SOURCE_DIR MPEG4IP_SOURCE_DIR MPEG4IP_CFLAGS PDP_STREAMING_OBJECTS PDP_PIDIP_LIBS PDP_PIDIP_INCLUDES LIBOBJS LTLIBOBJS' ac_subst_files='' *************** *** 803,808 **** --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --enable-ffmpeg enable ffmpeg streaming support (no) - --enable-mpeg4ip enable mpeg4ip streaming support (no) --enable-maintainer-mode enable make rules and dependencies not useful (and sometimes confusing) to the casual installer --- 803,806 ---- *************** *** 811,814 **** --- 809,816 ---- --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) + --with-pd=PATH pd source tree + --with-pdp=PATH pdp source tree + --with-ffmpeg=PATH ffmpeg source tree + --with-mpeg4ip=PATH mpeg4ip source tree --with-dmalloc use dmalloc, as in ftp://ftp.letters.com/src/dmalloc/dmalloc.tar.gz *************** *** 1265,1284 **** ac_config_headers="$ac_config_headers include/pidip_config.h" - # Check whether --enable-ffmpeg or --disable-ffmpeg was given. - if test "${enable_ffmpeg+set}" = set; then - enableval="$enable_ffmpeg" - - else - enable_ffmpeg=no - fi; - # Check whether --enable-mpeg4ip or --disable-mpeg4ip was given. - if test "${enable_mpeg4ip+set}" = set; then - enableval="$enable_mpeg4ip" - - else - enable_mpeg4ip=no - fi; ! PDP_PIDIP_VERSION="0.12.14" PD_DIR=/usr/local/pd PDP_DIR=/usr/local/pd/pdp --- 1267,1272 ---- ac_config_headers="$ac_config_headers include/pidip_config.h" ! PDP_PIDIP_VERSION="0.12.17" PD_DIR=/usr/local/pd PDP_DIR=/usr/local/pd/pdp *************** *** 1286,1289 **** --- 1274,1360 ---- MPEG4IP_SOURCE_DIR=/SOURCES/mpeg4ip PDP_STREAMING_OBJECTS= + enable_ffmpeg=no + enable_mpeg4ip=no + + + # Check whether --with-pdsources or --without-pdsources was given. + if test "${with_pdsources+set}" = set; then + withval="$with_pdsources" + + fi; + if ! test -z "${with_pd}" + then + pd_tree="`cd ${with_pd} 2>/dev/null && pwd`" + if test -z "${pd_tree}" + then + { { echo "$as_me:$LINENO: error: pd sources not found in ${with_pd}" >&5 + echo "$as_me: error: pd sources not found in ${with_pd}" >&2;} + { (exit 1); exit 1; }; } + else + PD_DIR=${pd_tree} + fi + fi + + + # Check whether --with-pdpsources or --without-pdpsources was given. + if test "${with_pdpsources+set}" = set; then + withval="$with_pdpsources" + + fi; + if ! test -z "${with_pdp}" + then + pdp_tree="`cd ${with_pdp} 2>/dev/null && pwd`" + if test -z "${pdp_tree}" + then + { { echo "$as_me:$LINENO: error: pdp sources not found in ${with_pdp}" >&5 + echo "$as_me: error: pdp sources not found in ${with_pdp}" >&2;} + { (exit 1); exit 1; }; } + else + PDP_DIR=${pdp_tree} + fi + fi + + + # Check whether --with-ffmpeg or --without-ffmpeg was given. + if test "${with_ffmpeg+set}" = set; then + withval="$with_ffmpeg" + + fi; + if ! test -z "${with_ffmpeg}" + then + ffmpeg_tree="`cd ${with_ffmpeg} 2>/dev/null && pwd`" + if test -z "${ffmpeg_tree}" + then + { { echo "$as_me:$LINENO: error: ffmpeg sources not found in ${with_ffmpeg}" >&5 + echo "$as_me: error: ffmpeg sources not found in ${with_ffmpeg}" >&2;} + { (exit 1); exit 1; }; } + else + FFMPEG_SOURCE_DIR=${ffmpeg_tree} + enable_ffmpeg=yes + fi + fi + + + # Check whether --with-mpeg4ip or --without-mpeg4ip was given. + if test "${with_mpeg4ip+set}" = set; then + withval="$with_mpeg4ip" + + fi; + if ! test -z "${with_mpeg4ip}" + then + mpeg4ip_tree="`cd ${with_mpeg4ip} 2>/dev/null && pwd`" + if test -z "${mpeg4ip_tree}" + then + echo "$as_me:$LINENO: result: no" >&5 + echo "${ECHO_T}no" >&6 + { { echo "$as_me:$LINENO: error: mpeg4ip sources not found in ${with_mpeg4ip}" >&5 + echo "$as_me: error: mpeg4ip sources not found in ${with_mpeg4ip}" >&2;} + { (exit 1); exit 1; }; } + else + MPEG4IP_SOURCE_DIR=${mpeg4ip_tree} + enable_mpeg4ip=yes + fi + fi + PDP_PIDIP_LIBS="$PDP_PIDIP_LIBS -lbz2 -lz -ldl -lmp3lame -logg -lvorbis -lvorbisenc" PDP_PIDIP_INCLUDES="-I$PD_DIR/src -I. -I$PDP_DIR/include -I../include -I../charmaps" *************** *** 4562,4565 **** --- 4633,4714 ---- + echo "$as_me:$LINENO: checking for theora_encode_init in -ltheora" >&5 + echo $ECHO_N "checking for theora_encode_init in -ltheora... $ECHO_C" >&6 + if test "${ac_cv_lib_theora_theora_encode_init+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-ltheora -lm $LIBS" + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + + /* Override any gcc2 internal prototype to avoid an error. */ + #ifdef __cplusplus + extern "C" + #endif + /* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ + char theora_encode_init (); + int + main () + { + theora_encode_init (); + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_theora_theora_encode_init=yes + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_theora_theora_encode_init=no + fi + rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi + echo "$as_me:$LINENO: result: $ac_cv_lib_theora_theora_encode_init" >&5 + echo "${ECHO_T}$ac_cv_lib_theora_theora_encode_init" >&6 + if test $ac_cv_lib_theora_theora_encode_init = yes; then + cat >>confdefs.h <<_ACEOF + #define HAVE_LIBTHEORA 1 + _ACEOF + + LIBS="-ltheora $LIBS" + + else + { { echo "$as_me:$LINENO: error: theora library needed! sorry..." >&5 + echo "$as_me: error: theora library needed! sorry..." >&2;} + { (exit 1); exit 1; }; } + fi + + *************** *** 4569,4572 **** --- 4718,4757 ---- + THEORA_LIBS="" + if test -f /usr/lib/libtheora.a + then + THEORA_LIBS="$THEORA_LIBS /usr/lib/libtheora.a" + fi + if test -f /usr/local/lib/libtheora.a + then + THEORA_LIBS="$THEORA_LIBS /usr/local/lib/libtheora.a" + fi + if test -f /usr/lib/libogg.a + then + THEORA_LIBS="$THEORA_LIBS /usr/lib/libogg.a" + fi + if test -f /usr/local/lib/libogg.a + then + THEORA_LIBS="$THEORA_LIBS /usr/local/lib/libogg.a" + fi + if test -f /usr/lib/libvorbis.a + then + THEORA_LIBS="$THEORA_LIBS /usr/lib/libvorbis.a" + fi + if test -f /usr/local/lib/libvorbis.a + then + THEORA_LIBS="$THEORA_LIBS /usr/local/lib/libvorbis.a" + fi + if test -f /usr/lib/libvorbisenc.a + then + THEORA_LIBS="$THEORA_LIBS /usr/lib/libvorbisenc.a" + fi + if test -f /usr/local/lib/libvorbisenc.a + then + THEORA_LIBS="$THEORA_LIBS /usr/local/lib/libvorbisenc.a" + fi + + + echo -n "looking for pd sources (required) ... " if test -f $PD_DIR/src/m_pd.h *************** *** 4575,4579 **** echo "ok." else ! echo "pd source tree not found... install it, fix the path in configure.ac and run autoconf" exit -1 fi --- 4760,4764 ---- echo "ok." else ! echo "pd source tree not found... install it and use the --with-pd=<path> configuration option." exit -1 fi *************** *** 4585,4589 **** echo "ok." else ! echo "pdp source tree not found... install it, fix the path in configure.ac and run autoconf" exit -1 fi --- 4770,4774 ---- echo "ok." else ! echo "pdp source tree not found... install it and use the --with-pdp=<path> configuration option." exit -1 fi *************** *** 4595,4599 **** then ! PDP_STREAMING_OBJECTS="$PDP_STREAMING_OBJECTS pdp_live~.o pdp_ffmpeg~.o" cat >>confdefs.h <<\_ACEOF --- 4780,4784 ---- then ! PDP_STREAMING_OBJECTS="pdp_live~.o pdp_ffmpeg~.o" cat >>confdefs.h <<\_ACEOF *************** *** 4605,4609 **** echo "ok." else ! echo "ffmpeg source tree not found... install it, fix the path in configure.ac and run autoconf" exit -1 fi --- 4790,4794 ---- echo "ok." else ! echo "ffmpeg source tree not found... install it and use the --with-ffmpeg=<path> configuration option." exit -1 fi *************** *** 4616,4620 **** then ! PDP_STREAMING_OBJECTS="$PDP_STREAMING_OBJECTS pdp_mp4config.o pdp_mp4videosource.o pdp_mp4audiosource.o pdp_mp4live~.o pdp_mp4player~.o pdp_mp4audiosync.o pdp_mp4videosync.o pdp_mp4playermedia.o pdp_mp4playersession.o" cat >>confdefs.h <<\_ACEOF --- 4801,4805 ---- then ! PDP_STREAMING_OBJECTS="pdp_mp4config.o pdp_mp4videosource.o pdp_mp4audiosource.o pdp_mp4live~.o pdp_mp4player~.o pdp_mp4audiosync.o pdp_mp4videosync.o pdp_mp4playermedia.o pdp_mp4playersession.o" cat >>confdefs.h <<\_ACEOF *************** *** 4628,4632 **** echo "ok." else ! echo "mpeg4ip source tree not found... install it, fix the path in configure.ac and run autoconf" exit -1 fi --- 4813,4817 ---- echo "ok." else ! echo "mpeg4ip source tree not found... install it and use the --with-mpeg4ip=<path> configuration option." exit -1 fi *************** *** 5276,5279 **** --- 5461,5465 ---- s,@MAGICK_LIBS@,$MAGICK_LIBS,;t t s,@MAGICK_CFLAGS@,$MAGICK_CFLAGS,;t t + s,@THEORA_LIBS@,$THEORA_LIBS,;t t s,@PD_DIR@,$PD_DIR,;t t s,@PDP_DIR@,$PDP_DIR,;t t Index: configure.in =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/configure.in,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** configure.in 18 May 2004 00:59:44 -0000 1.4 --- configure.in 14 Nov 2004 22:52:20 -0000 1.5 *************** *** 3,14 **** AC_INIT AC_CONFIG_HEADER(include/pidip_config.h) - AC_ARG_ENABLE(ffmpeg, - [ --enable-ffmpeg enable ffmpeg streaming support (no)], , - enable_ffmpeg=no) - AC_ARG_ENABLE(mpeg4ip, - [ --enable-mpeg4ip enable mpeg4ip streaming support (no)], , - enable_mpeg4ip=no) ! PDP_PIDIP_VERSION="0.12.14" PD_DIR=/usr/local/pd PDP_DIR=/usr/local/pd/pdp --- 3,8 ---- AC_INIT AC_CONFIG_HEADER(include/pidip_config.h) ! PDP_PIDIP_VERSION="0.12.17" PD_DIR=/usr/local/pd PDP_DIR=/usr/local/pd/pdp *************** *** 16,19 **** --- 10,71 ---- MPEG4IP_SOURCE_DIR=/SOURCES/mpeg4ip PDP_STREAMING_OBJECTS= + enable_ffmpeg=no + enable_mpeg4ip=no + + AC_ARG_WITH(pdsources, [ --with-pd=PATH pd source tree]) + if ! test -z "${with_pd}" + then + pd_tree="`cd ${with_pd} 2>/dev/null && pwd`" + if test -z "${pd_tree}" + then + dnl The given directory can't be found + AC_MSG_ERROR([pd sources not found in ${with_pd}]) + else + PD_DIR=${pd_tree} + fi + fi + + AC_ARG_WITH(pdpsources, [ --with-pdp=PATH pdp source tree]) + if ! test -z "${with_pdp}" + then + pdp_tree="`cd ${with_pdp} 2>/dev/null && pwd`" + if test -z "${pdp_tree}" + then + dnl The given directory can't be found + AC_MSG_ERROR([pdp sources not found in ${with_pdp}]) + else + PDP_DIR=${pdp_tree} + fi + fi + + AC_ARG_WITH(ffmpeg, [ --with-ffmpeg=PATH ffmpeg source tree]) + if ! test -z "${with_ffmpeg}" + then + ffmpeg_tree="`cd ${with_ffmpeg} 2>/dev/null && pwd`" + if test -z "${ffmpeg_tree}" + then + dnl The given directory can't be found + AC_MSG_ERROR([ffmpeg sources not found in ${with_ffmpeg}]) + else + FFMPEG_SOURCE_DIR=${ffmpeg_tree} + enable_ffmpeg=yes + fi + fi + + AC_ARG_WITH(mpeg4ip, [ --with-mpeg4ip=PATH mpeg4ip source tree]) + if ! test -z "${with_mpeg4ip}" + then + mpeg4ip_tree="`cd ${with_mpeg4ip} 2>/dev/null && pwd`" + if test -z "${mpeg4ip_tree}" + then + dnl The given directory can't be found + AC_MSG_RESULT(no) + AC_MSG_ERROR([mpeg4ip sources not found in ${with_mpeg4ip}]) + else + MPEG4IP_SOURCE_DIR=${mpeg4ip_tree} + enable_mpeg4ip=yes + fi + fi + PDP_PIDIP_LIBS="$PDP_PIDIP_LIBS -lbz2 -lz -ldl -lmp3lame -logg -lvorbis -lvorbisenc" PDP_PIDIP_INCLUDES="-I$PD_DIR/src -I. -I$PDP_DIR/include -I../include -I../charmaps" *************** *** 51,54 **** --- 103,107 ---- AC_CHECK_LIB(vorbis, vorbis_analysis_init, , AC_MSG_ERROR(streaming requires vorbis library!!), -lm) AC_CHECK_LIB(vorbisenc, vorbis_encode_setup_init, , AC_MSG_ERROR(streaming requires vorbis encoder library!!), -lm) + AC_CHECK_LIB(theora, theora_encode_init, , AC_MSG_ERROR(theora library needed! sorry...), -lm) AC_SUBST(PDP_PIDIP_VERSION) *************** *** 59,62 **** --- 112,151 ---- AC_SUBST(MAGICK_CFLAGS) + THEORA_LIBS="" + if test -f /usr/lib/libtheora.a + then + THEORA_LIBS="$THEORA_LIBS /usr/lib/libtheora.a" + fi + if test -f /usr/local/lib/libtheora.a + then + THEORA_LIBS="$THEORA_LIBS /usr/local/lib/libtheora.a" + fi + if test -f /usr/lib/libogg.a + then + THEORA_LIBS="$THEORA_LIBS /usr/lib/libogg.a" + fi + if test -f /usr/local/lib/libogg.a + then + THEORA_LIBS="$THEORA_LIBS /usr/local/lib/libogg.a" + fi + if test -f /usr/lib/libvorbis.a + then + THEORA_LIBS="$THEORA_LIBS /usr/lib/libvorbis.a" + fi + if test -f /usr/local/lib/libvorbis.a + then + THEORA_LIBS="$THEORA_LIBS /usr/local/lib/libvorbis.a" + fi + if test -f /usr/lib/libvorbisenc.a + then + THEORA_LIBS="$THEORA_LIBS /usr/lib/libvorbisenc.a" + fi + if test -f /usr/local/lib/libvorbisenc.a + then + THEORA_LIBS="$THEORA_LIBS /usr/local/lib/libvorbisenc.a" + fi + + AC_SUBST(THEORA_LIBS) + echo -n "looking for pd sources (required) ... " if test -f $PD_DIR/src/m_pd.h *************** *** 65,69 **** echo "ok." else ! echo "pd source tree not found... install it, fix the path in configure.ac and run autoconf" exit -1 fi --- 154,158 ---- echo "ok." else ! echo "pd source tree not found... install it and use the --with-pd=<path> configuration option." exit -1 fi *************** *** 75,79 **** echo "ok." else ! echo "pdp source tree not found... install it, fix the path in configure.ac and run autoconf" exit -1 fi --- 164,168 ---- echo "ok." else ! echo "pdp source tree not found... install it and use the --with-pdp=<path> configuration option." exit -1 fi *************** *** 85,89 **** then AC_SUBST(FFMPEG_SOURCE_DIR) ! PDP_STREAMING_OBJECTS="$PDP_STREAMING_OBJECTS pdp_live~.o pdp_ffmpeg~.o" AC_DEFINE(HAVE_PIDIP_FFMPEG, 1, build pdp_live~/pdp_ffmpeg~) PDP_PIDIP_LIBS="$PDP_PIDIP_LIBS $FFMPEG_SOURCE_DIR/libavformat/libavformat.a $FFMPEG_SOURCE_DIR/libavcodec/libavcodec.a" --- 174,178 ---- then AC_SUBST(FFMPEG_SOURCE_DIR) ! PDP_STREAMING_OBJECTS="pdp_live~.o pdp_ffmpeg~.o" AC_DEFINE(HAVE_PIDIP_FFMPEG, 1, build pdp_live~/pdp_ffmpeg~) PDP_PIDIP_LIBS="$PDP_PIDIP_LIBS $FFMPEG_SOURCE_DIR/libavformat/libavformat.a $FFMPEG_SOURCE_DIR/libavcodec/libavcodec.a" *************** *** 91,95 **** echo "ok." else ! echo "ffmpeg source tree not found... install it, fix the path in configure.ac and run autoconf" exit -1 fi --- 180,184 ---- echo "ok." else ! echo "ffmpeg source tree not found... install it and use the --with-ffmpeg=<path> configuration option." exit -1 fi *************** *** 102,106 **** then AC_SUBST(MPEG4IP_SOURCE_DIR) ! PDP_STREAMING_OBJECTS="$PDP_STREAMING_OBJECTS pdp_mp4config.o pdp_mp4videosource.o pdp_mp4audiosource.o pdp_mp4live~.o pdp_mp4player~.o pdp_mp4audiosync.o pdp_mp4videosync.o pdp_mp4playermedia.o pdp_mp4playersession.o" AC_DEFINE(HAVE_PIDIP_MPEG4IP, 1, build pdp_mp4live~/pdp_mp4player~) PDP_PIDIP_LIBS="$PDP_PIDIP_LIBS $MPEG4IP_SOURCE_DIR/player/src/our_bytestream_file.o $MPEG4IP_SOURCE_DIR/player/src/our_config_file.o $MPEG4IP_SOURCE_DIR/player/src/qtime_file.o $MPEG4IP_SOURCE_DIR/player/src/mp4_file.o $MPEG4IP_SOURCE_DIR/player/src/mpeg3_file.o $MPEG4IP_SOURCE_DIR/player/src/avi_file.o $MPEG4IP_SOURCE_DIR/player/src/ip_port.o $MPEG4IP_SOURCE_DIR/player/src/media_utils.o $MPEG4IP_SOURCE_DIR/player/src/mpeg2t_thread.o $MPEG4IP_SOURCE_DIR/player/src/mpeg2t_thread_nx.o $MPEG4IP_SOURCE_DIR/player/src/*bytestream.o $MPEG4IP_SOURCE_DIR/player/src/*plugin.o $MPEG4IP_SOURCE_DIR/player/src/player_sdp.o $MPEG4IP_SOURCE_DIR/player/src/player_util.o $MPEG4IP_SOURCE_DIR/player/src/audio.o $MPEG4IP_SOURCE_DIR/player/src/video.o $MPEG4IP_SOURCE_DIR/server/mp4live/video_util_mpeg4.o $MPEG4IP_SOURCE_DIR/server/mp4live/sdp_file.o $MPEG4IP_SOURCE_DIR/server/mp4live/util.o $MPEG4IP_SOURCE_DIR/server/mp4live/video_encoder.o $MPEG4IP_SOURCE_DIR/server/mp4live/video_xvid.o $MPEG4IP_SOURCE_DIR/server/mp4live/media_source.o $MPEG4IP_SOURCE_DIR/server/mp4live/video_util_rgb.o $MPEG4IP_SOURCE_DIR/server/mp4live/video_util_resize.o $MPEG4IP_SOURCE_DIR/server/mp4live/resample.o $MPEG4IP_SOURCE_DIR/server/mp4live/video_encoder_base.o $MPEG4IP_SOURCE_DIR/server/mp4live/audio_encoder.o $MPEG4IP_SOURCE_DIR/server/mp4live/audio_encoder_base.o $MPEG4IP_SOURCE_DIR/server/mp4live/audio_encoder_tables.o $MPEG4IP_SOURCE_DIR/server/mp4live/audio_lame.o $MPEG4IP_SOURCE_DIR/server/mp4live/audio_faac.o $MPEG4IP_SOURCE_DIR/server/mp4live/rtp_transmitter.o $MPEG4IP_SOURCE_DIR/server/mp4live/h261/.libs/*.a $MPEG4IP_SOURCE_DIR/lib/sdp/.libs/libsdp.so $MPEG4IP_SOURCE_DIR/player/lib/mp4util/.libs/libmp4util.so $MPEG4IP_SOURCE_DIR/player/lib/libhttp/.libs/libhttp.a $MPEG4IP_SOURCE_DIR/lib/config_file/.libs/libconfig_file.so $MPEG4IP_SOURCE_DIR/lib/msg_queue/.libs/libmsg_queue.so $MPEG4IP_SOURCE_DIR/lib/mp4av/.libs/libmp4av.so $MPEG4IP_SOURCE_DIR/lib/mp4/.libs/libmp4.so $MPEG4IP_SOURCE_DIR/lib/mp4v2/.libs/libmp4v2.so $MPEG4IP_SOURCE_DIR/lib/SDL/src/.libs/libSDL.so $MPEG4IP_SOURCE_DIR/lib/rtp/*.o $MPEG4IP_SOURCE_DIR/player/lib/rtsp/.libs/librtsp.a $MPEG4IP_SOURCE_DIR/common/video/libmpeg32/.libs/*.a $MPEG4IP_SOURCE_DIR/lib/avi/.libs/libavi.al $MPEG4IP_SOURCE_DIR/lib/mpeg2t/.libs/libmpeg2_transport.al $MPEG4IP_SOURCE_DIR/player/lib/audio/mp3util/.libs/libmp3utils.al -lm -L/usr/X11R6/lib -lX11 -lXext -lpthread $MPEG4IP_SOURCE_DIR/lib/SDL/src/main/libSDLmain.a -ldl -Wl,--rpath -Wl,/usr/local/lib -lfaac -lmpeg4ip_xvid" --- 191,195 ---- then AC_SUBST(MPEG4IP_SOURCE_DIR) ! PDP_STREAMING_OBJECTS="pdp_mp4config.o pdp_mp4videosource.o pdp_mp4audiosource.o pdp_mp4live~.o pdp_mp4player~.o pdp_mp4audiosync.o pdp_mp4videosync.o pdp_mp4playermedia.o pdp_mp4playersession.o" AC_DEFINE(HAVE_PIDIP_MPEG4IP, 1, build pdp_mp4live~/pdp_mp4player~) PDP_PIDIP_LIBS="$PDP_PIDIP_LIBS $MPEG4IP_SOURCE_DIR/player/src/our_bytestream_file.o $MPEG4IP_SOURCE_DIR/player/src/our_config_file.o $MPEG4IP_SOURCE_DIR/player/src/qtime_file.o $MPEG4IP_SOURCE_DIR/player/src/mp4_file.o $MPEG4IP_SOURCE_DIR/player/src/mpeg3_file.o $MPEG4IP_SOURCE_DIR/player/src/avi_file.o $MPEG4IP_SOURCE_DIR/player/src/ip_port.o $MPEG4IP_SOURCE_DIR/player/src/media_utils.o $MPEG4IP_SOURCE_DIR/player/src/mpeg2t_thread.o $MPEG4IP_SOURCE_DIR/player/src/mpeg2t_thread_nx.o $MPEG4IP_SOURCE_DIR/player/src/*bytestream.o $MPEG4IP_SOURCE_DIR/player/src/*plugin.o $MPEG4IP_SOURCE_DIR/player/src/player_sdp.o $MPEG4IP_SOURCE_DIR/player/src/player_util.o $MPEG4IP_SOURCE_DIR/player/src/audio.o $MPEG4IP_SOURCE_DIR/player/src/video.o $MPEG4IP_SOURCE_DIR/server/mp4live/video_util_mpeg4.o $MPEG4IP_SOURCE_DIR/server/mp4live/sdp_file.o $MPEG4IP_SOURCE_DIR/server/mp4live/util.o $MPEG4IP_SOURCE_DIR/server/mp4live/video_encoder.o $MPEG4IP_SOURCE_DIR/server/mp4live/video_xvid.o $MPEG4IP_SOURCE_DIR/server/mp4live/media_source.o $MPEG4IP_SOURCE_DIR/server/mp4live/video_util_rgb.o $MPEG4IP_SOURCE_DIR/server/mp4live/video_util_resize.o $MPEG4IP_SOURCE_DIR/server/mp4live/resample.o $MPEG4IP_SOURCE_DIR/server/mp4live/video_encoder_base.o $MPEG4IP_SOURCE_DIR/server/mp4live/audio_encoder.o $MPEG4IP_SOURCE_DIR/server/mp4live/audio_encoder_base.o $MPEG4IP_SOURCE_DIR/server/mp4live/audio_encoder_tables.o $MPEG4IP_SOURCE_DIR/server/mp4live/audio_lame.o $MPEG4IP_SOURCE_DIR/server/mp4live/audio_faac.o $MPEG4IP_SOURCE_DIR/server/mp4live/rtp_transmitter.o $MPEG4IP_SOURCE_DIR/server/mp4live/h261/.libs/*.a $MPEG4IP_SOURCE_DIR/lib/sdp/.libs/libsdp.so $MPEG4IP_SOURCE_DIR/player/lib/mp4util/.libs/libmp4util.so $MPEG4IP_SOURCE_DIR/player/lib/libhttp/.libs/libhttp.a $MPEG4IP_SOURCE_DIR/lib/config_file/.libs/libconfig_file.so $MPEG4IP_SOURCE_DIR/lib/msg_queue/.libs/libmsg_queue.so $MPEG4IP_SOURCE_DIR/lib/mp4av/.libs/libmp4av.so $MPEG4IP_SOURCE_DIR/lib/mp4/.libs/libmp4.so $MPEG4IP_SOURCE_DIR/lib/mp4v2/.libs/libmp4v2.so $MPEG4IP_SOURCE_DIR/lib/SDL/src/.libs/libSDL.so $MPEG4IP_SOURCE_DIR/lib/rtp/*.o $MPEG4IP_SOURCE_DIR/player/lib/rtsp/.libs/librtsp.a $MPEG4IP_SOURCE_DIR/common/video/libmpeg32/.libs/*.a $MPEG4IP_SOURCE_DIR/lib/avi/.libs/libavi.al $MPEG4IP_SOURCE_DIR/lib/mpeg2t/.libs/libmpeg2_transport.al $MPEG4IP_SOURCE_DIR/player/lib/audio/mp3util/.libs/libmp3utils.al -lm -L/usr/X11R6/lib -lX11 -lXext -lpthread $MPEG4IP_SOURCE_DIR/lib/SDL/src/main/libSDLmain.a -ldl -Wl,--rpath -Wl,/usr/local/lib -lfaac -lmpeg4ip_xvid" *************** *** 110,114 **** echo "ok." else ! echo "mpeg4ip source tree not found... install it, fix the path in configure.ac and run autoconf" exit -1 fi --- 199,203 ---- echo "ok." else ! echo "mpeg4ip source tree not found... install it and use the --with-mpeg4ip=<path> configuration option." exit -1 fi Index: Makefile.in =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/Makefile.in,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Makefile.in 18 May 2004 00:59:44 -0000 1.5 --- Makefile.in 14 Nov 2004 22:52:19 -0000 1.6 *************** *** 8,11 **** --- 8,12 ---- MAGICK_CFLAGS = @MAGICK_CFLAGS@ MAGICK_LIBS = @MAGICK_LIBS@ + THEORA_LIBS = @THEORA_LIBS@ PDP_PIDIP_INCLUDES = @PDP_PIDIP_INCLUDES@ PDP_PIDIP_VERSION = @PDP_PIDIP_VERSION@ *************** *** 36,40 **** pidip.pd_linux: pdp_pidip_all rm -f pidip.pd_linux ! g++ -export_dynamic -shared -o pidip.pd_linux modules/*.o system/*.o $(PDP_PIDIP_LIBS) $(IMLIB_LIBS) $(MAGICK_LIBS) strip --strip-unneeded pidip.pd_linux --- 37,41 ---- pidip.pd_linux: pdp_pidip_all rm -f pidip.pd_linux ! g++ -export_dynamic -shared -o pidip.pd_linux modules/*.o system/*.o $(THEORA_LIBS) $(PDP_PIDIP_LIBS) $(IMLIB_LIBS) $(MAGICK_LIBS) strip --strip-unneeded pidip.pd_linux *************** *** 44,47 **** --- 45,49 ---- install: + if test ! -d /usr/X11R6/lib/X11/fonts/TTF; then mkdir /usr/X11R6/lib/X11/fonts/TTF; fi cp fonts/* /usr/X11R6/lib/X11/fonts/TTF cp -f --remove-destination doc/* $(PD_DIR)/doc/5.reference Index: Makefile =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/Makefile,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Makefile 18 May 2004 00:59:44 -0000 1.6 --- Makefile 14 Nov 2004 22:52:19 -0000 1.7 *************** *** 1,13 **** PD_DIR = /usr/local/pd PDP_DIR = /usr/local/pd/pdp ! FFMPEG_SOURCE_DIR = /SOURCES/ffmpeg ! PDP_PIDIP_LIBS = -lbz2 -lz -ldl -lmp3lame -logg -lvorbis -lvorbisenc /SOURCES/ffmpeg/libavformat/libavformat.a /SOURCES/ffmpeg/libavcodec/libavcodec.a IMLIB_CFLAGS = -I/usr/local/include -I/usr/X11R6/include ! IMLIB_LIBS = -L/usr/local/lib -lImlib2 -lttf -lm -ldl -lXext -lXext -lX11 -L/usr/X11R6/lib ! MAGICK_CFLAGS = -I/usr/X11R6/include -g -O2 -Wall ! MAGICK_LIBS = -L/usr/X11R6/lib -lMagick -lMagick -ltiff -lfreetype -ljasper -ljpeg -lpng -lXext -lSM -lICE -lX11 -lbz2 -lxml2 -lz -lpthread -lm -L/usr/local/lib -L/usr/X11R6/lib -L/usr/X11R6/lib -L/usr/local/lib ! PDP_PIDIP_INCLUDES = -I/usr/local/pd/src -I. -I/usr/local/pd/pdp/include -I../include -I../charmaps -I/SOURCES/ffmpeg/libavcodec -I/SOURCES/ffmpeg/libavformat ! PDP_PIDIP_VERSION = 0.12.14 MPEG4IP_CFLAGS = --- 1,14 ---- PD_DIR = /usr/local/pd PDP_DIR = /usr/local/pd/pdp ! FFMPEG_SOURCE_DIR = /SOURCES/ffmpeg-cvs-2003-03-04 ! PDP_PIDIP_LIBS = -lbz2 -lz -ldl -lmp3lame -logg -lvorbis -lvorbisenc /SOURCES/ffmpeg-cvs-2003-03-04/libavformat/libavformat.a /SOURCES/ffmpeg-cvs-2003-03-04/libavcodec/libavcodec.a IMLIB_CFLAGS = -I/usr/local/include -I/usr/X11R6/include ! IMLIB_LIBS = -L/usr/local/lib -lImlib2 -lfreetype -lz -lm -ldl -lXext -lXext -lX11 -L/usr/X11R6/lib ! MAGICK_CFLAGS = -I/usr/X11R6/include -O2 -g -pipe -m32 -march=i386 -mtune=pentium4 -Wall -pthread ! MAGICK_LIBS = -L/usr/X11R6/lib -lMagick -lMagick -ltiff -lfreetype -ljpeg -lpng -ldpstk -ldps -lXext -lXt -lSM -lICE -lX11 -lbz2 -lxml2 -lz -lpthread -lm -lpthread -L/usr/lib -L/usr/X11R6/lib -lfreetype -lz -L/usr/lib ! THEORA_LIBS = /usr/lib/libtheora.a /usr/lib/libogg.a /usr/lib/libvorbis.a /usr/lib/libvorbisenc.a ! PDP_PIDIP_INCLUDES = -I/usr/local/pd/src -I. -I/usr/local/pd/pdp/include -I../include -I../charmaps -I/SOURCES/ffmpeg-cvs-2003-03-04/libavcodec -I/SOURCES/ffmpeg-cvs-2003-03-04/libavformat ! PDP_PIDIP_VERSION = 0.12.17 MPEG4IP_CFLAGS = *************** *** 36,40 **** pidip.pd_linux: pdp_pidip_all rm -f pidip.pd_linux ! g++ -export_dynamic -shared -o pidip.pd_linux modules/*.o system/*.o $(PDP_PIDIP_LIBS) $(IMLIB_LIBS) $(MAGICK_LIBS) strip --strip-unneeded pidip.pd_linux --- 37,41 ---- pidip.pd_linux: pdp_pidip_all rm -f pidip.pd_linux ! g++ -export_dynamic -shared -o pidip.pd_linux modules/*.o system/*.o $(THEORA_LIBS) $(PDP_PIDIP_LIBS) $(IMLIB_LIBS) $(MAGICK_LIBS) strip --strip-unneeded pidip.pd_linux *************** *** 44,47 **** --- 45,49 ---- install: + if test ! -d /usr/X11R6/lib/X11/fonts/TTF; then mkdir /usr/X11R6/lib/X11/fonts/TTF; fi cp fonts/* /usr/X11R6/lib/X11/fonts/TTF cp -f --remove-destination doc/* $(PD_DIR)/doc/5.reference Index: configure.ac =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/configure.ac,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** configure.ac 18 May 2004 00:59:44 -0000 1.9 --- configure.ac 14 Nov 2004 22:52:20 -0000 1.10 *************** *** 3,14 **** AC_INIT AC_CONFIG_HEADER(include/pidip_config.h) - AC_ARG_ENABLE(ffmpeg, - [ --enable-ffmpeg enable ffmpeg streaming support (no)], , - enable_ffmpeg=no) - AC_ARG_ENABLE(mpeg4ip, - [ --enable-mpeg4ip enable mpeg4ip streaming support (no)], , - enable_mpeg4ip=no) ! PDP_PIDIP_VERSION="0.12.14" PD_DIR=/usr/local/pd PDP_DIR=/usr/local/pd/pdp --- 3,8 ---- AC_INIT AC_CONFIG_HEADER(include/pidip_config.h) ! PDP_PIDIP_VERSION="0.12.17" PD_DIR=/usr/local/pd PDP_DIR=/usr/local/pd/pdp *************** *** 16,19 **** --- 10,71 ---- MPEG4IP_SOURCE_DIR=/SOURCES/mpeg4ip PDP_STREAMING_OBJECTS= + enable_ffmpeg=no + enable_mpeg4ip=no + + AC_ARG_WITH(pdsources, [ --with-pd=PATH pd source tree]) + if ! test -z "${with_pd}" + then + pd_tree="`cd ${with_pd} 2>/dev/null && pwd`" + if test -z "${pd_tree}" + then + dnl The given directory can't be found + AC_MSG_ERROR([pd sources not found in ${with_pd}]) + else + PD_DIR=${pd_tree} + fi + fi + + AC_ARG_WITH(pdpsources, [ --with-pdp=PATH pdp source tree]) + if ! test -z "${with_pdp}" + then + pdp_tree="`cd ${with_pdp} 2>/dev/null && pwd`" + if test -z "${pdp_tree}" + then + dnl The given directory can't be found + AC_MSG_ERROR([pdp sources not found in ${with_pdp}]) + else + PDP_DIR=${pdp_tree} + fi + fi + + AC_ARG_WITH(ffmpeg, [ --with-ffmpeg=PATH ffmpeg source tree]) + if ! test -z "${with_ffmpeg}" + then + ffmpeg_tree="`cd ${with_ffmpeg} 2>/dev/null && pwd`" + if test -z "${ffmpeg_tree}" + then + dnl The given directory can't be found + AC_MSG_ERROR([ffmpeg sources not found in ${with_ffmpeg}]) + else + FFMPEG_SOURCE_DIR=${ffmpeg_tree} + enable_ffmpeg=yes + fi + fi + + AC_ARG_WITH(mpeg4ip, [ --with-mpeg4ip=PATH mpeg4ip source tree]) + if ! test -z "${with_mpeg4ip}" + then + mpeg4ip_tree="`cd ${with_mpeg4ip} 2>/dev/null && pwd`" + if test -z "${mpeg4ip_tree}" + then + dnl The given directory can't be found + AC_MSG_RESULT(no) + AC_MSG_ERROR([mpeg4ip sources not found in ${with_mpeg4ip}]) + else + MPEG4IP_SOURCE_DIR=${mpeg4ip_tree} + enable_mpeg4ip=yes + fi + fi + PDP_PIDIP_LIBS="$PDP_PIDIP_LIBS -lbz2 -lz -ldl -lmp3lame -logg -lvorbis -lvorbisenc" PDP_PIDIP_INCLUDES="-I$PD_DIR/src -I. -I$PDP_DIR/include -I../include -I../charmaps" *************** *** 51,54 **** --- 103,107 ---- AC_CHECK_LIB(vorbis, vorbis_analysis_init, , AC_MSG_ERROR(streaming requires vorbis library!!), -lm) AC_CHECK_LIB(vorbisenc, vorbis_encode_setup_init, , AC_MSG_ERROR(streaming requires vorbis encoder library!!), -lm) + AC_CHECK_LIB(theora, theora_encode_init, , AC_MSG_ERROR(theora library needed! sorry...), -lm) AC_SUBST(PDP_PIDIP_VERSION) *************** *** 59,62 **** --- 112,151 ---- AC_SUBST(MAGICK_CFLAGS) + THEORA_LIBS="" + if test -f /usr/lib/libtheora.a + then + THEORA_LIBS="$THEORA_LIBS /usr/lib/libtheora.a" + fi + if test -f /usr/local/lib/libtheora.a + then + THEORA_LIBS="$THEORA_LIBS /usr/local/lib/libtheora.a" + fi + if test -f /usr/lib/libogg.a + then + THEORA_LIBS="$THEORA_LIBS /usr/lib/libogg.a" + fi + if test -f /usr/local/lib/libogg.a + then + THEORA_LIBS="$THEORA_LIBS /usr/local/lib/libogg.a" + fi + if test -f /usr/lib/libvorbis.a + then + THEORA_LIBS="$THEORA_LIBS /usr/lib/libvorbis.a" + fi + if test -f /usr/local/lib/libvorbis.a + then + THEORA_LIBS="$THEORA_LIBS /usr/local/lib/libvorbis.a" + fi + if test -f /usr/lib/libvorbisenc.a + then + THEORA_LIBS="$THEORA_LIBS /usr/lib/libvorbisenc.a" + fi + if test -f /usr/local/lib/libvorbisenc.a + then + THEORA_LIBS="$THEORA_LIBS /usr/local/lib/libvorbisenc.a" + fi + + AC_SUBST(THEORA_LIBS) + echo -n "looking for pd sources (required) ... " if test -f $PD_DIR/src/m_pd.h *************** *** 65,69 **** echo "ok." else ! echo "pd source tree not found... install it, fix the path in configure.ac and run autoconf" exit -1 fi --- 154,158 ---- echo "ok." else ! echo "pd source tree not found... install it and use the --with-pd=<path> configuration option." exit -1 fi *************** *** 75,79 **** echo "ok." else ! echo "pdp source tree not found... install it, fix the path in configure.ac and run autoconf" exit -1 fi --- 164,168 ---- echo "ok." else ! echo "pdp source tree not found... install it and use the --with-pdp=<path> configuration option." exit -1 fi *************** *** 85,89 **** then AC_SUBST(FFMPEG_SOURCE_DIR) ! PDP_STREAMING_OBJECTS="$PDP_STREAMING_OBJECTS pdp_live~.o pdp_ffmpeg~.o" AC_DEFINE(HAVE_PIDIP_FFMPEG, 1, build pdp_live~/pdp_ffmpeg~) PDP_PIDIP_LIBS="$PDP_PIDIP_LIBS $FFMPEG_SOURCE_DIR/libavformat/libavformat.a $FFMPEG_SOURCE_DIR/libavcodec/libavcodec.a" --- 174,178 ---- then AC_SUBST(FFMPEG_SOURCE_DIR) ! PDP_STREAMING_OBJECTS="pdp_live~.o pdp_ffmpeg~.o" AC_DEFINE(HAVE_PIDIP_FFMPEG, 1, build pdp_live~/pdp_ffmpeg~) PDP_PIDIP_LIBS="$PDP_PIDIP_LIBS $FFMPEG_SOURCE_DIR/libavformat/libavformat.a $FFMPEG_SOURCE_DIR/libavcodec/libavcodec.a" *************** *** 91,95 **** echo "ok." else ! echo "ffmpeg source tree not found... install it, fix the path in configure.ac and run autoconf" exit -1 fi --- 180,184 ---- echo "ok." else ! echo "ffmpeg source tree not found... install it and use the --with-ffmpeg=<path> configuration option." exit -1 fi *************** *** 102,106 **** then AC_SUBST(MPEG4IP_SOURCE_DIR) ! PDP_STREAMING_OBJECTS="$PDP_STREAMING_OBJECTS pdp_mp4config.o pdp_mp4videosource.o pdp_mp4audiosource.o pdp_mp4live~.o pdp_mp4player~.o pdp_mp4audiosync.o pdp_mp4videosync.o pdp_mp4playermedia.o pdp_mp4playersession.o" AC_DEFINE(HAVE_PIDIP_MPEG4IP, 1, build pdp_mp4live~/pdp_mp4player~) PDP_PIDIP_LIBS="$PDP_PIDIP_LIBS $MPEG4IP_SOURCE_DIR/player/src/our_bytestream_file.o $MPEG4IP_SOURCE_DIR/player/src/our_config_file.o $MPEG4IP_SOURCE_DIR/player/src/qtime_file.o $MPEG4IP_SOURCE_DIR/player/src/mp4_file.o $MPEG4IP_SOURCE_DIR/player/src/mpeg3_file.o $MPEG4IP_SOURCE_DIR/player/src/avi_file.o $MPEG4IP_SOURCE_DIR/player/src/ip_port.o $MPEG4IP_SOURCE_DIR/player/src/media_utils.o $MPEG4IP_SOURCE_DIR/player/src/mpeg2t_thread.o $MPEG4IP_SOURCE_DIR/player/src/mpeg2t_thread_nx.o $MPEG4IP_SOURCE_DIR/player/src/*bytestream.o $MPEG4IP_SOURCE_DIR/player/src/*plugin.o $MPEG4IP_SOURCE_DIR/player/src/player_sdp.o $MPEG4IP_SOURCE_DIR/player/src/player_util.o $MPEG4IP_SOURCE_DIR/player/src/audio.o $MPEG4IP_SOURCE_DIR/player/src/video.o $MPEG4IP_SOURCE_DIR/server/mp4live/video_util_mpeg4.o $MPEG4IP_SOURCE_DIR/server/mp4live/sdp_file.o $MPEG4IP_SOURCE_DIR/server/mp4live/util.o $MPEG4IP_SOURCE_DIR/server/mp4live/video_encoder.o $MPEG4IP_SOURCE_DIR/server/mp4live/video_xvid.o $MPEG4IP_SOURCE_DIR/server/mp4live/media_source.o $MPEG4IP_SOURCE_DIR/server/mp4live/video_util_rgb.o $MPEG4IP_SOURCE_DIR/server/mp4live/video_util_resize.o $MPEG4IP_SOURCE_DIR/server/mp4live/resample.o $MPEG4IP_SOURCE_DIR/server/mp4live/video_encoder_base.o $MPEG4IP_SOURCE_DIR/server/mp4live/audio_encoder.o $MPEG4IP_SOURCE_DIR/server/mp4live/audio_encoder_base.o $MPEG4IP_SOURCE_DIR/server/mp4live/audio_encoder_tables.o $MPEG4IP_SOURCE_DIR/server/mp4live/audio_lame.o $MPEG4IP_SOURCE_DIR/server/mp4live/audio_faac.o $MPEG4IP_SOURCE_DIR/server/mp4live/rtp_transmitter.o $MPEG4IP_SOURCE_DIR/server/mp4live/h261/.libs/*.a $MPEG4IP_SOURCE_DIR/lib/sdp/.libs/libsdp.so $MPEG4IP_SOURCE_DIR/player/lib/mp4util/.libs/libmp4util.so $MPEG4IP_SOURCE_DIR/player/lib/libhttp/.libs/libhttp.a $MPEG4IP_SOURCE_DIR/lib/config_file/.libs/libconfig_file.so $MPEG4IP_SOURCE_DIR/lib/msg_queue/.libs/libmsg_queue.so $MPEG4IP_SOURCE_DIR/lib/mp4av/.libs/libmp4av.so $MPEG4IP_SOURCE_DIR/lib/mp4/.libs/libmp4.so $MPEG4IP_SOURCE_DIR/lib/mp4v2/.libs/libmp4v2.so $MPEG4IP_SOURCE_DIR/lib/SDL/src/.libs/libSDL.so $MPEG4IP_SOURCE_DIR/lib/rtp/*.o $MPEG4IP_SOURCE_DIR/player/lib/rtsp/.libs/librtsp.a $MPEG4IP_SOURCE_DIR/common/video/libmpeg32/.libs/*.a $MPEG4IP_SOURCE_DIR/lib/avi/.libs/libavi.al $MPEG4IP_SOURCE_DIR/lib/mpeg2t/.libs/libmpeg2_transport.al $MPEG4IP_SOURCE_DIR/player/lib/audio/mp3util/.libs/libmp3utils.al -lm -L/usr/X11R6/lib -lX11 -lXext -lpthread $MPEG4IP_SOURCE_DIR/lib/SDL/src/main/libSDLmain.a -ldl -Wl,--rpath -Wl,/usr/local/lib -lfaac -lmpeg4ip_xvid" --- 191,195 ---- then AC_SUBST(MPEG4IP_SOURCE_DIR) ! PDP_STREAMING_OBJECTS="pdp_mp4config.o pdp_mp4videosource.o pdp_mp4audiosource.o pdp_mp4live~.o pdp_mp4player~.o pdp_mp4audiosync.o pdp_mp4videosync.o pdp_mp4playermedia.o pdp_mp4playersession.o" AC_DEFINE(HAVE_PIDIP_MPEG4IP, 1, build pdp_mp4live~/pdp_mp4player~) PDP_PIDIP_LIBS="$PDP_PIDIP_LIBS $MPEG4IP_SOURCE_DIR/player/src/our_bytestream_file.o $MPEG4IP_SOURCE_DIR/player/src/our_config_file.o $MPEG4IP_SOURCE_DIR/player/src/qtime_file.o $MPEG4IP_SOURCE_DIR/player/src/mp4_file.o $MPEG4IP_SOURCE_DIR/player/src/mpeg3_file.o $MPEG4IP_SOURCE_DIR/player/src/avi_file.o $MPEG4IP_SOURCE_DIR/player/src/ip_port.o $MPEG4IP_SOURCE_DIR/player/src/media_utils.o $MPEG4IP_SOURCE_DIR/player/src/mpeg2t_thread.o $MPEG4IP_SOURCE_DIR/player/src/mpeg2t_thread_nx.o $MPEG4IP_SOURCE_DIR/player/src/*bytestream.o $MPEG4IP_SOURCE_DIR/player/src/*plugin.o $MPEG4IP_SOURCE_DIR/player/src/player_sdp.o $MPEG4IP_SOURCE_DIR/player/src/player_util.o $MPEG4IP_SOURCE_DIR/player/src/audio.o $MPEG4IP_SOURCE_DIR/player/src/video.o $MPEG4IP_SOURCE_DIR/server/mp4live/video_util_mpeg4.o $MPEG4IP_SOURCE_DIR/server/mp4live/sdp_file.o $MPEG4IP_SOURCE_DIR/server/mp4live/util.o $MPEG4IP_SOURCE_DIR/server/mp4live/video_encoder.o $MPEG4IP_SOURCE_DIR/server/mp4live/video_xvid.o $MPEG4IP_SOURCE_DIR/server/mp4live/media_source.o $MPEG4IP_SOURCE_DIR/server/mp4live/video_util_rgb.o $MPEG4IP_SOURCE_DIR/server/mp4live/video_util_resize.o $MPEG4IP_SOURCE_DIR/server/mp4live/resample.o $MPEG4IP_SOURCE_DIR/server/mp4live/video_encoder_base.o $MPEG4IP_SOURCE_DIR/server/mp4live/audio_encoder.o $MPEG4IP_SOURCE_DIR/server/mp4live/audio_encoder_base.o $MPEG4IP_SOURCE_DIR/server/mp4live/audio_encoder_tables.o $MPEG4IP_SOURCE_DIR/server/mp4live/audio_lame.o $MPEG4IP_SOURCE_DIR/server/mp4live/audio_faac.o $MPEG4IP_SOURCE_DIR/server/mp4live/rtp_transmitter.o $MPEG4IP_SOURCE_DIR/server/mp4live/h261/.libs/*.a $MPEG4IP_SOURCE_DIR/lib/sdp/.libs/libsdp.so $MPEG4IP_SOURCE_DIR/player/lib/mp4util/.libs/libmp4util.so $MPEG4IP_SOURCE_DIR/player/lib/libhttp/.libs/libhttp.a $MPEG4IP_SOURCE_DIR/lib/config_file/.libs/libconfig_file.so $MPEG4IP_SOURCE_DIR/lib/msg_queue/.libs/libmsg_queue.so $MPEG4IP_SOURCE_DIR/lib/mp4av/.libs/libmp4av.so $MPEG4IP_SOURCE_DIR/lib/mp4/.libs/libmp4.so $MPEG4IP_SOURCE_DIR/lib/mp4v2/.libs/libmp4v2.so $MPEG4IP_SOURCE_DIR/lib/SDL/src/.libs/libSDL.so $MPEG4IP_SOURCE_DIR/lib/rtp/*.o $MPEG4IP_SOURCE_DIR/player/lib/rtsp/.libs/librtsp.a $MPEG4IP_SOURCE_DIR/common/video/libmpeg32/.libs/*.a $MPEG4IP_SOURCE_DIR/lib/avi/.libs/libavi.al $MPEG4IP_SOURCE_DIR/lib/mpeg2t/.libs/libmpeg2_transport.al $MPEG4IP_SOURCE_DIR/player/lib/audio/mp3util/.libs/libmp3utils.al -lm -L/usr/X11R6/lib -lX11 -lXext -lpthread $MPEG4IP_SOURCE_DIR/lib/SDL/src/main/libSDLmain.a -ldl -Wl,--rpath -Wl,/usr/local/lib -lfaac -lmpeg4ip_xvid" *************** *** 110,114 **** echo "ok." else ! echo "mpeg4ip source tree not found... install it, fix the path in configure.ac and run autoconf" exit -1 fi --- 199,203 ---- echo "ok." else ! echo "mpeg4ip source tree not found... install it and use the --with-mpeg4ip=<path> configuration option." exit -1 fi Index: CHANGES.LOG =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/CHANGES.LOG,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** CHANGES.LOG 18 May 2004 00:59:44 -0000 1.14 --- CHANGES.LOG 14 Nov 2004 22:52:19 -0000 1.15 *************** *** 1,2 **** --- 1,37 ---- + 0.12.17 ( codename No pasa nada ) + added pdp_theorout~ : theora file recorder + fixed pdp_theorin~ : fixed buggy end of file detection + fixed pdp_theorin~ : now, it's able to read files without sound + added pdp_cropper : a video cropper for image compositing + ( see patch cutandpaste.pd ) + added pdp_background : a simple background generator + modified pdp_ocanvas : added an alpha channel for each source + modified pdp_text, pdp_form, pdp_pen : added an alpha channel ( global ) + + 0.12.16 ( codename Fadaiat ) + added pdp_theorin~ : threaded theora file reader + ( warning : requires theora, ogg & vorbis static libs ) + + modified pdp_live~ : added an autoplay option ( default = true ) + modified pdp_live~ : made the files seekable + ( added an input for the frame number, works with ffmpeg >= 0.4.9 ) + modified pdp_live~ : better disconnection mechanism + modified pdp_live~ : reworked on a/v synchronisation + + fixed pdp_i/pdp_o : fixed huffman encoding and freezings + fixed pdp_i/pdp_o : fix communication between macs and pcs ( endianness problem ) + + added --with-ffmpeg=PATH and --with-mpeg4ip=PATH configure options + ( --enable-ffmpeg and --enable-mpeg4ip are dead ) + + 0.12.15 ( codename Technologia Del Sur ) + added morphology patches : patches/morphology : opening, closing, thinning, thickening, skeletization + added morphology operator : distance transform + ( inspired by Paul Rosin, 91, http://www.cs.cf.ac.uk/User/Paul.Rosin/resources/sdt/ ) + added morphology operators : erosion ( pdp_erode ), dilation ( pdp_dilate ), hit and miss ( pdp_hitandmiss ) + added pdp_binary : transform an image to a binary image ( using yuv settings, a filter for morphology ) + ( for all the theory on morphology, thanx to the excellent site : http://homepages.inf.ed.ac.uk/rbf/HIPR2 ) + added pdp_disintegration : a new effect based on piksels summing and averaging + 0.12.14 ( codename Naveen's Ethiopian Cafe ) added pdp_mp4player~ : a quicktime stream reader ( compiled against meg4ip v1.0, needs some testing ) *************** *** 6,9 **** --- 41,45 ---- added colorgrid : a color picker written by Lluis Gomez i Bigorda ( http://www.artefacte.org/pd ) added help_pdp-tatiana.pd : a more simple to use help patch for effects, contribution from Tatiana de la O. + 0.12.13 ( codename Gollum Club Riereta ) improved decoding in pdp_live~, in particular for audio/video synchronization *************** *** 13,16 **** --- 49,53 ---- added pdp_cabaret patch : a patch to track someone with a spotlight ( poursuite ) added pdp_ieee1394 : firewire capture object for OSX based on pix_video ( OSX only ) + 0.12.12 added pdp_mp4live~ : mpeg4ip streaming object to stream to a darwin server *************** *** 20,23 **** --- 57,61 ---- ( problem reported by Mark Widmer ) added offsets messages in pdp_pen + 0.12.11 added pdp_charcoal to the effect rack : charcoal effect using edge detection, blur, normalization and negate *************** *** 26,29 **** --- 64,68 ---- commented pdp_aa : it introduces useless dependencies ( aalib ) and is not very good added pdp_ocanvas : canvas with some overlay + 0.12.10 fixed crashes and 'resize' bug in pdp_text *************** *** 34,37 **** --- 73,77 ---- added help patches for pdp_yqt, pdp_fqt and pdp_fcqt adaptations for newer autoconfs + 0.12.9 fixed pdp_ripple *************** *** 39,51 **** --- 79,95 ---- added "fill" in pdp_pen ( on request from ben ) + 0.12.8 added pdp_pen : a free hand drawing object ( on request from patrick/11h11.com ) + 0.12.7 added pdp_canvas : a canvas to display several video sources + 0.12.6 fix conflict between pdp_text and pdp_imgloader ( and the likes using Imlib2 ) fix successive loading of images in pdp_imgloader set help patches for all objects and install them in PD's doc folder ( compliant with 0.37 ) + 0.12.5 pdp_cache : hiding triangular zones from a video stream to let you do some collage *************** *** 54,60 **** --- 98,106 ---- ( see collage.pd patch ) pdp_transition : added "page" transitions + 0.12.4 added pdp_imgsaver : save an image from the current video stream pdp_transition : added "melt" and "blend" transitions + 0.12.3 added pdp_imgloader : load an image and blend it with a video *************** *** 62,92 **** --- 108,150 ---- added pdp_lumafilt : lumosity filter, useful to isolate some objects added pdp_smuck : same as pdp_transform ( mode 5 ) but setable, ported from veejay + 0.12.2 Fixed problems with Image Magick includes + 0.12.1 Added color components output in pdp_ctrack + 0.12.0 Compatibility with PDP 0.12 + 0.11.3 Nicolas Lhommet added scroll parameter in pdp_text + 0.11.2 added pdp_capture : capture a portion of screen : lets you import browser data, etc .... fixed pdp_compose + 0.11.1 added pdp_juxta : allow juxtaposition of frames + 0.11.0 change some packet allocation policies to comply with PDP 0.11 no new object + 0.10.1 added pdp_noquark object : moving object are clear, the background is noisy added tolerance input in pdp_quark + 0.10.0 added pdp_segsnd~ : produces sound from a segment of the video ( similar to pdp_scanxy~ ) binary compatible with pdp v.0.10 improved installation instructions + 0.9.2 fixed disconnection phase in pdp_live~ + 0.9.1 remove synchronization proposed by martin pi : it lead to some deadlocks sometimes + 0.9.0 fixed audio encoding/decoding in pdp_ffmpeg~/pdp_live~ ( which caused a lot of crashes ) *************** *** 95,105 **** --- 153,166 ---- add "set cursor" message in pdp_cmap, pdp_ctrack, pdp_compose ( used in conjonction with coordinates output of pdp_xv v0.9 ) + 0.8.4 added pdp_live~ : receive a video feed, at least from a ffmpeg server ( ffserver ) fixed resampling in pdp_ffmpeg~ : resizing to a bigger image used to crash PD ( now, you can't resize to a bigger scale, blame it on libavcodec ) + 0.8.3 pdp_rec became pdp_rec~ : it can record audio now fix crash in pdp_ascii, pdp_nervous, pdp_quark + 0.8.2 added pdp_ffmpeg : stream to a ffmpeg server with possibly several formats ( mpeg, asf, ... ) *************** *** 109,122 **** --- 170,188 ---- added a planes number action in pdp_quark and pdp_nervous ( plays on speed of switching ) fixed index bug in pdp_ctrack, pdp_cmap + 0.8.1 fixed colors in pdp_warhol + 0.8.0 added pdp_ascii : rendering of videos in ASCII art using character maps + 0.7.7 added pdp_aa : rendering of videos in ASCII art using aalib + 0.7.6 added pdp_cmap : color mapper ( thanx to liz for the suggestion ) added actions in color tracker ( steady mode, cursor on/off, frame on/off ), generally improved fixed colors in pdp_spiral, pdp_dice + 0.7.5 added pdp_form : addition of geometric forms *************** *** 125,128 **** --- 191,195 ---- fixed colors in pdp_transform, pdp_warp fix install stage + 0.7.4 added pdp_text : text addition on videos ( requires imlib2 ) *************** *** 130,150 **** --- 197,224 ---- optimized streaming again (pdp_i/pdp_o) fixed colors in pdp_puzzle + 0.7.3 fixed streaming objects pdp_i/pdp_o added "smoothing" and "framerate" controls to act on the bandwidth + 0.7.2 added shagadelic, dice and puzzle from effecTV modified objects to use PDP queue + 0.7.1 added cycle and transform : first effetTV objects using PDP queue ( i know i changed my mind ) all other objects must be modified to use PDP queue + 0.7.0 compatibility with PDP 0.7 + 0.6.2 added pdp_ctrack : color tracker : lets you follow an object + 0.6.1 added pdp_i/pdp_o : PDP packets streaming objects using bz2 added pdp_mgrid : motion grid detects movement within a grid + 0.6.0 added pdp_rec : a video recording object *************** *** 152,157 **** --- 226,233 ---- incremented PDP release number : it's now 0.6 set proper credits for each effecTV plugin + 0.5.8 added pdp_spigot : a video signal routing utility + 0.5.7 added nervous and quark objects *************** *** 160,179 **** --- 236,262 ---- because they are just clones of some other effects or because i simply wasn't interested in porting them + 0.5.6 added radioactiv and warhol objects + 0.5.5 added edge and spiral objects happy new year 2003 + 0.5.4 renamed to PiDiP added rev and mosaic objects + 0.5.3 added parameter "increment" to ripple fix "threshold" in ripple added warp and mosaic object + 0.5.2 remove buggy support of GREY packets + 0.5.1 added aging and ripple effects + 0.5 initial release Index: INSTALL =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/INSTALL,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** INSTALL 30 Mar 2004 01:56:15 -0000 1.5 --- INSTALL 14 Nov 2004 22:52:19 -0000 1.6 *************** *** 6,9 **** --- 6,11 ---- ***** PDP and its deps : http://zwizwa.fartit.com/pd/pdp/ ***** imlib2 : http://sourceforge.net/project/showfiles.php?group_id=2 + ***** theora : http://www.theora.org/files/ + ----> watchout !! you will need the static libs ( theora.a, ogg.a, vorbis.a ) ***** Image Magick : http://www.imagemagick.org ----> watchout !! configure with --enable-shared *************** *** 12,16 **** ============= ***** ffmpeg : http://ffmpeg.sourceforge.net/cvs ! ( --enable-ffmpeg ) ----> watchout, it requires the cvs snapshot ! + don't forget to activate mp3 and vorbis support in ffmpeg : ./configure --enable-mp3lame --enable-vorbis --- 14,18 ---- ============= ***** ffmpeg : http://ffmpeg.sourceforge.net/cvs ! ( --with-ffmpeg=PATH ) ----> watchout, it requires the cvs snapshot ! + don't forget to activate mp3 and vorbis support in ffmpeg : ./configure --enable-mp3lame --enable-vorbis *************** *** 18,36 **** ***** mpeg4ip : http://mpeg4ip.sourceforge.net/ ( download mpeg4ip v1.0 ) ! ( --enable-mpeg4ip ) ! ! b/ fix PD, PDP and FFMPEG/MPEG4IP paths in configure.ac ! ! c/ autoconf ! d/ ./configure [--enable-ffmpeg] OR [--enable-mpeg4ip] ( not both ) ! e/ make clean ! f/ make ! g/ as root, make install ! h/ modify your pd start-up script : pidip is a library, it should be loaded --- 20,34 ---- ***** mpeg4ip : http://mpeg4ip.sourceforge.net/ ( download mpeg4ip v1.0 ) ! ( --with-mpeg4ip=PATH ) ! b/ ./configure --with-pd=PATH --with-pdp=PATH [--with-ffmpeg=PATH] OR [--with-mpeg4ip=PATH] ( not both ) ! c/ make clean ! d/ make ! e/ as root, make install ! f/ modify your pd start-up script : pidip is a library, it should be loaded

1 0

externals/pidip/doc help-pdp_ascii.pd,1.2,1.3 help-pdp_compose.pd,1.1,1.2 help-pdp_ctrack.pd,1.2,1.3 help-pdp_ffmpeg~.pd,1.5,1.6 help-pdp_form.pd,1.1,1.2 help-pdp_live~.pd,1.1,1.2 help-pdp_ocanvas.pd,1.3,1.4 help-pdp_pen.pd,1.3,1.4 help-pdp_streaming.pd,1.2,1.3 help-pdp_text.pd,1.1,1.2 help-pdp_yqt.pd,1.3,1.4 rs_pdp_live~.pd,1.4,1.5
by Yves Degoyon 14 Nov '04

14 Nov '04

Update of /cvsroot/pure-data/externals/pidip/doc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21582/doc Modified Files: help-pdp_ascii.pd help-pdp_compose.pd help-pdp_ctrack.pd help-pdp_ffmpeg~.pd help-pdp_form.pd help-pdp_live~.pd help-pdp_ocanvas.pd help-pdp_pen.pd help-pdp_streaming.pd help-pdp_text.pd help-pdp_yqt.pd rs_pdp_live~.pd Log Message: PiDiP v 0.12.17 Index: help-pdp_ctrack.pd =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/doc/help-pdp_ctrack.pd,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** help-pdp_ctrack.pd 17 Oct 2003 20:54:40 -0000 1.2 --- help-pdp_ctrack.pd 14 Nov 2004 22:52:20 -0000 1.3 *************** *** 1,8 **** #N canvas 42 26 781 666 10; ! #X obj 35 493 pdp_xv; #X obj 268 64 bng 15 250 50 0 empty empty empty 20 8 0 8 -262144 -1 -1; #X msg 123 136 loop \$1; ! #X obj 124 114 tgl 15 0 empty empty empty 20 8 0 8 -262144 -1 -1 0 1; #X msg 370 44 open \$1; --- 1,8 ---- #N canvas 42 26 781 666 10; ! #X obj 19 504 pdp_xv; #X obj 268 64 bng 15 250 50 0 empty empty empty 20 8 0 8 -262144 -1 -1; #X msg 123 136 loop \$1; ! #X obj 124 114 tgl 15 0 empty empty empty 20 8 0 8 -262144 -1 -1 1 1; #X msg 370 44 open \$1; *************** *** 68,78 **** #X msg 118 379 setcur \$1 \$2; #X text 6 378 Set the cursor; ! #X msg 12 527 cursor \$1; ! #X obj 85 529 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 1 ; #X floatatom 123 591 5 0 0 0 - - -; #X floatatom 173 592 5 0 0 0 - - -; #X floatatom 220 591 5 0 0 0 - - -; ! #X text 140 631 Color components; #X text 135 609 R; #X text 186 609 G; --- 68,78 ---- #X msg 118 379 setcur \$1 \$2; #X text 6 378 Set the cursor; ! #X msg 7 425 cursor \$1; ! #X obj 80 427 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 1 1 ; #X floatatom 123 591 5 0 0 0 - - -; #X floatatom 173 592 5 0 0 0 - - -; #X floatatom 220 591 5 0 0 0 - - -; ! #X text 139 624 Color components; #X text 135 609 R; #X text 186 609 G; Index: help-pdp_ascii.pd =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/doc/help-pdp_ascii.pd,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** help-pdp_ascii.pd 18 May 2004 00:50:40 -0000 1.2 --- help-pdp_ascii.pd 14 Nov 2004 22:52:20 -0000 1.3 *************** *** 1,7 **** ! #N canvas 84 12 763 664 10; #X obj 268 64 bng 15 250 50 0 empty empty empty 20 8 0 8 -262144 -1 -1; #X msg 123 136 loop \$1; ! #X obj 124 114 tgl 15 0 empty empty empty 20 8 0 8 -262144 -1 -1 1 1; #X msg 370 44 open \$1; --- 1,7 ---- ! #N canvas 368 56 763 664 10; #X obj 268 64 bng 15 250 50 0 empty empty empty 20 8 0 8 -262144 -1 -1; #X msg 123 136 loop \$1; ! #X obj 124 114 tgl 15 0 empty empty empty 20 8 0 8 -262144 -1 -1 0 1; #X msg 370 44 open \$1; *************** *** 34,38 **** #X floatatom 404 373 5 0 0 0 - - -; #X floatatom 302 398 5 0 0 0 - - -; - #X obj 191 444 pdp_xv; #X obj 366 300 openpanel; #X obj 438 301 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 --- 34,37 ---- *************** *** 46,50 **** #X text 462 300 Load a characters map; #X obj 346 203 pdp_v4l; ! #X obj 95 307 pdp_scale 800 600; #X connect 0 0 9 0; #X connect 1 0 14 0; --- 45,50 ---- #X text 462 300 Load a characters map; #X obj 346 203 pdp_v4l; ! #X obj 95 307 pdp_scale 600 480; ! #X obj 191 444 pdp_xv; #X connect 0 0 9 0; #X connect 1 0 14 0; *************** *** 57,78 **** #X connect 8 0 6 0; #X connect 9 0 14 0; ! #X connect 10 0 37 0; #X connect 11 0 10 0; #X connect 12 0 10 0; ! #X connect 13 0 37 0; ! #X connect 14 0 38 0; #X connect 15 0 17 0; #X connect 16 0 19 0; #X connect 17 0 16 0; #X connect 19 0 18 0; ! #X connect 22 0 32 0; #X connect 23 0 22 0; ! #X connect 24 0 32 0; #X connect 25 0 24 0; ! #X connect 26 0 32 1; ! #X connect 28 0 30 0; ! #X connect 29 0 28 0; ! #X connect 30 0 32 0; ! #X connect 32 0 27 0; ! #X connect 37 0 38 0; ! #X connect 38 0 32 0; --- 57,78 ---- #X connect 8 0 6 0; #X connect 9 0 14 0; ! #X connect 10 0 36 0; #X connect 11 0 10 0; #X connect 12 0 10 0; ! #X connect 13 0 36 0; ! #X connect 14 0 37 0; #X connect 15 0 17 0; #X connect 16 0 19 0; #X connect 17 0 16 0; #X connect 19 0 18 0; ! #X connect 22 0 31 0; #X connect 23 0 22 0; ! #X connect 24 0 31 0; #X connect 25 0 24 0; ! #X connect 26 0 31 1; ! #X connect 27 0 29 0; ! #X connect 28 0 27 0; ! #X connect 29 0 31 0; ! #X connect 31 0 38 0; ! #X connect 36 0 37 0; ! #X connect 37 0 31 0; Index: help-pdp_pen.pd =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/doc/help-pdp_pen.pd,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** help-pdp_pen.pd 8 Dec 2003 22:45:54 -0000 1.3 --- help-pdp_pen.pd 14 Nov 2004 22:52:20 -0000 1.4 *************** *** 3,7 **** -1; #X msg 123 136 loop \$1; ! #X obj 124 114 tgl 15 0 empty empty empty 20 8 0 8 -262144 -1 -1 0 1; #X msg 370 44 open \$1; --- 3,7 ---- -1; #X msg 123 136 loop \$1; ! #X obj 124 114 tgl 15 0 empty empty empty 20 8 0 8 -262144 -1 -1 1 1; #X msg 370 44 open \$1; *************** *** 31,65 **** #X text 85 514 written by Yves Degoyon ( ydegoyon(a)free.fr ); #X text 85 528 on request from patrick ( 11h11.com ); - #X obj 238 387 pdp_xv; #X msg 282 463 draw \$1 \$2; ! #X msg 383 241 clear; ! #X text 431 242 Clear all drawings; ! #X msg 382 270 width \$1; ! #X floatatom 455 271 5 0 0 0 - - -; ! #X text 503 271 Width of the pen ( default = 3 ); ! #X msg 381 302 rgb \$1 \$2 \$3; ! #X obj 479 305 pack f f f; ! #X floatatom 513 330 5 0 0 0 - - -; ! #X text 524 343 R; ! #X floatatom 562 331 5 0 0 0 - - -; ! #X floatatom 610 331 5 0 0 0 - - -; ! #X text 622 343 B; ! #X obj 610 303 t b f; ! #X text 572 343 G; ! #X obj 563 304 t b f; ! #X text 381 328 Color of the pen; ! #X msg 381 358 mode \$1; ! #X obj 447 360 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 1; ! #X text 473 361 Mode ( 0=drawing \, 1=erase ); ! #X text 473 374 ( default=0 ); ! #X obj 466 396 unpack f f; ! #X obj 469 418 f; ! #X obj 515 418 f; ! #X msg 381 395 fill \$1 \$2; ! #X obj 469 441 pack f f; ! #X obj 551 397 t b b; ! #X msg 600 397 bang; ! #X text 640 398 Fill a region; #X obj 238 419 route press drag release; #X floatatom 280 214 5 0 0 0 - - -; --- 31,64 ---- #X text 85 514 written by Yves Degoyon ( ydegoyon(a)free.fr ); #X text 85 528 on request from patrick ( 11h11.com ); #X msg 282 463 draw \$1 \$2; ! #X msg 403 238 clear; ! #X text 451 239 Clear all drawings; ! #X msg 402 267 width \$1; ! #X floatatom 470 267 5 0 0 0 - - -; ! #X text 523 268 Width of the pen ( default = 3 ); ! #X msg 401 299 rgb \$1 \$2 \$3; ! #X obj 499 302 pack f f f; ! #X floatatom 533 327 5 0 0 0 - - -; ! #X text 544 340 R; ! #X floatatom 582 328 5 0 0 0 - - -; ! #X floatatom 630 328 5 0 0 0 - - -; ! #X text 642 340 B; ! #X obj 630 300 t b f; ! #X text 592 340 G; ! #X obj 583 301 t b f; ! #X text 401 325 Color of the pen; ! #X msg 401 355 mode \$1; ! #X obj 467 357 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 1; ! #X text 493 358 Mode ( 0=drawing \, 1=erase ); ! #X text 493 371 ( default=0 ); ! #X obj 486 393 unpack f f; ! #X obj 489 415 f; ! #X obj 535 415 f; ! #X msg 401 392 fill \$1 \$2; ! #X obj 489 438 pack f f; ! #X obj 571 394 t b b; ! #X msg 620 394 bang; ! #X text 660 395 Fill a region; #X obj 238 419 route press drag release; #X floatatom 280 214 5 0 0 0 - - -; *************** *** 67,70 **** --- 66,73 ---- #X text 273 197 X Offset; #X text 329 197 Y Offset; + #X obj 406 213 hsl 128 15 0 1 0 0 empty empty empty -2 -6 0 8 -262144 + -1 -1 8800 1; + #X text 543 213 alpha; + #X obj 239 387 pdp_xv; #X connect 0 0 9 0; #X connect 1 0 10 0; *************** *** 87,118 **** #X connect 18 0 17 0; #X connect 20 0 19 0; ! #X connect 21 0 25 0; ! #X connect 25 0 55 0; #X connect 26 0 21 0; ! #X connect 27 0 21 0; ! #X connect 29 0 21 0; ! #X connect 30 0 29 0; ! #X connect 32 0 21 0; #X connect 33 0 32 0; ! #X connect 34 0 33 0; ! #X connect 36 0 41 0; ! #X connect 37 0 39 0; ! #X connect 39 0 33 0; ! #X connect 39 1 33 2; ! #X connect 41 0 33 0; ! #X connect 41 1 33 1; ! #X connect 43 0 21 0; ! #X connect 44 0 43 0; ! #X connect 47 0 48 1; ! #X connect 47 1 49 1; ! #X connect 48 0 51 0; ! #X connect 49 0 51 1; ! #X connect 50 0 21 0; ! #X connect 51 0 50 0; ! #X connect 52 0 48 0; ! #X connect 52 1 49 0; ! #X connect 53 0 52 0; ! #X connect 55 0 47 0; ! #X connect 55 1 26 0; ! #X connect 56 0 21 1; ! #X connect 57 0 21 2; --- 90,122 ---- #X connect 18 0 17 0; #X connect 20 0 19 0; ! #X connect 21 0 61 0; ! #X connect 25 0 21 0; #X connect 26 0 21 0; ! #X connect 28 0 21 0; ! #X connect 29 0 28 0; ! #X connect 31 0 21 0; ! #X connect 32 0 31 0; #X connect 33 0 32 0; ! #X connect 35 0 40 0; ! #X connect 36 0 38 0; ! #X connect 38 0 32 0; ! #X connect 38 1 32 2; ! #X connect 40 0 32 0; ! #X connect 40 1 32 1; ! #X connect 42 0 21 0; ! #X connect 43 0 42 0; ! #X connect 46 0 47 1; ! #X connect 46 1 48 1; ! #X connect 47 0 50 0; ! #X connect 48 0 50 1; ! #X connect 49 0 21 0; ! #X connect 50 0 49 0; ! #X connect 51 0 47 0; ! #X connect 51 1 48 0; ! #X connect 52 0 51 0; ! #X connect 54 0 46 0; ! #X connect 54 1 25 0; ! #X connect 55 0 21 1; ! #X connect 56 0 21 2; ! #X connect 59 0 21 3; ! #X connect 61 0 54 0; Index: help-pdp_ocanvas.pd =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/doc/help-pdp_ocanvas.pd,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** help-pdp_ocanvas.pd 18 May 2004 00:50:40 -0000 1.3 --- help-pdp_ocanvas.pd 14 Nov 2004 22:52:20 -0000 1.4 *************** *** 3,7 **** -1; #X msg 123 139 loop \$1; ! #X obj 124 117 tgl 15 0 empty empty empty 20 8 0 8 -262144 -1 -1 1 1; #X msg 119 80 open \$1; --- 3,7 ---- -1; #X msg 123 139 loop \$1; ! #X obj 124 117 tgl 15 0 empty empty empty 20 8 0 8 -262144 -1 -1 0 1; #X msg 119 80 open \$1; *************** *** 69,80 **** #X text 36 605 note : the maximum number of inputs is 10; #X text 36 618 ( easily hackable in the code ); ! #X text 544 397 Change offsets of first video source; ! #X obj 548 351 pack f f; ! #X floatatom 549 312 5 0 0 0 - - -; ! #X floatatom 599 312 5 0 0 0 - - -; ! #X obj 589 331 t b f; ! #X text 564 294 X; ! #X text 609 293 Y; ! #X msg 548 375 offset 1 \$1 \$2; #X obj 81 315 loadbang; #X msg 173 540 select \$1 \$2; --- 69,80 ---- #X text 36 605 note : the maximum number of inputs is 10; #X text 36 618 ( easily hackable in the code ); ! #X text 530 349 Change offsets of first video source; ! #X obj 534 303 pack f f; ! #X floatatom 639 304 5 0 0 0 - - -; ! #X floatatom 699 304 5 0 0 0 - - -; ! #X obj 597 302 t b f; ! #X text 679 302 X; ! #X text 740 304 Y; ! #X msg 534 327 offset 1 \$1 \$2; #X obj 81 315 loadbang; #X msg 173 540 select \$1 \$2; *************** *** 87,95 **** #X obj 496 254 pdp_scale 320 240; #X obj 234 497 route press drag release; ! #X msg 546 428 average \$1; ! #X obj 629 429 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 1; ! #X text 544 451 Average sources at intersections; ! #X text 544 463 ( default = 0 ); #X msg 104 476 cursor 0; #X obj 224 425 pdp_ocanvas 640 480 3; --- 87,95 ---- #X obj 496 254 pdp_scale 320 240; #X obj 234 497 route press drag release; ! #X msg 535 438 average \$1; ! #X obj 615 439 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 1; ! #X text 533 461 Average sources at intersections; ! #X text 533 473 ( default = 0 ); #X msg 104 476 cursor 0; #X obj 224 425 pdp_ocanvas 640 480 3; *************** *** 99,102 **** --- 99,111 ---- #X msg 105 446 cursor 1; #X obj 358 315 pdp_i 5000; + #X obj 535 369 pack f f; + #X floatatom 640 370 5 0 0 0 - - -; + #X floatatom 737 370 5 0 0 0 - - -; + #X obj 598 368 t b f; + #X msg 535 393 alpha \$1 \$2; + #X text 680 368 S; + #X text 531 415 Change alpha values for each source; + #X text 697 391 Alpha [0.0-1.0]; + #X obj 696 368 / 100; #X connect 0 0 7 0; #X connect 1 0 8 0; *************** *** 173,174 **** --- 182,190 ---- #X connect 80 0 77 0; #X connect 81 0 76 3; + #X connect 82 0 86 0; + #X connect 83 0 82 0; + #X connect 84 0 90 0; + #X connect 85 0 82 0; + #X connect 85 1 82 1; + #X connect 86 0 76 0; + #X connect 90 0 85 0; Index: help-pdp_ffmpeg~.pd =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/doc/help-pdp_ffmpeg~.pd,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** help-pdp_ffmpeg~.pd 18 May 2004 00:50:40 -0000 1.5 --- help-pdp_ffmpeg~.pd 14 Nov 2004 22:52:20 -0000 1.6 *************** *** 63,68 **** #X floatatom 128 194 5 0 0 0 - - -; #X obj 122 273 pdp_affine; - #X msg 319 358 feed http://www.xicnet.com:8000/feed1.ffm; #X msg 318 415 feed http://localhost:8090/feed1.ffm; #X connect 0 0 9 0; #X connect 1 0 46 0; --- 63,68 ---- #X floatatom 128 194 5 0 0 0 - - -; #X obj 122 273 pdp_affine; #X msg 318 415 feed http://localhost:8090/feed1.ffm; + #X msg 320 357 feed http://www.xicnet.com:8000/sin1.ffm; #X connect 0 0 9 0; #X connect 1 0 46 0; Index: help-pdp_compose.pd =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/doc/help-pdp_compose.pd,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** help-pdp_compose.pd 17 Sep 2003 20:21:11 -0000 1.1 --- help-pdp_compose.pd 14 Nov 2004 22:52:20 -0000 1.2 *************** *** 4,8 **** -1; #X msg 54 201 loop \$1; ! #X obj 55 179 tgl 15 0 empty empty empty 20 8 0 8 -262144 -1 -1 0 1 ; #X msg 39 146 open \$1; --- 4,8 ---- -1; #X msg 54 201 loop \$1; ! #X obj 55 179 tgl 15 0 empty empty empty 20 8 0 8 -262144 -1 -1 1 1 ; #X msg 39 146 open \$1; *************** *** 13,30 **** #X obj 121 168 metro 70; #X obj 116 200 pdp_yqt; ! #X floatatom 244 273 5 0 0; ! #X floatatom 253 294 5 0 0; ! #X floatatom 270 315 5 0 0; ! #X floatatom 288 339 5 0 0; #X text 269 614 written by Yves Degoyon ( ydegoyon(a)free.fr ); #X text 290 273 R component; #X text 298 293 G component; #X text 315 314 B component; ! #X floatatom 299 360 5 0 0; #X text 336 338 X coordinate of cursor ( pick ); #X text 347 359 Y coordinate of cursor ( pick ); #X msg 14 443 pick; #X text 11 422 Pick up the color; ! #X floatatom 309 380 5 0 0; #X text 356 380 Tolerance ( default = 50 ); #X text 269 583 pdp_compose : video compositor; --- 13,30 ---- #X obj 121 168 metro 70; #X obj 116 200 pdp_yqt; ! #X floatatom 244 273 5 0 0 0 - - -; ! #X floatatom 253 294 5 0 0 0 - - -; ! #X floatatom 270 315 5 0 0 0 - - -; ! #X floatatom 288 339 5 0 0 0 - - -; #X text 269 614 written by Yves Degoyon ( ydegoyon(a)free.fr ); #X text 290 273 R component; #X text 298 293 G component; #X text 315 314 B component; ! #X floatatom 299 360 5 0 0 0 - - -; #X text 336 338 X coordinate of cursor ( pick ); #X text 347 359 Y coordinate of cursor ( pick ); #X msg 14 443 pick; #X text 11 422 Pick up the color; ! #X floatatom 309 380 5 0 0 0 - - -; #X text 356 380 Tolerance ( default = 50 ); #X text 269 583 pdp_compose : video compositor; *************** *** 49,58 **** #X obj 589 507 pdp_control; #X msg 589 480 thread \$1; ! #X floatatom 589 568 5 0 0; #X obj 589 539 route pdp_drop; #X obj 97 305 pdp_form ---------; #X msg 116 246 ellipse 69 124 59 78; ! #X floatatom 130 274 5 0 0; ! #X floatatom 176 274 5 0 0; #X msg 317 410 luminosity \$1; #X obj 419 411 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 --- 49,58 ---- #X obj 589 507 pdp_control; #X msg 589 480 thread \$1; ! #X floatatom 589 568 5 0 0 0 - - -; #X obj 589 539 route pdp_drop; #X obj 97 305 pdp_form ---------; #X msg 116 246 ellipse 69 124 59 78; ! #X floatatom 130 274 5 0 0 0 - - -; ! #X floatatom 176 274 5 0 0 0 - - -; #X msg 317 410 luminosity \$1; #X obj 419 411 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 *************** *** 63,67 **** -1; #X msg 322 523 stop; - #X text 269 628 idea suggested by liz; #X obj 165 466 pdp_compose ----; #X obj 394 132 pdp_v4l; --- 63,66 ---- *************** *** 72,76 **** #X msg 490 99 open /dev/video; #X text 471 67 Live; ! #X floatatom 514 66 5 0 0; #X obj 401 437 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 1; --- 71,75 ---- #X msg 490 99 open /dev/video; #X text 471 67 Live; ! #X floatatom 514 66 5 0 0 0 - - -; #X obj 401 437 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 1; *************** *** 83,87 **** #X obj 233 562 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 1; ! #X connect 0 0 64 0; #X connect 1 0 8 0; #X connect 2 0 9 0; --- 82,87 ---- #X obj 233 562 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 1; ! #X obj 16 517 route press; ! #X connect 0 0 69 0; #X connect 1 0 8 0; #X connect 2 0 9 0; *************** *** 93,103 **** #X connect 8 0 9 0; #X connect 9 0 43 0; ! #X connect 10 0 54 2; ! #X connect 11 0 54 3; ! #X connect 12 0 54 4; ! #X connect 13 0 54 5; ! #X connect 18 0 54 6; ! #X connect 21 0 54 0; ! #X connect 23 0 54 7; #X connect 27 0 34 0; #X connect 28 0 35 0; --- 93,103 ---- #X connect 8 0 9 0; #X connect 9 0 43 0; ! #X connect 10 0 53 2; ! #X connect 11 0 53 3; ! #X connect 12 0 53 4; ! #X connect 13 0 53 5; ! #X connect 18 0 53 6; ! #X connect 21 0 53 0; ! #X connect 23 0 53 7; #X connect 27 0 34 0; #X connect 28 0 35 0; *************** *** 108,137 **** #X connect 33 0 34 0; #X connect 34 0 35 0; ! #X connect 35 0 54 1; #X connect 38 0 40 0; #X connect 39 0 42 0; #X connect 40 0 39 0; #X connect 42 0 41 0; ! #X connect 43 0 54 0; #X connect 44 0 43 0; #X connect 45 0 43 2; #X connect 46 0 43 3; ! #X connect 47 0 54 0; #X connect 48 0 47 0; ! #X connect 49 0 54 1; #X connect 50 0 49 0; #X connect 51 0 50 0; #X connect 52 0 50 0; ! #X connect 54 0 0 0; ! #X connect 55 0 43 0; #X connect 56 0 55 0; ! #X connect 57 0 56 0; ! #X connect 58 0 56 0; ! #X connect 59 0 55 0; ! #X connect 61 0 56 1; ! #X connect 62 0 63 0; ! #X connect 63 0 54 0; ! #X connect 64 0 54 0; ! #X connect 64 0 21 0; ! #X connect 68 0 0 0; ! #X connect 69 0 68 0; --- 108,138 ---- #X connect 33 0 34 0; #X connect 34 0 35 0; ! #X connect 35 0 53 1; #X connect 38 0 40 0; #X connect 39 0 42 0; #X connect 40 0 39 0; #X connect 42 0 41 0; ! #X connect 43 0 53 0; #X connect 44 0 43 0; #X connect 45 0 43 2; #X connect 46 0 43 3; ! #X connect 47 0 53 0; #X connect 48 0 47 0; ! #X connect 49 0 53 1; #X connect 50 0 49 0; #X connect 51 0 50 0; #X connect 52 0 50 0; ! #X connect 53 0 0 0; ! #X connect 54 0 43 0; ! #X connect 55 0 54 0; #X connect 56 0 55 0; ! #X connect 57 0 55 0; ! #X connect 58 0 54 0; ! #X connect 60 0 55 1; ! #X connect 61 0 62 0; ! #X connect 62 0 53 0; ! #X connect 63 0 53 0; ! #X connect 63 0 21 0; ! #X connect 67 0 0 0; ! #X connect 68 0 67 0; ! #X connect 69 0 63 0; Index: help-pdp_form.pd =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/doc/help-pdp_form.pd,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** help-pdp_form.pd 17 Sep 2003 20:21:11 -0000 1.1 --- help-pdp_form.pd 14 Nov 2004 22:52:20 -0000 1.2 *************** *** 22,31 **** #X msg 442 170 open /dev/video; #X obj 252 167 pdp_yqt; ! #X obj 606 530 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 1; ! #X obj 606 582 pdp_control; ! #X msg 606 555 thread \$1; ! #X floatatom 606 643 5 0 0 0 - - -; ! #X obj 606 614 route pdp_drop; #X text 222 631 written by Yves Degoyon (ydegoyon(a)free.fr); #X obj 189 362 hdl 15 1 0 10 empty empty empty 0 -6 0 8 -262144 -1 --- 22,31 ---- #X msg 442 170 open /dev/video; #X obj 252 167 pdp_yqt; ! #X obj 628 513 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 1; ! #X obj 628 565 pdp_control; ! #X msg 628 538 thread \$1; ! #X floatatom 628 626 5 0 0 0 - - -; ! #X obj 628 597 route pdp_drop; #X text 222 631 written by Yves Degoyon (ydegoyon(a)free.fr); #X obj 189 362 hdl 15 1 0 10 empty empty empty 0 -6 0 8 -262144 -1 *************** *** 60,63 **** --- 60,66 ---- #X text 222 605 pdp_form : geometric forms addition in PDP; #X obj 144 562 pdp_form -----------------; + #X obj 346 540 hsl 128 15 0 1 0 0 empty empty empty -2 -6 0 8 -262144 + -1 -1 0 1; + #X text 487 540 alpha ( global ); #X connect 1 0 10 0; #X connect 2 0 16 0; *************** *** 95,96 **** --- 98,100 ---- #X connect 49 0 51 0; #X connect 51 0 0 0; + #X connect 52 0 51 9; Index: help-pdp_live~.pd =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/doc/help-pdp_live~.pd,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** help-pdp_live~.pd 17 Sep 2003 20:21:11 -0000 1.1 --- help-pdp_live~.pd 14 Nov 2004 22:52:20 -0000 1.2 *************** *** 3,8 **** #X obj 156 158 dac~; #X text 51 321 written by Yves Degoyon (ydegoyon(a)free.fr); - #X text 51 308 ( at least from ffserver ); - #X text 51 295 pdp_live~ : decodes a live video stream; #X text 236 112 <-- everything is in this box; #X text 265 127 where the block size is redefined; --- 3,6 ---- *************** *** 11,15 **** #X obj 395 221 loadbang; #X msg 395 251 \; pd dsp 1; #X connect 0 0 1 0; #X connect 0 1 1 1; ! #X connect 9 0 10 0; --- 9,17 ---- #X obj 395 221 loadbang; #X msg 395 251 \; pd dsp 1; + #X text 51 308 and the video files supported by your ffmpeg (avi \, + mpg \, ..); + #X text 51 295 pdp_live~ : decodes a live video stream from ffmpeg + ; #X connect 0 0 1 0; #X connect 0 1 1 1; ! #X connect 7 0 8 0; Index: help-pdp_yqt.pd =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/doc/help-pdp_yqt.pd,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** help-pdp_yqt.pd 24 Oct 2003 02:39:46 -0000 1.3 --- help-pdp_yqt.pd 14 Nov 2004 22:52:20 -0000 1.4 *************** *** 4,8 **** -1; #X msg 123 136 loop \$1; ! #X obj 124 114 tgl 15 0 empty empty empty 20 8 0 8 -262144 -1 -1 0 1; #X msg 370 44 open \$1; --- 4,8 ---- -1; #X msg 123 136 loop \$1; ! #X obj 124 114 tgl 15 0 empty empty empty 20 8 0 8 -262144 -1 -1 1 1; #X msg 370 44 open \$1; Index: help-pdp_text.pd =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/doc/help-pdp_text.pd,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** help-pdp_text.pd 17 Sep 2003 20:21:11 -0000 1.1 --- help-pdp_text.pd 14 Nov 2004 22:52:20 -0000 1.2 *************** *** 1,4 **** #N canvas 84 12 763 664 10; ! #X obj 92 608 pdp_xv; #X obj 268 64 bng 15 250 50 0 empty empty empty 20 8 0 8 -262144 -1 -1; --- 1,4 ---- #N canvas 84 12 763 664 10; ! #X obj 152 627 pdp_xv; #X obj 268 64 bng 15 250 50 0 empty empty empty 20 8 0 8 -262144 -1 -1; *************** *** 22,31 **** #X msg 442 170 open /dev/video; #X obj 252 167 pdp_yqt; ! #X obj 606 530 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 1; ! #X obj 606 582 pdp_control; ! #X msg 606 555 thread \$1; ! #X floatatom 606 643 5 0 0 0 - - -; ! #X obj 606 614 route pdp_drop; #X text 221 617 pdp_text : text rendering in PDP; #X text 222 631 written by Yves Degoyon (ydegoyon(a)free.fr); --- 22,31 ---- #X msg 442 170 open /dev/video; #X obj 252 167 pdp_yqt; ! #X obj 648 451 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 1; ! #X obj 648 503 pdp_control; ! #X msg 648 476 thread \$1; ! #X floatatom 648 564 5 0 0 0 - - -; ! #X obj 648 535 route pdp_drop; #X text 221 617 pdp_text : text rendering in PDP; #X text 222 631 written by Yves Degoyon (ydegoyon(a)free.fr); *************** *** 58,62 **** #X msg 30 421 resize 20; #X msg 30 489 font helmetr/14; ! #X obj 155 585 pdp_text -----------------; #X text 139 254 text <text> x y [ r g b angle ]; #X floatatom 331 554 5 0 0 0 - - -; --- 58,62 ---- #X msg 30 421 resize 20; #X msg 30 489 font helmetr/14; ! #X obj 155 598 pdp_text -----------------; #X text 139 254 text <text> x y [ r g b angle ]; #X floatatom 331 554 5 0 0 0 - - -; *************** *** 69,74 **** #X msg 64 560 antialias \$1; #X msg 29 458 font helmetr/5; ! #X floatatom 365 577 5 0 0 0 - - -; ! #X text 411 577 Scroll; #X connect 1 0 10 0; #X connect 2 0 16 0; --- 69,77 ---- #X msg 64 560 antialias \$1; #X msg 29 458 font helmetr/5; ! #X floatatom 354 572 5 0 0 0 - - -; ! #X text 400 572 Scroll; ! #X obj 380 594 hsl 128 15 0 1 0 0 empty empty empty -2 -6 0 8 -262144 ! -1 -1 0 1; ! #X text 517 594 Alpha ( global ); #X connect 1 0 10 0; #X connect 2 0 16 0; *************** *** 117,118 **** --- 120,122 ---- #X connect 61 0 51 0; #X connect 62 0 51 8; + #X connect 64 0 51 9; Index: rs_pdp_live~.pd =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/doc/rs_pdp_live~.pd,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** rs_pdp_live~.pd 18 May 2004 00:50:40 -0000 1.4 --- rs_pdp_live~.pd 14 Nov 2004 22:52:20 -0000 1.5 *************** *** 1,73 **** ! #N canvas 168 29 842 529 10; ! #X text 460 551 written by Yves Degoyon (ydegoyon(a)free.fr); ! #X floatatom 223 475 5 0 0 0 - - -; ! #X text 269 474 Streaming status; ! #X floatatom 244 453 5 0 0 0 - - -; ! #X obj 36 449 pdp_xv; #X text 611 77 Connect to a live stream; ! #X text 325 118 Disconnect from the current stream; ! #X msg 247 116 disconnect; ! #X text 293 454 Number of video frames decoded; ! #X text 457 527 ( at least from ffserver ); ! #X text 23 547 NOTE : as for pdp_ffmpeg~ \, transmitting audio; ! #X text 22 565 with the video stream produces some unsteady sound; ! #X text 23 580 a prefered solution would be to use mp3cast~/mp3amp~ ; ! #X msg 246 335 priority \$1; ! #X floatatom 335 336 5 0 0 0 - - -; ! #X text 385 357 ( optional \, if you know what you're doing ); ! #X obj 70 493 outlet~; ! #X obj 146 486 outlet~; ! #X text 387 342 ([-20 \, 20 ] default : 0 ); ! #X text 390 329 Set the priority of decoding thread; ! #X msg 247 225 connect \$1; ! #X text 460 513 pdp_live~ : decodes a live video stream; ! #X text 458 539 and reads most common files ( avi \, mpg \, .... ) ; ! #X text 325 175 Read video file; ! #X obj 247 154 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 -1; ! #X obj 247 176 openpanel; ! #X msg 248 296 audio \$1; ! #X obj 317 298 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 1; ! #X text 348 298 Activate decoding of audio ( default : off ); ! #X obj 247 200 makefilename file://%s; ! #X msg 9 388 autocreate 1; #X msg 244 52 connect http://localhost:8090/test1.mpg; ! #X obj 65 61 block~ 1024; ! #X obj 322 261 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 1 1; ! #X msg 248 259 thread \$1; ! #X obj 378 259 loadbang; ! #X msg 343 259 1; ! #X text 449 259 Activate threading ( default : on ); ! #X floatatom 260 430 5 0 0 0 - - -; ! #X text 306 430 Reception framerate; ! #X text 333 411 End of stream reached; ! #X floatatom 287 409 5 0 0 0 - - -; #X msg 246 78 connect http://gollum.artefacte.org:8090/osas.mpg; ! #X obj 113 374 pdp_live~; ! #X connect 7 0 43 0; ! #X connect 13 0 43 0; ! #X connect 14 0 13 0; ! #X connect 20 0 43 0; ! #X connect 24 0 25 0; ! #X connect 25 0 29 0; ! #X connect 26 0 43 0; ! #X connect 27 0 26 0; ! #X connect 29 0 20 0; ! #X connect 30 0 4 0; ! #X connect 31 0 43 0; ! #X connect 33 0 34 0; ! #X connect 34 0 43 0; ! #X connect 35 0 36 0; ! #X connect 36 0 33 0; ! #X connect 42 0 43 0; ! #X connect 43 0 4 0; ! #X connect 43 1 16 0; ! #X connect 43 2 17 0; ! #X connect 43 3 1 0; ! #X connect 43 4 3 0; ! #X connect 43 5 38 0; ! #X connect 43 6 41 0; --- 1,108 ---- ! #N canvas 393 46 872 636 10; ! #X text 455 594 written by Yves Degoyon (ydegoyon(a)free.fr); ! #X floatatom 223 540 5 0 0 0 - - -; ! #X text 268 540 Streaming status; ! #X floatatom 243 519 5 0 0 0 - - -; #X text 611 77 Connect to a live stream; ! #X text 325 111 Disconnect from the current stream; ! #X msg 247 109 disconnect; ! #X text 292 520 Number of video frames decoded; ! #X text 452 570 ( at least from ffserver ); ! #X text 21 570 NOTE : as for pdp_ffmpeg~ \, transmitting audio; ! #X text 20 588 with the video stream produces some unsteady sound; ! #X text 21 603 a prefered solution would be to use mp3cast~/mp3amp~ ; ! #X msg 253 415 priority \$1; ! #X floatatom 342 416 5 0 0 0 - - -; ! #X text 388 439 ( optional \, if you know what you're doing ); ! #X obj 72 543 outlet~; ! #X text 393 411 Set the priority of decoding thread; ! #X msg 247 214 connect \$1; ! #X text 455 556 pdp_live~ : decodes a live video stream; ! #X text 453 582 and reads most common files ( avi \, mpg \, .... ) ; ! #X text 325 164 Read video file; ! #X obj 247 143 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 -1; ! #X obj 247 165 openpanel; ! #X msg 253 384 audio \$1; ! #X obj 322 386 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 1; ! #X text 353 386 Activate decoding of audio ( default : off ); ! #X obj 247 189 makefilename file://%s; #X msg 244 52 connect http://localhost:8090/test1.mpg; ! #X obj 327 355 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 1 1; ! #X msg 253 355 thread \$1; ! #X obj 383 355 loadbang; ! #X msg 348 355 1; ! #X text 451 355 Activate threading ( default : on ); ! #X floatatom 259 496 5 0 0 0 - - -; ! #X text 305 496 Reception framerate; ! #X text 333 476 End of stream reached; ! #X floatatom 286 475 5 0 0 0 - - -; ! #X obj 115 424 pdp_live~; ! #X obj 341 257 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 1 ! 1; ! #X obj 397 255 loadbang; ! #X msg 362 255 1; ! #X msg 250 256 autoplay \$1; ! #X text 465 255 Activate auto play mode ( default : on ); ! #X msg 252 291 bang; ! #X msg 392 293 bang; ! #X floatatom 433 294 5 0 0 0 - - -; ! #X text 485 292 In manual mode \, read next frame ( autoplay = off ! ); ! #X obj 328 293 metro 70; ! #X msg 254 319 loop \$1; ! #X obj 316 320 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 1 ! 1; ! #X obj 372 318 loadbang; ! #X msg 337 318 1; ! #X text 440 318 Activate loop mode for files ( default : on ); ! #X floatatom 75 252 5 0 0 0 - - -; ! #X text 6 194 Frame seek; ! #X msg 289 292 stop; ! #X obj 134 543 outlet~; ! #X text 390 424 ([0 \, 20 ] default : 1 ); ! #X text 6 222 ffmpeg >= 0.4.9; ! #X text 6 207 warning : works only with; ! #X obj 35 501 pdp_xv; ! #X obj 66 61 block~ 1024; #X msg 246 78 connect http://gollum.artefacte.org:8090/osas.mpg; ! #X connect 6 0 37 0; ! #X connect 12 0 37 0; ! #X connect 13 0 12 0; ! #X connect 17 0 37 0; ! #X connect 21 0 22 0; ! #X connect 22 0 26 0; ! #X connect 23 0 37 0; ! #X connect 24 0 23 0; ! #X connect 26 0 17 0; ! #X connect 27 0 37 0; ! #X connect 28 0 29 0; ! #X connect 29 0 37 0; ! #X connect 30 0 31 0; ! #X connect 31 0 28 0; ! #X connect 37 0 60 0; ! #X connect 37 1 15 0; ! #X connect 37 2 56 0; ! #X connect 37 3 1 0; ! #X connect 37 4 3 0; ! #X connect 37 5 33 0; ! #X connect 37 6 36 0; ! #X connect 38 0 41 0; ! #X connect 39 0 40 0; ! #X connect 40 0 38 0; ! #X connect 41 0 37 0; ! #X connect 43 0 37 0; ! #X connect 44 0 47 0; ! #X connect 45 0 47 1; ! #X connect 47 0 37 0; ! #X connect 48 0 37 0; ! #X connect 49 0 48 0; ! #X connect 50 0 51 0; ! #X connect 51 0 49 0; ! #X connect 53 0 37 1; ! #X connect 55 0 47 0; ! #X connect 62 0 37 0; Index: help-pdp_streaming.pd =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/doc/help-pdp_streaming.pd,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** help-pdp_streaming.pd 18 May 2004 00:50:40 -0000 1.2 --- help-pdp_streaming.pd 14 Nov 2004 22:52:20 -0000 1.3 *************** *** 4,8 **** -1; #X msg 165 92 loop \$1; ! #X obj 166 70 tgl 15 0 empty empty empty 20 8 0 8 -262144 -1 -1 0 1 ; #X msg 150 45 open \$1; --- 4,8 ---- -1; #X msg 165 92 loop \$1; ! #X obj 166 70 tgl 15 0 empty empty empty 20 8 0 8 -262144 -1 -1 1 1 ; #X msg 150 45 open \$1; *************** *** 14,18 **** #X obj 233 92 metro 70; #X text 386 588 written by Yves Degoyon ( ydegoyon(a)free.fr ); ! #X obj 169 156 pdp_yqt; #X obj 160 315 pdp_o; #X msg 267 154 connect localhost 4578; --- 14,18 ---- #X obj 233 92 metro 70; #X text 386 588 written by Yves Degoyon ( ydegoyon(a)free.fr ); ! #X obj 155 165 pdp_yqt; #X obj 160 315 pdp_o; #X msg 267 154 connect localhost 4578; *************** *** 25,30 **** #X text 229 512 Connection state; #X text 249 492 Number of frames received; ! #X symbolatom 220 470 10 0 0 0 - - -; ! #X text 301 472 Address of the emitter; #X msg 267 253 refresh; #X msg 267 279 framerate \$1; --- 25,30 ---- #X text 229 512 Connection state; #X text 249 492 Number of frames received; ! #X symbolatom 220 470 15 0 0 0 - - -; ! #X text 332 470 Address of the emitter; #X msg 267 253 refresh; #X msg 267 279 framerate \$1; *************** *** 51,54 **** --- 51,55 ---- #X floatatom 207 341 5 0 0 0 - - -; #X text 259 340 Bandwidth (in kb); + #X msg 268 133 connect 193.171.120.173 4578; #X connect 1 0 9 0; #X connect 2 0 11 0; *************** *** 82,83 **** --- 83,85 ---- #X connect 40 0 41 0; #X connect 41 0 12 0; + #X connect 47 0 12 0;

1 0

externals/unauthorized/stksitar~ help-stksitar~.pd,1.2,1.3
by Yves Degoyon 14 Nov '04

14 Nov '04

Update of /cvsroot/pure-data/externals/unauthorized/stksitar~ In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21139 Added Files: help-stksitar~.pd Log Message: adapted for STK 4.2.0 --- NEW FILE: help-stksitar~.pd --- #N canvas 33 1 784 529 10; #X obj 112 311 dac~; #X obj 115 248 stksitar~; #X obj 114 278 *~; #X floatatom 147 278 5 0 0 0 - - -; #X msg 162 172 stop; #X floatatom 196 200 5 52 100000 0 - - -; #X floatatom 238 248 5 5 35 0 - - -; #X text 247 335 stksitar~ : Object to embed stk-based sitar synthesis ; #X text 247 360 Comments and bugs @ ydegoyon(a)free.fr; #X msg 113 346 \; pd dsp 1; #X msg 179 346 \; pd dsp 0; #X msg 24 34 bang; #X msg 93 99 play; #X msg 113 173 play; #X obj 195 248 / 100; #X text 276 279 Master level; #X obj 23 99 metro 2000; #X floatatom 52 75 5 0 0 0 - - -; #X obj 134 78 / 1000; #X obj 134 98 + 0.05; #X floatatom 182 98 5 0 0 0 - - -; #X obj 217 278 loadbang; #X text 301 258 ( min=0.05 \, max=0.35 \, default = 0.25 ); #X text 303 248 Strength of plucking; #X text 239 205 ( min=52Hz \, default=250 Hz ); #X text 241 195 Frequency; #X obj 231 77 qlist; #X msg 274 76 read sitar-freqs; #X msg 231 55 next; #X msg 274 55 rewind; #X text 247 348 Originally written by Perry Cook for STK/ragamatic ; #X obj 386 76 loadbang; #X msg 189 278 40; #X obj 24 75 + 0; #X text 21 12 Ready for meditation ??; #X text 240 398 And now another message from Nancy Reagan : "Drugs destroy your brain"; #X obj 134 59 random 200; #X obj 24 57 random 1000; #X connect 1 0 2 0; #X connect 2 0 0 0; #X connect 2 0 0 1; #X connect 3 0 2 1; #X connect 4 0 1 0; #X connect 5 0 1 1; #X connect 6 0 14 0; #X connect 11 0 16 0; #X connect 11 0 37 0; #X connect 12 0 1 0; #X connect 13 0 1 0; #X connect 14 0 1 2; #X connect 16 0 12 0; #X connect 16 0 28 0; #X connect 16 0 36 0; #X connect 16 0 37 0; #X connect 17 0 16 1; #X connect 18 0 19 0; #X connect 19 0 20 0; #X connect 19 0 1 2; #X connect 21 0 32 0; #X connect 26 0 5 0; #X connect 26 1 29 0; #X connect 27 0 26 0; #X connect 28 0 26 0; #X connect 29 0 26 0; #X connect 31 0 27 0; #X connect 32 0 3 0; #X connect 33 0 17 0; #X connect 36 0 18 0; #X connect 37 0 33 0;

1 0

externals/unauthorized/stksitar~ Makefile,1.1,1.2 README,1.1,1.2 sitar.cc,1.1,1.2 sitar.h,1.1,1.2 stksitar~.cc,1.1,1.2
by Yves Degoyon 14 Nov '04

14 Nov '04

Update of /cvsroot/pure-data/externals/unauthorized/stksitar~ In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20979 Modified Files: Makefile README sitar.cc sitar.h stksitar~.cc Log Message: adapted for STK 4.2.0 Index: stksitar~.cc =================================================================== RCS file: /cvsroot/pure-data/externals/unauthorized/stksitar~/stksitar~.cc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** stksitar~.cc 16 Aug 2003 17:08:55 -0000 1.1 --- stksitar~.cc 14 Nov 2004 22:46:51 -0000 1.2 *************** *** 50,54 **** return; } ! x->x_stksitar->setFreq( (MY_FLOAT) ffreq ); x->x_freq = ffreq; } --- 50,54 ---- return; } ! x->x_stksitar->setFreq( (StkFloat) ffreq ); x->x_freq = ffreq; } *************** *** 61,65 **** return; } ! x->x_stksitar->pluck( (MY_FLOAT) fpluck ); x->x_pluck = fpluck; } --- 61,65 ---- return; } ! x->x_stksitar->pluck( (StkFloat) fpluck ); x->x_pluck = fpluck; } Index: README =================================================================== RCS file: /cvsroot/pure-data/externals/unauthorized/stksitar~/README,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** README 16 Aug 2003 17:08:55 -0000 1.1 --- README 14 Nov 2004 22:46:51 -0000 1.2 *************** *** 1,4 **** ***************************************************************************** ! Version 0.01 embedding Perry Cook's ragamatic in Pure Data copyright 2001 by Perry Cook --- 1,4 ---- ***************************************************************************** ! Version 0.2 embedding Perry Cook's ragamatic in Pure Data copyright 2001 by Perry Cook Index: Makefile =================================================================== RCS file: /cvsroot/pure-data/externals/unauthorized/stksitar~/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Makefile 16 Aug 2003 17:08:55 -0000 1.1 --- Makefile 14 Nov 2004 22:46:51 -0000 1.2 *************** *** 22,27 **** g++ -O3 -Wall -D__OS_Linux_ -g -I$(STK_HOME)/include -c sitar.cc g++ $(LINUXCCFLAGS) $(LINUXINCLUDE) -I$(STK_HOME)/include -o $*.o -c $*.cc ! ld -export_dynamic -shared -o $*.pd_linux *.o $(STK_HOME)/src/stklib.a -lc -lm -lstdc++ -lg++ ! #strip --strip-unneeded $*.pd_linux rm -f *.o ../$*.pd_linux ln -s $*/$*.pd_linux .. --- 22,27 ---- g++ -O3 -Wall -D__OS_Linux_ -g -I$(STK_HOME)/include -c sitar.cc g++ $(LINUXCCFLAGS) $(LINUXINCLUDE) -I$(STK_HOME)/include -o $*.o -c $*.cc ! g++ -export_dynamic -shared -o $*.pd_linux *.o $(STK_HOME)/src/libstk.a -lc -lm -lpthread ! strip --strip-unneeded $*.pd_linux rm -f *.o ../$*.pd_linux ln -s $*/$*.pd_linux .. Index: sitar.cc =================================================================== RCS file: /cvsroot/pure-data/externals/unauthorized/stksitar~/sitar.cc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** sitar.cc 16 Aug 2003 17:08:55 -0000 1.1 --- sitar.cc 14 Nov 2004 22:46:51 -0000 1.2 *************** *** 10,25 **** #include "sitar.h" ! #ifndef MY_FLOAT ! #warning "weird : MY_FLOAT undefined" ! #define MY_FLOAT double ! #endif ! ! sitar :: sitar(MY_FLOAT lowestFreq) { length = (long) (SRATE / lowestFreq + 1); ! loopGain = (MY_FLOAT) 0.999; loopFilt = new OneZero(); ! loopFilt->setCoeff(0.01); ! delayLine = new DLineA(length); delay = length/2; delayTarg = delay; --- 10,20 ---- #include "sitar.h" ! sitar :: sitar(StkFloat lowestFreq) { length = (long) (SRATE / lowestFreq + 1); ! loopGain = (StkFloat) 0.999; loopFilt = new OneZero(); ! loopFilt->setZero(0.01); ! delayLine = new DelayA(0.5 * length, length); delay = length/2; delayTarg = delay; *************** *** 44,62 **** } ! void sitar :: setFreq(MY_FLOAT frequency) { delayTarg = (SRATE / frequency); delay = delayTarg * (1.0 + (0.05 * noise->tick())); delayLine->setDelay(delay); ! loopGain = (MY_FLOAT) 0.995 + (frequency * (MY_FLOAT) 0.000001); ! if (loopGain>1.0) loopGain = (MY_FLOAT) 0.9995; } ! void sitar :: pluck(MY_FLOAT amplitude) { envelope->keyOn(); } ! void sitar :: noteOn(MY_FLOAT freq, MY_FLOAT amp) { this->setFreq(freq); --- 39,57 ---- } ! void sitar :: setFreq(StkFloat frequency) { delayTarg = (SRATE / frequency); delay = delayTarg * (1.0 + (0.05 * noise->tick())); delayLine->setDelay(delay); ! loopGain = (StkFloat) 0.995 + (frequency * (StkFloat) 0.000001); ! if (loopGain>1.0) loopGain = (StkFloat) 0.9995; } ! void sitar :: pluck(StkFloat amplitude) { envelope->keyOn(); } ! void sitar :: noteOn(StkFloat freq, StkFloat amp) { this->setFreq(freq); *************** *** 68,74 **** } ! void sitar :: noteOff(MY_FLOAT amp) { ! loopGain = (MY_FLOAT) 1.0 - amp; #if defined(_debug_) printf("sitar : NoteOff: Amp=%lf\n",amp); --- 63,69 ---- } ! void sitar :: noteOff(StkFloat amp) { ! loopGain = (StkFloat) 1.0 - amp; #if defined(_debug_) printf("sitar : NoteOff: Amp=%lf\n",amp); *************** *** 76,82 **** } ! MY_FLOAT sitar :: tick() { ! MY_FLOAT temp; temp = delayLine->lastOut(); --- 71,77 ---- } ! StkFloat sitar :: tick() { ! StkFloat temp; temp = delayLine->lastOut(); *************** *** 98,105 **** } ! lastOutput = delayLine->tick(loopFilt->tick(temp) + (amPluck * envelope->tick() * noise->tick())); ! return lastOutput; } --- 93,100 ---- } ! lastOutput_ = delayLine->tick(loopFilt->tick(temp) + (amPluck * envelope->tick() * noise->tick())); ! return lastOutput_; } Index: sitar.h =================================================================== RCS file: /cvsroot/pure-data/externals/unauthorized/stksitar~/sitar.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** sitar.h 16 Aug 2003 17:08:55 -0000 1.1 --- sitar.h 14 Nov 2004 22:46:51 -0000 1.2 *************** *** 11,42 **** #define __sitar_h ! #include "Instrmnt.h" ! #include "DLineA.h" #include "OneZero.h" ! #include "ADSR.h" ! #include "Noise.h" ! #include "Object.h" class sitar : public Instrmnt { protected: ! DLineA *delayLine; OneZero *loopFilt; ADSR *envelope; Noise *noise; long length; ! MY_FLOAT loopGain; ! MY_FLOAT amPluck; ! MY_FLOAT delay; ! MY_FLOAT delayTarg; public: ! sitar(MY_FLOAT lowestFreq); ~sitar(); void clear(); ! virtual void setFreq(MY_FLOAT frequency); ! void pluck(MY_FLOAT amplitude); ! virtual void noteOn(MY_FLOAT freq, MY_FLOAT amp); ! virtual void noteOff(MY_FLOAT amp); ! virtual MY_FLOAT tick(); }; --- 11,41 ---- #define __sitar_h ! #include "Instrmnt.h" ! #include "DelayA.h" #include "OneZero.h" ! #include "Noise.h" ! #include "ADSR.h" class sitar : public Instrmnt { protected: ! DelayA *delayLine; OneZero *loopFilt; ADSR *envelope; Noise *noise; long length; ! StkFloat loopGain; ! StkFloat amPluck; ! StkFloat delay; ! StkFloat delayTarg; public: ! sitar(StkFloat lowestFreq); ~sitar(); void clear(); ! virtual void setFreq(StkFloat frequency); ! void pluck(StkFloat amplitude); ! virtual void noteOn(StkFloat freq, StkFloat amp); ! virtual void noteOff(StkFloat amp); ! virtual StkFloat tick(); };

1 0

externals/unauthorized/stkdrone~ help-stkdrone~.pd,1.2,1.3
by Yves Degoyon 14 Nov '04

14 Nov '04

Update of /cvsroot/pure-data/externals/unauthorized/stkdrone~ In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20921 Added Files: help-stkdrone~.pd Log Message: adapted for STK 4.2.0 --- NEW FILE: help-stkdrone~.pd --- #N canvas 168 23 784 529 10; #X obj 112 311 dac~; #X obj 115 248 stkdrone~; #X obj 114 278 *~; #X floatatom 147 278 5 0 0; #X msg 162 172 stop; #X floatatom 197 201 5 0 0; #X floatatom 238 248 5 5 35; #X text 247 335 stkdrone~ : Object to embed stk-based drone synthesis ; #X text 247 360 Comments and bugs @ ydegoyon(a)free.fr; #X msg 113 346 \; pd dsp 1; #X msg 179 346 \; pd dsp 0; #X msg 24 34 bang; #X msg 93 99 play; #X msg 113 173 play; #X obj 195 248 / 100; #X text 276 279 Master level; #X obj 23 99 metro 2000; #X floatatom 52 75 5 0 0; #X obj 134 78 / 1000; #X obj 134 98 + 0.05; #X floatatom 182 98 5 0 0; #X obj 217 278 loadbang; #X text 301 258 ( min=0.05 \, max=0.35 \, default = 0.25 ); #X text 303 248 Strength of plucking; #X text 241 195 Frequency; #X obj 231 77 qlist; #X msg 274 76 read drone-freqs; #X msg 231 55 next; #X msg 274 55 rewind; #X text 247 348 Originally written by Perry Cook for STK/ragamatic ; #X obj 386 76 loadbang; #X msg 189 278 40; #X obj 24 75 + 0; #X text 21 12 Ready for meditation ??; #X text 240 398 And now another message from Nancy Reagan : "Drugs destroy your brain"; #X text 239 205 ( min=50Hz \, default=250 Hz ); #X obj 134 59 random 100; #X obj 24 56 random 1000; #X floatatom 98 27 5 0 0; #X connect 1 0 2 0; #X connect 2 0 0 0; #X connect 2 0 0 1; #X connect 3 0 2 1; #X connect 4 0 1 0; #X connect 5 0 1 1; #X connect 6 0 14 0; #X connect 11 0 16 0; #X connect 11 0 37 0; #X connect 12 0 1 0; #X connect 13 0 1 0; #X connect 14 0 1 2; #X connect 16 0 12 0; #X connect 16 0 27 0; #X connect 16 0 36 0; #X connect 16 0 37 0; #X connect 17 0 16 1; #X connect 18 0 19 0; #X connect 19 0 20 0; #X connect 19 0 1 2; #X connect 21 0 31 0; #X connect 25 0 5 0; #X connect 25 1 28 0; #X connect 26 0 25 0; #X connect 27 0 25 0; #X connect 28 0 25 0; #X connect 30 0 26 0; #X connect 31 0 3 0; #X connect 32 0 17 0; #X connect 36 0 18 0; #X connect 37 0 32 0; #X connect 38 0 37 1;

1 0

externals/unauthorized/stkdrone~ Makefile,1.1,1.2 README,1.1,1.2 drone.cc,1.1,1.2 drone.h,1.1,1.2
by Yves Degoyon 14 Nov '04

14 Nov '04

Update of /cvsroot/pure-data/externals/unauthorized/stkdrone~ In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20608 Modified Files: Makefile README drone.cc drone.h Log Message: adapted for STK 4.2.0 Index: README =================================================================== RCS file: /cvsroot/pure-data/externals/unauthorized/stkdrone~/README,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** README 16 Aug 2003 17:08:55 -0000 1.1 --- README 14 Nov 2004 22:45:03 -0000 1.2 *************** *** 1,4 **** ***************************************************************************** ! Version 0.01 embedding Perry Cook's ragamatic in Pure Data copyright 2001 by Perry Cook --- 1,4 ---- ***************************************************************************** ! Version 0.2 embedding Perry Cook's ragamatic in Pure Data copyright 2001 by Perry Cook Index: drone.h =================================================================== RCS file: /cvsroot/pure-data/externals/unauthorized/stkdrone~/drone.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** drone.h 16 Aug 2003 17:08:55 -0000 1.1 --- drone.h 14 Nov 2004 22:45:03 -0000 1.2 *************** *** 12,16 **** #include "Instrmnt.h" ! #include "DLineA.h" #include "OneZero.h" #include "ADSR.h" --- 12,16 ---- #include "Instrmnt.h" ! #include "DelayA.h" #include "OneZero.h" #include "ADSR.h" *************** *** 20,24 **** { protected: ! DLineA *delayLine; ADSR *envelope; Noise *noise; --- 20,24 ---- { protected: ! DelayA *delayLine; ADSR *envelope; Noise *noise; Index: Makefile =================================================================== RCS file: /cvsroot/pure-data/externals/unauthorized/stkdrone~/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Makefile 16 Aug 2003 17:08:55 -0000 1.1 --- Makefile 14 Nov 2004 22:45:03 -0000 1.2 *************** *** 1,5 **** NAME=stkdrone~ CSYM=stkdrone_tilde ! STK_HOME=/usr/local/stk-3.2 current: pd_linux --- 1,5 ---- NAME=stkdrone~ CSYM=stkdrone_tilde ! STK_HOME=/usr/local/stk current: pd_linux *************** *** 22,26 **** g++ -O3 -Wall -D__OS_Linux_ -g -I$(STK_HOME)/include -c drone.cc g++ $(LINUXCCFLAGS) $(LINUXINCLUDE) -I$(STK_HOME)/include -o $*.o -c $*.cc ! ld -export_dynamic -shared -o $*.pd_linux *.o $(STK_HOME)/src/stklib.a -lc -lm -lstdc++ -lg++ strip --strip-unneeded $*.pd_linux rm -f *.o ../$*.pd_linux --- 22,26 ---- g++ -O3 -Wall -D__OS_Linux_ -g -I$(STK_HOME)/include -c drone.cc g++ $(LINUXCCFLAGS) $(LINUXINCLUDE) -I$(STK_HOME)/include -o $*.o -c $*.cc ! g++ -export_dynamic -shared -o $*.pd_linux *.o $(STK_HOME)/src/libstk.a -lc -lm -lpthread strip --strip-unneeded $*.pd_linux rm -f *.o ../$*.pd_linux Index: drone.cc =================================================================== RCS file: /cvsroot/pure-data/externals/unauthorized/stkdrone~/drone.cc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** drone.cc 16 Aug 2003 17:08:55 -0000 1.1 --- drone.cc 14 Nov 2004 22:45:03 -0000 1.2 *************** *** 10,19 **** #include "drone.h" ! drone :: drone(MY_FLOAT lowestFreq) { length = (long) (SRATE / lowestFreq + 1); ! loopGain = (MY_FLOAT) 0.999; loopFilt = new OneZero(); ! delayLine = new DLineA(length); envelope = new ADSR(); noise = new Noise; --- 10,19 ---- #include "drone.h" ! drone :: drone(StkFloat lowestFreq) { length = (long) (SRATE / lowestFreq + 1); ! loopGain = (StkFloat) 0.999; loopFilt = new OneZero(); ! delayLine = new DelayA(0.5*length, length); envelope = new ADSR(); noise = new Noise; *************** *** 36,54 **** } ! void drone :: setFreq(MY_FLOAT frequency) { ! MY_FLOAT delay; delay = (SRATE / frequency); delayLine->setDelay(delay - 0.5); ! loopGain = (MY_FLOAT) 0.997 + (frequency * (MY_FLOAT) 0.000002); ! if (loopGain>1.0) loopGain = (MY_FLOAT) 0.99999; } ! void drone :: pluck(MY_FLOAT amplitude) { envelope->keyOn(); } ! void drone :: noteOn(MY_FLOAT freq, MY_FLOAT amp) { this->setFreq(freq); --- 36,54 ---- } ! void drone :: setFreq(StkFloat frequency) { ! StkFloat delay; delay = (SRATE / frequency); delayLine->setDelay(delay - 0.5); ! loopGain = (StkFloat) 0.997 + (frequency * (StkFloat) 0.000002); ! if (loopGain>1.0) loopGain = (StkFloat) 0.99999; } ! void drone :: pluck(StkFloat amplitude) { envelope->keyOn(); } ! void drone :: noteOn(StkFloat freq, StkFloat amp) { this->setFreq(freq); *************** *** 59,65 **** } ! void drone :: noteOff(MY_FLOAT amp) { ! loopGain = (MY_FLOAT) 1.0 - amp; #if defined(_debug_) printf("drone : NoteOff: Amp=%lf\n",amp); --- 59,65 ---- } ! void drone :: noteOff(StkFloat amp) { ! loopGain = (StkFloat) 1.0 - amp; #if defined(_debug_) printf("drone : NoteOff: Amp=%lf\n",amp); *************** *** 67,77 **** } ! MY_FLOAT drone :: tick() { /* check this out */ /* here's the whole inner loop of the instrument!! */ ! lastOutput = delayLine->tick(loopFilt->tick((delayLine->lastOut() * loopGain)) + (0.005 * envelope->tick() * noise->tick())); ! return lastOutput; } --- 67,77 ---- } ! StkFloat drone :: tick() { /* check this out */ /* here's the whole inner loop of the instrument!! */ ! lastOutput_ = delayLine->tick(loopFilt->tick((delayLine->lastOut() * loopGain)) + (0.005 * envelope->tick() * noise->tick())); ! return lastOutput_; }

1 0

externals/hcs/hid TODO,1.3,1.4 hid-help.pd,1.8,1.9 hid.c,1.12,1.13 hid_darwin.c,1.7,1.8 joystick-help.pd,1.1,1.2 joystick.pd,1.1,1.2 make-arrays-from-input.h.pl,1.5,1.6 mouse-help.pd,1.3,1.4 mouse.pd,1.2,1.3
by Hans-Christoph Steiner 14 Nov '04

14 Nov '04

Update of /cvsroot/pure-data/externals/hcs/hid In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16637 Modified Files: TODO hid-help.pd hid.c hid_darwin.c joystick-help.pd joystick.pd make-arrays-from-input.h.pl mouse-help.pd mouse.pd Log Message: removed the ev_ from the types Index: TODO =================================================================== RCS file: /cvsroot/pure-data/externals/hcs/hid/TODO,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** TODO 7 Nov 2004 16:28:25 -0000 1.3 --- TODO 14 Nov 2004 22:29:43 -0000 1.4 *************** *** 94,97 **** --- 94,109 ---- + ============================================================================== + = event name changes + + - make key/button Type ev_btn rather than ev_key + + - perhaps remove the "ev_" prefix on event Types for efficiency and clarity + + ============================================================================== + = mapping object ideas + + - [mousefilter]-like object to easily control things with a button + ______________________________________________________________________________ ------------------------------------------------------------------------------ Index: mouse.pd =================================================================== RCS file: /cvsroot/pure-data/externals/hcs/hid/mouse.pd,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** mouse.pd 6 Nov 2004 21:15:04 -0000 1.2 --- mouse.pd 14 Nov 2004 22:29:43 -0000 1.3 *************** *** 1,3 **** ! #N canvas 305 189 693 438 10; #X obj 125 38 inlet; #X obj 5 346 outlet; --- 1,3 ---- ! #N canvas 305 189 713 458 10; #X obj 125 38 inlet; #X obj 5 346 outlet; *************** *** 5,9 **** #X obj 220 346 outlet; #X obj 500 347 outlet; - #X obj 586 347 outlet; #X msg 355 119 open \$1; #X obj 356 94 makefilename mouse%d; --- 5,8 ---- *************** *** 13,20 **** #X text 115 369 Y; #X text 222 367 wheel; - #X text 485 368 button code; - #X text 574 368 button value; - #X obj 125 155 route ev_rel ev_key; - #X obj 500 238 unpack s f; #X msg 187 84 open \$1; #X obj 187 61 f \$1; --- 12,15 ---- *************** *** 27,45 **** #X text 343 139 this is for once this feature is implemented; #X obj 125 115 hid \$1; ! #X connect 0 0 26 0; #X connect 7 0 6 0; #X connect 8 0 7 0; ! #X connect 9 0 8 0; ! #X connect 15 0 23 0; ! #X connect 15 1 16 0; ! #X connect 16 0 4 0; ! #X connect 16 1 5 0; ! #X connect 18 0 17 0; ! #X connect 19 0 18 0; ! #X connect 20 0 1 0; ! #X connect 21 0 2 0; ! #X connect 22 0 3 0; ! #X connect 23 0 20 0; ! #X connect 23 1 21 0; ! #X connect 23 2 22 0; ! #X connect 26 0 15 0; --- 22,45 ---- #X text 343 139 this is for once this feature is implemented; #X obj 125 115 hid \$1; ! #X obj 125 155 route rel key; ! #X text 484 368 button code/value list; ! #X text 1 422 (C) Copyright 2004 Hans-Christoph Steiner <hans(a)at.or.at> ! ; ! #X text 218 436 released under the GNU GPL; ! #X text 414 436 $Author$; ! #X text 414 423 $Revision$; ! #X connect 0 0 21 0; ! #X connect 6 0 5 0; #X connect 7 0 6 0; #X connect 8 0 7 0; ! #X connect 13 0 12 0; ! #X connect 14 0 13 0; ! #X connect 15 0 1 0; ! #X connect 16 0 2 0; ! #X connect 17 0 3 0; ! #X connect 18 0 15 0; ! #X connect 18 1 16 0; ! #X connect 18 2 17 0; ! #X connect 21 0 22 0; ! #X connect 22 0 18 0; ! #X connect 22 1 4 0; Index: hid_darwin.c =================================================================== RCS file: /cvsroot/pure-data/externals/hcs/hid/hid_darwin.c,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** hid_darwin.c 7 Nov 2004 16:28:25 -0000 1.7 --- hid_darwin.c 14 Nov 2004 22:29:43 -0000 1.8 *************** *** 77,86 **** if (element->relative) { ! sprintf(linux_type,"ev_rel"); sprintf(linux_code,"rel_%c",axis); } else { ! sprintf(linux_type,"ev_abs"); sprintf(linux_code,"abs_%c",axis); } --- 77,86 ---- if (element->relative) { ! sprintf(linux_type,"rel"); sprintf(linux_code,"rel_%c",axis); } else { ! sprintf(linux_type,"abs"); sprintf(linux_code,"abs_%c",axis); } *************** *** 95,99 **** { case kIOHIDElementTypeInput_Button: ! sprintf(linux_type, "ev_key"); break; } --- 95,99 ---- { case kIOHIDElementTypeInput_Button: ! sprintf(linux_type, "key"); break; } *************** *** 111,119 **** case kHIDUsage_GD_Rz: convertAxis(element, linux_type, linux_code, 'z'); break; case kHIDUsage_GD_Wheel: ! sprintf(linux_type,"ev_rel");sprintf(linux_code,"rel_wheel");break; } break; case kHIDPage_Button: ! sprintf(linux_type, "ev_key"); sprintf(linux_code, "btn_%ld", element->usage); break; --- 111,119 ---- case kHIDUsage_GD_Rz: convertAxis(element, linux_type, linux_code, 'z'); break; case kHIDUsage_GD_Wheel: ! sprintf(linux_type,"rel");sprintf(linux_code,"rel_wheel");break; } break; case kHIDPage_Button: ! sprintf(linux_type, "key"); sprintf(linux_code, "btn_%ld", element->usage); break; *************** *** 173,176 **** --- 173,179 ---- DEBUG(post("[hid] found %d elements:",numElements);); + post("-----------------------------------------------------------"); + post(" TYPE\t\tCODE\tEVENT NAME"); + post("-----------------------------------------------------------"); for(i=0; i<numElements; i++) { *************** *** 178,185 **** HIDGetTypeName((IOHIDElementType) pCurrentHIDElement->type, type_name); HIDGetUsageName(pCurrentHIDElement->usagePage, pCurrentHIDElement->usage, usage_name); ! post("\tType: %s \t code: %s \t event name: \t %s, %s",type,code,type_name,usage_name); pCurrentHIDElement = HIDGetNextDeviceElement (pCurrentHIDElement, kHIDElementTypeInput); } return (0); } --- 181,190 ---- HIDGetTypeName((IOHIDElementType) pCurrentHIDElement->type, type_name); HIDGetUsageName(pCurrentHIDElement->usagePage, pCurrentHIDElement->usage, usage_name); ! post(" %s\t%s\t%s, %s",type,code,type_name,usage_name); pCurrentHIDElement = HIDGetNextDeviceElement (pCurrentHIDElement, kHIDElementTypeInput); } + post("-----------------------------------------------------------"); + return (0); } *************** *** 231,235 **** convertDarwinElementToLinuxTypeCode(pCurrentHIDElement,type,code); ! DEBUG(post("type: %s code: %s event name: %s",type,code,event_output_string);); // TODO: convert this to a common time format, i.e. Linux struct timeval --- 236,240 ---- convertDarwinElementToLinuxTypeCode(pCurrentHIDElement,type,code); ! // DEBUG(post("type: %s code: %s event name: %s",type,code,event_output_string);); // TODO: convert this to a common time format, i.e. Linux struct timeval Index: joystick.pd =================================================================== RCS file: /cvsroot/pure-data/externals/hcs/hid/joystick.pd,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** joystick.pd 6 Nov 2004 21:15:04 -0000 1.1 --- joystick.pd 14 Nov 2004 22:29:43 -0000 1.2 *************** *** 1,20 **** ! #N canvas 353 77 803 591 10; #X msg 96 64 start; #X msg 105 83 stop; #X obj 77 30 inlet; #X obj 207 160 print UNKNOWN_JOYSTICK_EVENT_TYPE; - #X text 260 134 types (1=buttons 3=abs axes); #X obj 218 286 print UNKNOWN_JOYSTICK_EVENT_CODE; #X obj 38 508 outlet; ! #X obj 143 327 outlet; ! #X obj 164 307 outlet; #X text 52 244 codes (0=X 1=Y 6=throttle 7=rudder \, 16=hat0X \, 17=hat0Y) ; #X obj 411 417 outlet; - #X text 401 433 button_num; - #X text 492 434 button_value; - #X obj 511 418 outlet; #X obj 77 107 hid \$1; - #X obj 38 264 route abs_x abs_y 7 16 17 6; #X obj 38 489 autoscale -1 1; #X obj 68 468 outlet; --- 1,15 ---- ! #N canvas 368 109 807 595 10; #X msg 96 64 start; #X msg 105 83 stop; #X obj 77 30 inlet; #X obj 207 160 print UNKNOWN_JOYSTICK_EVENT_TYPE; #X obj 218 286 print UNKNOWN_JOYSTICK_EVENT_CODE; #X obj 38 508 outlet; ! #X obj 180 327 outlet; ! #X obj 201 307 outlet; #X text 52 244 codes (0=X 1=Y 6=throttle 7=rudder \, 16=hat0X \, 17=hat0Y) ; #X obj 411 417 outlet; #X obj 77 107 hid \$1; #X obj 38 489 autoscale -1 1; #X obj 68 468 outlet; *************** *** 24,47 **** #X obj 130 388 outlet; #X obj 130 369 autoscale -1 1; - #X obj 79 139 route ev_abs ev_key; #X obj 221 91 print RAW; ! #X obj 411 351 unpack s f f; ! #X connect 0 0 14 0; ! #X connect 1 0 14 0; ! #X connect 2 0 14 0; ! #X connect 14 0 23 0; ! #X connect 15 0 16 0; ! #X connect 15 1 18 0; ! #X connect 15 2 20 0; ! #X connect 15 3 22 0; ! #X connect 15 4 7 0; ! #X connect 15 5 8 0; ! #X connect 16 0 6 0; ! #X connect 18 0 17 0; ! #X connect 20 0 19 0; ! #X connect 22 0 21 0; ! #X connect 23 0 15 0; ! #X connect 23 1 25 0; ! #X connect 23 2 3 0; ! #X connect 25 0 10 0; ! #X connect 25 1 13 0; --- 19,49 ---- #X obj 130 388 outlet; #X obj 130 369 autoscale -1 1; #X obj 221 91 print RAW; ! #X obj 79 139 route abs key; ! #X text 401 433 button code/value list; ! #X obj 38 264 route abs_x abs_y abs_z 16 17 6; ! #X text 91 509 X-axis; ! #X text 117 468 Y-axis; ! #X text 152 430 twist; ! #X text 11 552 (C) Copyright 2004 Hans-Christoph Steiner <hans(a)at.or.at> ! ; ! #X text 228 566 released under the GNU GPL; ! #X text 424 566 $Author$; ! #X text 424 553 $Revision$$Date$; ! #X connect 0 0 10 0; ! #X connect 1 0 10 0; ! #X connect 2 0 10 0; ! #X connect 10 0 19 0; ! #X connect 11 0 5 0; ! #X connect 13 0 12 0; ! #X connect 15 0 14 0; ! #X connect 17 0 16 0; ! #X connect 19 0 21 0; ! #X connect 19 1 9 0; ! #X connect 19 2 3 0; ! #X connect 21 0 11 0; ! #X connect 21 1 13 0; ! #X connect 21 2 15 0; ! #X connect 21 3 17 0; ! #X connect 21 4 6 0; ! #X connect 21 5 7 0; Index: joystick-help.pd =================================================================== RCS file: /cvsroot/pure-data/externals/hcs/hid/joystick-help.pd,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** joystick-help.pd 6 Nov 2004 21:15:04 -0000 1.1 --- joystick-help.pd 14 Nov 2004 22:29:43 -0000 1.2 *************** *** 1,44 **** ! #N canvas 182 322 672 437 10; ! #X symbolatom 339 141 0 0 0 0 - - -; ! #X obj 178 21 tgl 25 0 empty empty empty 0 -6 0 8 -225271 -1 -1 1 1 ; ! #X floatatom 420 144 5 0 0 0 - - -; ! #X floatatom 93 184 7 0 0 3 Y - -; ! #X floatatom 39 184 7 0 0 3 X - -; ! #X obj 158 294 tgl 25 0 empty empty empty 0 -6 0 8 -195568 -1 -1 0 1; ! #X obj 203 294 tgl 25 0 empty empty empty 0 -6 0 8 -195568 -1 -1 0 1; ! #X obj 248 294 tgl 25 0 empty empty empty 0 -6 0 8 -195568 -1 -1 0 1; ! #X obj 294 294 tgl 25 0 empty empty empty 0 -6 0 8 -195568 -1 -1 0 1; ! #X obj 178 74 joystick 3; ! #X floatatom 153 184 5 0 0 0 - - -; ! #X floatatom 196 184 5 0 0 0 - - -; ! #X obj 158 271 route btn_1 btn_2 btn_3 btn_4 btn_5 btn_6 btn_7 btn_8 btn_9; ! #X obj 339 294 tgl 25 0 empty empty empty 0 -6 0 8 -195568 -1 -1 0 1; ! #X obj 384 294 tgl 25 0 empty empty empty 0 -6 0 8 -195568 -1 -1 0 1; ! #X obj 430 294 tgl 25 0 empty empty empty 0 -6 0 8 -195568 -1 -1 0 1; ! #X obj 475 294 tgl 25 0 empty empty empty 0 -6 0 8 -195568 -1 -1 0 1; ! #X obj 338 115 unpack s f; ! #X connect 1 0 9 0; ! #X connect 9 0 4 0; ! #X connect 9 1 3 0; ! #X connect 9 2 10 0; ! #X connect 9 3 11 0; ! #X connect 12 0 5 0; ! #X connect 12 1 6 0; ! #X connect 12 2 7 0; ! #X connect 12 3 8 0; ! #X connect 12 4 13 0; ! #X connect 12 5 14 0; ! #X connect 12 6 15 0; ! #X connect 12 7 16 0; ! #X connect 17 0 0 0; ! #X connect 17 1 2 0; --- 1,72 ---- ! #N canvas 96 237 669 433 10; ! #X obj 168 41 tgl 25 0 empty empty empty 0 -6 0 8 -225271 -1 -1 1 1 ; ! #X floatatom 63 184 7 0 0 3 Y-axis - -; ! #X floatatom 9 184 7 0 0 3 X-axis - -; ! #X obj 219 294 tgl 25 0 empty empty empty 0 -6 0 8 -195568 -1 -1 0 1; ! #X obj 264 294 tgl 25 0 empty empty empty 0 -6 0 8 -195568 -1 -1 0 1; ! #X obj 309 294 tgl 25 0 empty empty empty 0 -6 0 8 -195568 -1 -1 0 1; ! #X obj 355 294 tgl 25 0 empty empty empty 0 -6 0 8 -195568 -1 -1 0 1; ! #X floatatom 123 184 7 0 0 3 twist - -; ! #X floatatom 182 184 5 0 0 0 - - -; ! #X obj 219 271 route btn_1 btn_2 btn_3 btn_4 btn_5 btn_6 btn_7 btn_8 btn_9; ! #X obj 400 294 tgl 25 0 empty empty empty 0 -6 0 8 -195568 -1 -1 0 1; ! #X obj 445 294 tgl 25 0 empty empty empty 0 -6 0 8 -195568 -1 -1 0 1; ! #X obj 491 294 tgl 25 0 empty empty empty 0 -6 0 8 -195568 -1 -1 0 1; ! #X obj 536 294 tgl 25 0 empty empty empty 0 -6 0 8 -195568 -1 -1 0 1; ! #X obj 168 104 joystick 3; ! #X obj 581 294 tgl 25 0 empty empty empty 0 -6 0 8 -195568 -1 -1 0 ! 1; ! #X obj 627 294 tgl 25 0 empty empty empty 0 -6 0 8 -195568 -1 -1 0 ! 1; ! #X symbolatom 441 178 6 0 0 1 code - -; ! #X floatatom 569 178 5 0 0 1 value - -; ! #X obj 441 151 unpack symbol float; ! #X text 512 194 buttons; ! #X obj 2 2 cnv 15 650 20 empty empty [joystick] 2 11 1 18 -233017 -66577 ! 0; ! #X msg 215 43 open 1; ! #X msg 220 62 open 2; ! #X msg 225 81 open 3; ! #X text 1 382 (C) Copyright 2004 Hans-Christoph Steiner <hans(a)at.or.at> ! ; ! #X text 218 396 released under the GNU GPL; ! #X text 414 396 $Author$; ! #X text 414 383 $Revision$; ! #X obj 526 350 all_about_hid; ! #X text 417 351 For more info:; ! #X floatatom 225 184 5 0 0 0 - - -; ! #X floatatom 268 184 5 0 0 0 - - -; ! #X connect 0 0 14 0; ! #X connect 9 0 3 0; ! #X connect 9 1 4 0; ! #X connect 9 2 5 0; ! #X connect 9 3 6 0; ! #X connect 9 4 10 0; ! #X connect 9 5 11 0; ! #X connect 9 6 12 0; ! #X connect 9 7 13 0; ! #X connect 9 8 15 0; ! #X connect 9 9 16 0; ! #X connect 14 0 2 0; ! #X connect 14 1 1 0; ! #X connect 14 2 7 0; ! #X connect 14 3 8 0; ! #X connect 14 4 31 0; ! #X connect 14 5 32 0; ! #X connect 14 6 19 0; ! #X connect 14 6 9 0; ! #X connect 19 0 17 0; ! #X connect 19 1 18 0; ! #X connect 22 0 14 0; ! #X connect 23 0 14 0; ! #X connect 24 0 14 0; Index: mouse-help.pd =================================================================== RCS file: /cvsroot/pure-data/externals/hcs/hid/mouse-help.pd,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** mouse-help.pd 7 Nov 2004 16:28:25 -0000 1.3 --- mouse-help.pd 14 Nov 2004 22:29:43 -0000 1.4 *************** *** 1,82 **** ! #N canvas 225 161 684 449 10; ! #X symbolatom 233 198 0 0 0 0 - - -; ! #X obj 200 36 tgl 25 0 empty empty empty 0 -6 0 8 -225271 -1 -1 0 1 ! ; ! #X floatatom 309 200 5 0 0 0 - - -; ! #X floatatom 190 199 5 0 0 3 wheel - -; ! #X floatatom 135 199 7 0 0 3 Y - -; ! #X floatatom 81 199 7 0 0 3 X - -; ! #X obj 28 294 tgl 25 0 empty empty empty 0 -6 0 8 -195568 -1 -1 0 1 ; ! #X obj 108 294 tgl 25 0 empty empty empty 0 -6 0 8 -195568 -1 -1 0 1; ! #X obj 188 294 tgl 25 0 empty empty empty 0 -6 0 8 -195568 -1 -1 0 1; ! #X obj 28 271 route btn_left btn_middle btn_right; ! #X text 26 250 the standard three buttons; ! #X obj 268 323 tgl 25 0 empty empty empty 0 -6 0 8 -195568 -1 -1 0 1; ! #X obj 342 323 tgl 25 0 empty empty empty 0 -6 0 8 -195568 -1 -1 0 1; ! #X obj 417 323 tgl 25 0 empty empty empty 0 -6 0 8 -195568 -1 -1 0 1; ! #X obj 491 323 tgl 25 0 empty empty empty 0 -6 0 8 -195568 -1 -1 0 1; ! #X obj 566 323 tgl 25 0 empty empty empty 0 -6 0 8 -195568 -1 -1 0 1; ! #X obj 268 295 route btn_side btn_extra btn_forward btn_back btn_task ! ; ! #X msg 245 23 open 0; ! #X msg 250 42 open 1; ! #X msg 255 61 open 2; ! #X obj 200 91 mouse 1; ! #N canvas 462 248 604 514 mouse-noise 0; ! #X obj 90 55 inlet; ! #X obj 113 173 mouse \$1; ! #X obj 180 294 noise~; ! #X obj 125 293 osc~; ! #X obj 125 266 * 4000; ! #X obj 113 367 *~; ! #X msg 162 103 \; pd dsp 1; ! #X obj 103 418 dac~; ! #X obj 91 78 t f a b; ! #X connect 0 0 8 0; ! #X connect 1 0 5 0; ! #X connect 1 1 4 0; ! #X connect 2 0 5 1; ! #X connect 3 0 5 1; ! #X connect 4 0 3 0; ! #X connect 5 0 7 0; ! #X connect 5 0 7 1; ! #X connect 8 0 5 0; ! #X connect 8 1 1 0; ! #X connect 8 2 6 0; ! #X restore 464 163 pd mouse-noise 1; ! #X msg 505 95 open 0; ! #X msg 510 114 open 1; ! #X msg 515 133 open 2; ! #X obj 464 96 tgl 25 0 empty empty empty 0 -6 0 8 -225271 -1 -1 0 1 ; ! #X text 347 72 turn this on to make some noise with the mouse; ! #X connect 1 0 20 0; ! #X connect 9 0 6 0; ! #X connect 9 1 7 0; ! #X connect 9 2 8 0; ! #X connect 9 3 16 0; ! #X connect 16 0 11 0; ! #X connect 16 1 12 0; ! #X connect 16 2 13 0; ! #X connect 16 3 14 0; ! #X connect 16 4 15 0; ! #X connect 17 0 20 0; ! #X connect 18 0 20 0; ! #X connect 19 0 20 0; ! #X connect 20 0 5 0; ! #X connect 20 1 4 0; ! #X connect 20 2 3 0; ! #X connect 20 3 0 0; ! #X connect 20 4 2 0; ! #X connect 22 0 21 0; ! #X connect 23 0 21 0; ! #X connect 24 0 21 0; ! #X connect 25 0 21 0; --- 1,104 ---- ! #N canvas 354 179 662 416 10; ! #X symbolatom 211 218 6 0 0 1 code - -; ! #X obj 130 56 tgl 25 0 empty empty empty 0 -6 0 8 -225271 -1 -1 0 1 ; ! #X floatatom 339 218 5 0 0 1 value - -; ! #X floatatom 140 218 5 0 0 3 wheel - -; ! #X floatatom 85 218 7 0 0 3 Y - -; ! #X floatatom 31 218 7 0 0 3 X - -; ! #X obj 193 287 tgl 25 0 empty empty empty 0 -6 0 8 -195568 -1 -1 0 1; ! #X obj 238 287 tgl 25 0 empty empty empty 0 -6 0 8 -195568 -1 -1 0 1; ! #X obj 284 287 tgl 25 0 empty empty empty 0 -6 0 8 -195568 -1 -1 0 1; ! #X msg 175 43 open 0; ! #X msg 180 62 open 1; ! #X msg 185 81 open 2; ! #N canvas 462 248 632 542 mouse-noise 0; ! #X obj 100 25 inlet; ! #X obj 210 294 noise~; ! #X obj 155 293 osc~; ! #X obj 155 266 * 4000; ! #X obj 113 367 *~; ! #X msg 162 103 \; pd dsp 1; ! #X obj 103 418 dac~; ! #X obj 338 61 inlet; ! #X text 400 62 open msgs; ! #X obj 143 173 mouse \$1; ! #X obj 101 78 t f b; ! #X obj 194 196 unpack s f; ! #X text 270 197 get button value only; ! #X obj 210 320 *~; ! #X connect 0 0 10 0; ! #X connect 1 0 13 0; ! #X connect 2 0 4 1; ! #X connect 3 0 2 0; ! #X connect 4 0 6 0; ! #X connect 4 0 6 1; ! #X connect 7 0 9 0; ! #X connect 9 0 4 0; ! #X connect 9 1 3 0; ! #X connect 9 3 11 0; ! #X connect 10 0 4 0; ! #X connect 10 0 9 0; ! #X connect 10 1 5 0; ! #X connect 11 1 13 1; ! #X connect 13 0 4 1; ! #X restore 425 136 pd mouse-noise 1; ! #X msg 536 68 open 0; ! #X msg 541 87 open 1; ! #X msg 546 106 open 2; ! #X obj 425 69 tgl 25 0 empty empty empty 0 -6 0 8 -225271 -1 -1 0 1 ! ; ! #X text 308 45 turn this on to make some noise with the mouse; ! #X obj 130 111 mouse 1; ! #X obj 211 191 unpack symbol float; ! #X text 282 234 buttons; ! #X obj 193 264 route btn_1 btn_2 btn_3 btn_4 btn_5 btn_6 btn_7 btn_8 ! ; ! #X obj 330 287 tgl 25 0 empty empty empty 0 -6 0 8 -195568 -1 -1 0 1; ! #X obj 376 287 tgl 25 0 empty empty empty 0 -6 0 8 -195568 -1 -1 0 1; ! #X obj 421 287 tgl 25 0 empty empty empty 0 -6 0 8 -195568 -1 -1 0 1; ! #X obj 467 287 tgl 25 0 empty empty empty 0 -6 0 8 -195568 -1 -1 0 1; ! #X obj 513 287 tgl 25 0 empty empty empty 0 -6 0 8 -195568 -1 -1 0 ! 1; ! #X obj 2 2 cnv 15 650 20 empty empty [mouse] 2 11 1 18 -233017 -66577 ! 0; ! #X obj 559 287 tgl 25 0 empty empty empty 0 -6 0 8 -195568 -1 -1 0 ! 1; ! #X text 1 372 (C) Copyright 2004 Hans-Christoph Steiner <hans(a)at.or.at> ; ! #X text 218 386 released under the GNU GPL; ! #X text 414 386 $Author$; ! #X text 414 373 $Revision$; ! #X obj 526 340 all_about_hid; ! #X text 417 341 For more info:; ! #X connect 1 0 18 0; ! #X connect 9 0 18 0; ! #X connect 10 0 18 0; ! #X connect 11 0 18 0; ! #X connect 13 0 12 1; ! #X connect 14 0 12 1; ! #X connect 15 0 12 1; ! #X connect 16 0 12 0; ! #X connect 18 0 5 0; ! #X connect 18 1 4 0; ! #X connect 18 2 3 0; ! #X connect 18 3 19 0; ! #X connect 18 3 21 0; ! #X connect 19 0 0 0; ! #X connect 19 1 2 0; ! #X connect 21 0 6 0; ! #X connect 21 1 7 0; ! #X connect 21 2 8 0; ! #X connect 21 3 22 0; ! #X connect 21 4 23 0; ! #X connect 21 5 24 0; ! #X connect 21 6 25 0; ! #X connect 21 7 26 0; ! #X connect 21 8 28 0; Index: hid.c =================================================================== RCS file: /cvsroot/pure-data/externals/hcs/hid/hid.c,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** hid.c 7 Nov 2004 16:28:25 -0000 1.12 --- hid.c 14 Nov 2004 22:29:43 -0000 1.13 *************** *** 33,46 **** #define DEBUG(x) x - /* - * Various Max Refresh Rates: - ADB = 15.5 ms - USB mice on Windows = 8-10 ms - USB mice on GNU/Linux = 1-10 ms - USB wireless mice = 12-20 ms - PS/2 mouse = 5-25 ms - P5 Globe = 22 ms - */ - #define DEFAULT_DELAY 5 --- 33,36 ---- Index: make-arrays-from-input.h.pl =================================================================== RCS file: /cvsroot/pure-data/externals/hcs/hid/make-arrays-from-input.h.pl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** make-arrays-from-input.h.pl 23 Oct 2004 03:40:39 -0000 1.5 --- make-arrays-from-input.h.pl 14 Nov 2004 22:29:43 -0000 1.6 *************** *** 1,3 **** ! #!/usr/bin/perl -w use Switch; --- 1,3 ---- ! #!/usr/bin/perl use Switch; *************** *** 163,168 **** print(HEADER "\#define _INPUT_ARRAYS_H\n\n\n"); # generate a C array for each array and stick them all in the same file ! printArray("ev",@EV); printArray("ev_syn",@SYN); printArray("ev_key",@KEY); --- 163,175 ---- print(HEADER "\#define _INPUT_ARRAYS_H\n\n\n"); + # strip the ev_ from the type names + for ($i=0; $i <= $#EV; ++$i) { + $_ = $EV[$i]; + s/ev_//; + $EVtemp[$i] = $_; + } + # generate a C array for each array and stick them all in the same file ! printArray("ev",@EVtemp); printArray("ev_syn",@SYN); printArray("ev_key",@KEY); Index: hid-help.pd =================================================================== RCS file: /cvsroot/pure-data/externals/hcs/hid/hid-help.pd,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** hid-help.pd 7 Nov 2004 16:28:25 -0000 1.8 --- hid-help.pd 14 Nov 2004 22:29:43 -0000 1.9 *************** *** 1,5 **** ! #N canvas 156 27 943 666 10; ! #X msg 390 265 ev_rel rel_x 2 3.57445e+09; ! #X obj 390 244 prepend set; #X obj 149 473 route rel_x rel_y; #X floatatom 149 493 5 0 0 0 - - -; --- 1,5 ---- ! #N canvas 267 62 963 686 10; ! #X msg 430 325 rel rel_x 0 3.31743e+09; ! #X obj 430 304 prepend set; #X obj 149 473 route rel_x rel_y; #X floatatom 149 493 5 0 0 0 - - -; *************** *** 7,12 **** #X msg 148 77 start; #X msg 174 96 stop; ! #X floatatom 531 375 12 0 0 1 time - -; ! #X obj 438 355 unpack s s f f; #X msg 239 57 open 0; #X msg 246 75 open 1; --- 7,12 ---- #X msg 148 77 start; #X msg 174 96 stop; ! #X floatatom 521 385 12 0 0 1 time - -; ! #X obj 428 365 unpack s s f f; #X msg 239 57 open 0; #X msg 246 75 open 1; *************** *** 16,29 **** #X floatatom 206 454 7 0 0 0 - - -; #X floatatom 264 454 7 0 0 0 - - -; ! #X obj 86 81 tgl 35 0 empty empty empty 0 -6 0 8 -24198 -1 -1 25 25 ; ! #X floatatom 500 392 12 0 0 1 value - -; ! #X symbolatom 468 409 10 0 0 1 eventcode - -; ! #X symbolatom 438 428 15 0 0 1 eventtype - -; ! #X obj 177 296 bng 35 250 50 0 empty empty event_received 38 18 1 9 ! -225280 -1 -1; #X obj 2 2 cnv 15 900 20 empty empty [hid] 2 11 1 18 -233017 -66577 0; ! #X text 362 287 outlet message format:; #X obj 742 104 ev-list; #X obj 742 155 ev_syn-list; --- 16,29 ---- #X floatatom 206 454 7 0 0 0 - - -; #X floatatom 264 454 7 0 0 0 - - -; ! #X obj 86 81 tgl 35 0 empty empty empty 0 -6 0 8 -24198 -1 -1 0 25 ; ! #X floatatom 490 402 12 0 0 1 value - -; ! #X symbolatom 459 419 10 0 0 1 event_code - -; ! #X symbolatom 428 438 15 0 0 1 event_type - -; ! #X obj 17 271 bng 35 250 50 0 empty empty event_received 38 18 1 9 ! -262144 -1 -1; #X obj 2 2 cnv 15 900 20 empty empty [hid] 2 11 1 18 -233017 -66577 0; ! #X text 363 234 outlet message format:; #X obj 742 104 ev-list; #X obj 742 155 ev_syn-list; *************** *** 39,55 **** #X text 710 85 Event Types:; #X text 710 136 Event Codes:; ! #X obj 223 287 print INPUT_EVENT; ! #X obj 223 266 spigot; ! #X obj 269 266 tgl 17 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 ! 1; ! #X obj 93 345 route ev_key ev_rel ev_abs ev_syn; #X floatatom 289 398 5 0 0 1 ev_syn - -; #X obj 262 397 +; #X msg 262 377 1; #X msg 336 136 close; - #X text 380 136 probably not needed; #X msg 336 113 refresh; #X text 397 111 refresh device list; - #X obj 248 225 hid 2; #X obj 94 524 unpack s f f; #X obj 133 542 tgl 25 0 empty empty any_button 27 13 1 9 -195568 -1 --- 39,52 ---- #X text 710 85 Event Types:; #X text 710 136 Event Codes:; ! #X obj 63 262 print INPUT_EVENT; ! #X obj 63 241 spigot; ! #X obj 109 241 tgl 17 0 empty empty console_print 19 9 1 9 -262131 ! -1 -1 0 1; #X floatatom 289 398 5 0 0 1 ev_syn - -; #X obj 262 397 +; #X msg 262 377 1; #X msg 336 136 close; #X msg 336 113 refresh; #X text 397 111 refresh device list; #X obj 94 524 unpack s f f; #X obj 133 542 tgl 25 0 empty empty any_button 27 13 1 9 -195568 -1 *************** *** 67,161 **** #X msg 336 180 poll 2; #X text 332 159 start polling and set the poll delay in ms; ! #X text 386 301 event_type event_code value timestamp; ! #X msg 465 180 poll 2000; ! #X text 371 56 !!! This software is very much alpha \, so any aspect ! of it could change without notice !!!; ! #X text 650 400 REFRESH RATES; ! #X text 660 415 ADB = 15.5 ms; ! #X text 660 430 USB mice on Windows = 8-10 ms; ! #X text 660 445 USB mice on GNU/Linux = 1-10 ms; ! #X text 660 460 USB wireless mice = 12-20 ms; ! #X text 660 475 PS/2 mouse = 5-25 ms; ! #X text 660 490 P5 Glove = 22 ms; ! #N canvas 0 22 454 304 JustFOrTestng 0; ! #X msg 390 265 ev_rel rel_x 0 2.56485e+09; ! #X obj 390 244 prepend set; ! #X msg 148 77 start; ! #X msg 174 96 stop; ! #X msg 239 57 open 0; ! #X msg 246 75 open 1; ! #X msg 253 93 open 2; ! #X msg 259 111 open 3; ! #X msg 265 129 open 4; ! #X obj 86 81 tgl 35 0 empty empty empty 0 -6 0 8 -24198 -1 -1 0 25 ! ; ! #X obj 223 266 spigot; ! #X obj 269 266 tgl 17 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 ! 1; ! #X msg 336 136 close; ! #X text 380 136 probably not needed; ! #X msg 336 113 refresh; ! #X text 397 111 refresh device list; ! #X msg 398 180 poll 20; ! #X msg 336 180 poll 2; ! #X text 332 159 start polling and set the poll delay in ms; #X msg 465 180 poll 2000; #X text 371 56 !!! This software is very much alpha \, so any aspect of it could change without notice !!!; #X obj 248 225 hid 1; ! #X connect 1 0 0 0; ! #X connect 2 0 21 0; ! #X connect 3 0 21 0; ! #X connect 4 0 21 0; ! #X connect 5 0 21 0; ! #X connect 6 0 21 0; ! #X connect 7 0 21 0; ! #X connect 8 0 21 0; ! #X connect 9 0 21 0; ! #X connect 11 0 10 1; ! #X connect 12 0 21 0; ! #X connect 14 0 21 0; ! #X connect 16 0 21 0; ! #X connect 17 0 21 0; ! #X connect 19 0 21 0; ! #X connect 21 0 10 0; ! #X connect 21 0 1 0; ! #X restore 446 483 pd JustFOrTestng; #X connect 1 0 0 0; #X connect 2 0 3 0; #X connect 2 1 4 0; ! #X connect 5 0 47 0; ! #X connect 6 0 47 0; #X connect 8 0 19 0; #X connect 8 1 18 0; #X connect 8 2 17 0; #X connect 8 3 7 0; ! #X connect 9 0 47 0; ! #X connect 10 0 47 0; ! #X connect 11 0 47 0; ! #X connect 12 0 47 0; ! #X connect 13 0 47 0; ! #X connect 16 0 47 0; #X connect 37 0 36 0; #X connect 37 0 20 0; #X connect 38 0 37 1; ! #X connect 39 0 48 0; ! #X connect 39 1 2 0; ! #X connect 39 2 56 0; ! #X connect 39 3 42 0; ! #X connect 40 0 41 1; #X connect 41 0 40 0; ! #X connect 42 0 41 0; ! #X connect 43 0 47 0; ! #X connect 45 0 47 0; ! #X connect 47 0 37 0; ! #X connect 47 0 39 0; ! #X connect 47 0 1 0; ! #X connect 47 0 8 0; ! #X connect 48 1 49 0; ! #X connect 56 0 14 0; ! #X connect 56 1 15 0; ! #X connect 56 2 57 0; ! #X connect 58 0 47 0; ! #X connect 59 0 47 0; ! #X connect 62 0 47 0; --- 64,109 ---- #X msg 336 180 poll 2; #X text 332 159 start polling and set the poll delay in ms; ! #X text 387 248 event_type event_code value timestamp; #X msg 465 180 poll 2000; #X text 371 56 !!! This software is very much alpha \, so any aspect of it could change without notice !!!; #X obj 248 225 hid 1; ! #X obj 93 345 route key rel abs syn; #X connect 1 0 0 0; #X connect 2 0 3 0; #X connect 2 1 4 0; ! #X connect 5 0 61 0; ! #X connect 6 0 61 0; #X connect 8 0 19 0; #X connect 8 1 18 0; #X connect 8 2 17 0; #X connect 8 3 7 0; ! #X connect 9 0 61 0; ! #X connect 10 0 61 0; ! #X connect 11 0 61 0; ! #X connect 12 0 61 0; ! #X connect 13 0 61 0; ! #X connect 16 0 61 0; #X connect 37 0 36 0; #X connect 37 0 20 0; #X connect 38 0 37 1; ! #X connect 39 0 40 1; ! #X connect 40 0 39 0; #X connect 41 0 40 0; ! #X connect 42 0 61 0; ! #X connect 43 0 61 0; ! #X connect 45 1 46 0; ! #X connect 53 0 14 0; ! #X connect 53 1 15 0; ! #X connect 53 2 54 0; ! #X connect 55 0 61 0; ! #X connect 56 0 61 0; ! #X connect 59 0 61 0; ! #X connect 61 0 37 0; ! #X connect 61 0 1 0; ! #X connect 61 0 8 0; ! #X connect 61 0 62 0; ! #X connect 62 0 45 0; ! #X connect 62 1 2 0; ! #X connect 62 2 53 0; ! #X connect 62 3 41 0;

1 0

pd/src m_simd_sse_gcc.c,1.1.4.4,1.1.4.5 m_simd_sse_vc.c,1.1.4.2,1.1.4.3
by Tim Blechmann 14 Nov '04

14 Nov '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16753 Modified Files: Tag: devel_0_38 m_simd_sse_gcc.c m_simd_sse_vc.c Log Message: fixed bug with return value of clip~ Index: m_simd_sse_vc.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/m_simd_sse_vc.c,v retrieving revision 1.1.4.2 retrieving revision 1.1.4.3 diff -C2 -d -r1.1.4.2 -r1.1.4.3 *** m_simd_sse_vc.c 10 Nov 2004 21:53:02 -0000 1.1.4.2 --- m_simd_sse_vc.c 14 Nov 2004 12:42:04 -0000 1.1.4.3 *************** *** 888,892 **** loop loopa } ! return (w+5); } --- 888,892 ---- loop loopa } ! return (w+6); } Index: m_simd_sse_gcc.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/m_simd_sse_gcc.c,v retrieving revision 1.1.4.4 retrieving revision 1.1.4.5 diff -C2 -d -r1.1.4.4 -r1.1.4.5 *** m_simd_sse_gcc.c 11 Nov 2004 22:30:41 -0000 1.1.4.4 --- m_simd_sse_gcc.c 14 Nov 2004 12:42:04 -0000 1.1.4.5 *************** *** 726,730 **** :"%xmm2","%xmm3","%xmm4","%xmm5" ); ! return w+5; } --- 726,730 ---- :"%xmm2","%xmm3","%xmm4","%xmm5" ); ! return w+6; }

1 0

pd/src d_soundfile.c,1.4.4.1,1.4.4.2
by Tim Blechmann 14 Nov '04

14 Nov '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2530 Modified Files: Tag: devel_0_38 d_soundfile.c Log Message: threaded soundfiler for writing is brocken ... rethink Index: d_soundfile.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/d_soundfile.c,v retrieving revision 1.4.4.1 retrieving revision 1.4.4.2 diff -C2 -d -r1.4.4.1 -r1.4.4.2 *** d_soundfile.c 5 Nov 2004 13:55:58 -0000 1.4.4.1 --- d_soundfile.c 14 Nov 2004 12:08:02 -0000 1.4.4.2 *************** *** 1434,1438 **** if (samplerate < 0) samplerate = sys_getsr(); ! for (i = 0; i < nchannels; i++) { int vecsize; --- 1434,1438 ---- if (samplerate < 0) samplerate = sys_getsr(); ! for (i = 0; i < nchannels; i++) { int vecsize; *************** *** 2120,2126 **** class_addmethod(soundfiler_class, (t_method)soundfiler_read, gensym("read"), A_GIMME, 0); class_addmethod(soundfiler_class, (t_method)soundfiler_write, gensym("write"), A_GIMME, 0); - #endif /* THREADED_SF */ } --- 2120,2126 ---- class_addmethod(soundfiler_class, (t_method)soundfiler_read, gensym("read"), A_GIMME, 0); + #endif /* THREADED_SF */ class_addmethod(soundfiler_class, (t_method)soundfiler_write, gensym("write"), A_GIMME, 0); }

1 0

externals/grill/vst/vst.xcode project.pbxproj,NONE,1.1
by Thomas Grill 14 Nov '04

14 Nov '04

Update of /cvsroot/pure-data/externals/grill/vst/vst.xcode In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12538/vst.xcode Added Files: project.pbxproj Log Message: a bit of code for OS X editor-less Mac version --- NEW FILE: project.pbxproj --- // !$*UTF8*$! { archiveVersion = 1; classes = { }; objectVersion = 39; objects = { 014CEA440018CDF011CA2923 = { buildSettings = { COPY_PHASE_STRIP = NO; GCC_ALTIVEC_EXTENSIONS = YES; GCC_DYNAMIC_NO_PIC = NO; GCC_ENABLE_FIX_AND_CONTINUE = YES; GCC_GENERATE_DEBUGGING_SYMBOLS = YES; GCC_OPTIMIZATION_LEVEL = 0; GCC_PREPROCESSOR_DEFINITIONS = "FLEXT_SYS=2 FLEXT_SHARED"; LIBRARY_STYLE = DYNAMIC; ZERO_LINK = YES; }; isa = PBXBuildStyle; name = Development; }; 014CEA450018CDF011CA2923 = { buildSettings = { COPY_PHASE_STRIP = YES; GCC_ALTIVEC_EXTENSIONS = YES; GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_MODEL_TUNING = ""; GCC_OPTIMIZATION_LEVEL = 0; GCC_PREPROCESSOR_DEFINITIONS = "FLEXT_SYS=2 FLEXT_SHARED"; ZERO_LINK = NO; }; isa = PBXBuildStyle; name = Deployment; }; //010 //011 //012 //013 //014 //030 //031 //032 //033 //034 034768DFFF38A50411DB9C8B = { children = ( D2AAC0C705546C1D00DB518D, ); isa = PBXGroup; name = Products; refType = 4; sourceTree = "<group>"; }; //030 //031 //032 //033 //034 //080 //081 //082 //083 //084 0867D690FE84028FC02AAC07 = { buildSettings = { }; buildStyles = ( 014CEA440018CDF011CA2923, 014CEA450018CDF011CA2923, ); hasScannedForEncodings = 1; isa = PBXProject; mainGroup = 0867D691FE84028FC02AAC07; productRefGroup = 034768DFFF38A50411DB9C8B; projectDirPath = ""; targets = ( D2AAC0C605546C1D00DB518D, ); }; 0867D691FE84028FC02AAC07 = { children = ( E9E87848074674890035356B, E9E87845074674560035356B, E9E87713074673750035356B, E9E87710074673590035356B, E9C0C57707461746002B8D0A, E9C0C57807461746002B8D0A, E9C0C57907461746002B8D0A, E9C0C57A07461746002B8D0A, E9C0C57B07461746002B8D0A, E9C0C57C07461746002B8D0A, 034768DFFF38A50411DB9C8B, ); isa = PBXGroup; name = vst; refType = 4; sourceTree = "<group>"; }; //080 //081 //082 //083 //084 //D20 //D21 //D22 //D23 //D24 D2AAC0C305546C1D00DB518D = { buildActionMask = 2147483647; files = ( E9C0C57D07461746002B8D0A, E9C0C58007461746002B8D0A, E9C0C58207461746002B8D0A, ); isa = PBXHeadersBuildPhase; runOnlyForDeploymentPostprocessing = 0; }; D2AAC0C405546C1D00DB518D = { buildActionMask = 2147483647; files = ( E9C0C57E07461746002B8D0A, E9C0C57F07461746002B8D0A, E9C0C58107461746002B8D0A, ); isa = PBXSourcesBuildPhase; runOnlyForDeploymentPostprocessing = 0; }; D2AAC0C505546C1D00DB518D = { buildActionMask = 2147483647; files = ( E9E87711074673590035356B, E9E87714074673750035356B, E9E87846074674560035356B, E9E87849074674890035356B, ); isa = PBXFrameworksBuildPhase; runOnlyForDeploymentPostprocessing = 0; }; D2AAC0C605546C1D00DB518D = { buildPhases = ( D2AAC0C305546C1D00DB518D, D2AAC0C405546C1D00DB518D, D2AAC0C505546C1D00DB518D, ); buildRules = ( ); buildSettings = { DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; EXECUTABLE_EXTENSION = pd_darwin; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PREFIX_HEADER = ""; GCC_PREPROCESSOR_DEFINITIONS = "FLEXT_SYS=2 FLEXT_SHARED"; HEADER_SEARCH_PATHS = "/Volumes/Daten/Prog/pdmax/flext/source /Volumes/Daten/Prog/packs/vstsdk2.3/source/common"; INSTALL_PATH = /usr/local/lib/flext; LIBRARY_STYLE = BUNDLE; OTHER_LDFLAGS = "-bundle_loader /usr/local/bin/pd"; PRODUCT_NAME = "vst~"; SKIP_INSTALL = YES; }; dependencies = ( ); isa = PBXNativeTarget; name = vst; productName = vst; productReference = D2AAC0C705546C1D00DB518D; productType = "com.apple.product-type.library.dynamic"; }; D2AAC0C705546C1D00DB518D = { explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; isa = PBXFileReference; path = "vst~.pd_darwin"; refType = 3; sourceTree = BUILT_PRODUCTS_DIR; }; //D20 //D21 //D22 //D23 //D24 //E90 //E91 //E92 //E93 //E94 E9C0C57707461746002B8D0A = { fileEncoding = 30; isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = Editor.h; path = src/Editor.h; refType = 4; sourceTree = "<group>"; }; E9C0C57807461746002B8D0A = { fileEncoding = 30; isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = EditorMac.cpp; path = src/EditorMac.cpp; refType = 4; sourceTree = "<group>"; }; E9C0C57907461746002B8D0A = { fileEncoding = 30; isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = main.cpp; path = src/main.cpp; refType = 4; sourceTree = "<group>"; }; E9C0C57A07461746002B8D0A = { fileEncoding = 30; isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = main.h; path = src/main.h; refType = 4; sourceTree = "<group>"; }; E9C0C57B07461746002B8D0A = { fileEncoding = 30; isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = VstHost.cpp; path = src/VstHost.cpp; refType = 4; sourceTree = "<group>"; }; E9C0C57C07461746002B8D0A = { fileEncoding = 30; isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = VstHost.h; path = src/VstHost.h; refType = 4; sourceTree = "<group>"; }; E9C0C57D07461746002B8D0A = { fileRef = E9C0C57707461746002B8D0A; isa = PBXBuildFile; settings = { }; }; E9C0C57E07461746002B8D0A = { fileRef = E9C0C57807461746002B8D0A; isa = PBXBuildFile; settings = { }; }; E9C0C57F07461746002B8D0A = { fileRef = E9C0C57907461746002B8D0A; isa = PBXBuildFile; settings = { }; }; E9C0C58007461746002B8D0A = { fileRef = E9C0C57A07461746002B8D0A; isa = PBXBuildFile; settings = { }; }; E9C0C58107461746002B8D0A = { fileRef = E9C0C57B07461746002B8D0A; isa = PBXBuildFile; settings = { }; }; E9C0C58207461746002B8D0A = { fileRef = E9C0C57C07461746002B8D0A; isa = PBXBuildFile; settings = { }; }; E9E87710074673590035356B = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = System.framework; path = /System/Library/Frameworks/System.framework; refType = 0; sourceTree = "<absolute>"; }; E9E87711074673590035356B = { fileRef = E9E87710074673590035356B; isa = PBXBuildFile; settings = { }; }; E9E87713074673750035356B = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ApplicationServices.framework; path = /System/Library/Frameworks/ApplicationServices.framework; refType = 0; sourceTree = "<absolute>"; }; E9E87714074673750035356B = { fileRef = E9E87713074673750035356B; isa = PBXBuildFile; settings = { }; }; E9E87845074674560035356B = { isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libflext.dylib; path = /usr/local/lib/libflext.dylib; refType = 0; sourceTree = "<absolute>"; }; E9E87846074674560035356B = { fileRef = E9E87845074674560035356B; isa = PBXBuildFile; settings = { }; }; E9E87848074674890035356B = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = vecLib.framework; path = /System/Library/Frameworks/vecLib.framework; refType = 0; sourceTree = "<absolute>"; }; E9E87849074674890035356B = { fileRef = E9E87848074674890035356B; isa = PBXBuildFile; settings = { }; }; }; rootObject = 0867D690FE84028FC02AAC07; }

1 0

← Newer
1
...
9
10
11
12
13
14
15
...
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

Pd-cvs November 2004