change deefuzzer setup, get the video device

diff --git a/install.py b/install.py
index 1ba6001371222da17950bc86c7da7dc0749d2784..d3ba244942030e71b75cf6522c6376595bf44531 100644 (file)
--- a/install.py
+++ b/install.py
@@ -62,7 +62,7 @@ os.system('./configure; make; sudo make install')
 
 # installing deefuzzer
 os.chdir(app_dir + '/tools/deefuzzer')
-os.system('sudo python install.py')
+os.system('sudo python setup.py install')
 
 os.chdir(app_dir)
 install_dir = '/var/www/telecaster'

diff --git a/tools/edcast-jack/libedcast/Makefile b/tools/edcast-jack/libedcast/Makefile
index 91a83d012d3b38ff2aaf185de7671bd08efe9d58..855fde40d6e5181e145c980cf5768f1d211c6c11 100644 (file)
--- a/tools/edcast-jack/libedcast/Makefile
+++ b/tools/edcast-jack/libedcast/Makefile
@@ -87,12 +87,12 @@ HEADERS = $(include_HEADERS)
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /home/momo/dev/telecaster_svn/trunk/tools/edcast-jack/missing --run aclocal-1.10
-AMTAR = ${SHELL} /home/momo/dev/telecaster_svn/trunk/tools/edcast-jack/missing --run tar
+ACLOCAL = ${SHELL} /home/telecaster/apps/telecaster/tools/edcast-jack/missing --run aclocal-1.10
+AMTAR = ${SHELL} /home/telecaster/apps/telecaster/tools/edcast-jack/missing --run tar
 AR = ar
-AUTOCONF = ${SHELL} /home/momo/dev/telecaster_svn/trunk/tools/edcast-jack/missing --run autoconf
-AUTOHEADER = ${SHELL} /home/momo/dev/telecaster_svn/trunk/tools/edcast-jack/missing --run autoheader
-AUTOMAKE = ${SHELL} /home/momo/dev/telecaster_svn/trunk/tools/edcast-jack/missing --run automake-1.10
+AUTOCONF = ${SHELL} /home/telecaster/apps/telecaster/tools/edcast-jack/missing --run autoconf
+AUTOHEADER = ${SHELL} /home/telecaster/apps/telecaster/tools/edcast-jack/missing --run autoheader
+AUTOMAKE = ${SHELL} /home/telecaster/apps/telecaster/tools/edcast-jack/missing --run automake-1.10
 AWK = gawk
 CC = gcc
 CCDEPMODE = depmode=gcc3
@@ -136,7 +136,7 @@ LN_S = ln -s
 LTLIBOBJS = 
 MAD_CFLAGS = 
 MAD_LIBS = -lmad
-MAKEINFO = ${SHELL} /home/momo/dev/telecaster_svn/trunk/tools/edcast-jack/missing --run makeinfo
+MAKEINFO = ${SHELL} /home/telecaster/apps/telecaster/tools/edcast-jack/missing --run makeinfo
 MKDIR_P = /bin/mkdir -p
 OBJEXT = o
 OGG_CFLAGS = 
@@ -152,7 +152,7 @@ PACKAGE_VERSION = 3.1.7
 PATH_SEPARATOR = :
 RANLIB = ranlib
 SET_MAKE = 
-SHELL = /bin/sh
+SHELL = /bin/bash
 STRIP = strip
 VERSION = 3.1.7
 VORBISENC_LIBS = -lvorbisenc
@@ -161,10 +161,10 @@ VORBIS_CFLAGS =
 VORBIS_LDFLAGS = 
 VORBIS_LIBS = -lvorbis
 VORBIS_PREFIX = 
-abs_builddir = /home/momo/dev/telecaster_svn/trunk/tools/edcast-jack/libedcast
-abs_srcdir = /home/momo/dev/telecaster_svn/trunk/tools/edcast-jack/libedcast
-abs_top_builddir = /home/momo/dev/telecaster_svn/trunk/tools/edcast-jack
-abs_top_srcdir = /home/momo/dev/telecaster_svn/trunk/tools/edcast-jack
+abs_builddir = /home/telecaster/apps/telecaster/tools/edcast-jack/libedcast
+abs_srcdir = /home/telecaster/apps/telecaster/tools/edcast-jack/libedcast
+abs_top_builddir = /home/telecaster/apps/telecaster/tools/edcast-jack
+abs_top_srcdir = /home/telecaster/apps/telecaster/tools/edcast-jack
 ac_ct_CC = gcc
 ac_ct_CXX = g++
 ac_ct_F77 = 
@@ -193,7 +193,7 @@ host_vendor = unknown
 htmldir = ${docdir}
 includedir = ${prefix}/include
 infodir = ${datarootdir}/info
-install_sh = $(SHELL) /home/momo/dev/telecaster_svn/trunk/tools/edcast-jack/install-sh
+install_sh = $(SHELL) /home/telecaster/apps/telecaster/tools/edcast-jack/install-sh
 libdir = ${exec_prefix}/lib
 libexecdir = ${exec_prefix}/libexec
 localedir = ${datarootdir}/locale

diff --git a/tools/ffmpeg_dv_jack_fifo_usb_gst b/tools/ffmpeg_dv_jack_fifo_usb_gst
index 6e6b41d7c4e758918b2ddcb56233730962814c57..cfe6fe0c3ac256035d95ad9473d8c5a9cd048a84 100755 (executable)
--- a/tools/ffmpeg_dv_jack_fifo_usb_gst
+++ b/tools/ffmpeg_dv_jack_fifo_usb_gst
@@ -7,7 +7,7 @@ case "$1" in
    dir=/tmp
    file=$dir/video_test.ogg
 
-   gst-launch v4l2src ! queue ! videorate ! video/x-raw-yuv,width=320 ! queue  ! theoraenc quality=60 ! queue ! muxout. jackaudiosrc connect=1 ! audioconvert ! audio/x-raw-int,rate=44100,channels=1,width=16 ! queue ! audioconvert ! vorbisenc ! queue ! muxout. oggmux name=muxout ! filesink location=$file sync=true &
+   gst-launch-0.10 v4l2src device=/dev/video0 ! queue ! videorate ! video/x-raw-yuv,width=320 ! queue  ! theoraenc quality=60 ! queue ! muxout. jackaudiosrc connect=1 ! audioconvert ! audio/x-raw-int,rate=44100,channels=1,width=16 ! queue ! audioconvert ! vorbisenc ! queue ! muxout. oggmux name=muxout ! filesink location=$file sync=true &
    
 #    gst-launch v4l2src ! queue ! videorate ! video/x-raw-yuv,fps=30,width=320 ! queue  ! theoraenc quality=60 ! queue ! muxout. jackaudiosrc connect=1 ! audioconvert ! audio/x-raw-int,rate=44100,channels=1,width=16 ! queue ! audioconvert ! vorbisenc ! queue ! muxout. oggmux name=muxout ! shout2send mount=/telecaster_live_video.ogg port=8000 password=source2parisson ip=127.0.0.1 &