added jack audio support, added audio resampler, added unicap capture library, removed v4l,dv1394 and vloopback obsolete code, removed unnecessary files, several bugfixes and cleanup

git-svn-id: svn://code.dyne.org/veejay/trunk@577 eb8d1916-c9e9-0310-b8de-cf0c9472ead5

veejay-ng/Makefile.am

@@ -1,7 +1,7 @@
 # Process with automake to produce Makefile.in
 
 SUBDIRS = bio2jack libOSC libhash libvjmsg libvjmem 
-SUBDIRS += libvevo libplugger libvjnet libyuv libel vevosample veejay
+SUBDIRS += libvevo libplugger libvjnet libyuv libel libvjaudio vevosample veejay
 SUBDIRS += man
 
 #SUBDIRS    = ffmpeg bio2jack libOSC libhash libvjmsg libvjmem libpostproc libvje libsample libvjnet libyuv libel libstream liblavjpeg libsamplerec plugins veejay gveejay tools man 

veejay-ng/Makefile.in

@@ -1,810 +0,0 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-# Process with automake to produce Makefile.in
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = .
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-target_triplet = @target@
-DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
-	$(srcdir)/veejay-config.in $(srcdir)/veejay.pc.in \
-	$(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
-	compile config.guess config.rpath config.sub depcomp \
-	install-sh ltmain.sh missing
-subdir = .
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno configure.status.lineno
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES = veejay-config veejay.pc
-SOURCES =
-DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-	html-recursive info-recursive install-data-recursive \
-	install-exec-recursive install-info-recursive \
-	install-recursive installcheck-recursive installdirs-recursive \
-	pdf-recursive ps-recursive uninstall-info-recursive \
-	uninstall-recursive
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(pkgconfigdir)"
-pkgconfigDATA_INSTALL = $(INSTALL_DATA)
-DATA = $(pkgconfig_DATA)
-ETAGS = etags
-CTAGS = ctags
-DIST_SUBDIRS = $(SUBDIRS)
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-distdir = $(PACKAGE)-$(VERSION)
-top_distdir = $(distdir)
-am__remove_distdir = \
-  { test ! -d $(distdir) \
-    || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
-         && rm -fr $(distdir); }; }
-DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2
-GZIP_ENV = --best
-distuninstallcheck_listfiles = find . -type f -print
-distcleancheck_listfiles = find . -type f -print
-ACLOCAL = @ACLOCAL@
-ALTIVEC_CFLAGS = @ALTIVEC_CFLAGS@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
-AMTAR = @AMTAR@
-AR = @AR@
-AS = @AS@
-ASFLAGS = @ASFLAGS@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCAS = @CCAS@
-CCASFLAGS = @CCASFLAGS@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-ECHO = @ECHO@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
-FFMPEG_AVCODEC_CFLAGS = @FFMPEG_AVCODEC_CFLAGS@
-FFMPEG_AVCODEC_LIBS = @FFMPEG_AVCODEC_LIBS@
-FFMPEG_AVFORMAT_CFLAGS = @FFMPEG_AVFORMAT_CFLAGS@
-FFMPEG_AVFORMAT_LIBS = @FFMPEG_AVFORMAT_LIBS@
-GLIB_CFLAGS = @GLIB_CFLAGS@
-GLIB_CONFIG = @GLIB_CONFIG@
-GLIB_LIBS = @GLIB_LIBS@
-GL_CFLAGS = @GL_CFLAGS@
-GL_LIBS = @GL_LIBS@
-HAVE_ALTIVEC_FALSE = @HAVE_ALTIVEC_FALSE@
-HAVE_ALTIVEC_TRUE = @HAVE_ALTIVEC_TRUE@
-HAVE_ASM_MMX2_FALSE = @HAVE_ASM_MMX2_FALSE@
-HAVE_ASM_MMX2_TRUE = @HAVE_ASM_MMX2_TRUE@
-HAVE_ASM_MMX_FALSE = @HAVE_ASM_MMX_FALSE@
-HAVE_ASM_MMX_TRUE = @HAVE_ASM_MMX_TRUE@
-HAVE_ASM_NASM_FALSE = @HAVE_ASM_NASM_FALSE@
-HAVE_ASM_NASM_TRUE = @HAVE_ASM_NASM_TRUE@
-HAVE_ASM_SSE2_FALSE = @HAVE_ASM_SSE2_FALSE@
-HAVE_ASM_SSE2_TRUE = @HAVE_ASM_SSE2_TRUE@
-HAVE_ASM_SSE_FALSE = @HAVE_ASM_SSE_FALSE@
-HAVE_ASM_SSE_TRUE = @HAVE_ASM_SSE_TRUE@
-HAVE_DL_DLOPEN_FALSE = @HAVE_DL_DLOPEN_FALSE@
-HAVE_DL_DLOPEN_TRUE = @HAVE_DL_DLOPEN_TRUE@
-HAVE_JACK_FALSE = @HAVE_JACK_FALSE@
-HAVE_JACK_TRUE = @HAVE_JACK_TRUE@
-HAVE_MMX2_FALSE = @HAVE_MMX2_FALSE@
-HAVE_MMX2_TRUE = @HAVE_MMX2_TRUE@
-HAVE_MMX_FALSE = @HAVE_MMX_FALSE@
-HAVE_MMX_TRUE = @HAVE_MMX_TRUE@
-HAVE_PPCCPU_FALSE = @HAVE_PPCCPU_FALSE@
-HAVE_PPCCPU_TRUE = @HAVE_PPCCPU_TRUE@
-HAVE_SDL_FALSE = @HAVE_SDL_FALSE@
-HAVE_SDL_TRUE = @HAVE_SDL_TRUE@
-HAVE_SSE2_FALSE = @HAVE_SSE2_FALSE@
-HAVE_SSE2_TRUE = @HAVE_SSE2_TRUE@
-HAVE_SSE_FALSE = @HAVE_SSE_FALSE@
-HAVE_SSE_TRUE = @HAVE_SSE_TRUE@
-HAVE_V4L_FALSE = @HAVE_V4L_FALSE@
-HAVE_V4L_TRUE = @HAVE_V4L_TRUE@
-HAVE_X86CPU_FALSE = @HAVE_X86CPU_FALSE@
-HAVE_X86CPU_TRUE = @HAVE_X86CPU_TRUE@
-HAVE_XML2_FALSE = @HAVE_XML2_FALSE@
-HAVE_XML2_TRUE = @HAVE_XML2_TRUE@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
-LIBDV_CFLAGS = @LIBDV_CFLAGS@
-LIBDV_LIBS = @LIBDV_LIBS@
-LIBGETOPT_LIB = @LIBGETOPT_LIB@
-LIBM_LIBS = @LIBM_LIBS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-LT_AGE = @LT_AGE@
-LT_CURRENT = @LT_CURRENT@
-LT_RELEASE = @LT_RELEASE@
-LT_REVISION = @LT_REVISION@
-MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-MAKEINFO = @MAKEINFO@
-MJPEGTOOLS_CFLAGS = @MJPEGTOOLS_CFLAGS@
-MJPEGTOOLS_LIBS = @MJPEGTOOLS_LIBS@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PROGRAM_NOPIC = @PROGRAM_NOPIC@
-PTHREAD_LIBS = @PTHREAD_LIBS@
-RANLIB = @RANLIB@
-SDL_CFLAGS = @SDL_CFLAGS@
-SDL_CONFIG = @SDL_CONFIG@
-SDL_LIBS = @SDL_LIBS@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-SUPPORT_READ_DV2_FALSE = @SUPPORT_READ_DV2_FALSE@
-SUPPORT_READ_DV2_TRUE = @SUPPORT_READ_DV2_TRUE@
-V4LCONF_LIBS = @V4LCONF_LIBS@
-VERSION = @VERSION@
-XML2_CONFIG = @XML2_CONFIG@
-XML_CPPFLAGS = @XML_CPPFLAGS@
-XML_LIBS = @XML_LIBS@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-datadir = @datadir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target = @target@
-target_alias = @target_alias@
-target_cpu = @target_cpu@
-target_os = @target_os@
-target_vendor = @target_vendor@
-SUBDIRS = bio2jack libOSC libhash libvjmsg libvjmem libvevo libplugger \
-	libvjnet libyuv libel vevosample veejay man
-
-#SUBDIRS    = ffmpeg bio2jack libOSC libhash libvjmsg libvjmem libpostproc libvje libsample libvjnet libyuv libel libstream liblavjpeg libsamplerec plugins veejay gveejay tools man 
-
-#bin_SCRIPTS = veejay-config
-
-#
-# Add any non autoconf'd files here, extra readmes and other misc 
-# info to be copied into the dist
-#
-EXTRA_DIST = \
- autogen.sh\
- depcomp \
- cpuinfo.sh \
- autogen.sh 
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = veejay.pc
-DISTCLEANFILES = \
-	veejay-config.h \
-	veejay.pc \
-	confdefs.h \
-	config.cache \
-	config.status \
-	config.log 
-
-MAINTAINERCLEANFILES = \
-	compile \
-	depcomp \
-	install-sh \
-	missing \
-	mkinstalldirs \
-	Makefile.in \
-	aclocal.m4 \
-	config.guess \
-	config.h.in \
-	config.sub \
-	configure \
-	ltmain.sh \
-	stamp-h.in
-
-all: config.h
-	$(MAKE) $(AM_MAKEFLAGS) all-recursive
-
-.SUFFIXES:
-am--refresh:
-	@:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \
-	      cd $(srcdir) && $(AUTOMAKE) --gnu  \
-		&& exit 0; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    echo ' $(SHELL) ./config.status'; \
-	    $(SHELL) ./config.status;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	$(SHELL) ./config.status --recheck
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(srcdir) && $(AUTOCONF)
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-
-config.h: stamp-h1
-	@if test ! -f $@; then \
-	  rm -f stamp-h1; \
-	  $(MAKE) stamp-h1; \
-	else :; fi
-
-stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
-	@rm -f stamp-h1
-	cd $(top_builddir) && $(SHELL) ./config.status config.h
-$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) 
-	cd $(top_srcdir) && $(AUTOHEADER)
-	rm -f stamp-h1
-	touch $@
-
-distclean-hdr:
-	-rm -f config.h stamp-h1
-veejay-config: $(top_builddir)/config.status $(srcdir)/veejay-config.in
-	cd $(top_builddir) && $(SHELL) ./config.status $@
-veejay.pc: $(top_builddir)/config.status $(srcdir)/veejay.pc.in
-	cd $(top_builddir) && $(SHELL) ./config.status $@
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-install-pkgconfigDATA: $(pkgconfig_DATA)
-	@$(NORMAL_INSTALL)
-	test -z "$(pkgconfigdir)" || $(mkdir_p) "$(DESTDIR)$(pkgconfigdir)"
-	@list='$(pkgconfig_DATA)'; for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(pkgconfigDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgconfigdir)/$$f'"; \
-	  $(pkgconfigDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgconfigdir)/$$f"; \
-	done
-
-uninstall-pkgconfigDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(pkgconfig_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(pkgconfigdir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(pkgconfigdir)/$$f"; \
-	done
-
-# This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
-	@failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    dot_seen=yes; \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done; \
-	if test "$$dot_seen" = "no"; then \
-	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-	fi; test -z "$$fail"
-
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
-	@failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	rev=''; for subdir in $$list; do \
-	  if test "$$subdir" = "."; then :; else \
-	    rev="$$subdir $$rev"; \
-	  fi; \
-	done; \
-	rev="$$rev ."; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-ctags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-	done
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
-	  include_option=--etags-include; \
-	  empty_fix=.; \
-	else \
-	  include_option=--include; \
-	  empty_fix=; \
-	fi; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test ! -f $$subdir/TAGS || \
-	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
-	  fi; \
-	done; \
-	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
-	fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	$(am__remove_distdir)
-	mkdir $(distdir)
-	$(mkdir_p) $(distdir)/.
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test -d "$(distdir)/$$subdir" \
-	    || $(mkdir_p) "$(distdir)/$$subdir" \
-	    || exit 1; \
-	    distdir=`$(am__cd) $(distdir) && pwd`; \
-	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-	    (cd $$subdir && \
-	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$$top_distdir" \
-	        distdir="$$distdir/$$subdir" \
-	        distdir) \
-	      || exit 1; \
-	  fi; \
-	done
-	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
-	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
-	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
-	  ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
-	|| chmod -R a+r $(distdir)
-dist-gzip: distdir
-	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	$(am__remove_distdir)
-dist-bzip2: distdir
-	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
-	$(am__remove_distdir)
-
-dist-tarZ: distdir
-	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
-	$(am__remove_distdir)
-
-dist-shar: distdir
-	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
-	$(am__remove_distdir)
-
-dist-zip: distdir
-	-rm -f $(distdir).zip
-	zip -rq $(distdir).zip $(distdir)
-	$(am__remove_distdir)
-
-dist dist-all: distdir
-	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
-	$(am__remove_distdir)
-
-# This target untars the dist file and tries a VPATH configuration.  Then
-# it guarantees that the distribution is self-contained by making another
-# tarfile.
-distcheck: dist
-	case '$(DIST_ARCHIVES)' in \
-	*.tar.gz*) \
-	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
-	*.tar.bz2*) \
-	  bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
-	*.tar.Z*) \
-	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
-	*.shar.gz*) \
-	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
-	*.zip*) \
-	  unzip $(distdir).zip ;;\
-	esac
-	chmod -R a-w $(distdir); chmod a+w $(distdir)
-	mkdir $(distdir)/_build
-	mkdir $(distdir)/_inst
-	chmod a-w $(distdir)
-	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
-	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
-	  && cd $(distdir)/_build \
-	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
-	    $(DISTCHECK_CONFIGURE_FLAGS) \
-	  && $(MAKE) $(AM_MAKEFLAGS) \
-	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
-	  && $(MAKE) $(AM_MAKEFLAGS) check \
-	  && $(MAKE) $(AM_MAKEFLAGS) install \
-	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
-	  && $(MAKE) $(AM_MAKEFLAGS) uninstall \
-	  && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
-	        distuninstallcheck \
-	  && chmod -R a-w "$$dc_install_base" \
-	  && ({ \
-	       (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
-	            distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
-	      } || { rm -rf "$$dc_destdir"; exit 1; }) \
-	  && rm -rf "$$dc_destdir" \
-	  && $(MAKE) $(AM_MAKEFLAGS) dist \
-	  && rm -rf $(DIST_ARCHIVES) \
-	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
-	$(am__remove_distdir)
-	@(echo "$(distdir) archives ready for distribution: "; \
-	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
-	  sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
-distuninstallcheck:
-	@cd $(distuninstallcheck_dir) \
-	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
-	   || { echo "ERROR: files left after uninstall:" ; \
-	        if test -n "$(DESTDIR)"; then \
-	          echo "  (check DESTDIR support)"; \
-	        fi ; \
-	        $(distuninstallcheck_listfiles) ; \
-	        exit 1; } >&2
-distcleancheck: distclean
-	@if test '$(srcdir)' = . ; then \
-	  echo "ERROR: distcleancheck can only run from a VPATH build" ; \
-	  exit 1 ; \
-	fi
-	@test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
-	  || { echo "ERROR: files left in build directory after distclean:" ; \
-	       $(distcleancheck_listfiles) ; \
-	       exit 1; } >&2
-check-am: all-am
-check: check-recursive
-all-am: Makefile $(DATA) config.h
-installdirs: installdirs-recursive
-installdirs-am:
-	for dir in "$(DESTDIR)$(pkgconfigdir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
-	done
-install: install-recursive
-install-exec: install-exec-recursive
-install-data: install-data-recursive
-uninstall: uninstall-recursive
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-recursive
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-clean: clean-recursive
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-recursive
-	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-hdr \
-	distclean-libtool distclean-tags
-
-dvi: dvi-recursive
-
-dvi-am:
-
-html: html-recursive
-
-info: info-recursive
-
-info-am:
-
-install-data-am: install-pkgconfigDATA
-
-install-exec-am:
-
-install-info: install-info-recursive
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-recursive
-	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-	-rm -rf $(top_srcdir)/autom4te.cache
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-recursive
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-recursive
-
-pdf-am:
-
-ps: ps-recursive
-
-ps-am:
-
-uninstall-am: uninstall-info-am uninstall-pkgconfigDATA
-
-uninstall-info: uninstall-info-recursive
-
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
-	check-am clean clean-generic clean-libtool clean-recursive \
-	ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
-	dist-shar dist-tarZ dist-zip distcheck distclean \
-	distclean-generic distclean-hdr distclean-libtool \
-	distclean-recursive distclean-tags distcleancheck distdir \
-	distuninstallcheck dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am install-man \
-	install-pkgconfigDATA install-strip installcheck \
-	installcheck-am installdirs installdirs-am maintainer-clean \
-	maintainer-clean-generic maintainer-clean-recursive \
-	mostlyclean mostlyclean-generic mostlyclean-libtool \
-	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
-	uninstall uninstall-am uninstall-info-am \
-	uninstall-pkgconfigDATA
-
-
-#install-data-local:
-#	@$(NORMAL_INSTALL)
-#	if test -d $(srcdir)/share; then \
-#	 $(mkinstalldirs) $(DESTDIR)$(pkgdatadir); \
-#	 for dialog in $(srcdir)/share/*; do \
-#	 	if test -f $$dialog; then \
-#		 $(INSTALL_DATA) $$dialog $(DESTDIR)$(pkgdatadir); \
-#		fi \
-#	 done \
-#	fi
-
-#gveejay-path.h: gveejay-paths.sh
-#	@sh $< > $@.tmp ;
-#	if cmp -s $@.tmp $@; then
-#		rm $@.tmp;
-#	else
-#		mv $@.tmp $@ ; echo updated gveejay-paths.h;
-#	fi
-
-#dist-hook:
-#	rm -f %(distdir)/gveejay-paths.sh \
-#	if test -d share; then \
-#	  mkdir $(distdir)/dialogs; \
-#	 for dialog in share/*; do \
-#		if test -f $$dialog; then \
-#			cp -p $$dialog $(distdir)/dialogs; \
-#		fi \
-#		done \
-#	fi
-
-rpm: Makefile
-	$(MAKE) dist
-	rpmbuild -ta --clean $(PACKAGE)-$(VERSION).tar.gz
-
-deb: Makefile dist
-	-chmod -R +w $(PACKAGE)-$(VERSION)
-	rm -rf $(PACKAGE)-$(VERSION)
-	tar xzf $(PACKAGE)-$(VERSION).tar.gz
-	cd $(PACKAGE)-$(VERSION); dpkg-buildpackage -rfakeroot
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

veejay-ng/bio2jack/Makefile.am

@@ -1,4 +1,4 @@
 noinst_LTLIBRARIES = libbio2jack.la
-AM_CFLAGS = -Wall
+AM_CFLAGS = -Wall @SAMPLERATE_CFLAGS@
-LIBS = @LIBS@ @PTHREAD_LIBS@ @JACK_LIBS@
+LIBS = @LIBS@ @PTHREAD_LIBS@ @JACK_LIBS@ @SAMPLERATE_LIBS@
 libbio2jack_la_SOURCES = bio2jack.c bio2jack.h

veejay-ng/bio2jack/Makefile.in

@@ -1,501 +0,0 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-SOURCES = $(libbio2jack_la_SOURCES)
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-target_triplet = @target@
-subdir = bio2jack
-DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	AUTHORS COPYING INSTALL NEWS
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-LTLIBRARIES = $(noinst_LTLIBRARIES)
-libbio2jack_la_LIBADD =
-am_libbio2jack_la_OBJECTS = bio2jack.lo
-libbio2jack_la_OBJECTS = $(am_libbio2jack_la_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = $(libbio2jack_la_SOURCES)
-DIST_SOURCES = $(libbio2jack_la_SOURCES)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALTIVEC_CFLAGS = @ALTIVEC_CFLAGS@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
-AMTAR = @AMTAR@
-AR = @AR@
-AS = @AS@
-ASFLAGS = @ASFLAGS@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCAS = @CCAS@
-CCASFLAGS = @CCASFLAGS@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-ECHO = @ECHO@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
-FFMPEG_AVCODEC_CFLAGS = @FFMPEG_AVCODEC_CFLAGS@
-FFMPEG_AVCODEC_LIBS = @FFMPEG_AVCODEC_LIBS@
-FFMPEG_AVFORMAT_CFLAGS = @FFMPEG_AVFORMAT_CFLAGS@
-FFMPEG_AVFORMAT_LIBS = @FFMPEG_AVFORMAT_LIBS@
-GLIB_CFLAGS = @GLIB_CFLAGS@
-GLIB_CONFIG = @GLIB_CONFIG@
-GLIB_LIBS = @GLIB_LIBS@
-GL_CFLAGS = @GL_CFLAGS@
-GL_LIBS = @GL_LIBS@
-HAVE_ALTIVEC_FALSE = @HAVE_ALTIVEC_FALSE@
-HAVE_ALTIVEC_TRUE = @HAVE_ALTIVEC_TRUE@
-HAVE_ASM_MMX2_FALSE = @HAVE_ASM_MMX2_FALSE@
-HAVE_ASM_MMX2_TRUE = @HAVE_ASM_MMX2_TRUE@
-HAVE_ASM_MMX_FALSE = @HAVE_ASM_MMX_FALSE@
-HAVE_ASM_MMX_TRUE = @HAVE_ASM_MMX_TRUE@
-HAVE_ASM_NASM_FALSE = @HAVE_ASM_NASM_FALSE@
-HAVE_ASM_NASM_TRUE = @HAVE_ASM_NASM_TRUE@
-HAVE_ASM_SSE2_FALSE = @HAVE_ASM_SSE2_FALSE@
-HAVE_ASM_SSE2_TRUE = @HAVE_ASM_SSE2_TRUE@
-HAVE_ASM_SSE_FALSE = @HAVE_ASM_SSE_FALSE@
-HAVE_ASM_SSE_TRUE = @HAVE_ASM_SSE_TRUE@
-HAVE_DL_DLOPEN_FALSE = @HAVE_DL_DLOPEN_FALSE@
-HAVE_DL_DLOPEN_TRUE = @HAVE_DL_DLOPEN_TRUE@
-HAVE_JACK_FALSE = @HAVE_JACK_FALSE@
-HAVE_JACK_TRUE = @HAVE_JACK_TRUE@
-HAVE_MMX2_FALSE = @HAVE_MMX2_FALSE@
-HAVE_MMX2_TRUE = @HAVE_MMX2_TRUE@
-HAVE_MMX_FALSE = @HAVE_MMX_FALSE@
-HAVE_MMX_TRUE = @HAVE_MMX_TRUE@
-HAVE_PPCCPU_FALSE = @HAVE_PPCCPU_FALSE@
-HAVE_PPCCPU_TRUE = @HAVE_PPCCPU_TRUE@
-HAVE_SDL_FALSE = @HAVE_SDL_FALSE@
-HAVE_SDL_TRUE = @HAVE_SDL_TRUE@
-HAVE_SSE2_FALSE = @HAVE_SSE2_FALSE@
-HAVE_SSE2_TRUE = @HAVE_SSE2_TRUE@
-HAVE_SSE_FALSE = @HAVE_SSE_FALSE@
-HAVE_SSE_TRUE = @HAVE_SSE_TRUE@
-HAVE_V4L_FALSE = @HAVE_V4L_FALSE@
-HAVE_V4L_TRUE = @HAVE_V4L_TRUE@
-HAVE_X86CPU_FALSE = @HAVE_X86CPU_FALSE@
-HAVE_X86CPU_TRUE = @HAVE_X86CPU_TRUE@
-HAVE_XML2_FALSE = @HAVE_XML2_FALSE@
-HAVE_XML2_TRUE = @HAVE_XML2_TRUE@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
-LIBDV_CFLAGS = @LIBDV_CFLAGS@
-LIBDV_LIBS = @LIBDV_LIBS@
-LIBGETOPT_LIB = @LIBGETOPT_LIB@
-LIBM_LIBS = @LIBM_LIBS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@ @PTHREAD_LIBS@ @JACK_LIBS@
-LIBTOOL = @LIBTOOL@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-LT_AGE = @LT_AGE@
-LT_CURRENT = @LT_CURRENT@
-LT_RELEASE = @LT_RELEASE@
-LT_REVISION = @LT_REVISION@
-MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-MAKEINFO = @MAKEINFO@
-MJPEGTOOLS_CFLAGS = @MJPEGTOOLS_CFLAGS@
-MJPEGTOOLS_LIBS = @MJPEGTOOLS_LIBS@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PROGRAM_NOPIC = @PROGRAM_NOPIC@
-PTHREAD_LIBS = @PTHREAD_LIBS@
-RANLIB = @RANLIB@
-SDL_CFLAGS = @SDL_CFLAGS@
-SDL_CONFIG = @SDL_CONFIG@
-SDL_LIBS = @SDL_LIBS@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-SUPPORT_READ_DV2_FALSE = @SUPPORT_READ_DV2_FALSE@
-SUPPORT_READ_DV2_TRUE = @SUPPORT_READ_DV2_TRUE@
-V4LCONF_LIBS = @V4LCONF_LIBS@
-VERSION = @VERSION@
-XML2_CONFIG = @XML2_CONFIG@
-XML_CPPFLAGS = @XML_CPPFLAGS@
-XML_LIBS = @XML_LIBS@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-datadir = @datadir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target = @target@
-target_alias = @target_alias@
-target_cpu = @target_cpu@
-target_os = @target_os@
-target_vendor = @target_vendor@
-noinst_LTLIBRARIES = libbio2jack.la
-AM_CFLAGS = -Wall
-libbio2jack_la_SOURCES = bio2jack.c bio2jack.h
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  bio2jack/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  bio2jack/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-clean-noinstLTLIBRARIES:
-	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
-	@list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
-libbio2jack.la: $(libbio2jack_la_OBJECTS) $(libbio2jack_la_DEPENDENCIES) 
-	$(LINK)  $(libbio2jack_la_LDFLAGS) $(libbio2jack_la_OBJECTS) $(libbio2jack_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bio2jack.Plo@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
-	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LTLIBRARIES)
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
-	mostlyclean-am
-
-distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-exec-am:
-
-install-info: install-info-am
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-info-am
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-noinstLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am install-man \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	pdf pdf-am ps ps-am tags uninstall uninstall-am \
-	uninstall-info-am
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

veejay-ng/bio2jack/bio2jack.h

@@ -1,5 +1,5 @@
 /*
- * Copyright 2003 Chris Morgan <cmorgan@alum.wpi.edu>
+ * Copyright 2003-2004 Chris Morgan <cmorgan@alum.wpi.edu>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -21,7 +21,11 @@
 
 #include <jack/jack.h>
 
+#ifdef __cplusplus
+extern "C" {
+#else
 #define bool long
+#endif
 
 #ifndef TRUE
 #define TRUE 1
@@ -39,6 +43,8 @@
 #define ERR_TOO_MANY_OUTPUT_CHANNELS          5
 #define ERR_PORT_NAME_OUTPUT_CHANNEL_MISMATCH 6
 #define ERR_PORT_NOT_FOUND                    7
+#define ERR_TOO_MANY_INPUT_CHANNELS           8
+#define ERR_PORT_NAME_INPUT_CHANNEL_MISMATCH  9
 
 enum status_enum { PLAYING, PAUSED, STOPPED, CLOSED, RESET };
 enum pos_enum    { BYTES, MILLISECONDS };
@@ -50,34 +56,47 @@ enum pos_enum    { BYTES, MILLISECONDS };
 /**********************/
 /* External functions */
 void JACK_Init(void); /* call this before any other bio2jack calls */
-int  JACK_Open(int *deviceID, unsigned int bits_per_sample, unsigned long *rate, int channels);
+void JACK_DoSampleRateConversion(bool value); /* whether the next device that's Open()d should do
+                                                 sample rate conversion if necessary */
+void JACK_SetSampleRateConversionFunction(int converter); /* which SRC converter function should be used
+                                                             for the next Open()d device */
+int  JACK_Open(int *deviceID, unsigned int bits_per_sample, unsigned long *rate, int channels); /* Note: defaults to 0 input channels
+												   if you need input (record) use OpenEx
+												   instead */
 int  JACK_OpenEx(int *deviceID, unsigned int bits_per_channel,
                  unsigned long *rate,
                  unsigned int input_channels, unsigned int output_channels,
-                 char **jack_port_name, unsigned int jack_port_name_count,
+                 const char **jack_port_name, unsigned int jack_port_name_count,
                  unsigned long jack_port_flags);
 int  JACK_Close(int deviceID); /* return 0 for success */
 void JACK_Reset(int deviceID); /* free all buffered data and reset several values in the device */
-long JACK_Write(int deviceID, char *data, unsigned long bytes); /* returns the number of bytes written */
+long JACK_Write(int deviceID, unsigned char *data, unsigned long bytes); /* returns the number of bytes written */
+long JACK_Read(int deviceID, unsigned char *data, unsigned long bytes); /* returns the number of bytes read */
 
 /* state setting values */
 /* set/get the written/played/buffered value based on a byte or millisecond input value */
 long JACK_GetPosition(int deviceID, enum pos_enum position, int type);
 void JACK_SetPosition(int deviceID, enum pos_enum position, long value);
 
-long JACK_GetJackLatency(int deviceID); /* return the latency in milliseconds of jack */
+long JACK_GetJackLatency(int deviceID); /* deprectated, you probably want JACK_GetJackOutputLatency */
+long JACK_GetJackOutputLatency(int deviceID); /* return the output latency in frames */
+long JACK_GetJackInputLatency(int deviceID); /* return the input latency in frames */
 
 int JACK_SetState(int deviceID, enum status_enum state); /* playing, paused, stopped */
 enum status_enum JACK_GetState(int deviceID);
 
-long JACK_GetMaxBufferedBytes(int deviceID);
+long JACK_GetMaxOutputBufferedBytes(int deviceID);
-void JACK_SetMaxBufferedBytes(int deviceID, long max_buffered_bytes); /* set the max number of bytes the jack driver should buffer */
+long JACK_GetMaxInputBufferedBytes(int deviceID);
+
+/* bytes that jack requests during each callback */
+unsigned long JACK_GetJackBufferedBytes(int deviceID);
 
 /* Properties of the jack driver */
 
 /* linear means 0 volume is silence, 100 is full volume */
 /* dbAttenuation means 0 volume is 0dB attenuation */
 /* Bio2jack defaults to linear */
+/* Note: volume controls only effect output channels for now */
 enum JACK_VOLUME_TYPE { linear, dbAttenuation };
 enum JACK_VOLUME_TYPE JACK_SetVolumeEffectType(int deviceID,
                                                enum JACK_VOLUME_TYPE type);
@@ -87,17 +106,40 @@ int  JACK_SetVolumeForChannel(int deviceID, unsigned int channel, unsigned int v
 void JACK_GetVolumeForChannel(int deviceID, unsigned int channel, unsigned int *volume);
 
 
+unsigned long JACK_GetOutputBytesPerSecond(int deviceID); /* bytes_per_output_frame * sample_rate */
+unsigned long JACK_GetInputBytesPerSecond(int deviceID);  /* bytes_per_input_frame * sample_rate */
+unsigned long JACK_GetBytesStored(int deviceID);          /* bytes currently buffered in the output buffer */
+unsigned long JACK_GetBytesFreeSpace(int deviceID);       /* bytes of free space in the output buffer */
+unsigned long JACK_GetBytesUsedSpace(int deviceID);       /* bytes of space used in the input buffer */
+unsigned long JACK_GetBytesPerOutputFrame(int deviceID);
+unsigned long JACK_GetBytesPerInputFrame(int deviceID);
 
-long JACK_GetOutputBytesPerSecond(int deviceID); /* bytes_per_frame * sample_rate */
+/* Note: these will probably be removed in a future release */
-long JACK_GetInputBytesPerSecond(int deviceID);  /* bytes_per_frame * sample_rate */
-long JACK_GetBytesStored(int deviceID);          /* bytes currently buffered in the device */
-long JACK_GetBytesFreeSpace(int deviceID);       /* bytes of free space in the buffers */
-long JACK_GetBytesPerOutputFrame(int deviceID);
 int  JACK_GetNumInputChannels(int deviceID);
-int  JACK_SetNumInputChannels(int deviceID, int channels);
 int  JACK_GetNumOutputChannels(int deviceID);
-int  JACK_SetNumOutputChannels(int deviceID, int channels);
-long JACK_GetSampleRate(int deviceID); /* samples per second */
-long JACK_OutputStatus(int deviceID, long int *sec, long int *usec);
-#endif /* #ifndef JACK_OUT_H */
 
+long JACK_GetSampleRate(int deviceID); /* samples per second */
+
+void JACK_SetClientName(char *name); /* sets the name that bio2jack will use when
+                                        creating a new jack client.  name_%pid%_%deviceID%%counter%
+                                        will be used
+                                        NOTE: this defaults to name = bio2jack
+                                        NOTE: we limit the size of the client name to
+                                           jack_client_name_size() */
+
+enum JACK_PORT_CONNECTION_MODE
+{
+    CONNECT_ALL,    /* connect to all avaliable ports */
+    CONNECT_OUTPUT, /* connect only to the ports we need for output */
+    CONNECT_NONE    /* don't connect to any ports */
+};
+
+/* set the mode for port connections */
+/* defaults to CONNECT_ALL */ 
+void JACK_SetPortConnectionMode(enum JACK_PORT_CONNECTION_MODE mode);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* #ifndef JACK_OUT_H */

veejay-ng/config.h.in

@@ -81,6 +81,9 @@
 /* Define to 1 if you have the <inttypes.h> header file. */
 #undef HAVE_INTTYPES_H
 
+/* Compiling with support for Jack */
+#undef HAVE_JACK
+
 /* Define to 1 if you have the `dl' library (-ldl). */
 #undef HAVE_LIBDL
 
@@ -135,6 +138,9 @@
 /* Using pthread stack size */
 #undef HAVE_PTHREADSTACKSIZE
 
+/* Set to 1 if you have libsamplerate. */
+#undef HAVE_SAMPLERATE
+
 /* Define to 1 if you have the `sched_get_priority_max' function. */
 #undef HAVE_SCHED_GET_PRIORITY_MAX
 

veejay-ng/configure.ac

@@ -337,19 +337,54 @@ AM_PATH_GLIB(2.0,[
 dnl *********************************************************************
 dnl Check for the Jack Audio connection kit
 dnl
-
+have_samplerate=false
 have_jack=false
-dnl dnl if test x$with_jack != xno ; then
+if test x$with_jack != xno ; then
-dnl  PKG_CHECK_MODULES(JACK, jack >= 0.98.1 , have_jack=true, have_jack=false)
+ PKG_CHECK_MODULES(JACK, jack >= 0.98.1 , have_jack=true, have_jack=false)
-dnl  if test x$have_jack = xtrue ; then
+ if test x$have_jack = xtrue ; then
-dnl    AC_SUBST(JACK_LIBS)
+    AC_SUBST(JACK_LIBS)
-dnl    AC_SUBST(JACK_CFLAGS)
+    AC_SUBST(JACK_CFLAGS)
-dnl    AC_DEFINE(HAVE_JACK,,[Compiling with support for Jack])
+    AC_DEFINE(HAVE_JACK,,[Compiling with support for Jack])
-dnl  else
+  else
-dnl    AC_MSG_WARN([Jack >= 0.981.1 is required, get it at http://jackit.sourceforge.net]);
+    AC_MSG_WARN([Jack >= 0.981.1 is required, get it at http://jackit.sourceforge.net]);
-dnl  fi
+  fi
-dnlfi
 
+dnl **** Check for libsamplerate necessary for bio2jack ****
+PKG_CHECK_MODULES(SAMPLERATE, samplerate >= 0.0.15,
+            ac_cv_samplerate=1, ac_cv_samplerate=0)
+
+AC_DEFINE_UNQUOTED([HAVE_SAMPLERATE],${ac_cv_samplerate},
+            [Set to 1 if you have libsamplerate.])
+
+dnl Make sure libsamplerate is found, we can't compile without it
+if test "${ac_cv_samplerate}" = 0
+then
+  AC_MSG_ERROR([Could not find libsamplerate, see that you have libsamplerate-dev or libsamplerate0-dev installed.])
+else
+have_samplerate=true
+fi
+
+AC_SUBST(SAMPLERATE_CFLAGS)
+AC_SUBST(SAMPLERATE_LIBS)
+
+
+fi
+have_unicap=false
+PKG_CHECK_MODULES( UNICAP, libunicap >= 1.14.1,
+		ac_cv_unicap=1, ac_cv_unicap=0)
+
+AC_DEFINE_UNQUOTED([HAVE_UNICAP], ${ac_cv_unicap},
+	[ Set to 1 if you have unicap.])
+
+if test "${ac_cv_unicap}" = 0
+then
+  AC_MSG_ERROR([Could not find libunicap, see that you have libunicap-dev installed.])
+else
+have_unicap=true
+fi
+
+AC_SUBST(UNICAP_CFLAGS)
+AC_SUBST(UNICAP_LIBS)
 
 
 dnl ********************************************************************
@@ -702,14 +737,14 @@ fi
 AC_MSG_RESULT($warnCFLAGS)
 AC_MSG_RESULT($warnCXXFLAGS)
 
-CFLAGS="$ARCHFLAGS $CFLAGS -std=c99"
+CFLAGS="$ARCHFLAGS $CFLAGS"
 CXXFLAGS="$ARCHFLAGS $CXXFLAGS"
 
 if test "x$cflags_set" != "xyes" ; then
   if test "x$enable_debug" = "xyes" ; then
-  	CFLAGS="$debugCFLAGS $warnCFLAGS -std=c99"
+  	CFLAGS="$debugCFLAGS $warnCFLAGS"
   else
- 	CFLAGS="$CFLAGS $warnCFLAGS -std=c99"
+ 	CFLAGS="$CFLAGS $warnCFLAGS"
   fi
   CXXFLAGS="$CXXFLAGS $warnCXXFLAGS"
   cflags_set=yes
@@ -737,6 +772,7 @@ libvjmem/Makefile
 libplugger/Makefile
 libvjnet/Makefile
 libyuv/Makefile
+libvjaudio/Makefile
 libel/Makefile
 bio2jack/Makefile
 vevosample/Makefile
@@ -797,7 +833,9 @@ AC_MSG_NOTICE([  - POSIX Threads (pthread)       : ${have_pthread}])
 AC_MSG_NOTICE([  - MJPEGTools                    : ${have_mjpegtools}])
 AC_MSG_NOTICE([  - SDL Video			 : ${have_sdl}])
 AC_MSG_NOTICE([ Optional dependencies])
-
+AC_MSG_NOTICE([  - unicap			 : ${have_unicap}])
+AC_MSG_NOTICE([  - Jack				 : ${have_jack}])
+AC_MSG_NOTICE([  - Samplerate			 : ${have_samplerate}])
 AC_MSG_NOTICE([  - video4linux                   : ${have_v4l}])
 AC_MSG_NOTICE([  - libDV (digital video) support : ${have_libdv} ])
 AC_MSG_NOTICE([  - Jack                          : ${have_jack}])

veejay-ng/libOSC/Makefile.in

@@ -1,596 +0,0 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-SOURCES = $(libOSC_la_SOURCES)
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-target_triplet = @target@
-subdir = libOSC
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in AUTHORS NEWS
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-LTLIBRARIES = $(noinst_LTLIBRARIES)
-libOSC_la_LIBADD =
-am_libOSC_la_OBJECTS = libOSC_la-OSC-address-space.lo \
-	libOSC_la-OSC-callbacklist.lo libOSC_la-OSC-drop.lo \
-	libOSC_la-OSC-pattern-match.lo libOSC_la-OSC-priority-queue.lo \
-	libOSC_la-OSC-receive.lo libOSC_la-OSC-string-help.lo \
-	libOSC_la-OSC-common.lo libOSC_la-OSC-timetag.lo \
-	libOSC_la-NetworkReturnAddress.lo
-libOSC_la_OBJECTS = $(am_libOSC_la_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = $(libOSC_la_SOURCES)
-DIST_SOURCES = $(libOSC_la_SOURCES)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALTIVEC_CFLAGS = @ALTIVEC_CFLAGS@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
-AMTAR = @AMTAR@
-AR = @AR@
-AS = @AS@
-ASFLAGS = @ASFLAGS@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCAS = @CCAS@
-CCASFLAGS = @CCASFLAGS@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-ECHO = @ECHO@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
-FFMPEG_AVCODEC_CFLAGS = @FFMPEG_AVCODEC_CFLAGS@
-FFMPEG_AVCODEC_LIBS = @FFMPEG_AVCODEC_LIBS@
-FFMPEG_AVFORMAT_CFLAGS = @FFMPEG_AVFORMAT_CFLAGS@
-FFMPEG_AVFORMAT_LIBS = @FFMPEG_AVFORMAT_LIBS@
-GLIB_CFLAGS = @GLIB_CFLAGS@
-GLIB_CONFIG = @GLIB_CONFIG@
-GLIB_LIBS = @GLIB_LIBS@
-GL_CFLAGS = @GL_CFLAGS@
-GL_LIBS = @GL_LIBS@
-HAVE_ALTIVEC_FALSE = @HAVE_ALTIVEC_FALSE@
-HAVE_ALTIVEC_TRUE = @HAVE_ALTIVEC_TRUE@
-HAVE_ASM_MMX2_FALSE = @HAVE_ASM_MMX2_FALSE@
-HAVE_ASM_MMX2_TRUE = @HAVE_ASM_MMX2_TRUE@
-HAVE_ASM_MMX_FALSE = @HAVE_ASM_MMX_FALSE@
-HAVE_ASM_MMX_TRUE = @HAVE_ASM_MMX_TRUE@
-HAVE_ASM_NASM_FALSE = @HAVE_ASM_NASM_FALSE@
-HAVE_ASM_NASM_TRUE = @HAVE_ASM_NASM_TRUE@
-HAVE_ASM_SSE2_FALSE = @HAVE_ASM_SSE2_FALSE@
-HAVE_ASM_SSE2_TRUE = @HAVE_ASM_SSE2_TRUE@
-HAVE_ASM_SSE_FALSE = @HAVE_ASM_SSE_FALSE@
-HAVE_ASM_SSE_TRUE = @HAVE_ASM_SSE_TRUE@
-HAVE_DL_DLOPEN_FALSE = @HAVE_DL_DLOPEN_FALSE@
-HAVE_DL_DLOPEN_TRUE = @HAVE_DL_DLOPEN_TRUE@
-HAVE_JACK_FALSE = @HAVE_JACK_FALSE@
-HAVE_JACK_TRUE = @HAVE_JACK_TRUE@
-HAVE_MMX2_FALSE = @HAVE_MMX2_FALSE@
-HAVE_MMX2_TRUE = @HAVE_MMX2_TRUE@
-HAVE_MMX_FALSE = @HAVE_MMX_FALSE@
-HAVE_MMX_TRUE = @HAVE_MMX_TRUE@
-HAVE_PPCCPU_FALSE = @HAVE_PPCCPU_FALSE@
-HAVE_PPCCPU_TRUE = @HAVE_PPCCPU_TRUE@
-HAVE_SDL_FALSE = @HAVE_SDL_FALSE@
-HAVE_SDL_TRUE = @HAVE_SDL_TRUE@
-HAVE_SSE2_FALSE = @HAVE_SSE2_FALSE@
-HAVE_SSE2_TRUE = @HAVE_SSE2_TRUE@
-HAVE_SSE_FALSE = @HAVE_SSE_FALSE@
-HAVE_SSE_TRUE = @HAVE_SSE_TRUE@
-HAVE_V4L_FALSE = @HAVE_V4L_FALSE@
-HAVE_V4L_TRUE = @HAVE_V4L_TRUE@
-HAVE_X86CPU_FALSE = @HAVE_X86CPU_FALSE@
-HAVE_X86CPU_TRUE = @HAVE_X86CPU_TRUE@
-HAVE_XML2_FALSE = @HAVE_XML2_FALSE@
-HAVE_XML2_TRUE = @HAVE_XML2_TRUE@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
-LIBDV_CFLAGS = @LIBDV_CFLAGS@
-LIBDV_LIBS = @LIBDV_LIBS@
-LIBGETOPT_LIB = @LIBGETOPT_LIB@
-LIBM_LIBS = @LIBM_LIBS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-LT_AGE = @LT_AGE@
-LT_CURRENT = @LT_CURRENT@
-LT_RELEASE = @LT_RELEASE@
-LT_REVISION = @LT_REVISION@
-MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-MAKEINFO = @MAKEINFO@
-MJPEGTOOLS_CFLAGS = @MJPEGTOOLS_CFLAGS@
-MJPEGTOOLS_LIBS = @MJPEGTOOLS_LIBS@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PROGRAM_NOPIC = @PROGRAM_NOPIC@
-PTHREAD_LIBS = @PTHREAD_LIBS@
-RANLIB = @RANLIB@
-SDL_CFLAGS = @SDL_CFLAGS@
-SDL_CONFIG = @SDL_CONFIG@
-SDL_LIBS = @SDL_LIBS@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-SUPPORT_READ_DV2_FALSE = @SUPPORT_READ_DV2_FALSE@
-SUPPORT_READ_DV2_TRUE = @SUPPORT_READ_DV2_TRUE@
-V4LCONF_LIBS = @V4LCONF_LIBS@
-VERSION = @VERSION@
-XML2_CONFIG = @XML2_CONFIG@
-XML_CPPFLAGS = @XML_CPPFLAGS@
-XML_LIBS = @XML_LIBS@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-datadir = @datadir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target = @target@
-target_alias = @target_alias@
-target_cpu = @target_cpu@
-target_os = @target_os@
-target_vendor = @target_vendor@
-INCLUDES = -I$(top_srcdir)/libOSC -I$(includedir)
-OSC_LIB_FILE = libOSC.la 
-noinst_LTLIBRARIES = $(OSC_LIB_FILE)
-libOSC_la_CFLAGS = $(AM_CFLAGS)
-libOSC_la_SOURCES = OSC-address-space.c \
-		 OSC-callbacklist.c \
-		 OSC-drop.c \
-		 OSC-pattern-match.c \
-		 OSC-priority-queue.c \
-		 OSC-receive.c \
-		 OSC-string-help.c \
-		 OSC-common.c \
-		 OSC-timetag.c \
-		 NetworkReturnAddress.c 
-
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  libOSC/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  libOSC/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-clean-noinstLTLIBRARIES:
-	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
-	@list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
-libOSC.la: $(libOSC_la_OBJECTS) $(libOSC_la_DEPENDENCIES) 
-	$(LINK)  $(libOSC_la_LDFLAGS) $(libOSC_la_OBJECTS) $(libOSC_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libOSC_la-NetworkReturnAddress.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libOSC_la-OSC-address-space.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libOSC_la-OSC-callbacklist.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libOSC_la-OSC-common.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libOSC_la-OSC-drop.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libOSC_la-OSC-pattern-match.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libOSC_la-OSC-priority-queue.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libOSC_la-OSC-receive.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libOSC_la-OSC-string-help.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libOSC_la-OSC-timetag.Plo@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-
-libOSC_la-OSC-address-space.lo: OSC-address-space.c
-@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libOSC_la_CFLAGS) $(CFLAGS) -MT libOSC_la-OSC-address-space.lo -MD -MP -MF "$(DEPDIR)/libOSC_la-OSC-address-space.Tpo" -c -o libOSC_la-OSC-address-space.lo `test -f 'OSC-address-space.c' || echo '$(srcdir)/'`OSC-address-space.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libOSC_la-OSC-address-space.Tpo" "$(DEPDIR)/libOSC_la-OSC-address-space.Plo"; else rm -f "$(DEPDIR)/libOSC_la-OSC-address-space.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='OSC-address-space.c' object='libOSC_la-OSC-address-space.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libOSC_la_CFLAGS) $(CFLAGS) -c -o libOSC_la-OSC-address-space.lo `test -f 'OSC-address-space.c' || echo '$(srcdir)/'`OSC-address-space.c
-
-libOSC_la-OSC-callbacklist.lo: OSC-callbacklist.c
-@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libOSC_la_CFLAGS) $(CFLAGS) -MT libOSC_la-OSC-callbacklist.lo -MD -MP -MF "$(DEPDIR)/libOSC_la-OSC-callbacklist.Tpo" -c -o libOSC_la-OSC-callbacklist.lo `test -f 'OSC-callbacklist.c' || echo '$(srcdir)/'`OSC-callbacklist.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libOSC_la-OSC-callbacklist.Tpo" "$(DEPDIR)/libOSC_la-OSC-callbacklist.Plo"; else rm -f "$(DEPDIR)/libOSC_la-OSC-callbacklist.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='OSC-callbacklist.c' object='libOSC_la-OSC-callbacklist.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libOSC_la_CFLAGS) $(CFLAGS) -c -o libOSC_la-OSC-callbacklist.lo `test -f 'OSC-callbacklist.c' || echo '$(srcdir)/'`OSC-callbacklist.c
-
-libOSC_la-OSC-drop.lo: OSC-drop.c
-@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libOSC_la_CFLAGS) $(CFLAGS) -MT libOSC_la-OSC-drop.lo -MD -MP -MF "$(DEPDIR)/libOSC_la-OSC-drop.Tpo" -c -o libOSC_la-OSC-drop.lo `test -f 'OSC-drop.c' || echo '$(srcdir)/'`OSC-drop.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libOSC_la-OSC-drop.Tpo" "$(DEPDIR)/libOSC_la-OSC-drop.Plo"; else rm -f "$(DEPDIR)/libOSC_la-OSC-drop.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='OSC-drop.c' object='libOSC_la-OSC-drop.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libOSC_la_CFLAGS) $(CFLAGS) -c -o libOSC_la-OSC-drop.lo `test -f 'OSC-drop.c' || echo '$(srcdir)/'`OSC-drop.c
-
-libOSC_la-OSC-pattern-match.lo: OSC-pattern-match.c
-@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libOSC_la_CFLAGS) $(CFLAGS) -MT libOSC_la-OSC-pattern-match.lo -MD -MP -MF "$(DEPDIR)/libOSC_la-OSC-pattern-match.Tpo" -c -o libOSC_la-OSC-pattern-match.lo `test -f 'OSC-pattern-match.c' || echo '$(srcdir)/'`OSC-pattern-match.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libOSC_la-OSC-pattern-match.Tpo" "$(DEPDIR)/libOSC_la-OSC-pattern-match.Plo"; else rm -f "$(DEPDIR)/libOSC_la-OSC-pattern-match.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='OSC-pattern-match.c' object='libOSC_la-OSC-pattern-match.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libOSC_la_CFLAGS) $(CFLAGS) -c -o libOSC_la-OSC-pattern-match.lo `test -f 'OSC-pattern-match.c' || echo '$(srcdir)/'`OSC-pattern-match.c
-
-libOSC_la-OSC-priority-queue.lo: OSC-priority-queue.c
-@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libOSC_la_CFLAGS) $(CFLAGS) -MT libOSC_la-OSC-priority-queue.lo -MD -MP -MF "$(DEPDIR)/libOSC_la-OSC-priority-queue.Tpo" -c -o libOSC_la-OSC-priority-queue.lo `test -f 'OSC-priority-queue.c' || echo '$(srcdir)/'`OSC-priority-queue.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libOSC_la-OSC-priority-queue.Tpo" "$(DEPDIR)/libOSC_la-OSC-priority-queue.Plo"; else rm -f "$(DEPDIR)/libOSC_la-OSC-priority-queue.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='OSC-priority-queue.c' object='libOSC_la-OSC-priority-queue.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libOSC_la_CFLAGS) $(CFLAGS) -c -o libOSC_la-OSC-priority-queue.lo `test -f 'OSC-priority-queue.c' || echo '$(srcdir)/'`OSC-priority-queue.c
-
-libOSC_la-OSC-receive.lo: OSC-receive.c
-@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libOSC_la_CFLAGS) $(CFLAGS) -MT libOSC_la-OSC-receive.lo -MD -MP -MF "$(DEPDIR)/libOSC_la-OSC-receive.Tpo" -c -o libOSC_la-OSC-receive.lo `test -f 'OSC-receive.c' || echo '$(srcdir)/'`OSC-receive.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libOSC_la-OSC-receive.Tpo" "$(DEPDIR)/libOSC_la-OSC-receive.Plo"; else rm -f "$(DEPDIR)/libOSC_la-OSC-receive.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='OSC-receive.c' object='libOSC_la-OSC-receive.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libOSC_la_CFLAGS) $(CFLAGS) -c -o libOSC_la-OSC-receive.lo `test -f 'OSC-receive.c' || echo '$(srcdir)/'`OSC-receive.c
-
-libOSC_la-OSC-string-help.lo: OSC-string-help.c
-@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libOSC_la_CFLAGS) $(CFLAGS) -MT libOSC_la-OSC-string-help.lo -MD -MP -MF "$(DEPDIR)/libOSC_la-OSC-string-help.Tpo" -c -o libOSC_la-OSC-string-help.lo `test -f 'OSC-string-help.c' || echo '$(srcdir)/'`OSC-string-help.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libOSC_la-OSC-string-help.Tpo" "$(DEPDIR)/libOSC_la-OSC-string-help.Plo"; else rm -f "$(DEPDIR)/libOSC_la-OSC-string-help.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='OSC-string-help.c' object='libOSC_la-OSC-string-help.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libOSC_la_CFLAGS) $(CFLAGS) -c -o libOSC_la-OSC-string-help.lo `test -f 'OSC-string-help.c' || echo '$(srcdir)/'`OSC-string-help.c
-
-libOSC_la-OSC-common.lo: OSC-common.c
-@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libOSC_la_CFLAGS) $(CFLAGS) -MT libOSC_la-OSC-common.lo -MD -MP -MF "$(DEPDIR)/libOSC_la-OSC-common.Tpo" -c -o libOSC_la-OSC-common.lo `test -f 'OSC-common.c' || echo '$(srcdir)/'`OSC-common.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libOSC_la-OSC-common.Tpo" "$(DEPDIR)/libOSC_la-OSC-common.Plo"; else rm -f "$(DEPDIR)/libOSC_la-OSC-common.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='OSC-common.c' object='libOSC_la-OSC-common.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libOSC_la_CFLAGS) $(CFLAGS) -c -o libOSC_la-OSC-common.lo `test -f 'OSC-common.c' || echo '$(srcdir)/'`OSC-common.c
-
-libOSC_la-OSC-timetag.lo: OSC-timetag.c
-@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libOSC_la_CFLAGS) $(CFLAGS) -MT libOSC_la-OSC-timetag.lo -MD -MP -MF "$(DEPDIR)/libOSC_la-OSC-timetag.Tpo" -c -o libOSC_la-OSC-timetag.lo `test -f 'OSC-timetag.c' || echo '$(srcdir)/'`OSC-timetag.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libOSC_la-OSC-timetag.Tpo" "$(DEPDIR)/libOSC_la-OSC-timetag.Plo"; else rm -f "$(DEPDIR)/libOSC_la-OSC-timetag.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='OSC-timetag.c' object='libOSC_la-OSC-timetag.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libOSC_la_CFLAGS) $(CFLAGS) -c -o libOSC_la-OSC-timetag.lo `test -f 'OSC-timetag.c' || echo '$(srcdir)/'`OSC-timetag.c
-
-libOSC_la-NetworkReturnAddress.lo: NetworkReturnAddress.c
-@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libOSC_la_CFLAGS) $(CFLAGS) -MT libOSC_la-NetworkReturnAddress.lo -MD -MP -MF "$(DEPDIR)/libOSC_la-NetworkReturnAddress.Tpo" -c -o libOSC_la-NetworkReturnAddress.lo `test -f 'NetworkReturnAddress.c' || echo '$(srcdir)/'`NetworkReturnAddress.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libOSC_la-NetworkReturnAddress.Tpo" "$(DEPDIR)/libOSC_la-NetworkReturnAddress.Plo"; else rm -f "$(DEPDIR)/libOSC_la-NetworkReturnAddress.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='NetworkReturnAddress.c' object='libOSC_la-NetworkReturnAddress.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libOSC_la_CFLAGS) $(CFLAGS) -c -o libOSC_la-NetworkReturnAddress.lo `test -f 'NetworkReturnAddress.c' || echo '$(srcdir)/'`NetworkReturnAddress.c
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
-	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LTLIBRARIES)
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
-	mostlyclean-am
-
-distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-exec-am:
-
-install-info: install-info-am
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-info-am
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-noinstLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am install-man \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	pdf pdf-am ps ps-am tags uninstall uninstall-am \
-	uninstall-info-am
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

veejay-ng/libel/Makefile.in

@@ -1,516 +0,0 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-# Makefile for veejay
-
-SOURCES = $(libel_la_SOURCES)
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-target_triplet = @target@
-subdir = libel
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-LTLIBRARIES = $(noinst_LTLIBRARIES)
-libel_la_LIBADD =
-am_libel_la_OBJECTS = vj-mmap.lo elcache.lo avilib.lo lav_io.lo \
-	vj-dv.lo rawdv.lo vj-avcodec.lo vj-el.lo
-libel_la_OBJECTS = $(am_libel_la_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = $(libel_la_SOURCES)
-DIST_SOURCES = $(libel_la_SOURCES)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALTIVEC_CFLAGS = @ALTIVEC_CFLAGS@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
-AMTAR = @AMTAR@
-AR = @AR@
-AS = @AS@
-ASFLAGS = @ASFLAGS@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCAS = @CCAS@
-CCASFLAGS = @CCASFLAGS@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-ECHO = @ECHO@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
-FFMPEG_AVCODEC_CFLAGS = @FFMPEG_AVCODEC_CFLAGS@
-FFMPEG_AVCODEC_LIBS = @FFMPEG_AVCODEC_LIBS@
-FFMPEG_AVFORMAT_CFLAGS = @FFMPEG_AVFORMAT_CFLAGS@
-FFMPEG_AVFORMAT_LIBS = @FFMPEG_AVFORMAT_LIBS@
-GLIB_CFLAGS = @GLIB_CFLAGS@
-GLIB_CONFIG = @GLIB_CONFIG@
-GLIB_LIBS = @GLIB_LIBS@
-GL_CFLAGS = @GL_CFLAGS@
-GL_LIBS = @GL_LIBS@
-HAVE_ALTIVEC_FALSE = @HAVE_ALTIVEC_FALSE@
-HAVE_ALTIVEC_TRUE = @HAVE_ALTIVEC_TRUE@
-HAVE_ASM_MMX2_FALSE = @HAVE_ASM_MMX2_FALSE@
-HAVE_ASM_MMX2_TRUE = @HAVE_ASM_MMX2_TRUE@
-HAVE_ASM_MMX_FALSE = @HAVE_ASM_MMX_FALSE@
-HAVE_ASM_MMX_TRUE = @HAVE_ASM_MMX_TRUE@
-HAVE_ASM_NASM_FALSE = @HAVE_ASM_NASM_FALSE@
-HAVE_ASM_NASM_TRUE = @HAVE_ASM_NASM_TRUE@
-HAVE_ASM_SSE2_FALSE = @HAVE_ASM_SSE2_FALSE@
-HAVE_ASM_SSE2_TRUE = @HAVE_ASM_SSE2_TRUE@
-HAVE_ASM_SSE_FALSE = @HAVE_ASM_SSE_FALSE@
-HAVE_ASM_SSE_TRUE = @HAVE_ASM_SSE_TRUE@
-HAVE_DL_DLOPEN_FALSE = @HAVE_DL_DLOPEN_FALSE@
-HAVE_DL_DLOPEN_TRUE = @HAVE_DL_DLOPEN_TRUE@
-HAVE_JACK_FALSE = @HAVE_JACK_FALSE@
-HAVE_JACK_TRUE = @HAVE_JACK_TRUE@
-HAVE_MMX2_FALSE = @HAVE_MMX2_FALSE@
-HAVE_MMX2_TRUE = @HAVE_MMX2_TRUE@
-HAVE_MMX_FALSE = @HAVE_MMX_FALSE@
-HAVE_MMX_TRUE = @HAVE_MMX_TRUE@
-HAVE_PPCCPU_FALSE = @HAVE_PPCCPU_FALSE@
-HAVE_PPCCPU_TRUE = @HAVE_PPCCPU_TRUE@
-HAVE_SDL_FALSE = @HAVE_SDL_FALSE@
-HAVE_SDL_TRUE = @HAVE_SDL_TRUE@
-HAVE_SSE2_FALSE = @HAVE_SSE2_FALSE@
-HAVE_SSE2_TRUE = @HAVE_SSE2_TRUE@
-HAVE_SSE_FALSE = @HAVE_SSE_FALSE@
-HAVE_SSE_TRUE = @HAVE_SSE_TRUE@
-HAVE_V4L_FALSE = @HAVE_V4L_FALSE@
-HAVE_V4L_TRUE = @HAVE_V4L_TRUE@
-HAVE_X86CPU_FALSE = @HAVE_X86CPU_FALSE@
-HAVE_X86CPU_TRUE = @HAVE_X86CPU_TRUE@
-HAVE_XML2_FALSE = @HAVE_XML2_FALSE@
-HAVE_XML2_TRUE = @HAVE_XML2_TRUE@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
-LIBDV_CFLAGS = @LIBDV_CFLAGS@
-LIBDV_LIBS = @LIBDV_LIBS@
-LIBGETOPT_LIB = @LIBGETOPT_LIB@
-LIBM_LIBS = @LIBM_LIBS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-LT_AGE = @LT_AGE@
-LT_CURRENT = @LT_CURRENT@
-LT_RELEASE = @LT_RELEASE@
-LT_REVISION = @LT_REVISION@
-MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-MAKEINFO = @MAKEINFO@
-MJPEGTOOLS_CFLAGS = @MJPEGTOOLS_CFLAGS@
-MJPEGTOOLS_LIBS = @MJPEGTOOLS_LIBS@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PROGRAM_NOPIC = @PROGRAM_NOPIC@
-PTHREAD_LIBS = @PTHREAD_LIBS@
-RANLIB = @RANLIB@
-SDL_CFLAGS = @SDL_CFLAGS@
-SDL_CONFIG = @SDL_CONFIG@
-SDL_LIBS = @SDL_LIBS@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-SUPPORT_READ_DV2_FALSE = @SUPPORT_READ_DV2_FALSE@
-SUPPORT_READ_DV2_TRUE = @SUPPORT_READ_DV2_TRUE@
-V4LCONF_LIBS = @V4LCONF_LIBS@
-VERSION = @VERSION@
-XML2_CONFIG = @XML2_CONFIG@
-XML_CPPFLAGS = @XML_CPPFLAGS@
-XML_LIBS = @XML_LIBS@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-datadir = @datadir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target = @target@
-target_alias = @target_alias@
-target_cpu = @target_cpu@
-target_os = @target_os@
-target_vendor = @target_vendor@
-MAINTAINERCLEANFILES = Makefile.in
-INCLUDES = -I$(top_srcdir) -I$(includedir) -I$(top_srcdir)/vjmem \
-		-I$(top_srcdir)/vjmsg \
-		$(MJPEGTOOLS_CFLAGS) ${FFMPEG_CFLAGS} 
-
-VJEL_LIB_FILE = libel.la
-noinst_LTLIBRARIES = $(VJEL_LIB_FILE)
-libel_la_SOURCES = vj-mmap.c elcache.c avilib.c lav_io.c vj-dv.c rawdv.c vj-avcodec.c vj-el.c
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  libel/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  libel/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-clean-noinstLTLIBRARIES:
-	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
-	@list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
-libel.la: $(libel_la_OBJECTS) $(libel_la_DEPENDENCIES) 
-	$(LINK)  $(libel_la_LDFLAGS) $(libel_la_OBJECTS) $(libel_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/avilib.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elcache.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lav_io.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rawdv.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vj-avcodec.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vj-dv.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vj-el.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vj-mmap.Plo@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
-	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LTLIBRARIES)
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-clean: clean-am
-
-clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
-	mostlyclean-am
-
-distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-exec-am:
-
-install-info: install-info-am
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-info-am
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-noinstLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am install-man \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	pdf pdf-am ps ps-am tags uninstall uninstall-am \
-	uninstall-info-am
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

veejay-ng/libel/vj-el.c

@@ -1113,18 +1113,22 @@ void	vj_el_set_itu601( void *edl , int status )
 	}
 }
 
-int	vj_el_get_audio_frame(void *edl, uint32_t nframe, uint8_t *dst)
+
+int	vj_el_get_audio_frame(void *edl, uint32_t nframe, void *dav, int n_packets)
 {
+	AFrame *av = (AFrame*) dav;
 	editlist *el = (editlist*) edl;
     long pos, asize;
     int ret = 0;
     uint64_t n;	
-	int ns0, ns1;
+    uint64_t n2;
+	unsigned long ns0, ns1, nswap;
 
 	if(el->is_empty)
 	{
-		int ns = el->audio_rate / el->video_fps;
+		int ns = el->audio_rate / el->video_fps * n_packets;
-		memset( dst, 0, sizeof(uint8_t) * ns * el->audio_bps );
+		memset( av->data, 0, sizeof(uint8_t) * ns * el->audio_bps );
+		av->samples = ns;
 		return 1;
 	}
 
@@ -1139,76 +1143,37 @@ int	vj_el_get_audio_frame(void *edl, uint32_t nframe, uint8_t *dst)
 
     n = el->frame_list[nframe];
 
+    n2 = n + n_packets;
+
     /*if( lav_is_DV( el->lav_fd[N_EL_FILE(n)] ) )
     {
 	lav_set_video_position( el->lav_fd[N_EL_FILE(n)] , nframe );
 	return lav_read_audio( el->lav_fd[N_EL_FILE(n)], dst, 0  );
     }*/
 
-    ns1 = (double) (N_EL_FRAME(n) + 1) * el->audio_rate / el->video_fps;
+	av->rate = el->audio_rate;
+	av->bits = el->audio_bits;
+	av->bps  = el->audio_bps;
+	av->num_chans = el->audio_chans;
+    
+    ns1 = (double) N_EL_FRAME(n2) * el->audio_rate / el->video_fps;
     ns0 = (double) N_EL_FRAME(n) * el->audio_rate / el->video_fps;
 
-    //asize = el->audio_rate / el->video_fps;
-    pos = nframe * asize;
-
     ret = lav_set_audio_position(el->lav_fd[N_EL_FILE(n)], ns0);
-
     if (ret < 0)
+    {
+	    veejay_msg(0, "Error seeking to %d",ns0 );
 		return -1;
-
-    //mlt need int16_t
-    ret = lav_read_audio(el->lav_fd[N_EL_FILE(n)], dst, (ns1 - ns0));
-    if (ret < 0)
-		return -1;
-
-    return (ns1 - ns0);
-
-}
-
-
-int	vj_el_get_audio_frame_at(void *edl, uint32_t nframe, uint8_t *dst, int num )
-{
-	editlist *el = (editlist*) edl;
-	// get audio from current frame + n frames
-    long pos, asize;
-    int ret = 0;
-    uint64_t n;	
-    int ns0, ns1;
-
-    if (!el->has_audio)
-	return 0;
-
-    if  (!el->has_video)
-	{
-		int size = el->audio_rate / el->video_fps * el->audio_bps;
-		memset(dst,0,size);
-		return size;
 	}
-
-    if (nframe < 0)
-		nframe = 0;
-
-    if (nframe > el->video_frames)
-		nframe = el->video_frames - num;
-
-    n = el->frame_list[nframe];
-
-    ns1 = (double) (N_EL_FRAME(n) + num) * el->audio_rate / el->video_fps;
-    ns0 = (double) N_EL_FRAME(n) * el->audio_rate / el->video_fps;
-
-    //asize = el->audio_rate / el->video_fps;
-    pos = nframe * asize;
-    ret = lav_set_audio_position(el->lav_fd[N_EL_FILE(n)], ns0);
-
-    if (ret < 0)
-		return -1;
-
     //mlt need int16_t
-    ret = lav_read_audio(el->lav_fd[N_EL_FILE(n)], dst, (ns1 - ns0));
+    ret = lav_read_audio(el->lav_fd[N_EL_FILE(n)], av->data, (ns1 - ns0));
     if (ret < 0)
+    {
+	    veejay_msg(0, "Unable to read audio data %ld ",ns1-ns0);
 		return -1;
-
+    }
-    return (ns1 - ns0);
+    av->samples = ns1 - ns0;
+    return av->samples;
 
 }
 
@@ -2123,6 +2088,11 @@ int		vj_el_get_audio_bps( void *edl )
 	editlist *el = (editlist*) edl;
 	return el->audio_bps;
 }
+int		vj_el_get_audio_bits( void *edl )
+{
+	editlist *el = (editlist*) edl;
+	return el->audio_bits;
+}
 int		vj_el_get_audio_chans( void *edl )
 {
 	editlist *el = (editlist*) edl;

veejay-ng/libel/vj-el.h

@@ -33,15 +33,13 @@ void	vj_el_init_chunk(int n);
 
 void	vj_el_free(void *el);
 
-int	vj_el_get_audio_frame_at(void *el, uint32_t nframe, uint8_t *dst, int speed );
-
 int	vj_el_append_video_file(void *el, char *filename);
 
 int	vj_el_write_void( char *filename, long start, long end, void *el );
 
 int	vj_el_get_video_frame(void *el, long nframe, void *frame);
 
-int	vj_el_get_audio_frame(void *el, uint32_t nframe, uint8_t *dst);
+int	vj_el_get_audio_frame(void *el, uint32_t nframe, void *av,int n);
 
 int	vj_el_get_file_fourcc(void *el, int num, char *buf);
 

veejay-ng/libhash/Makefile.in

@@ -1,503 +0,0 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-SOURCES = $(libhash_la_SOURCES)
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-target_triplet = @target@
-subdir = libhash
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-LTLIBRARIES = $(noinst_LTLIBRARIES)
-libhash_la_LIBADD =
-am_libhash_la_OBJECTS = hash.lo
-libhash_la_OBJECTS = $(am_libhash_la_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = $(libhash_la_SOURCES)
-DIST_SOURCES = $(libhash_la_SOURCES)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALTIVEC_CFLAGS = @ALTIVEC_CFLAGS@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
-AMTAR = @AMTAR@
-AR = @AR@
-AS = @AS@
-ASFLAGS = @ASFLAGS@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCAS = @CCAS@
-CCASFLAGS = @CCASFLAGS@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-ECHO = @ECHO@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
-FFMPEG_AVCODEC_CFLAGS = @FFMPEG_AVCODEC_CFLAGS@
-FFMPEG_AVCODEC_LIBS = @FFMPEG_AVCODEC_LIBS@
-FFMPEG_AVFORMAT_CFLAGS = @FFMPEG_AVFORMAT_CFLAGS@
-FFMPEG_AVFORMAT_LIBS = @FFMPEG_AVFORMAT_LIBS@
-GLIB_CFLAGS = @GLIB_CFLAGS@
-GLIB_CONFIG = @GLIB_CONFIG@
-GLIB_LIBS = @GLIB_LIBS@
-GL_CFLAGS = @GL_CFLAGS@
-GL_LIBS = @GL_LIBS@
-HAVE_ALTIVEC_FALSE = @HAVE_ALTIVEC_FALSE@
-HAVE_ALTIVEC_TRUE = @HAVE_ALTIVEC_TRUE@
-HAVE_ASM_MMX2_FALSE = @HAVE_ASM_MMX2_FALSE@
-HAVE_ASM_MMX2_TRUE = @HAVE_ASM_MMX2_TRUE@
-HAVE_ASM_MMX_FALSE = @HAVE_ASM_MMX_FALSE@
-HAVE_ASM_MMX_TRUE = @HAVE_ASM_MMX_TRUE@
-HAVE_ASM_NASM_FALSE = @HAVE_ASM_NASM_FALSE@
-HAVE_ASM_NASM_TRUE = @HAVE_ASM_NASM_TRUE@
-HAVE_ASM_SSE2_FALSE = @HAVE_ASM_SSE2_FALSE@
-HAVE_ASM_SSE2_TRUE = @HAVE_ASM_SSE2_TRUE@
-HAVE_ASM_SSE_FALSE = @HAVE_ASM_SSE_FALSE@
-HAVE_ASM_SSE_TRUE = @HAVE_ASM_SSE_TRUE@
-HAVE_DL_DLOPEN_FALSE = @HAVE_DL_DLOPEN_FALSE@
-HAVE_DL_DLOPEN_TRUE = @HAVE_DL_DLOPEN_TRUE@
-HAVE_JACK_FALSE = @HAVE_JACK_FALSE@
-HAVE_JACK_TRUE = @HAVE_JACK_TRUE@
-HAVE_MMX2_FALSE = @HAVE_MMX2_FALSE@
-HAVE_MMX2_TRUE = @HAVE_MMX2_TRUE@
-HAVE_MMX_FALSE = @HAVE_MMX_FALSE@
-HAVE_MMX_TRUE = @HAVE_MMX_TRUE@
-HAVE_PPCCPU_FALSE = @HAVE_PPCCPU_FALSE@
-HAVE_PPCCPU_TRUE = @HAVE_PPCCPU_TRUE@
-HAVE_SDL_FALSE = @HAVE_SDL_FALSE@
-HAVE_SDL_TRUE = @HAVE_SDL_TRUE@
-HAVE_SSE2_FALSE = @HAVE_SSE2_FALSE@
-HAVE_SSE2_TRUE = @HAVE_SSE2_TRUE@
-HAVE_SSE_FALSE = @HAVE_SSE_FALSE@
-HAVE_SSE_TRUE = @HAVE_SSE_TRUE@
-HAVE_V4L_FALSE = @HAVE_V4L_FALSE@
-HAVE_V4L_TRUE = @HAVE_V4L_TRUE@
-HAVE_X86CPU_FALSE = @HAVE_X86CPU_FALSE@
-HAVE_X86CPU_TRUE = @HAVE_X86CPU_TRUE@
-HAVE_XML2_FALSE = @HAVE_XML2_FALSE@
-HAVE_XML2_TRUE = @HAVE_XML2_TRUE@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
-LIBDV_CFLAGS = @LIBDV_CFLAGS@
-LIBDV_LIBS = @LIBDV_LIBS@
-LIBGETOPT_LIB = @LIBGETOPT_LIB@
-LIBM_LIBS = @LIBM_LIBS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-LT_AGE = @LT_AGE@
-LT_CURRENT = @LT_CURRENT@
-LT_RELEASE = @LT_RELEASE@
-LT_REVISION = @LT_REVISION@
-MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-MAKEINFO = @MAKEINFO@
-MJPEGTOOLS_CFLAGS = @MJPEGTOOLS_CFLAGS@
-MJPEGTOOLS_LIBS = @MJPEGTOOLS_LIBS@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PROGRAM_NOPIC = @PROGRAM_NOPIC@
-PTHREAD_LIBS = @PTHREAD_LIBS@
-RANLIB = @RANLIB@
-SDL_CFLAGS = @SDL_CFLAGS@
-SDL_CONFIG = @SDL_CONFIG@
-SDL_LIBS = @SDL_LIBS@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-SUPPORT_READ_DV2_FALSE = @SUPPORT_READ_DV2_FALSE@
-SUPPORT_READ_DV2_TRUE = @SUPPORT_READ_DV2_TRUE@
-V4LCONF_LIBS = @V4LCONF_LIBS@
-VERSION = @VERSION@
-XML2_CONFIG = @XML2_CONFIG@
-XML_CPPFLAGS = @XML_CPPFLAGS@
-XML_LIBS = @XML_LIBS@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-datadir = @datadir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target = @target@
-target_alias = @target_alias@
-target_cpu = @target_cpu@
-target_os = @target_os@
-target_vendor = @target_vendor@
-
-# Makefile for veejay
-INCLUDES = -I$(top_srcdir) -I$(includedir) 
-HASH_LIB_FILE = libhash.la
-noinst_LTLIBRARIES = $(HASH_LIB_FILE)
-libhash_la_SOURCES = hash.c 
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  libhash/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  libhash/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-clean-noinstLTLIBRARIES:
-	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
-	@list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
-libhash.la: $(libhash_la_OBJECTS) $(libhash_la_DEPENDENCIES) 
-	$(LINK)  $(libhash_la_LDFLAGS) $(libhash_la_OBJECTS) $(libhash_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hash.Plo@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
-	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LTLIBRARIES)
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
-	mostlyclean-am
-
-distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-exec-am:
-
-install-info: install-info-am
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-info-am
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-noinstLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am install-man \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	pdf pdf-am ps ps-am tags uninstall uninstall-am \
-	uninstall-info-am
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

veejay-ng/libplugger/Makefile.in

@@ -1,509 +0,0 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-SOURCES = $(libvjplug_la_SOURCES)
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-target_triplet = @target@
-subdir = libplugger
-DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-LTLIBRARIES = $(noinst_LTLIBRARIES)
-libvjplug_la_LIBADD =
-am_libvjplug_la_OBJECTS = utility.lo freeframe-loader.lo \
-	frei0r-loader.lo livido-loader.lo plugload.lo
-libvjplug_la_OBJECTS = $(am_libvjplug_la_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = $(libvjplug_la_SOURCES)
-DIST_SOURCES = $(libvjplug_la_SOURCES)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALTIVEC_CFLAGS = @ALTIVEC_CFLAGS@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
-AMTAR = @AMTAR@
-AR = @AR@
-AS = @AS@
-ASFLAGS = @ASFLAGS@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCAS = @CCAS@
-CCASFLAGS = @CCASFLAGS@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-ECHO = @ECHO@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
-FFMPEG_AVCODEC_CFLAGS = @FFMPEG_AVCODEC_CFLAGS@
-FFMPEG_AVCODEC_LIBS = @FFMPEG_AVCODEC_LIBS@
-FFMPEG_AVFORMAT_CFLAGS = @FFMPEG_AVFORMAT_CFLAGS@
-FFMPEG_AVFORMAT_LIBS = @FFMPEG_AVFORMAT_LIBS@
-GLIB_CFLAGS = @GLIB_CFLAGS@
-GLIB_CONFIG = @GLIB_CONFIG@
-GLIB_LIBS = @GLIB_LIBS@
-GL_CFLAGS = @GL_CFLAGS@
-GL_LIBS = @GL_LIBS@
-HAVE_ALTIVEC_FALSE = @HAVE_ALTIVEC_FALSE@
-HAVE_ALTIVEC_TRUE = @HAVE_ALTIVEC_TRUE@
-HAVE_ASM_MMX2_FALSE = @HAVE_ASM_MMX2_FALSE@
-HAVE_ASM_MMX2_TRUE = @HAVE_ASM_MMX2_TRUE@
-HAVE_ASM_MMX_FALSE = @HAVE_ASM_MMX_FALSE@
-HAVE_ASM_MMX_TRUE = @HAVE_ASM_MMX_TRUE@
-HAVE_ASM_NASM_FALSE = @HAVE_ASM_NASM_FALSE@
-HAVE_ASM_NASM_TRUE = @HAVE_ASM_NASM_TRUE@
-HAVE_ASM_SSE2_FALSE = @HAVE_ASM_SSE2_FALSE@
-HAVE_ASM_SSE2_TRUE = @HAVE_ASM_SSE2_TRUE@
-HAVE_ASM_SSE_FALSE = @HAVE_ASM_SSE_FALSE@
-HAVE_ASM_SSE_TRUE = @HAVE_ASM_SSE_TRUE@
-HAVE_DL_DLOPEN_FALSE = @HAVE_DL_DLOPEN_FALSE@
-HAVE_DL_DLOPEN_TRUE = @HAVE_DL_DLOPEN_TRUE@
-HAVE_JACK_FALSE = @HAVE_JACK_FALSE@
-HAVE_JACK_TRUE = @HAVE_JACK_TRUE@
-HAVE_MMX2_FALSE = @HAVE_MMX2_FALSE@
-HAVE_MMX2_TRUE = @HAVE_MMX2_TRUE@
-HAVE_MMX_FALSE = @HAVE_MMX_FALSE@
-HAVE_MMX_TRUE = @HAVE_MMX_TRUE@
-HAVE_PPCCPU_FALSE = @HAVE_PPCCPU_FALSE@
-HAVE_PPCCPU_TRUE = @HAVE_PPCCPU_TRUE@
-HAVE_SDL_FALSE = @HAVE_SDL_FALSE@
-HAVE_SDL_TRUE = @HAVE_SDL_TRUE@
-HAVE_SSE2_FALSE = @HAVE_SSE2_FALSE@
-HAVE_SSE2_TRUE = @HAVE_SSE2_TRUE@
-HAVE_SSE_FALSE = @HAVE_SSE_FALSE@
-HAVE_SSE_TRUE = @HAVE_SSE_TRUE@
-HAVE_V4L_FALSE = @HAVE_V4L_FALSE@
-HAVE_V4L_TRUE = @HAVE_V4L_TRUE@
-HAVE_X86CPU_FALSE = @HAVE_X86CPU_FALSE@
-HAVE_X86CPU_TRUE = @HAVE_X86CPU_TRUE@
-HAVE_XML2_FALSE = @HAVE_XML2_FALSE@
-HAVE_XML2_TRUE = @HAVE_XML2_TRUE@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
-LIBDV_CFLAGS = @LIBDV_CFLAGS@
-LIBDV_LIBS = @LIBDV_LIBS@
-LIBGETOPT_LIB = @LIBGETOPT_LIB@
-LIBM_LIBS = @LIBM_LIBS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-LT_AGE = @LT_AGE@
-LT_CURRENT = @LT_CURRENT@
-LT_RELEASE = @LT_RELEASE@
-LT_REVISION = @LT_REVISION@
-MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-MAKEINFO = @MAKEINFO@
-MJPEGTOOLS_CFLAGS = @MJPEGTOOLS_CFLAGS@
-MJPEGTOOLS_LIBS = @MJPEGTOOLS_LIBS@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PROGRAM_NOPIC = @PROGRAM_NOPIC@
-PTHREAD_LIBS = @PTHREAD_LIBS@
-RANLIB = @RANLIB@
-SDL_CFLAGS = @SDL_CFLAGS@
-SDL_CONFIG = @SDL_CONFIG@
-SDL_LIBS = @SDL_LIBS@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-SUPPORT_READ_DV2_FALSE = @SUPPORT_READ_DV2_FALSE@
-SUPPORT_READ_DV2_TRUE = @SUPPORT_READ_DV2_TRUE@
-V4LCONF_LIBS = @V4LCONF_LIBS@
-VERSION = @VERSION@
-XML2_CONFIG = @XML2_CONFIG@
-XML_CPPFLAGS = @XML_CPPFLAGS@
-XML_LIBS = @XML_LIBS@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-datadir = @datadir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target = @target@
-target_alias = @target_alias@
-target_cpu = @target_cpu@
-target_os = @target_os@
-target_vendor = @target_vendor@
-MAINTAINERCLEANFILES = Makefile.in
-INCLUDES = -I$(top_srcdir)/libplugger -I$(includedir) -I$(top_srcdir)/libhash -I$(top_srcdir)/libvevo ${FFMPEG_CFLAGS} 
-AM_CFLAGS = $(CFLAGS) -freg-struct-return
-LIBVJPLUG_LIB_FILE = libvjplug.la
-noinst_LTLIBRARIES = $(LIBVJPLUG_LIB_FILE)
-libvjplug_la_SOURCES = utility.c freeframe-loader.c frei0r-loader.c livido-loader.c plugload.c
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  libplugger/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  libplugger/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-clean-noinstLTLIBRARIES:
-	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
-	@list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
-libvjplug.la: $(libvjplug_la_OBJECTS) $(libvjplug_la_DEPENDENCIES) 
-	$(LINK)  $(libvjplug_la_LDFLAGS) $(libvjplug_la_OBJECTS) $(libvjplug_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/freeframe-loader.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/frei0r-loader.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/livido-loader.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/plugload.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utility.Plo@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
-	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LTLIBRARIES)
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-clean: clean-am
-
-clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
-	mostlyclean-am
-
-distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-exec-am:
-
-install-info: install-info-am
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-info-am
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-noinstLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am install-man \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	pdf pdf-am ps ps-am tags uninstall uninstall-am \
-	uninstall-info-am
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

veejay-ng/libplugger/livido-loader.c

@@ -445,7 +445,7 @@ static	int	init_ports_from_template( livido_port_t *filter_instance, livido_port
 #ifdef STRICT_CHECKING
 		assert( error == LIVIDO_NO_ERROR );
 #endif
-                in_channels[i] = livido_port_new( id );
+                in_channels[i] = livido_port_new( id ); //@ is this ever freed?!
 		livido_property_set( in_channels[i], "parent_template",LIVIDO_ATOM_TYPE_PORTPTR,1, &ptr);
 		livido_property_soft_reference( in_channels[i], "parent_template" );
 ;

veejay-ng/libvevo/Makefile.in

@@ -1,504 +0,0 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-SOURCES = $(libvevo_la_SOURCES)
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-target_triplet = @target@
-subdir = libvevo
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-LTLIBRARIES = $(noinst_LTLIBRARIES)
-libvevo_la_LIBADD =
-am_libvevo_la_OBJECTS = pool.lo vevo.lo
-libvevo_la_OBJECTS = $(am_libvevo_la_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = $(libvevo_la_SOURCES)
-DIST_SOURCES = $(libvevo_la_SOURCES)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALTIVEC_CFLAGS = @ALTIVEC_CFLAGS@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
-AMTAR = @AMTAR@
-AR = @AR@
-AS = @AS@
-ASFLAGS = @ASFLAGS@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCAS = @CCAS@
-CCASFLAGS = @CCASFLAGS@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-ECHO = @ECHO@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
-FFMPEG_AVCODEC_CFLAGS = @FFMPEG_AVCODEC_CFLAGS@
-FFMPEG_AVCODEC_LIBS = @FFMPEG_AVCODEC_LIBS@
-FFMPEG_AVFORMAT_CFLAGS = @FFMPEG_AVFORMAT_CFLAGS@
-FFMPEG_AVFORMAT_LIBS = @FFMPEG_AVFORMAT_LIBS@
-GLIB_CFLAGS = @GLIB_CFLAGS@
-GLIB_CONFIG = @GLIB_CONFIG@
-GLIB_LIBS = @GLIB_LIBS@
-GL_CFLAGS = @GL_CFLAGS@
-GL_LIBS = @GL_LIBS@
-HAVE_ALTIVEC_FALSE = @HAVE_ALTIVEC_FALSE@
-HAVE_ALTIVEC_TRUE = @HAVE_ALTIVEC_TRUE@
-HAVE_ASM_MMX2_FALSE = @HAVE_ASM_MMX2_FALSE@
-HAVE_ASM_MMX2_TRUE = @HAVE_ASM_MMX2_TRUE@
-HAVE_ASM_MMX_FALSE = @HAVE_ASM_MMX_FALSE@
-HAVE_ASM_MMX_TRUE = @HAVE_ASM_MMX_TRUE@
-HAVE_ASM_NASM_FALSE = @HAVE_ASM_NASM_FALSE@
-HAVE_ASM_NASM_TRUE = @HAVE_ASM_NASM_TRUE@
-HAVE_ASM_SSE2_FALSE = @HAVE_ASM_SSE2_FALSE@
-HAVE_ASM_SSE2_TRUE = @HAVE_ASM_SSE2_TRUE@
-HAVE_ASM_SSE_FALSE = @HAVE_ASM_SSE_FALSE@
-HAVE_ASM_SSE_TRUE = @HAVE_ASM_SSE_TRUE@
-HAVE_DL_DLOPEN_FALSE = @HAVE_DL_DLOPEN_FALSE@
-HAVE_DL_DLOPEN_TRUE = @HAVE_DL_DLOPEN_TRUE@
-HAVE_JACK_FALSE = @HAVE_JACK_FALSE@
-HAVE_JACK_TRUE = @HAVE_JACK_TRUE@
-HAVE_MMX2_FALSE = @HAVE_MMX2_FALSE@
-HAVE_MMX2_TRUE = @HAVE_MMX2_TRUE@
-HAVE_MMX_FALSE = @HAVE_MMX_FALSE@
-HAVE_MMX_TRUE = @HAVE_MMX_TRUE@
-HAVE_PPCCPU_FALSE = @HAVE_PPCCPU_FALSE@
-HAVE_PPCCPU_TRUE = @HAVE_PPCCPU_TRUE@
-HAVE_SDL_FALSE = @HAVE_SDL_FALSE@
-HAVE_SDL_TRUE = @HAVE_SDL_TRUE@
-HAVE_SSE2_FALSE = @HAVE_SSE2_FALSE@
-HAVE_SSE2_TRUE = @HAVE_SSE2_TRUE@
-HAVE_SSE_FALSE = @HAVE_SSE_FALSE@
-HAVE_SSE_TRUE = @HAVE_SSE_TRUE@
-HAVE_V4L_FALSE = @HAVE_V4L_FALSE@
-HAVE_V4L_TRUE = @HAVE_V4L_TRUE@
-HAVE_X86CPU_FALSE = @HAVE_X86CPU_FALSE@
-HAVE_X86CPU_TRUE = @HAVE_X86CPU_TRUE@
-HAVE_XML2_FALSE = @HAVE_XML2_FALSE@
-HAVE_XML2_TRUE = @HAVE_XML2_TRUE@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
-LIBDV_CFLAGS = @LIBDV_CFLAGS@
-LIBDV_LIBS = @LIBDV_LIBS@
-LIBGETOPT_LIB = @LIBGETOPT_LIB@
-LIBM_LIBS = @LIBM_LIBS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-LT_AGE = @LT_AGE@
-LT_CURRENT = @LT_CURRENT@
-LT_RELEASE = @LT_RELEASE@
-LT_REVISION = @LT_REVISION@
-MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-MAKEINFO = @MAKEINFO@
-MJPEGTOOLS_CFLAGS = @MJPEGTOOLS_CFLAGS@
-MJPEGTOOLS_LIBS = @MJPEGTOOLS_LIBS@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PROGRAM_NOPIC = @PROGRAM_NOPIC@
-PTHREAD_LIBS = @PTHREAD_LIBS@
-RANLIB = @RANLIB@
-SDL_CFLAGS = @SDL_CFLAGS@
-SDL_CONFIG = @SDL_CONFIG@
-SDL_LIBS = @SDL_LIBS@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-SUPPORT_READ_DV2_FALSE = @SUPPORT_READ_DV2_FALSE@
-SUPPORT_READ_DV2_TRUE = @SUPPORT_READ_DV2_TRUE@
-V4LCONF_LIBS = @V4LCONF_LIBS@
-VERSION = @VERSION@
-XML2_CONFIG = @XML2_CONFIG@
-XML_CPPFLAGS = @XML_CPPFLAGS@
-XML_LIBS = @XML_LIBS@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-datadir = @datadir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target = @target@
-target_alias = @target_alias@
-target_cpu = @target_cpu@
-target_os = @target_os@
-target_vendor = @target_vendor@
-MAINTAINERCLEANFILES = Makefile.in
-INCLUDES = $(GLIB_CFLAGS) -I$(top_srcdir)/libvevo -I$(includedir) -I$(top_srcdir)/libhash
-VEVO_LIB_FILE = libvevo.la
-noinst_LTLIBRARIES = $(VEVO_LIB_FILE)
-libvevo_la_SOURCES = pool.c vevo.c
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  libvevo/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  libvevo/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-clean-noinstLTLIBRARIES:
-	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
-	@list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
-libvevo.la: $(libvevo_la_OBJECTS) $(libvevo_la_DEPENDENCIES) 
-	$(LINK)  $(libvevo_la_LDFLAGS) $(libvevo_la_OBJECTS) $(libvevo_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pool.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vevo.Plo@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
-	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LTLIBRARIES)
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-clean: clean-am
-
-clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
-	mostlyclean-am
-
-distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-exec-am:
-
-install-info: install-info-am
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-info-am
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-noinstLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am install-man \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	pdf pdf-am ps ps-am tags uninstall uninstall-am \
-	uninstall-info-am
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

veejay-ng/libvevo/vevo.c

@@ -2280,6 +2280,7 @@ int	vevo_property_from_string( vevo_port_t *port, const char *s, const char *key
 
 		if( p == NULL )
 		{
+			free(format);
 			return 0;
 		}
 		if( arg[0] != ':' ) 
@@ -2340,6 +2341,7 @@ int	vevo_property_from_string( vevo_port_t *port, const char *s, const char *key
 
 	if( error == VEVO_NO_ERROR )
 		done = 1;
+	free(format);
 	return done;
 }
 

veejay-ng/libvjaudio/Makefile.am

@@ -0,0 +1,6 @@
+# Makefile for  logging/messages 
+INCLUDES = 	-I$(top_srcdir) -I$(includedir) @SAMPLERATE_CFLAGS@ 
+VJAUDIO_LIB_FILE = libvjaudio.la
+noinst_LTLIBRARIES = $(VJAUDIO_LIB_FILE)
+libvjaudio_la_SOURCES =	audio.c 
+

veejay-ng/libvjaudio/audio.c

@@ -0,0 +1,250 @@
+/* veejay - Linux VeeJay
+ *           (C) 2002-2006 Niels Elburg <nelburg@looze.net> 
+ *
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+#include <config.h>
+#ifdef HAVE_JACK
+#include <stdint.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <math.h>
+#include <libvjmem/vjmem.h>
+#include <libvjmsg/vj-common.h>
+#include <veejay/defs.h>
+#include <samplerate.h>
+#include <libvjaudio/audio.h>
+#ifdef STRICT_CHECKING
+#include <assert.h>
+#endif
+typedef struct
+{
+	float *in;
+	float *out;
+	float *tmp;
+	SRC_STATE *state;
+	SRC_DATA data;
+	double last_ratio;
+	int    resampler;
+	int  size;
+	int  pos;
+	int  channels;
+} audio_resample_t;
+
+//@ Lavplay liblavplay.c MJPEGTOOLS project
+void	vj_audio_sample_reverse( uint8_t *in, uint8_t *out, int n_samples, int bytes_per_sample )
+{
+	uint8_t sample[bytes_per_sample];
+	unsigned int i;
+	unsigned int n = (n_samples * bytes_per_sample);
+
+	for( i = 0; i < n/2; i += bytes_per_sample )
+	{
+		memcpy(sample,in+i,bytes_per_sample);
+		memcpy(out+i, in+(n-i-bytes_per_sample), bytes_per_sample);
+		memcpy(out+(n-i-bytes_per_sample), sample, bytes_per_sample);
+	}
+	
+}
+void	vj_audio_free( void *dar )
+{
+	audio_resample_t *ar = (audio_resample_t*) dar;
+#ifdef STRICT_CHECKING
+	assert( ar != NULL );
+	if( ar->resampler)
+	{
+		assert( ar->in != NULL );
+		assert( ar->out != NULL );
+	}
+	assert( ar->state != NULL );
+#endif
+	if( ar->resampler )
+	{
+		free(ar->in);
+		free(ar->out);
+		src_delete( ar->state );
+
+	}
+	else
+	{	
+		free(ar->tmp);
+	}
+	free(ar);
+	ar = NULL;
+}
+
+static inline float	audio_new_sample_( float freq, float amp, int n, long rate )
+{
+	float sample = amp * sin( 2.0 * M_PI * freq * n / rate);
+	return sample;
+}
+static inline void uint8_t_to_float( float *dst, uint8_t *src, int n_samples, int bytes_per_sample )
+{
+	uint8_t *in = src;
+	int i;
+	for( i = 0; i < n_samples; i ++ )
+	{
+		int32_t sample_mem = 0;
+		uint8_t *sample = (uint8_t*) &sample_mem;
+		memcpy( sample, in, bytes_per_sample );
+		in += bytes_per_sample;
+		*dst++ = sample_mem / (8.0 * 0x10000000);
+	}
+}
+
+static inline void float_to_uint8_t( float *src, uint8_t *dst , int n_samples, int bytes_per_sample)
+{
+	int i;
+	for( i = 0; i < n_samples; i ++ )
+	{
+		float sample_value = src[i] * (8.0 * 0x10000000);
+		
+		int32_t sample;
+		if( sample_value >= ( 1.0 * 0x7FFFFFFF)) {
+			sample = 0x7FFFFFFF;
+		} else if ( sample_value <= (-8.0 * 0x10000000)) {
+			sample = -0x80000000;
+		} else {
+			sample = lrintf( sample_value );
+		}
+
+		sample >>= 8 * ((sizeof(int32_t)) - bytes_per_sample);
+		
+		uint8_t *sample_ptr = (uint8_t*) &sample;
+		memcpy( dst, sample_ptr, bytes_per_sample );
+		dst += bytes_per_sample;
+	}
+}
+
+int	vj_audio_gen_tone( void *dar, double seconds, long rate, float freq, float amp )
+{
+	audio_resample_t *ar = (audio_resample_t*) dar;
+
+	int n;
+	float *buf = ar->tmp;
+	int k=0;
+	int c =0;
+	int samples = (rate * seconds)/ar->channels;
+	for( n = 0; n < samples; n ++ )
+	{
+		for( c = 0; c < ar->channels; c ++ )
+		{
+			buf[k++] = audio_new_sample_( freq, amp, n, rate );
+		}
+	}
+	ar->size = rate * seconds;
+	return k;
+}
+
+int	vj_audio_noise_pack( void *dar, void *audio_frame, int n_samples, int bytes_per_sample, int n_packets )
+{
+	AFrame *af = (AFrame*) audio_frame;
+	audio_resample_t *ar = (audio_resample_t*) dar;
+	
+	float_to_uint8_t( ar->tmp, af->data , n_samples, bytes_per_sample);
+	af->samples = n_samples * n_packets;
+	af->bps     = bytes_per_sample;
+//	ar->pos     += n_samples;
+	af->num_chans = ar->channels;
+//	if(ar->pos > ar->size)
+//		ar->pos = 0;
+	return af->samples;
+}	
+
+void	*vj_audio_init( int max_buffer_size, int channels, int resampler )
+{
+	audio_resample_t *ar = (audio_resample_t*) vj_malloc(sizeof(audio_resample_t));
+	int error = 0;
+
+	memset(ar,0,sizeof(audio_resample_t));
+
+	if(!resampler)
+	{
+		ar->tmp = (float*) vj_malloc(sizeof( float ) * max_buffer_size );
+		memset( ar->tmp,0,sizeof(float) * max_buffer_size );
+	}
+	else
+	{
+		ar->state = src_new( SRC_SINC_FASTEST, channels,&error );
+		ar->in = (float*) vj_malloc( sizeof( float ) * max_buffer_size );
+		ar->out = (float*) vj_malloc(sizeof( float ) * max_buffer_size );
+		memset( ar->in,0, sizeof(float) * max_buffer_size );
+		memset( ar->out,0,sizeof(float) * max_buffer_size );
+	}
+
+	if(error)
+	{
+		veejay_msg(0, "Error while initializing resampler");
+		vj_audio_free( (void*) ar);
+		return NULL;
+	}
+	ar->resampler = resampler;
+	ar->size = max_buffer_size;
+	ar->pos  = 0;
+	ar->channels = channels;
+	return (void*) ar;
+}
+
+int	vj_audio_resample_data( void *dar,
+	       			uint8_t *input,
+				uint8_t *output,
+				int bps,
+				int channels,
+				int factor,
+				int slow,
+				int in_samples,
+				int out_samples)
+{
+	audio_resample_t *ar = (audio_resample_t*) dar;
+#ifdef STRICT_CHECKING
+	assert( ar->resampler == 1 );
+#endif
+	SRC_DATA *d = &(ar->data);
+
+	uint8_t_to_float( ar->in, input, in_samples, bps );
+
+	d->data_in = ar->in;
+	d->data_out = ar->out;
+	d->input_frames = in_samples / channels;
+	if(slow)
+	{	
+		d->output_frames = d->input_frames * (slow+1);
+		d->src_ratio = d->output_frames / (double) d->input_frames;
+	}
+	else
+	{
+		d->output_frames = d->input_frames / factor;	
+		d->src_ratio = d->output_frames / (double) d->input_frames;
+	}
+	d->end_of_input = 0;
+
+	if( ar->last_ratio != d->src_ratio )
+	{
+		src_set_ratio( ar->state, d->src_ratio );
+		ar->last_ratio = d->src_ratio;
+	}
+
+	if( src_process( ar->state,d ) != 0 )
+		return 0;
+
+	int gen_out_samples = d->output_frames_gen * channels;
+	
+	float_to_uint8_t( ar->out, output, gen_out_samples, bps );
+
+	return gen_out_samples;
+}
+#endif

veejay-ng/libvjaudio/audio.h

@@ -1,5 +1,5 @@
 /* veejay - Linux VeeJay
- * 	     (C) 2002-2005 Niels Elburg <nelburg@looze.net> 
+ * 	     (C) 2002-2004 Niels Elburg <nelburg@looze.net> 
  *
  *
  * This program is free software; you can redistribute it and/or modify
@@ -16,27 +16,26 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+#ifndef AUDIOUTILS_H
+#define AUDIOUTILS_H
 
+extern void	vj_audio_sample_reverse( uint8_t *in, uint8_t *out, int n_samples, int bytes_per_sample );
 
+extern void	*vj_audio_init( int max_buffer_size, int channels, int resampler );
+extern void	vj_audio_free( void *dar );
 
-void *vj_vloopback_open(const char *device_name, int norm, int mode,
+extern int	vj_audio_gen_tone( void *dar, double seconds, long rate, float freq, float amp );
-	int w, int h, int pixel_format);
-// if using write mode
-int	vj_vloopback_start_pipe( void *vloop );
-int	vj_vloopback_write_pipe( void *vloop );
 
-// resfresh buffer every cycle
+extern int	vj_audio_noise_pack( void *dar, void *af, int n_samples, int bytes_per_sample, int n_packets );
-int	vj_vloopback_fill_buffer( void *vloop, uint8_t **image );
 
-// if using mmap mode
+extern int	vj_audio_resample_data( void *dar,
-//int	vj_vloopback_start_mmap( void *vloop );
+	       			uint8_t *input,
-
+				uint8_t *output,
-//int	vj_vloopback_ioctl( void *vloop, unsigned long int cmd, void *arg );
+				int bps,
-void	vj_vlooopback_close( void *vloop );
+				int channels,
-
+				int factor,
-int	vj_vloopback_get_mode( void *vloop );
+				int slow,
-void     vj_vloopback_close( void *vloop );
+				int in_samples,
-
+				int out_samples);
-
-//void	vj_vloopback_signal_handler( void *vloop, int sig_no );
 
+#endif

veejay-ng/libvjmem/Makefile.in

@@ -1,504 +0,0 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-SOURCES = $(libvjmem_la_SOURCES)
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-target_triplet = @target@
-subdir = libvjmem
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-LTLIBRARIES = $(noinst_LTLIBRARIES)
-libvjmem_la_LIBADD =
-am_libvjmem_la_OBJECTS = memcpy.lo vj-x86.lo
-libvjmem_la_OBJECTS = $(am_libvjmem_la_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = $(libvjmem_la_SOURCES)
-DIST_SOURCES = $(libvjmem_la_SOURCES)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALTIVEC_CFLAGS = @ALTIVEC_CFLAGS@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
-AMTAR = @AMTAR@
-AR = @AR@
-AS = @AS@
-ASFLAGS = @ASFLAGS@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCAS = @CCAS@
-CCASFLAGS = @CCASFLAGS@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-ECHO = @ECHO@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
-FFMPEG_AVCODEC_CFLAGS = @FFMPEG_AVCODEC_CFLAGS@
-FFMPEG_AVCODEC_LIBS = @FFMPEG_AVCODEC_LIBS@
-FFMPEG_AVFORMAT_CFLAGS = @FFMPEG_AVFORMAT_CFLAGS@
-FFMPEG_AVFORMAT_LIBS = @FFMPEG_AVFORMAT_LIBS@
-GLIB_CFLAGS = @GLIB_CFLAGS@
-GLIB_CONFIG = @GLIB_CONFIG@
-GLIB_LIBS = @GLIB_LIBS@
-GL_CFLAGS = @GL_CFLAGS@
-GL_LIBS = @GL_LIBS@
-HAVE_ALTIVEC_FALSE = @HAVE_ALTIVEC_FALSE@
-HAVE_ALTIVEC_TRUE = @HAVE_ALTIVEC_TRUE@
-HAVE_ASM_MMX2_FALSE = @HAVE_ASM_MMX2_FALSE@
-HAVE_ASM_MMX2_TRUE = @HAVE_ASM_MMX2_TRUE@
-HAVE_ASM_MMX_FALSE = @HAVE_ASM_MMX_FALSE@
-HAVE_ASM_MMX_TRUE = @HAVE_ASM_MMX_TRUE@
-HAVE_ASM_NASM_FALSE = @HAVE_ASM_NASM_FALSE@
-HAVE_ASM_NASM_TRUE = @HAVE_ASM_NASM_TRUE@
-HAVE_ASM_SSE2_FALSE = @HAVE_ASM_SSE2_FALSE@
-HAVE_ASM_SSE2_TRUE = @HAVE_ASM_SSE2_TRUE@
-HAVE_ASM_SSE_FALSE = @HAVE_ASM_SSE_FALSE@
-HAVE_ASM_SSE_TRUE = @HAVE_ASM_SSE_TRUE@
-HAVE_DL_DLOPEN_FALSE = @HAVE_DL_DLOPEN_FALSE@
-HAVE_DL_DLOPEN_TRUE = @HAVE_DL_DLOPEN_TRUE@
-HAVE_JACK_FALSE = @HAVE_JACK_FALSE@
-HAVE_JACK_TRUE = @HAVE_JACK_TRUE@
-HAVE_MMX2_FALSE = @HAVE_MMX2_FALSE@
-HAVE_MMX2_TRUE = @HAVE_MMX2_TRUE@
-HAVE_MMX_FALSE = @HAVE_MMX_FALSE@
-HAVE_MMX_TRUE = @HAVE_MMX_TRUE@
-HAVE_PPCCPU_FALSE = @HAVE_PPCCPU_FALSE@
-HAVE_PPCCPU_TRUE = @HAVE_PPCCPU_TRUE@
-HAVE_SDL_FALSE = @HAVE_SDL_FALSE@
-HAVE_SDL_TRUE = @HAVE_SDL_TRUE@
-HAVE_SSE2_FALSE = @HAVE_SSE2_FALSE@
-HAVE_SSE2_TRUE = @HAVE_SSE2_TRUE@
-HAVE_SSE_FALSE = @HAVE_SSE_FALSE@
-HAVE_SSE_TRUE = @HAVE_SSE_TRUE@
-HAVE_V4L_FALSE = @HAVE_V4L_FALSE@
-HAVE_V4L_TRUE = @HAVE_V4L_TRUE@
-HAVE_X86CPU_FALSE = @HAVE_X86CPU_FALSE@
-HAVE_X86CPU_TRUE = @HAVE_X86CPU_TRUE@
-HAVE_XML2_FALSE = @HAVE_XML2_FALSE@
-HAVE_XML2_TRUE = @HAVE_XML2_TRUE@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
-LIBDV_CFLAGS = @LIBDV_CFLAGS@
-LIBDV_LIBS = @LIBDV_LIBS@
-LIBGETOPT_LIB = @LIBGETOPT_LIB@
-LIBM_LIBS = @LIBM_LIBS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-LT_AGE = @LT_AGE@
-LT_CURRENT = @LT_CURRENT@
-LT_RELEASE = @LT_RELEASE@
-LT_REVISION = @LT_REVISION@
-MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-MAKEINFO = @MAKEINFO@
-MJPEGTOOLS_CFLAGS = @MJPEGTOOLS_CFLAGS@
-MJPEGTOOLS_LIBS = @MJPEGTOOLS_LIBS@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PROGRAM_NOPIC = @PROGRAM_NOPIC@
-PTHREAD_LIBS = @PTHREAD_LIBS@
-RANLIB = @RANLIB@
-SDL_CFLAGS = @SDL_CFLAGS@
-SDL_CONFIG = @SDL_CONFIG@
-SDL_LIBS = @SDL_LIBS@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-SUPPORT_READ_DV2_FALSE = @SUPPORT_READ_DV2_FALSE@
-SUPPORT_READ_DV2_TRUE = @SUPPORT_READ_DV2_TRUE@
-V4LCONF_LIBS = @V4LCONF_LIBS@
-VERSION = @VERSION@
-XML2_CONFIG = @XML2_CONFIG@
-XML_CPPFLAGS = @XML_CPPFLAGS@
-XML_LIBS = @XML_LIBS@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-datadir = @datadir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target = @target@
-target_alias = @target_alias@
-target_cpu = @target_cpu@
-target_os = @target_os@
-target_vendor = @target_vendor@
-
-# Makefile for memory managment / platform specific optimizations
-INCLUDES = -I$(top_srcdir) -I$(includedir)  -I$(top_builddir)/libvjmsg
-VJMEM_LIB_FILE = libvjmem.la
-noinst_LTLIBRARIES = $(VJMEM_LIB_FILE)
-libvjmem_la_SOURCES = memcpy.c vj-x86.c 
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  libvjmem/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  libvjmem/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-clean-noinstLTLIBRARIES:
-	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
-	@list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
-libvjmem.la: $(libvjmem_la_OBJECTS) $(libvjmem_la_DEPENDENCIES) 
-	$(LINK)  $(libvjmem_la_LDFLAGS) $(libvjmem_la_OBJECTS) $(libvjmem_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/memcpy.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vj-x86.Plo@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
-	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LTLIBRARIES)
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
-	mostlyclean-am
-
-distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-exec-am:
-
-install-info: install-info-am
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-info-am
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-noinstLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am install-man \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	pdf pdf-am ps ps-am tags uninstall uninstall-am \
-	uninstall-info-am
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

veejay-ng/libvjmsg/Makefile.in

@@ -1,503 +0,0 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-SOURCES = $(libvjmsg_la_SOURCES)
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-target_triplet = @target@
-subdir = libvjmsg
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-LTLIBRARIES = $(noinst_LTLIBRARIES)
-libvjmsg_la_LIBADD =
-am_libvjmsg_la_OBJECTS = vj-common.lo
-libvjmsg_la_OBJECTS = $(am_libvjmsg_la_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = $(libvjmsg_la_SOURCES)
-DIST_SOURCES = $(libvjmsg_la_SOURCES)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALTIVEC_CFLAGS = @ALTIVEC_CFLAGS@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
-AMTAR = @AMTAR@
-AR = @AR@
-AS = @AS@
-ASFLAGS = @ASFLAGS@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCAS = @CCAS@
-CCASFLAGS = @CCASFLAGS@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-ECHO = @ECHO@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
-FFMPEG_AVCODEC_CFLAGS = @FFMPEG_AVCODEC_CFLAGS@
-FFMPEG_AVCODEC_LIBS = @FFMPEG_AVCODEC_LIBS@
-FFMPEG_AVFORMAT_CFLAGS = @FFMPEG_AVFORMAT_CFLAGS@
-FFMPEG_AVFORMAT_LIBS = @FFMPEG_AVFORMAT_LIBS@
-GLIB_CFLAGS = @GLIB_CFLAGS@
-GLIB_CONFIG = @GLIB_CONFIG@
-GLIB_LIBS = @GLIB_LIBS@
-GL_CFLAGS = @GL_CFLAGS@
-GL_LIBS = @GL_LIBS@
-HAVE_ALTIVEC_FALSE = @HAVE_ALTIVEC_FALSE@
-HAVE_ALTIVEC_TRUE = @HAVE_ALTIVEC_TRUE@
-HAVE_ASM_MMX2_FALSE = @HAVE_ASM_MMX2_FALSE@
-HAVE_ASM_MMX2_TRUE = @HAVE_ASM_MMX2_TRUE@
-HAVE_ASM_MMX_FALSE = @HAVE_ASM_MMX_FALSE@
-HAVE_ASM_MMX_TRUE = @HAVE_ASM_MMX_TRUE@
-HAVE_ASM_NASM_FALSE = @HAVE_ASM_NASM_FALSE@
-HAVE_ASM_NASM_TRUE = @HAVE_ASM_NASM_TRUE@
-HAVE_ASM_SSE2_FALSE = @HAVE_ASM_SSE2_FALSE@
-HAVE_ASM_SSE2_TRUE = @HAVE_ASM_SSE2_TRUE@
-HAVE_ASM_SSE_FALSE = @HAVE_ASM_SSE_FALSE@
-HAVE_ASM_SSE_TRUE = @HAVE_ASM_SSE_TRUE@
-HAVE_DL_DLOPEN_FALSE = @HAVE_DL_DLOPEN_FALSE@
-HAVE_DL_DLOPEN_TRUE = @HAVE_DL_DLOPEN_TRUE@
-HAVE_JACK_FALSE = @HAVE_JACK_FALSE@
-HAVE_JACK_TRUE = @HAVE_JACK_TRUE@
-HAVE_MMX2_FALSE = @HAVE_MMX2_FALSE@
-HAVE_MMX2_TRUE = @HAVE_MMX2_TRUE@
-HAVE_MMX_FALSE = @HAVE_MMX_FALSE@
-HAVE_MMX_TRUE = @HAVE_MMX_TRUE@
-HAVE_PPCCPU_FALSE = @HAVE_PPCCPU_FALSE@
-HAVE_PPCCPU_TRUE = @HAVE_PPCCPU_TRUE@
-HAVE_SDL_FALSE = @HAVE_SDL_FALSE@
-HAVE_SDL_TRUE = @HAVE_SDL_TRUE@
-HAVE_SSE2_FALSE = @HAVE_SSE2_FALSE@
-HAVE_SSE2_TRUE = @HAVE_SSE2_TRUE@
-HAVE_SSE_FALSE = @HAVE_SSE_FALSE@
-HAVE_SSE_TRUE = @HAVE_SSE_TRUE@
-HAVE_V4L_FALSE = @HAVE_V4L_FALSE@
-HAVE_V4L_TRUE = @HAVE_V4L_TRUE@
-HAVE_X86CPU_FALSE = @HAVE_X86CPU_FALSE@
-HAVE_X86CPU_TRUE = @HAVE_X86CPU_TRUE@
-HAVE_XML2_FALSE = @HAVE_XML2_FALSE@
-HAVE_XML2_TRUE = @HAVE_XML2_TRUE@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
-LIBDV_CFLAGS = @LIBDV_CFLAGS@
-LIBDV_LIBS = @LIBDV_LIBS@
-LIBGETOPT_LIB = @LIBGETOPT_LIB@
-LIBM_LIBS = @LIBM_LIBS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-LT_AGE = @LT_AGE@
-LT_CURRENT = @LT_CURRENT@
-LT_RELEASE = @LT_RELEASE@
-LT_REVISION = @LT_REVISION@
-MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-MAKEINFO = @MAKEINFO@
-MJPEGTOOLS_CFLAGS = @MJPEGTOOLS_CFLAGS@
-MJPEGTOOLS_LIBS = @MJPEGTOOLS_LIBS@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PROGRAM_NOPIC = @PROGRAM_NOPIC@
-PTHREAD_LIBS = @PTHREAD_LIBS@
-RANLIB = @RANLIB@
-SDL_CFLAGS = @SDL_CFLAGS@
-SDL_CONFIG = @SDL_CONFIG@
-SDL_LIBS = @SDL_LIBS@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-SUPPORT_READ_DV2_FALSE = @SUPPORT_READ_DV2_FALSE@
-SUPPORT_READ_DV2_TRUE = @SUPPORT_READ_DV2_TRUE@
-V4LCONF_LIBS = @V4LCONF_LIBS@
-VERSION = @VERSION@
-XML2_CONFIG = @XML2_CONFIG@
-XML_CPPFLAGS = @XML_CPPFLAGS@
-XML_LIBS = @XML_LIBS@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-datadir = @datadir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target = @target@
-target_alias = @target_alias@
-target_cpu = @target_cpu@
-target_os = @target_os@
-target_vendor = @target_vendor@
-
-# Makefile for  logging/messages 
-INCLUDES = -I$(top_srcdir) -I$(includedir) 
-VJMSG_LIB_FILE = libvjmsg.la
-noinst_LTLIBRARIES = $(VJMSG_LIB_FILE)
-libvjmsg_la_SOURCES = vj-common.c 
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  libvjmsg/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  libvjmsg/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-clean-noinstLTLIBRARIES:
-	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
-	@list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
-libvjmsg.la: $(libvjmsg_la_OBJECTS) $(libvjmsg_la_DEPENDENCIES) 
-	$(LINK)  $(libvjmsg_la_LDFLAGS) $(libvjmsg_la_OBJECTS) $(libvjmsg_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vj-common.Plo@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
-	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LTLIBRARIES)
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
-	mostlyclean-am
-
-distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-exec-am:
-
-install-info: install-info-am
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-info-am
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-noinstLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am install-man \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	pdf pdf-am ps ps-am tags uninstall uninstall-am \
-	uninstall-info-am
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

veejay-ng/libvjmsg/vj-common.c

@@ -43,16 +43,6 @@ static int _color_level = 0;
 static int _no_msg = 0;
 
 #define MAX_LINES 100 
-typedef struct
-{
-	char *msg[MAX_LINES];
-	int	r_index;
-	int	w_index;
-} vj_msg_hist;
-
-static	vj_msg_hist	_message_history;
-static	int		_message_his_status = 0;
-
 void veejay_set_debug_level(int level)
 {
 	if(level)
@@ -108,12 +98,6 @@ void veejay_msg(int type, const char format[], ...)
     bzero(buf,256);
     vsnprintf(buf, sizeof(buf) - 1, format, args);
  
-    if(!_message_his_status)
-    {
-	memset( &_message_history , 0 , sizeof(vj_msg_hist));
-	_message_his_status = 1;
-    }
-
     if(_color_level)
     {
 	  switch (type) {
@@ -138,14 +122,6 @@ void veejay_msg(int type, const char format[], ...)
 	     else
 	     fprintf(out,"%s%s%s", TXT_GRE, buf, TXT_END );
  
-	if( _message_history.w_index < MAX_LINES )
-	{
-		if(type == 3)
-			sprintf(sline, "%s", buf );
-		else
-			sprintf( sline, "%s\n", buf );	
-		_message_history.msg[_message_history.w_index ++ ] = strdup(sline);
-	}
      }
      else
      {
@@ -171,69 +147,10 @@ void veejay_msg(int type, const char format[], ...)
 	     else
 	     fprintf(out,"%s", buf );
 
-	  if( _message_history.w_index < MAX_LINES )
-	  {
-		if(type == 3 )
-			sprintf(sline, "%s", buf );
-		else
-			sprintf(sline, "%s\n", buf );
-		_message_history.msg[_message_history.w_index ++ ] = strdup(sline);
-	  }
      }
      va_end(args);
 }
 
-char *veejay_pop_messages(int *num_lines, int *total_len)
-{
-	char *res = NULL;
-	if( _message_his_status == 0 )
-		return res;
-	if( _message_history.w_index == 0 )
-		return res;
-	int i;
-	int len = 0;
-	for( i = 0; i < _message_history.w_index ; i ++ )
-		len += strlen( _message_history.msg[i] );
-	if(len <= 0)
-		return res;
-
-	res = (char*) malloc(sizeof(char) * (len+1) );
-	if(!res)
-		return NULL;
-	bzero(res, len );
-	*num_lines = i;
-
-	for( i = 0; i < _message_history.w_index ; i ++ )
-	{
-		if( strlen(_message_history.msg[i]) > 0 )
-		strcat( res, _message_history.msg[i] );
-	}
-	*total_len = len;
-	_message_history.r_index ++;
-	return res;
-}
-
-int	veejay_keep_messages(void)
-{
-	if( _message_history.r_index )
-		return 0;
-	return 1;
-}
-
-void	veejay_reap_messages(void)
-{
-	int i;
-	for( i = 0; i < _message_history.w_index ; i ++ )
-	{
-		if( _message_history.msg[i] ) 
-			free(_message_history.msg[i] );
-	}
-
-	_message_his_status = 0;
-	_message_history.w_index = 0;
-
-}
-
 int	veejay_get_file_ext( char *file, char *dst, int dlen)
 {
 	int len = strlen(file)-1;

veejay-ng/libvjmsg/vj-common.h

@@ -37,9 +37,6 @@ extern void veejay_set_debug_level(int level);
 extern void veejay_set_colors(int level);
 extern void veejay_silent();
 extern int  veejay_is_silent();
-extern int	veejay_keep_messages(void);
-extern void	veejay_reap_messages(void);
-extern char *veejay_pop_messages(int *num_lines, int *total_len);
 extern void	get_cache_line_size(void);
 extern int	veejay_get_file_ext( char *file, char *dst, int dlen);
 extern void	veejay_chomp_str( char *str, int *dlen );

veejay-ng/libvjnet/Makefile.in

@@ -1,511 +0,0 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-# Makefile for veejay
-
-SOURCES = $(libvjnet_la_SOURCES)
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-target_triplet = @target@
-subdir = libvjnet
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-LTLIBRARIES = $(noinst_LTLIBRARIES)
-libvjnet_la_LIBADD =
-am_libvjnet_la_OBJECTS = packet.lo mcastsender.lo mcastreceiver.lo \
-	cmd.lo vj-server.lo vj-client.lo
-libvjnet_la_OBJECTS = $(am_libvjnet_la_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = $(libvjnet_la_SOURCES)
-DIST_SOURCES = $(libvjnet_la_SOURCES)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALTIVEC_CFLAGS = @ALTIVEC_CFLAGS@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
-AMTAR = @AMTAR@
-AR = @AR@
-AS = @AS@
-ASFLAGS = @ASFLAGS@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCAS = @CCAS@
-CCASFLAGS = @CCASFLAGS@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-ECHO = @ECHO@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
-FFMPEG_AVCODEC_CFLAGS = @FFMPEG_AVCODEC_CFLAGS@
-FFMPEG_AVCODEC_LIBS = @FFMPEG_AVCODEC_LIBS@
-FFMPEG_AVFORMAT_CFLAGS = @FFMPEG_AVFORMAT_CFLAGS@
-FFMPEG_AVFORMAT_LIBS = @FFMPEG_AVFORMAT_LIBS@
-GLIB_CFLAGS = @GLIB_CFLAGS@
-GLIB_CONFIG = @GLIB_CONFIG@
-GLIB_LIBS = @GLIB_LIBS@
-GL_CFLAGS = @GL_CFLAGS@
-GL_LIBS = @GL_LIBS@
-HAVE_ALTIVEC_FALSE = @HAVE_ALTIVEC_FALSE@
-HAVE_ALTIVEC_TRUE = @HAVE_ALTIVEC_TRUE@
-HAVE_ASM_MMX2_FALSE = @HAVE_ASM_MMX2_FALSE@
-HAVE_ASM_MMX2_TRUE = @HAVE_ASM_MMX2_TRUE@
-HAVE_ASM_MMX_FALSE = @HAVE_ASM_MMX_FALSE@
-HAVE_ASM_MMX_TRUE = @HAVE_ASM_MMX_TRUE@
-HAVE_ASM_NASM_FALSE = @HAVE_ASM_NASM_FALSE@
-HAVE_ASM_NASM_TRUE = @HAVE_ASM_NASM_TRUE@
-HAVE_ASM_SSE2_FALSE = @HAVE_ASM_SSE2_FALSE@
-HAVE_ASM_SSE2_TRUE = @HAVE_ASM_SSE2_TRUE@
-HAVE_ASM_SSE_FALSE = @HAVE_ASM_SSE_FALSE@
-HAVE_ASM_SSE_TRUE = @HAVE_ASM_SSE_TRUE@
-HAVE_DL_DLOPEN_FALSE = @HAVE_DL_DLOPEN_FALSE@
-HAVE_DL_DLOPEN_TRUE = @HAVE_DL_DLOPEN_TRUE@
-HAVE_JACK_FALSE = @HAVE_JACK_FALSE@
-HAVE_JACK_TRUE = @HAVE_JACK_TRUE@
-HAVE_MMX2_FALSE = @HAVE_MMX2_FALSE@
-HAVE_MMX2_TRUE = @HAVE_MMX2_TRUE@
-HAVE_MMX_FALSE = @HAVE_MMX_FALSE@
-HAVE_MMX_TRUE = @HAVE_MMX_TRUE@
-HAVE_PPCCPU_FALSE = @HAVE_PPCCPU_FALSE@
-HAVE_PPCCPU_TRUE = @HAVE_PPCCPU_TRUE@
-HAVE_SDL_FALSE = @HAVE_SDL_FALSE@
-HAVE_SDL_TRUE = @HAVE_SDL_TRUE@
-HAVE_SSE2_FALSE = @HAVE_SSE2_FALSE@
-HAVE_SSE2_TRUE = @HAVE_SSE2_TRUE@
-HAVE_SSE_FALSE = @HAVE_SSE_FALSE@
-HAVE_SSE_TRUE = @HAVE_SSE_TRUE@
-HAVE_V4L_FALSE = @HAVE_V4L_FALSE@
-HAVE_V4L_TRUE = @HAVE_V4L_TRUE@
-HAVE_X86CPU_FALSE = @HAVE_X86CPU_FALSE@
-HAVE_X86CPU_TRUE = @HAVE_X86CPU_TRUE@
-HAVE_XML2_FALSE = @HAVE_XML2_FALSE@
-HAVE_XML2_TRUE = @HAVE_XML2_TRUE@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
-LIBDV_CFLAGS = @LIBDV_CFLAGS@
-LIBDV_LIBS = @LIBDV_LIBS@
-LIBGETOPT_LIB = @LIBGETOPT_LIB@
-LIBM_LIBS = @LIBM_LIBS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-LT_AGE = @LT_AGE@
-LT_CURRENT = @LT_CURRENT@
-LT_RELEASE = @LT_RELEASE@
-LT_REVISION = @LT_REVISION@
-MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-MAKEINFO = @MAKEINFO@
-MJPEGTOOLS_CFLAGS = @MJPEGTOOLS_CFLAGS@
-MJPEGTOOLS_LIBS = @MJPEGTOOLS_LIBS@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PROGRAM_NOPIC = @PROGRAM_NOPIC@
-PTHREAD_LIBS = @PTHREAD_LIBS@
-RANLIB = @RANLIB@
-SDL_CFLAGS = @SDL_CFLAGS@
-SDL_CONFIG = @SDL_CONFIG@
-SDL_LIBS = @SDL_LIBS@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-SUPPORT_READ_DV2_FALSE = @SUPPORT_READ_DV2_FALSE@
-SUPPORT_READ_DV2_TRUE = @SUPPORT_READ_DV2_TRUE@
-V4LCONF_LIBS = @V4LCONF_LIBS@
-VERSION = @VERSION@
-XML2_CONFIG = @XML2_CONFIG@
-XML_CPPFLAGS = @XML_CPPFLAGS@
-XML_LIBS = @XML_LIBS@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-datadir = @datadir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target = @target@
-target_alias = @target_alias@
-target_cpu = @target_cpu@
-target_os = @target_os@
-target_vendor = @target_vendor@
-MAINTAINERCLEANFILES = Makefile.in
-INCLUDES = -I$(top_srcdir) -I$(includedir) -I$(top_srcdir)/vjmem -I$(top_srcdir)/vjmsg 
-VJNET_LIB_FILE = libvjnet.la
-noinst_LTLIBRARIES = $(VJNET_LIB_FILE)
-libvjnet_la_SOURCES = packet.c mcastsender.c mcastreceiver.c cmd.c vj-server.c vj-client.c
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  libvjnet/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  libvjnet/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-clean-noinstLTLIBRARIES:
-	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
-	@list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
-libvjnet.la: $(libvjnet_la_OBJECTS) $(libvjnet_la_DEPENDENCIES) 
-	$(LINK)  $(libvjnet_la_LDFLAGS) $(libvjnet_la_OBJECTS) $(libvjnet_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cmd.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mcastreceiver.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mcastsender.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/packet.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vj-client.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vj-server.Plo@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
-	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LTLIBRARIES)
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-clean: clean-am
-
-clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
-	mostlyclean-am
-
-distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-exec-am:
-
-install-info: install-info-am
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-info-am
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-noinstLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am install-man \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	pdf pdf-am ps ps-am tags uninstall uninstall-am \
-	uninstall-info-am
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

veejay-ng/libyuv/Makefile.in

@@ -1,506 +0,0 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-# Makefile for veejay
-
-SOURCES = $(libyuv_la_SOURCES)
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-target_triplet = @target@
-subdir = libyuv
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-LTLIBRARIES = $(noinst_LTLIBRARIES)
-libyuv_la_LIBADD =
-am_libyuv_la_OBJECTS = subsample.lo yuvconv.lo
-libyuv_la_OBJECTS = $(am_libyuv_la_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = $(libyuv_la_SOURCES)
-DIST_SOURCES = $(libyuv_la_SOURCES)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALTIVEC_CFLAGS = @ALTIVEC_CFLAGS@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
-AMTAR = @AMTAR@
-AR = @AR@
-AS = @AS@
-ASFLAGS = @ASFLAGS@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCAS = @CCAS@
-CCASFLAGS = @CCASFLAGS@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-ECHO = @ECHO@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
-FFMPEG_AVCODEC_CFLAGS = @FFMPEG_AVCODEC_CFLAGS@
-FFMPEG_AVCODEC_LIBS = @FFMPEG_AVCODEC_LIBS@
-FFMPEG_AVFORMAT_CFLAGS = @FFMPEG_AVFORMAT_CFLAGS@
-FFMPEG_AVFORMAT_LIBS = @FFMPEG_AVFORMAT_LIBS@
-GLIB_CFLAGS = @GLIB_CFLAGS@
-GLIB_CONFIG = @GLIB_CONFIG@
-GLIB_LIBS = @GLIB_LIBS@
-GL_CFLAGS = @GL_CFLAGS@
-GL_LIBS = @GL_LIBS@
-HAVE_ALTIVEC_FALSE = @HAVE_ALTIVEC_FALSE@
-HAVE_ALTIVEC_TRUE = @HAVE_ALTIVEC_TRUE@
-HAVE_ASM_MMX2_FALSE = @HAVE_ASM_MMX2_FALSE@
-HAVE_ASM_MMX2_TRUE = @HAVE_ASM_MMX2_TRUE@
-HAVE_ASM_MMX_FALSE = @HAVE_ASM_MMX_FALSE@
-HAVE_ASM_MMX_TRUE = @HAVE_ASM_MMX_TRUE@
-HAVE_ASM_NASM_FALSE = @HAVE_ASM_NASM_FALSE@
-HAVE_ASM_NASM_TRUE = @HAVE_ASM_NASM_TRUE@
-HAVE_ASM_SSE2_FALSE = @HAVE_ASM_SSE2_FALSE@
-HAVE_ASM_SSE2_TRUE = @HAVE_ASM_SSE2_TRUE@
-HAVE_ASM_SSE_FALSE = @HAVE_ASM_SSE_FALSE@
-HAVE_ASM_SSE_TRUE = @HAVE_ASM_SSE_TRUE@
-HAVE_DL_DLOPEN_FALSE = @HAVE_DL_DLOPEN_FALSE@
-HAVE_DL_DLOPEN_TRUE = @HAVE_DL_DLOPEN_TRUE@
-HAVE_JACK_FALSE = @HAVE_JACK_FALSE@
-HAVE_JACK_TRUE = @HAVE_JACK_TRUE@
-HAVE_MMX2_FALSE = @HAVE_MMX2_FALSE@
-HAVE_MMX2_TRUE = @HAVE_MMX2_TRUE@
-HAVE_MMX_FALSE = @HAVE_MMX_FALSE@
-HAVE_MMX_TRUE = @HAVE_MMX_TRUE@
-HAVE_PPCCPU_FALSE = @HAVE_PPCCPU_FALSE@
-HAVE_PPCCPU_TRUE = @HAVE_PPCCPU_TRUE@
-HAVE_SDL_FALSE = @HAVE_SDL_FALSE@
-HAVE_SDL_TRUE = @HAVE_SDL_TRUE@
-HAVE_SSE2_FALSE = @HAVE_SSE2_FALSE@
-HAVE_SSE2_TRUE = @HAVE_SSE2_TRUE@
-HAVE_SSE_FALSE = @HAVE_SSE_FALSE@
-HAVE_SSE_TRUE = @HAVE_SSE_TRUE@
-HAVE_V4L_FALSE = @HAVE_V4L_FALSE@
-HAVE_V4L_TRUE = @HAVE_V4L_TRUE@
-HAVE_X86CPU_FALSE = @HAVE_X86CPU_FALSE@
-HAVE_X86CPU_TRUE = @HAVE_X86CPU_TRUE@
-HAVE_XML2_FALSE = @HAVE_XML2_FALSE@
-HAVE_XML2_TRUE = @HAVE_XML2_TRUE@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
-LIBDV_CFLAGS = @LIBDV_CFLAGS@
-LIBDV_LIBS = @LIBDV_LIBS@
-LIBGETOPT_LIB = @LIBGETOPT_LIB@
-LIBM_LIBS = @LIBM_LIBS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-LT_AGE = @LT_AGE@
-LT_CURRENT = @LT_CURRENT@
-LT_RELEASE = @LT_RELEASE@
-LT_REVISION = @LT_REVISION@
-MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-MAKEINFO = @MAKEINFO@
-MJPEGTOOLS_CFLAGS = @MJPEGTOOLS_CFLAGS@
-MJPEGTOOLS_LIBS = @MJPEGTOOLS_LIBS@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PROGRAM_NOPIC = @PROGRAM_NOPIC@
-PTHREAD_LIBS = @PTHREAD_LIBS@
-RANLIB = @RANLIB@
-SDL_CFLAGS = @SDL_CFLAGS@
-SDL_CONFIG = @SDL_CONFIG@
-SDL_LIBS = @SDL_LIBS@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-SUPPORT_READ_DV2_FALSE = @SUPPORT_READ_DV2_FALSE@
-SUPPORT_READ_DV2_TRUE = @SUPPORT_READ_DV2_TRUE@
-V4LCONF_LIBS = @V4LCONF_LIBS@
-VERSION = @VERSION@
-XML2_CONFIG = @XML2_CONFIG@
-XML_CPPFLAGS = @XML_CPPFLAGS@
-XML_LIBS = @XML_LIBS@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-datadir = @datadir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target = @target@
-target_alias = @target_alias@
-target_cpu = @target_cpu@
-target_os = @target_os@
-target_vendor = @target_vendor@
-MAINTAINERCLEANFILES = Makefile.in
-INCLUDES = -I$(top_srcdir) -I$(includedir) -I$(top_srcdir)/vjmem -I$(top_srcdir)/vjmsg -I$(top_srcdir)/libpostproc 
-YUV_LIB_FILE = libyuv.la
-noinst_LTLIBRARIES = $(YUV_LIB_FILE)
-libyuv_la_SOURCES = subsample.c yuvconv.c
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  libyuv/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  libyuv/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-clean-noinstLTLIBRARIES:
-	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
-	@list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
-libyuv.la: $(libyuv_la_OBJECTS) $(libyuv_la_DEPENDENCIES) 
-	$(LINK)  $(libyuv_la_LDFLAGS) $(libyuv_la_OBJECTS) $(libyuv_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/subsample.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/yuvconv.Plo@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
-	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LTLIBRARIES)
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-clean: clean-am
-
-clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
-	mostlyclean-am
-
-distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-exec-am:
-
-install-info: install-info-am
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-info-am
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-noinstLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am install-man \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	pdf pdf-am ps ps-am tags uninstall uninstall-am \
-	uninstall-info-am
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

veejay-ng/man/Makefile.in

@@ -1,446 +0,0 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-target_triplet = @target@
-subdir = man
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-SOURCES =
-DIST_SOURCES =
-man1dir = $(mandir)/man1
-am__installdirs = "$(DESTDIR)$(man1dir)"
-NROFF = nroff
-MANS = $(man_MANS)
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALTIVEC_CFLAGS = @ALTIVEC_CFLAGS@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
-AMTAR = @AMTAR@
-AR = @AR@
-AS = @AS@
-ASFLAGS = @ASFLAGS@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCAS = @CCAS@
-CCASFLAGS = @CCASFLAGS@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-ECHO = @ECHO@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
-FFMPEG_AVCODEC_CFLAGS = @FFMPEG_AVCODEC_CFLAGS@
-FFMPEG_AVCODEC_LIBS = @FFMPEG_AVCODEC_LIBS@
-FFMPEG_AVFORMAT_CFLAGS = @FFMPEG_AVFORMAT_CFLAGS@
-FFMPEG_AVFORMAT_LIBS = @FFMPEG_AVFORMAT_LIBS@
-GLIB_CFLAGS = @GLIB_CFLAGS@
-GLIB_CONFIG = @GLIB_CONFIG@
-GLIB_LIBS = @GLIB_LIBS@
-GL_CFLAGS = @GL_CFLAGS@
-GL_LIBS = @GL_LIBS@
-HAVE_ALTIVEC_FALSE = @HAVE_ALTIVEC_FALSE@
-HAVE_ALTIVEC_TRUE = @HAVE_ALTIVEC_TRUE@
-HAVE_ASM_MMX2_FALSE = @HAVE_ASM_MMX2_FALSE@
-HAVE_ASM_MMX2_TRUE = @HAVE_ASM_MMX2_TRUE@
-HAVE_ASM_MMX_FALSE = @HAVE_ASM_MMX_FALSE@
-HAVE_ASM_MMX_TRUE = @HAVE_ASM_MMX_TRUE@
-HAVE_ASM_NASM_FALSE = @HAVE_ASM_NASM_FALSE@
-HAVE_ASM_NASM_TRUE = @HAVE_ASM_NASM_TRUE@
-HAVE_ASM_SSE2_FALSE = @HAVE_ASM_SSE2_FALSE@
-HAVE_ASM_SSE2_TRUE = @HAVE_ASM_SSE2_TRUE@
-HAVE_ASM_SSE_FALSE = @HAVE_ASM_SSE_FALSE@
-HAVE_ASM_SSE_TRUE = @HAVE_ASM_SSE_TRUE@
-HAVE_DL_DLOPEN_FALSE = @HAVE_DL_DLOPEN_FALSE@
-HAVE_DL_DLOPEN_TRUE = @HAVE_DL_DLOPEN_TRUE@
-HAVE_JACK_FALSE = @HAVE_JACK_FALSE@
-HAVE_JACK_TRUE = @HAVE_JACK_TRUE@
-HAVE_MMX2_FALSE = @HAVE_MMX2_FALSE@
-HAVE_MMX2_TRUE = @HAVE_MMX2_TRUE@
-HAVE_MMX_FALSE = @HAVE_MMX_FALSE@
-HAVE_MMX_TRUE = @HAVE_MMX_TRUE@
-HAVE_PPCCPU_FALSE = @HAVE_PPCCPU_FALSE@
-HAVE_PPCCPU_TRUE = @HAVE_PPCCPU_TRUE@
-HAVE_SDL_FALSE = @HAVE_SDL_FALSE@
-HAVE_SDL_TRUE = @HAVE_SDL_TRUE@
-HAVE_SSE2_FALSE = @HAVE_SSE2_FALSE@
-HAVE_SSE2_TRUE = @HAVE_SSE2_TRUE@
-HAVE_SSE_FALSE = @HAVE_SSE_FALSE@
-HAVE_SSE_TRUE = @HAVE_SSE_TRUE@
-HAVE_V4L_FALSE = @HAVE_V4L_FALSE@
-HAVE_V4L_TRUE = @HAVE_V4L_TRUE@
-HAVE_X86CPU_FALSE = @HAVE_X86CPU_FALSE@
-HAVE_X86CPU_TRUE = @HAVE_X86CPU_TRUE@
-HAVE_XML2_FALSE = @HAVE_XML2_FALSE@
-HAVE_XML2_TRUE = @HAVE_XML2_TRUE@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
-LIBDV_CFLAGS = @LIBDV_CFLAGS@
-LIBDV_LIBS = @LIBDV_LIBS@
-LIBGETOPT_LIB = @LIBGETOPT_LIB@
-LIBM_LIBS = @LIBM_LIBS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-LT_AGE = @LT_AGE@
-LT_CURRENT = @LT_CURRENT@
-LT_RELEASE = @LT_RELEASE@
-LT_REVISION = @LT_REVISION@
-MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-MAKEINFO = @MAKEINFO@
-MJPEGTOOLS_CFLAGS = @MJPEGTOOLS_CFLAGS@
-MJPEGTOOLS_LIBS = @MJPEGTOOLS_LIBS@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PROGRAM_NOPIC = @PROGRAM_NOPIC@
-PTHREAD_LIBS = @PTHREAD_LIBS@
-RANLIB = @RANLIB@
-SDL_CFLAGS = @SDL_CFLAGS@
-SDL_CONFIG = @SDL_CONFIG@
-SDL_LIBS = @SDL_LIBS@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-SUPPORT_READ_DV2_FALSE = @SUPPORT_READ_DV2_FALSE@
-SUPPORT_READ_DV2_TRUE = @SUPPORT_READ_DV2_TRUE@
-V4LCONF_LIBS = @V4LCONF_LIBS@
-VERSION = @VERSION@
-XML2_CONFIG = @XML2_CONFIG@
-XML_CPPFLAGS = @XML_CPPFLAGS@
-XML_LIBS = @XML_LIBS@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-datadir = @datadir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target = @target@
-target_alias = @target_alias@
-target_cpu = @target_cpu@
-target_os = @target_os@
-target_vendor = @target_vendor@
-man_MANS = veejay.1 
-EXTRA_DIST = $(man_MANS)
-MAINTAINERCLEANFILES = Makefile.in
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  man/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  man/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-install-man1: $(man1_MANS) $(man_MANS)
-	@$(NORMAL_INSTALL)
-	test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)"
-	@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
-	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
-	for i in $$l2; do \
-	  case "$$i" in \
-	    *.1*) list="$$list $$i" ;; \
-	  esac; \
-	done; \
-	for i in $$list; do \
-	  if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
-	  else file=$$i; fi; \
-	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-	  case "$$ext" in \
-	    1*) ;; \
-	    *) ext='1' ;; \
-	  esac; \
-	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
-	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-	  echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
-	  $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \
-	done
-uninstall-man1:
-	@$(NORMAL_UNINSTALL)
-	@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
-	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
-	for i in $$l2; do \
-	  case "$$i" in \
-	    *.1*) list="$$list $$i" ;; \
-	  esac; \
-	done; \
-	for i in $$list; do \
-	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-	  case "$$ext" in \
-	    1*) ;; \
-	    *) ext='1' ;; \
-	  esac; \
-	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
-	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-	  echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \
-	  rm -f "$(DESTDIR)$(man1dir)/$$inst"; \
-	done
-tags: TAGS
-TAGS:
-
-ctags: CTAGS
-CTAGS:
-
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(MANS)
-installdirs:
-	for dir in "$(DESTDIR)$(man1dir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-clean: clean-am
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-info: info-am
-
-info-am:
-
-install-data-am: install-man
-
-install-exec-am:
-
-install-info: install-info-am
-
-install-man: install-man1
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-info-am uninstall-man
-
-uninstall-man: uninstall-man1
-
-.PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-exec install-exec-am \
-	install-info install-info-am install-man install-man1 \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	uninstall uninstall-am uninstall-info-am uninstall-man \
-	uninstall-man1
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

veejay-ng/veejay/Makefile.am

@@ -49,6 +49,7 @@ libveejay_la_LIBADD = -L$(top_builddir)/libOSC / -lOSC \
 			-L$(top_builddir)/libel -lel \
 			-L$(top_builddir)/libyuv -lyuv \
 			-L$(top_builddir)/libvevo -lvevo \
+			-L$(top_builddir)/libvjaudio -lvjaudio \
 			-L$(top_builddir)/vevosample -lvevosample 
 
 #libveejay_la_LDFLAGS +=	${FFMPEG_LIBS} \
@@ -68,4 +69,4 @@ bin_PROGRAMS = $(VEEJAY_BIN)
 veejay_SOURCES	= veejay.c  
 veejay_LDADD 	= libveejay.la @LIBGETOPT_LIB@ ${FFMPEG_AVCODEC_LIBS} ${FFMPEG_AVFORMAT_LIBS} \
 			${PTHREAD_LIBS} ${XML_LIBS} ${LIBDV_LIBS} ${GL_LIBS} \
-			${MJPEGTOOLS_LIBS} ${LIBM_LIBS}  ${SDL_LIBS}
+			${MJPEGTOOLS_LIBS} ${UNICAP_LIBS} ${LIBM_LIBS}  ${SDL_LIBS}

veejay-ng/veejay/Makefile.in

@@ -1,650 +0,0 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-# Makefile for veejay
-
-
-SOURCES = $(libveejay_la_SOURCES) $(veejay_SOURCES)
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-target_triplet = @target@
-bin_PROGRAMS = $(am__EXEEXT_1)
-subdir = veejay
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)"
-libLTLIBRARIES_INSTALL = $(INSTALL)
-LTLIBRARIES = $(lib_LTLIBRARIES)
-libveejay_la_DEPENDENCIES = / /
-am_libveejay_la_OBJECTS = vj-misc.lo vj-pjack.lo performer.lo gl.lo \
-	vj-sdl.lo vj-eventman.lo vj-event.lo liblavplayvj.lo
-libveejay_la_OBJECTS = $(am_libveejay_la_OBJECTS)
-am__EXEEXT_1 = veejay$(EXEEXT)
-binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
-PROGRAMS = $(bin_PROGRAMS)
-am_veejay_OBJECTS = veejay.$(OBJEXT)
-veejay_OBJECTS = $(am_veejay_OBJECTS)
-am__DEPENDENCIES_1 =
-veejay_DEPENDENCIES = libveejay.la $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = $(libveejay_la_SOURCES) $(veejay_SOURCES)
-DIST_SOURCES = $(libveejay_la_SOURCES) $(veejay_SOURCES)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALTIVEC_CFLAGS = @ALTIVEC_CFLAGS@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
-AMTAR = @AMTAR@
-AR = @AR@
-AS = @AS@
-ASFLAGS = @ASFLAGS@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCAS = @CCAS@
-CCASFLAGS = @CCASFLAGS@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-ECHO = @ECHO@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
-FFMPEG_AVCODEC_CFLAGS = @FFMPEG_AVCODEC_CFLAGS@
-FFMPEG_AVCODEC_LIBS = @FFMPEG_AVCODEC_LIBS@
-FFMPEG_AVFORMAT_CFLAGS = @FFMPEG_AVFORMAT_CFLAGS@
-FFMPEG_AVFORMAT_LIBS = @FFMPEG_AVFORMAT_LIBS@
-GLIB_CFLAGS = @GLIB_CFLAGS@
-GLIB_CONFIG = @GLIB_CONFIG@
-GLIB_LIBS = @GLIB_LIBS@
-GL_CFLAGS = @GL_CFLAGS@
-GL_LIBS = @GL_LIBS@
-HAVE_ALTIVEC_FALSE = @HAVE_ALTIVEC_FALSE@
-HAVE_ALTIVEC_TRUE = @HAVE_ALTIVEC_TRUE@
-HAVE_ASM_MMX2_FALSE = @HAVE_ASM_MMX2_FALSE@
-HAVE_ASM_MMX2_TRUE = @HAVE_ASM_MMX2_TRUE@
-HAVE_ASM_MMX_FALSE = @HAVE_ASM_MMX_FALSE@
-HAVE_ASM_MMX_TRUE = @HAVE_ASM_MMX_TRUE@
-HAVE_ASM_NASM_FALSE = @HAVE_ASM_NASM_FALSE@
-HAVE_ASM_NASM_TRUE = @HAVE_ASM_NASM_TRUE@
-HAVE_ASM_SSE2_FALSE = @HAVE_ASM_SSE2_FALSE@
-HAVE_ASM_SSE2_TRUE = @HAVE_ASM_SSE2_TRUE@
-HAVE_ASM_SSE_FALSE = @HAVE_ASM_SSE_FALSE@
-HAVE_ASM_SSE_TRUE = @HAVE_ASM_SSE_TRUE@
-HAVE_DL_DLOPEN_FALSE = @HAVE_DL_DLOPEN_FALSE@
-HAVE_DL_DLOPEN_TRUE = @HAVE_DL_DLOPEN_TRUE@
-HAVE_JACK_FALSE = @HAVE_JACK_FALSE@
-HAVE_JACK_TRUE = @HAVE_JACK_TRUE@
-HAVE_MMX2_FALSE = @HAVE_MMX2_FALSE@
-HAVE_MMX2_TRUE = @HAVE_MMX2_TRUE@
-HAVE_MMX_FALSE = @HAVE_MMX_FALSE@
-HAVE_MMX_TRUE = @HAVE_MMX_TRUE@
-HAVE_PPCCPU_FALSE = @HAVE_PPCCPU_FALSE@
-HAVE_PPCCPU_TRUE = @HAVE_PPCCPU_TRUE@
-HAVE_SDL_FALSE = @HAVE_SDL_FALSE@
-HAVE_SDL_TRUE = @HAVE_SDL_TRUE@
-HAVE_SSE2_FALSE = @HAVE_SSE2_FALSE@
-HAVE_SSE2_TRUE = @HAVE_SSE2_TRUE@
-HAVE_SSE_FALSE = @HAVE_SSE_FALSE@
-HAVE_SSE_TRUE = @HAVE_SSE_TRUE@
-HAVE_V4L_FALSE = @HAVE_V4L_FALSE@
-HAVE_V4L_TRUE = @HAVE_V4L_TRUE@
-HAVE_X86CPU_FALSE = @HAVE_X86CPU_FALSE@
-HAVE_X86CPU_TRUE = @HAVE_X86CPU_TRUE@
-HAVE_XML2_FALSE = @HAVE_XML2_FALSE@
-HAVE_XML2_TRUE = @HAVE_XML2_TRUE@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
-LIBDV_CFLAGS = @LIBDV_CFLAGS@
-LIBDV_LIBS = @LIBDV_LIBS@
-LIBGETOPT_LIB = @LIBGETOPT_LIB@
-LIBM_LIBS = @LIBM_LIBS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-LT_AGE = @LT_AGE@
-LT_CURRENT = @LT_CURRENT@
-LT_RELEASE = @LT_RELEASE@
-LT_REVISION = @LT_REVISION@
-MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-MAKEINFO = @MAKEINFO@
-MJPEGTOOLS_CFLAGS = @MJPEGTOOLS_CFLAGS@
-MJPEGTOOLS_LIBS = @MJPEGTOOLS_LIBS@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PROGRAM_NOPIC = @PROGRAM_NOPIC@
-PTHREAD_LIBS = @PTHREAD_LIBS@
-RANLIB = @RANLIB@
-SDL_CFLAGS = @SDL_CFLAGS@
-SDL_CONFIG = @SDL_CONFIG@
-SDL_LIBS = @SDL_LIBS@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-SUPPORT_READ_DV2_FALSE = @SUPPORT_READ_DV2_FALSE@
-SUPPORT_READ_DV2_TRUE = @SUPPORT_READ_DV2_TRUE@
-V4LCONF_LIBS = @V4LCONF_LIBS@
-VERSION = @VERSION@
-XML2_CONFIG = @XML2_CONFIG@
-XML_CPPFLAGS = @XML_CPPFLAGS@
-XML_LIBS = @XML_LIBS@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-datadir = @datadir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target = @target@
-target_alias = @target_alias@
-target_cpu = @target_cpu@
-target_os = @target_os@
-target_vendor = @target_vendor@
-MAINTAINERCLEANFILES = Makefile.in
-INCLUDES = -I$(top_srcdir) -I$(includedir) \
-		-DG_LOG_DOMAIN=\"veejay\" -DVEEJAY_VERSION=\"$(VERSION)\" \
-     		-I /usr/X11R6/include -I$(top_srcdir)/libOSC \
-		-I$(top_srcdir)/libhash \
-		-I$(top_srcdir)/libvje \
-		-I$(top_srcdir)/libplugger \
-		-I$(top_srcdir)/libvjmem \
-		-I$(top_srcdir)/libvjmsg \
-		-I$(top_srcdir)/libvjnet \
-		-I$(top_srcdir)/libel \
-		-I$(top_srcdir)/libstream \
-		-I$(top_scrdir)/libyuv \
-		-I$(top_srcdir)/liblavjpeg \
-		-I$(top_srcdir)/libsamplerec \
-		-I$(top_srcdir)/libvevo \
-		$(FFMPEG_CFLAGS)\
-		${XML_CFLAGS} ${DV_FLAGS} ${X_CFLAGS} ${XML_CPPFLAGS} \
-		${PTHREAD_CFLAGS} ${MJPEGTOOLS_CFLAGS} ${GL_CFLAGS} ${SDL_CFLAGS} 
-
-VEEJAY_LIB_FILE = libveejay.la
-lib_LTLIBRARIES = $(VEEJAY_LIB_FILE) 
-VEEJAY_ALL_LIB_OPTS = \
-	-version-info $(LT_AGE):$(LT_REVISION):$(LT_AGE) \
-	-release $(LT_RELEASE) \
-	-export-dynamic 
-
-libveejay_la_SOURCES = vj-misc.c \
-			vj-pjack.c performer.c \
-			gl.c vj-sdl.c \
-			vj-eventman.c \
-			vj-event.c \
-			liblavplayvj.c
-
-libveejay_la_LDFLAGS = $(VEEJAY_ALL_LIB_OPTS )
-libveejay_la_LIBADD = -L$(top_builddir)/libOSC / -lOSC \
-			-L$(top_builddir)/libhash / -lhash \
-			-L$(top_builddir)/bio2jack/ -lbio2jack \
-			-L$(top_builddir)/libvjmsg -lvjmsg \
-			-L$(top_builddir)/libvjmem/ -lvjmem \
-			-L$(top_builddir)/libplugger -lvjplug \
-			-L$(top_builddir)/libvjnet -lvjnet \
-			-L$(top_builddir)/libel -lel \
-			-L$(top_builddir)/libyuv -lyuv \
-			-L$(top_builddir)/libvevo -lvevo \
-			-L$(top_builddir)/vevosample -lvevosample 
-
-
-#libveejay_la_LDFLAGS +=	${FFMPEG_LIBS} \
-#			${SDL_LIBS} ${DIRECTFB_LIBS} ${PTHREAD_LIBS} \
-#			${XML_LIBS} ${JPEG_LIBS} ${JACK_LIBS} \
-#			${LIBDV_LIBS} ${LIBM_LIBS} ${PIXBUF_LIBS} ${MJPEGTOOLS_LIBS}\
-#			-DDYNAMIC -O3 -Wall -rdynamic 
-#
-
-# *********************************************************************
-# The tools themselves
-VEEJAY_BIN = veejay
-veejay_SOURCES = veejay.c  
-veejay_LDADD = libveejay.la @LIBGETOPT_LIB@ ${FFMPEG_AVCODEC_LIBS} ${FFMPEG_AVFORMAT_LIBS} \
-			${PTHREAD_LIBS} ${XML_LIBS} ${LIBDV_LIBS} ${GL_LIBS} \
-			${MJPEGTOOLS_LIBS} ${LIBM_LIBS}  ${SDL_LIBS}
-
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  veejay/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  veejay/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-install-libLTLIBRARIES: $(lib_LTLIBRARIES)
-	@$(NORMAL_INSTALL)
-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	  if test -f $$p; then \
-	    f=$(am__strip_dir) \
-	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
-	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
-	  else :; fi; \
-	done
-
-uninstall-libLTLIBRARIES:
-	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	  p=$(am__strip_dir) \
-	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
-	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
-	done
-
-clean-libLTLIBRARIES:
-	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
-libveejay.la: $(libveejay_la_OBJECTS) $(libveejay_la_DEPENDENCIES) 
-	$(LINK) -rpath $(libdir) $(libveejay_la_LDFLAGS) $(libveejay_la_OBJECTS) $(libveejay_la_LIBADD) $(LIBS)
-install-binPROGRAMS: $(bin_PROGRAMS)
-	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  if test -f $$p \
-	     || test -f $$p1 \
-	  ; then \
-	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
-	  else :; fi; \
-	done
-
-uninstall-binPROGRAMS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-	  echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
-	done
-
-clean-binPROGRAMS:
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
-veejay$(EXEEXT): $(veejay_OBJECTS) $(veejay_DEPENDENCIES) 
-	@rm -f veejay$(EXEEXT)
-	$(LINK) $(veejay_LDFLAGS) $(veejay_OBJECTS) $(veejay_LDADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gl.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblavplayvj.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/performer.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/veejay.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vj-event.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vj-eventman.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vj-misc.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vj-pjack.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vj-sdl.Plo@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
-	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LTLIBRARIES) $(PROGRAMS)
-install-binPROGRAMS: install-libLTLIBRARIES
-
-installdirs:
-	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-clean: clean-am
-
-clean-am: clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \
-	clean-libtool mostlyclean-am
-
-distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-exec-am: install-binPROGRAMS install-libLTLIBRARIES
-
-install-info: install-info-am
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-binPROGRAMS uninstall-info-am \
-	uninstall-libLTLIBRARIES
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
-	clean-generic clean-libLTLIBRARIES clean-libtool ctags \
-	distclean distclean-compile distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-binPROGRAMS \
-	install-data install-data-am install-exec install-exec-am \
-	install-info install-info-am install-libLTLIBRARIES \
-	install-man install-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
-	uninstall-am uninstall-binPROGRAMS uninstall-info-am \
-	uninstall-libLTLIBRARIES
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

veejay-ng/veejay/defs.h

@@ -36,6 +36,16 @@ typedef struct VJFrame_t
 	double	fps;
 } VJFrame;
 
+typedef struct AFrame_t
+{
+	long	rate;
+	uint8_t *data;
+	int	bits;
+	int	bps;
+	int	samples;
+	int	num_chans;
+} AFrame;
+
 #define	FMT_420	0
 #define	FMT_422	1	
 #define FMT_444	2

veejay-ng/veejay/liblavplayvj.c

@@ -132,26 +132,24 @@ const	char	*veejay_get_fmt_(int fmt)
  */
 void	veejay_load_video_settings( veejay_t *info, int id )
 {
+	
 	info->current_sample = find_sample(id);
 #ifdef STRICT_CHECKING
 	assert( info->current_sample != NULL );
 #endif
+	sample_video_info_t *svit = info->video_info;
 	video_playback_setup *settings =
 		(video_playback_setup*) info->settings;
-	/*settings->min_frame_num = sample_get_start_pos( info->current_sample );
+	settings->spvf = 1.0 / svit->fps;
-	settings->max_frame_num = sample_get_end_pos( info->current_sample );
-	settings->current_frame_num = sample_get_current_pos( info->current_sample );
-	settings->previous_frame_num = 1;*/
 	settings->msec_per_frame = 1000 / settings->spvf;
-	settings->spas = 0.0;
 
-	if( sample_has_audio( info->current_sample ))
+	if(!svit->has_audio)
-	{
+		settings->spas = 0.0;
-/*		int res = performer_audio_start( info );
+	else
-		if(res)
+		settings->spas = 1.0 / svit->rate;
-			settings->spas = 1.0 / (double) sample_get_audio_rate( info->current_sample );	
+	veejay_msg(0, "\tSeconds per video frame = %g",settings->spvf );
-*/
+	veejay_msg(0, "\tSeconds per audio sample = %g",settings->spas);
-	}
+	veejay_msg(0, "\tRate = %ld", (long) svit->rate );
 }
 
 //! Wait until Software Playback thread has finished
@@ -182,8 +180,6 @@ void veejay_free(veejay_t * info)
     video_playback_setup *settings =
 	(video_playback_setup *) info->settings;
 
-    veejay_reap_messages();
-    
 //    if(info->display)
 //	x_display_close( info->display );
  
@@ -230,7 +226,7 @@ void veejay_quit(veejay_t * info)
  \return Error code
  */
 int veejay_init_project_from_args( veejay_t *info, int w, int h, float fps, int inter, int norm, int fmt,
-		int audio, int rate, int n_chan, int bits, int display )
+		int audio, int rate, int n_chan, int bps, int display )
 {
 	sample_video_info_t *svit = (sample_video_info_t*) vj_malloc(sizeof( sample_video_info_t ));
 	memset( svit,0,sizeof(sample_video_info_t));
@@ -248,7 +244,14 @@ int veejay_init_project_from_args( veejay_t *info, int w, int h, float fps, int
 	svit->has_audio = (audio ? 1: 0 );
 	svit->chans = n_chan;
 	svit->rate = rate;
-	svit->bits = bits;
+	svit->bits = 16;
+	svit->bps = bps;
+	
+	veejay_msg(2, "Project settings:");
+	veejay_msg(2, "\tvideo settings: %d x %d, @%2.2f in %s", svit->w,svit->h,svit->fps, (svit->norm ? "NTSC" :"PAL") );
+	veejay_msg(2, "\taudio settings: %ld Hz, %d bits, %d channels, %d bps",
+			svit->rate, svit->bits,svit->chans, svit->bps );
+	
 	info->video_info = (void*) svit;
 #ifdef STRICT_CHECKING
 	assert( info->video_info != NULL );
@@ -262,7 +265,8 @@ int veejay_init_project_from_args( veejay_t *info, int w, int h, float fps, int
 		veejay_msg(0, "Error initializing EDL cache");
 		return -1;
 	}
-
+	plug_sys_init( svit->fmt,svit->w,svit->h);
+//	plug_sys_set_palette( svit->fmt );
 	return 1;
 }
 
@@ -710,6 +714,28 @@ static	void	veejay_setup_timer(veejay_t *info)
     	}    
 }
 
+int		veejay_load_devices( veejay_t *info )
+{
+	sample_video_info_t *vid_info = info->video_info;
+	
+	int n = vevo_num_devices();
+	int i;
+	for( i = 0; i < n ; i ++ )
+	{
+		void *sample = sample_new( VJ_TAG_TYPE_CAPTURE );
+		if( sample_open( sample, NULL, 0, vid_info ) <= 0 )
+		{
+			if(sample) sample_delete_ptr( sample );
+		}
+		else
+		{
+			samplebank_add_sample( sample );
+		}
+	}
+
+	return 1;
+}
+
 int		veejay_load_samples( veejay_t *info, const char **argv, int n_arg )
 {
 	sample_video_info_t *vid_info = info->video_info;
@@ -719,6 +745,8 @@ int		veejay_load_samples( veejay_t *info, const char **argv, int n_arg )
 	{
 		veejay_msg(2, "No input files given, starting with dummy video");
 		void *sample = sample_new( VJ_TAG_TYPE_COLOR );
+		if( sample_open(sample, NULL, 0, vid_info ) <= 0 )
+			return 0;
 		id = samplebank_add_sample( sample );
 		veejay_load_video_settings(info, id );	
 		return 1;
@@ -894,6 +922,8 @@ void	veejay_playback_status( veejay_t *info )
 	}
 	//sample_sprintf_port( info->current_sample);
 }
+
+
 /******************************************************
  * veejay_playback_cycle()
  *   the playback cycle
@@ -916,8 +946,27 @@ static void veejay_playback_cycle(veejay_t * info)
     long ts, te;
 
     sample_video_info_t *vid_info = (sample_video_info_t*) info->video_info;
-    performer_queue_audio_frame( info );
+
-    performer_queue_video_frame( info, 0 );
+    if( sample_has_audio( info->current_sample ))
+	{
+		
+		long rate = performer_audio_start(info);
+		if( rate > 0 )
+		{
+			vid_info->audio = 1;
+			vid_info->has_audio = 1;
+			settings->spas = 1.0 / (double) rate;
+			stats.audio =1;
+		}
+		else
+		{
+			info->audio = NO_AUDIO;
+			vid_info->audio = 0;
+			stats.audio = 0;
+		}
+	}
+
+    performer_queue_audio_frame( info, 0 );
 
     if (performer_queue_frame(info, 0) != 0)
     {
@@ -929,27 +978,12 @@ static void veejay_playback_cycle(veejay_t * info)
     stats.norm = vid_info->norm;
     nvcorr = 0;
     
-    if(vid_info->has_audio && vid_info->audio == AUDIO_PLAY)
-    {
-	    stats.audio = 1;
-
-//   if (el->has_audio && info->audio == AUDIO_PLAY) {
-//	if (vj_perform_audio_start(info)) {
-//	    stats.audio = 1;
-//	} else {
-//	    veejay_msg(VEEJAY_MSG_ERROR, "Could not start Audio Task");
-//	}
-  //  }
- /* Queue the buffers read, this triggers video playback */
-  
-    }
-  
     frame_number[0] = sample_get_current_pos( info->current_sample );
-    //settings->current_frame_num;
+
     veejay_mjpeg_queue_buf(info, 0, 1);
     
     stats.nqueue = 1;
-
+	int last_id = sample_get_key_ptr( info->current_sample);
     while (settings->state != VEEJAY_STATE_STOP)
     {
 	first_free = stats.nsync;
@@ -985,22 +1019,22 @@ static void veejay_playback_cycle(veejay_t * info)
 	} while (stats.tdiff > settings->spvf && (stats.nsync - first_free) < (1 - 1));
 
 #ifdef HAVE_JACK
-	if ( el->has_audio && info->audio==AUDIO_PLAY ) {
+	if (stats.audio ) {
-	    //audio_get_output_status(&audio_tmstmp, &(stats.num_asamps),
-		//			    &(stats.num_aerr));
 	   struct timeval audio_tmstmp;	
 	   long int sec=0;
 	   long int usec=0;
 	   long num_audio_bytes_written = vj_jack_get_status( &sec,&usec);
 	   audio_tmstmp.tv_sec = sec;
 	   audio_tmstmp.tv_usec = usec;
-	   if (audio_tmstmp.tv_sec)
+	  if (audio_tmstmp.tv_sec)
           {
-             tdiff1 = settings->spvf * (stats.nsync - nvcorr) -
+     		  tdiff2 = (bs.timestamp.tv_sec - audio_tmstmp.tv_sec) +
-                settings->spas * num_audio_bytes_written;
-             tdiff2 = (bs.timestamp.tv_sec - audio_tmstmp.tv_sec) +
                 (bs.timestamp.tv_usec - audio_tmstmp.tv_usec) * 1.e-6;
-          }
+
+	      tdiff1 = settings->spvf * (stats.nsync - nvcorr) -
+                settings->spas * num_audio_bytes_written;
+
+ 	  }
 	
 	}
 #endif
@@ -1011,7 +1045,6 @@ static void veejay_playback_cycle(veejay_t * info)
 	    skipv = 0;
 	    skipa = 0;
 	    skipi = 0;
- 
 	    if (info->sync_correction) {
 		if (stats.tdiff > settings->spvf) {
 		    /* Video is ahead audio */
@@ -1039,22 +1072,27 @@ static void veejay_playback_cycle(veejay_t * info)
 	    /* Read one frame, break if EOF is reached */
 	    // actually measure duration of render in ms */
 	    frame = n % 1;
-
 	    frame_number[frame] = sample_get_current_pos( info->current_sample );
+
 	    settings->buffer_entry[frame] = 
 		    sample_get_current_pos( info->current_sample );
 	  
 	    sample_cache_data( info->current_sample );
 	    
-	    if (!skipa) 
+	    vj_jack_continue( sample_get_speed(info->current_sample) );
-			performer_queue_audio_frame(info);
 		     
-	    if (!skipv)
+	    performer_queue_audio_frame(info,skipa);	    
-			performer_queue_video_frame(info,skipi);
 		
 	    performer_queue_frame(info,skipi);
 	
 	    sample_save_cache_data( info->current_sample );
+	    int cur_id = sample_get_key_ptr( info->current_sample);
+	    if( cur_id != last_id )
+	    {
+		last_id = cur_id;
+		performer_audio_restart(info);
+	    }	
+		//@ and restart performer on sample switch!
 	    
 	    if(skipv) continue;
 	    
@@ -1067,16 +1105,14 @@ static void veejay_playback_cycle(veejay_t * info)
 	    stats.nqueue++;
 	    n++;
 	}
-	if (vid_info->has_audio && (vid_info->audio==AUDIO_PLAY))
+	if (vid_info->has_audio)
 	    stats.audio = settings->audio_mute ? 0 : 1;
 	stats.stats_changed = 0;
     }
 
   FINISH:
 
-   // if (vid_info->audio==AUDIO_PLAY)
+	performer_audio_stop(info);
-//	vj_perform_audio_stop(info);
-	veejay_msg(0, "TODO: audio stop");
 }
 
 /******************************************************

veejay-ng/veejay/performer.c

@@ -34,11 +34,14 @@
 #ifdef STRICT_CHECKING
 #include <assert.h>
 #endif
-#define PERFORM_AS 16384
+#define PERFORM_AUDIO_SIZE 16384
 #define PERFORM_FX 20
 #define PERFORM_NS 10
 
-
+#ifdef HAVE_JACK
+#include <veejay/vj-bjack.h>
+#include <libvjaudio/audio.h>
+#endif
 #include <ffmpeg/avutil.h>
 /** \defgroup performer Performer
  *
@@ -75,8 +78,6 @@
 //! \typedef performer_t Performer runtime data
 typedef struct
 {
-//	ReSampleContext *audio_resampler[PERFORM_NS];
-//	ReSampleContext *jack_resampler;
 	uint8_t **frame_buffer;			//<<! Linear buffer, locked in RAM
 	VJFrame **ref_buffer;			//<<! Chunks, pointers to frame_buffer
 	VJFrame *out_buffers[2];		//<<! Temporary output buffer if a Plugin requires one
@@ -87,8 +88,9 @@ typedef struct
 	VJFrame *display;
 	void	*in_frames;			//<<! Port, list of frames needed for this cycle
 	void	*out_frames;			//<<! Port, list of output frames accumulated
-	uint8_t *audio_buffers[PERFORM_FX];	//<<! Linear buffer, locked in RAM
+	uint8_t *audio_buffer;
-	uint8_t *tmp_buffers;			//<<! Audio processing buffers, locked in RAM
+	AFrame **audio_buffers;		//<<! Linear buffer, locked in RAM
+	void	*resampler;
 	void 	*sampler;			//<<! YUV sampler
 	int	sample_mode;
 	int	n_fb;				//<<! Maximum number of Chunks
@@ -176,31 +178,28 @@ void	*performer_init( veejay_t *info, const int max_fb )
 	p->n_fb = max_fb;
 	p->ref_buffer = (VJFrame**) vj_malloc(sizeof(VJFrame*) * p->n_fb);
 	p->fx_buffer  = (VJFrame**) vj_malloc(sizeof(VJFrame*) * SAMPLE_CHAIN_LEN );
+#ifdef HAVE_JACK
+	p->audio_buffers = (AFrame**) vj_malloc(sizeof(AFrame*) * 3);
+	p->audio_buffer = (uint8_t*) vj_malloc(sizeof(uint8_t) * PERFORM_AUDIO_SIZE * 32 *3);
+	memset( p->audio_buffer, 0, sizeof(uint8_t) * PERFORM_AUDIO_SIZE * 32*3 );
+#endif
 	p->frame_buffer = (uint8_t**) vj_malloc(sizeof(uint8_t*) * p->n_fb );
 	p->sampler = subsample_init( svit->w );
-	p->audio_buffers[0] =
-		(uint8_t*) vj_malloc(sizeof(uint8_t) * 2 * PERFORM_AS );
-	memset( p->audio_buffers[0],0, sizeof(uint8_t) * 2 * PERFORM_AS );
-	
-	p->tmp_buffers =
-		(uint8_t*) vj_malloc(sizeof(uint8_t) * 10 * PERFORM_AS );
-	memset( p->tmp_buffers, 0, sizeof(uint8_t) * 10 * PERFORM_AS );
-
-	/*#ifdef HAVE_JACK
-	for( i = 2; i < PERFORM_NS; i ++ )
-	{
-		int rate = info->current_edit_list->audio_rate * i;
-		p->audio_resampler[(i-1)] =
-			audio_resample_init(
-				info->current_edit_list->audio_chans,
-				info->current_edit_list->audio_chans,
-				info->current_edit_list->audio_rate,
-				rate );
-	}
-#endif*/
 	
 	size_t tot_len = (size_t) ( svit->w * svit->h * (p->n_fb+5+SAMPLE_CHAIN_LEN)) * sizeof(uint8_t);
 	int error=0;
+
+	size_t audio_offset = 0;
+#ifdef HAVE_JACK
+	for( i = 0; i < 3; i ++ )
+	{
+		p->audio_buffers[i] = (AFrame*) vj_malloc(sizeof(AFrame));
+		memset( p->audio_buffers[i], 0, sizeof(AFrame) );
+		p->audio_buffers[i]->data = p->audio_buffer + audio_offset;
+		audio_offset += (PERFORM_AUDIO_SIZE * 32);
+	}
+#endif
+	
 	for( i = 0; i < 4; i ++ )
 	{
 		p->frame_buffer[i] = (uint8_t*) vj_malloc( tot_len );
@@ -237,6 +236,7 @@ void	*performer_init( veejay_t *info, const int max_fb )
 				p->frame_buffer[3] + offset );
 		offset += (size_t) ( svit->w * svit->h * sizeof(uint8_t));
 	}	
+	
 	p->out_buffers[0] = performer_alloc_frame(
 			info,
 			p->frame_buffer[0] + offset,
@@ -289,6 +289,8 @@ void	*performer_init( veejay_t *info, const int max_fb )
 	char type[100];
 #ifdef HAVE_JACK
 	sprintf(type, "Audio and Video");
+	vj_jack_initialize();
+
 #else
 	sprintf(type, "Video Only");
 #endif
@@ -315,14 +317,102 @@ void	*performer_init( veejay_t *info, const int max_fb )
 			p->sample_mode = SSM_444;
 			break;
 	}
+	
 	veejay_msg(2,"\tProcessing in      :\t%s", nfmat );
 	
-	plug_sys_init( svit->fmt,svit->w,svit->h);
+
-//	plug_sys_set_palette( svit->fmt );
 
 	return (void*) p;
 }
 
+long	performer_audio_start( veejay_t *info )
+{
+#ifdef HAVE_JACK
+	int bps = 0;
+	int chans = 0;
+	long rate = 0;
+	int bits = 0;
+	int error = 0;
+	if(sample_get_audio_properties( 
+			info->current_sample,
+			&bits,
+			&bps,
+			&chans,
+			&rate )<= 0 )
+	{
+		veejay_msg(VEEJAY_MSG_INFO, "Sample without Audio");
+		info->audio = NO_AUDIO;
+		return 0;
+	}
+
+	performer_t *p =  info->performer;
+	
+#ifdef STRICT_CHECKING
+	assert( bps > 0 );
+	assert( chans > 0 );
+	assert( rate > 0 );
+	assert( bits > 0 );
+#endif
+	int res = vj_jack_init( bits, chans, rate );
+	if( res <= 0 )
+	{
+		veejay_msg(VEEJAY_MSG_WARNING,
+				"Unable to connect to Jack. Not playing Audio");
+		info->audio = NO_AUDIO;
+	}
+	else
+	{
+		info->audio = AUDIO_PLAY;
+		p->resampler =	vj_audio_init( PERFORM_AUDIO_SIZE * 32 , chans,1 );
+
+	}
+
+	return rate;
+#else
+	return 0;
+#endif
+}
+
+void	performer_audio_continue( veejay_t *info )
+{
+	performer_t *p = info->performer;
+
+	int speed = sample_get_speed( info->current_sample );
+
+	vj_jack_continue( speed );
+}
+
+
+int	performer_audio_stop( veejay_t *info )
+{
+	int i;
+#ifdef HAVE_JACK
+	performer_t *p = info->performer;
+	vj_jack_stop();
+	if(info->audio == AUDIO_PLAY )
+	{
+		vj_audio_free( p->resampler );
+		for( i = 0; i < 3; i ++ )
+		{
+			memset( p->audio_buffers[i]->data, 0, sizeof(uint8_t) * PERFORM_AUDIO_SIZE * 32 );
+		}
+	}
+#endif	
+	info->audio = NO_AUDIO;
+	return 1;
+}
+void	performer_audio_restart( veejay_t *info )
+{
+	int i;
+#ifdef HAVE_JACK
+	performer_t *p = info->performer;
+	for( i = 0; i < 3; i ++ )
+	{
+		memset( p->audio_buffers[i]->data, 0, sizeof(uint8_t) * PERFORM_AUDIO_SIZE * 32 );
+	}
+#endif	
+}
+
 //! Destroy Performer
 /**!
  \param info Veejay Object
@@ -333,8 +423,6 @@ void	performer_destroy( veejay_t *info )
 	subsample_free( p->sampler );
   	if(p->in_frames)
                 vevo_port_free( p->in_frames );
-	free( p->audio_buffers[0] );
-	free( p->tmp_buffers );
 	int i;
 	for( i = 0; i < 4; i ++ )
 	{
@@ -345,7 +433,12 @@ void	performer_destroy( veejay_t *info )
 		free( p->ref_buffer[i]);
 	for( i = 0; i < SAMPLE_CHAIN_LEN; i ++ )
 		free( p->fx_buffer[i]);
-
+#ifdef HAVE_JACK
+	free( p->audio_buffer );
+	for( i = 0; i < 3; i ++ )
+		free( p->audio_buffers[i]);
+	free( p->audio_buffers );
+#endif
 	free( p->preview_col );
 	free( p->preview_bw  );
 	free( p->step_buffer );
@@ -371,84 +464,115 @@ void	*performer_get_output_frame( veejay_t *info )
 //	return res;		
 }
 
-//! Reverse all samples in an audio frame
-/**!
- \param info Veejay Object
- \param len Length of audio buffer
- \param buf Pointer to audio buffer
- */
-static	void	performer_reverse_audio_frame( veejay_t *info,int len, uint8_t *buf )
-{
-    int i;
-    //int bps = info->edit_list->audio_bps;
-	int bps = 4;
-    uint8_t sample[bps];
-    int x=len*bps;
-    for( i = 0; i < x/2 ; i += bps )
-    {
-	veejay_memcpy(sample,buf+i,bps);	
-	veejay_memcpy(buf+i ,buf+(x-i-bps),bps);
-	veejay_memcpy(buf+(x-i-bps), sample,bps);
-    }
-}
-
-//! Fill audio buffer with a frame or mute the buffer
-/**!
- \param p Performer Object
- \param info Veejay Object
- \return Length of audio buffer
- */
-static	int	performer_fill_audio_buffer( performer_t *p, veejay_t *info )
-{
-	int speed = sample_get_speed( info->current_sample );
-	int len = 0;
-	if( speed == 0 )
-	{
-	/*	len = info->current_edit_list->audio_rate /
-			info->current_edit_list->video_fps *
-			info->current_edit_list->audio_bps;
-	        veejay_memset( p->audio_buffers[0],
-					0, len );*/
-	
-	}
-	return len;
-}
-
 //! Queue sufficient audio samples for immediate playback
 /**!
  \param info Veejay Object
  \return Error code
  */
-int	performer_queue_audio_frame( veejay_t *info )
+#ifdef HAVE_JACK
+static	uint8_t *performer_fetch_audio_frames( veejay_t *info, int *gen_samples )
 {
-#ifdef HAVE_JACk
-	video_playback_setup *settings = info->settings;
-	long cur_frame	= settings->current_frame_num;
-
 	performer_t *p = info->performer;
+	AFrame *f = p->audio_buffers[0];
+	AFrame *k = p->audio_buffers[1];
+	AFrame *q = p->audio_buffers[2];
+	int n_samples = f->samples;
 
-	if( info->audio == AUDIO_PLAY && el->has_audio)
+	int speed = sample_get_speed(info->current_sample);
+	int res = 0;
+	int has_audio = sample_has_audio( info->current_sample);	
+	if(!has_audio)
 	{
-		if( settings->audio_mute )
+		n_samples = 0;
-			veejay_memset( p->audio_buffers[0],
+	}
-					0, PERFORM_AS );
+	if( n_samples == 0 )
-					
+	{
-		else
+		sample_get_property_ptr(info->current_sample, "audio_spas", &n_samples );
+		if(!has_audio)
 		{
-			performer_fill_audio_buffers( p, info );
+			veejay_msg(0, "%s: Not playing audio, faking samples to 1764");
+			*gen_samples = 1764;
+			memset( f->data,0 , PERFORM_AUDIO_SIZE);
+			return f->data;
 		}
-
-		if( el->play_rate != el->audio_rate && el->play_rate > 0 )
-		{
-		//	veejay_memcpy( x_audio_buffer, a_buf, num_samples * el->audio_bps);
-		//	int r = audio_resample( resample_jack, (short*)top_audio_buffer,(short*)a_buf, num_samples );
-		//	vj_jack_play( top_audio_buffer, ( r * el->audio_bps ));	
-		}
-		else
-			vj_jack_play( a_buf, (num_samples * el->audio_bps ));
 	}
 		
+	if( speed == 0 )
+	{
+		memset( f->data,0,PERFORM_AUDIO_SIZE );
+	}
+	else
+	{
+		res = sample_get_audio_frame( info->current_sample,f, abs(speed) );
+	}
 
+	uint8_t *out = (speed == 1 || speed == -1 ? f->data : k->data );
+	uint8_t *in  = f->data;
+		
+	if( speed < 0 )
+	{
+		vj_audio_sample_reverse( in, q->data, n_samples, f->bps );
+		in = q->data;
+		out = q->data;
+	}
+
+	int slow = sample_get_repeat( info->current_sample );
+	if( (speed > 1 || speed < -1 || slow) && has_audio)
+	{
+		n_samples = vj_audio_resample_data( p->resampler,
+				in,
+				k->data,
+				f->bps,
+				f->num_chans,
+				abs(speed),
+				slow,
+				f->samples,
+				n_samples );
+		out = k->data;
+	}
+	*gen_samples = n_samples;
+	
+	return out;
+}
+#endif
+
+int	performer_queue_audio_frame( veejay_t *info, int skipa )
+{
+	static uint8_t *buffer_ = NULL;
+	static int	j_samples_ = 0;
+	static int	samples_played_ =0;
+#ifdef HAVE_JACK
+	video_playback_setup *settings = info->settings;
+	sample_video_info_t *svit = (sample_video_info_t*) info->video_info;
+	
+	performer_t *p = info->performer;
+	AFrame *f = p->audio_buffers[0];
+	AFrame *k = p->audio_buffers[1];
+	AFrame *q = p->audio_buffers[2];
+	int res = 0;
+	int n_samples_ = 0;
+	if(info->audio != AUDIO_PLAY)
+		return 1;
+
+	int frame_repeat = sample_get_repeat_count( info->current_sample );
+	int nf		 = sample_get_repeat( info->current_sample );
+	if( frame_repeat == 0 && !skipa)
+	{
+		buffer_ =	performer_fetch_audio_frames( info,  &n_samples_ );
+		j_samples_ = (nf>0 ? n_samples_ / (nf+1) : n_samples_);
+		samples_played_ = 0;
+	}
+	
+	if(nf == 0)
+	{
+		if(!skipa) vj_jack_play( buffer_, f->bps * n_samples_ );
+	}
+
+	if( nf > 0)
+	{
+		if(!skipa) vj_jack_play( buffer_ + (samples_played_ * f->bps), f->bps * j_samples_ );
+		samples_played_ += j_samples_;
+	}
 #endif	
 	return 1;
 }
@@ -459,20 +583,6 @@ int	performer_queue_audio_frame( veejay_t *info )
  \param skip_incr Skip Increment
  \return Error code
  */
-int	performer_queue_video_frame( veejay_t *info , int skip_incr )
-{
-#ifdef STRICT_CHECKING
-	assert( info->current_sample != NULL );
-#endif
-	performer_t *p = (performer_t*) info->performer;
-/*
-	int res = sample_get_frame(
-			info->current_sample,
-			p->ref_buffer[0] );
-	video_playback_setup *settings = info->settings;*/
-//	return res;
-	return 1;
-}
 
 //! Fetch all video frames needed for this run. 
 /**
@@ -726,7 +836,7 @@ static	int	performer_render_entry( veejay_t *info, void *sample, performer_t *p,
 	
 	error = sample_process_fx( sample, i );
 #ifdef STRICT_CHECKING
-	error == VEVO_NO_ERROR;
+	assert(error == VEVO_NO_ERROR);
 #endif
 
 //	subsample_ycbcr_clamp_itu601_copy( out, p->ref_buffer[i] );

veejay-ng/veejay/performer.h

@@ -3,7 +3,7 @@
 void	*performer_init( veejay_t *info, const int n );
 void	*performer_get_output_frame( veejay_t *info );
 void	performer_convert_output_frame( veejay_t *info, uint8_t **frame);
-int	performer_queue_audio_frame( veejay_t *info );
+int	performer_queue_audio_frame( veejay_t *info , int skip_incr );
 int	performer_queue_video_frame( veejay_t *info , int skip_incr );
 int	performer_queue_frame( veejay_t *info, int skip_incr );
 void	performer_destroy( veejay_t *info );

veejay-ng/veejay/veejay.c

@@ -68,10 +68,11 @@ static int bezerk_ = 0;
 static int fmt_ = 0;
 static int rate_ = 0;
 static int n_chans_ = 0;
-static int bits_ = 0;
+static int bps_ = 0;
 static int display_ = 0;
 static int itu601_ = 0;
 static int dump_ = 0;
+static int devices_ = 0;
 
 static void Usage(char *progname)
 {
@@ -82,6 +83,9 @@ static void Usage(char *progname)
 	fprintf(stderr, " -s/--skip\t\t\n");
 	fprintf(stderr, " -c/--synchronization\t\t\n");
 	fprintf(stderr, " -a/--audio\t\t\n");
+	fprintf(stderr, " -r/--audio-rate\t\t\n");
+	fprintf(stderr, " -n/--audio-channels\t\t\n");
+	fprintf(stderr, " -B/--audio-bps\n");
 	fprintf(stderr, " -t/--timer\t\t\n");
 	fprintf(stderr, " -b/--bezerk\t\t\n");
 	fprintf(stderr, " -f/--fps\t\t\n");
@@ -96,6 +100,7 @@ static void Usage(char *progname)
 	fprintf(stderr, " -d/--display [num] 1=SDL, 2=OpenGL\t\t\n");
 	fprintf(stderr, " -u/--itu601 [0|1]\n");
 	fprintf(stderr, " -l/--list\n");
+	fprintf(stderr, " -A/--alldevices\n");
 			
 }
 
@@ -145,12 +150,12 @@ static int set_option(const char *name, char *value)
 		n_slots_ = atoi(value);
 	} else if(strcmp(name, "pixelformat") == 0 || strcmp(name, "P" ) == 0 ) {
 		fmt_ = atoi(value);
-	} else if(strcmp(name, "audiorate" ) == 0 || strcmp(name, "r" ) == 0 ) {
+	} else if(strcmp(name, "audio-rate" ) == 0 || strcmp(name, "r" ) == 0 ) {
 		rate_ = atoi(value);
-	} else if(strcmp(name, "audiochans" ) == 0 || strcmp(name, "n" ) == 0 ) {
+	} else if(strcmp(name, "audio-channels" ) == 0 || strcmp(name, "N" ) == 0 ) {
 		n_chans_ = atoi(value);
-	} else if(strcmp(name, "audiobits" ) == 0 || strcmp(name, "B" ) == 0 ) {
+	} else if(strcmp(name, "audio-bps" ) == 0 || strcmp(name, "B" ) == 0 ) {
-		bits_ = atoi(value);
+		bps_ = atoi(value);
 	} else if(strcmp(name, "display") == 0 || strcmp(name, "d") == 0 ) {
 		display_ = atoi(value);
 	} else if(strcmp(name, "port") == 0 || strcmp(name, "p") == 0 ) {
@@ -159,6 +164,8 @@ static int set_option(const char *name, char *value)
 		info->itu601 = atoi(value);
 	} else if(strcmp(name, "list") == 0 || strcmp(name,"l") == 0 ) {
 		dump_ = 1;
+	} else if(strcmp(name, "alldevices") == 0 ||strcmp(name,"A")== 0 ) {
+		devices_ = 1;
 	} else
 		nerr++;	
 	
@@ -186,13 +193,14 @@ static int check_command_line_options(int argc, char *argv[])
 	{"memory",1,0,0},
 	{"max_cache",1,0,0},
 	{"pixelformat",1,0,0},
-	{"audiorate",1,0,0},
+	{"audio-rate",1,0,0},
-	{"audiochans",1,0,0},
+	{"audio-channels",1,0,0},
-	{"audiobits",1,0,0},
+	{"audio-bps",1,0,0},
 	{"display",1,0,0},
 	{"port",1,0,0},
 	{"itu601",1,0,0},
 	{"list",0,0,0},
+	{"alldevices",0,0,0},
 	{0, 0, 0, 0}
     };
 #endif
@@ -206,12 +214,12 @@ static int check_command_line_options(int argc, char *argv[])
 #ifdef HAVE_GETOPT_LONG
     while ((n =
 	    getopt_long(argc, argv,
-			"lvs:c:a:t:b:f:w:h:n:i:m:j:p:P:r:n:B:d:u:",
+			"lvs:c:a:t:b:f:w:h:n:i:m:j:p:P:r:n:B:d:u:N:A",
 			long_options, &option_index)) != EOF)
 #else
     while ((n =
 	    getopt(argc, argv,
-		   "lvs:c:a:t:b:f:w:h:n:i:m:j:p:P:r:n:B:d:u:")) != EOF)
+		   "lvs:c:a:t:b:f:w:h:n:i:m:j:p:P:r:n:B:d:u:N:A")) != EOF)
 #endif
     {
 	switch (n) {
@@ -340,19 +348,21 @@ int main(int argc, char **argv)
     info->sync_skip_frames = skip_;
     info->timer = timer_;
     info->continuous = 1;
-    if(!veejay_init_project_from_args( info, width_, height_ , fps_,inter_,norm_,fmt_,audio_,rate_,n_chans_,bits_, display_ ))
+    if(!veejay_init_project_from_args( info, width_, height_ , fps_,inter_,norm_,fmt_,audio_,rate_,n_chans_,bps_, display_ ))
     {
 	veejay_msg(0, "Invalid project settings");
 	return 0;
     }
 
+	if(devices_)
+		veejay_load_devices( info);
+    
     if(!veejay_load_samples( info, argv + optind, argc - optind ) )
     {
 	veejay_msg(0, "Project setting do not match input file(s)");
 	return 0;
     }
     
-    
       //print_license();
   /* setup SIGPIPE and SIGINT catcher as a thread */
     sigemptyset(&(settings->signal_set));

veejay-ng/veejay/veejay.h

@@ -112,7 +112,7 @@ typedef struct
 	int			continuous;
 	int			verbose;
 	int			preview_size;
-	
+	int			audio;	
 	void			*display;
 
 	void			*status_socket;

veejay-ng/veejay/vims.h

@@ -43,7 +43,6 @@ enum {
 	VIMS_LOG				=	412,
 	VIMS_SAMPLE_INFO			=	413,
 /* general controls */
-	VIMS_SET_VOLUME				=	300,
 	VIMS_FULLSCREEN				=	301,
 	VIMS_QUIT				=	600,
 	VIMS_RECORD_DATAFORMAT			=	302,
@@ -69,7 +68,7 @@ enum {
 	VIMS_SAMPLE_GOTO_END			=	18,
 	VIMS_SAMPLE_SET_FRAME			=	19,
 	VIMS_SAMPLE_SET_SPEED			=	20,
-		
+	VIMS_SAMPLE_SET_SLOW			=	21,
 /* editlist commands */
 
 	VIMS_SAMPLE_NEW				=	100,
@@ -83,7 +82,7 @@ enum {
 	VIMS_SAMPLE_REC_START			=	130,
 	VIMS_SAMPLE_REC_STOP			=	131,
 	VIMS_SAMPLE_CHAIN_ACTIVE		=	112,
-
+	VIMS_SAMPLE_SET_VOLUME			=	132,
 	VIMS_SAMPLE_EDL_PASTE_AT			=	50,
 	VIMS_SAMPLE_EDL_COPY			=	51,
 	VIMS_SAMPLE_EDL_DEL			=	52,

veejay-ng/veejay/vj-event.c

@@ -555,7 +555,11 @@ void	vj_event_fire_net_event(veejay_t *v, int net_id, char *str_arg, int *args,
 	{
 		if( vims_arguments[i].value &&
 			fmt[fmt_offset] == 's' )
-			free( vims_arguments[i].value );
+			if( vims_arguments[i].value)
+			{
+				free( vims_arguments[i].value );
+				vims_arguments[i].value = NULL;
+			}
 		fmt_offset += 3;
 	}
 	if(fmt)
@@ -920,9 +924,6 @@ void vj_event_update_remote(void *ptr)
 		}
 	}
 
-	if(!veejay_keep_messages())
-		veejay_reap_messages();
-	
 }
 
 
@@ -938,31 +939,6 @@ void vj_event_none(void *ptr, const char format[], va_list ap)
 	veejay_msg(VEEJAY_MSG_INFO, "No event attached on this key");
 }
 
-static	void	vj_event_send_new_id(veejay_t * v, int new_id)
-{
-
-	if( vj_server_client_promoted( v->command_socket, v->current_link ))
-	{
-		char result[6];
-		if(new_id < 0 ) new_id = 0;
-		bzero(result,6);
-		bzero( _s_print_buf,SEND_BUF);
-
-		sprintf( result, "%05d",new_id );
-		sprintf(_s_print_buf, "%03d%s",5, result);	
-		SEND_MSG( v,_s_print_buf );
-	}
-}
-
-void	vj_event_read_file( void *ptr, 	const char format[], va_list ap )
-{
-	char file_name[512];
-	int args[1];
-
-//	P_A(args,file_name,format,ap);
-
-}
-
 void	vj_event_init_network_events()
 {
 	int i;
@@ -1044,16 +1020,6 @@ void vj_event_debug_level(void *ptr, const char format[], va_list ap)
 		veejay_msg(VEEJAY_MSG_INFO, "Not displaying debug information");
 }
 
-void	vj_event_send_bundles(void *ptr, const char format[], va_list ap)
-{
-}
-
-void	vj_event_send_vimslist(void *ptr, const char format[], va_list ap)
-{
-}
-
-
-
 void vj_event_sample_select(void *ptr, const char format[], va_list ap)
 {
 	veejay_t *v = (veejay_t*) ptr;
@@ -1081,24 +1047,24 @@ void vj_event_sample_select(void *ptr, const char format[], va_list ap)
 
 void	vj_event_set_volume(void *ptr, const char format[], va_list ap)
 {
-	int args[1];	
+	int args[2];	
 	char *s = NULL;
+	veejay_t *v = (veejay_t*) ptr;
 	P_A(args,s,format,ap)
-	if(args[0] >= 0 && args[0] <= 100)
+
+	void *sample = which_sample( v,args );
+	if(sample)
 	{
 #ifdef HAVE_JACK
-		if(vj_jack_set_volume(args[0])) //@ TODO: audio
+		if(vj_jack_set_volume(args[1])) //@ TODO: audio
 		{
-			veejay_msg(VEEJAY_MSG_INFO, "Volume set to %d", args[0]);
+			veejay_msg(VEEJAY_MSG_INFO, "Volume set to %d", args[1]);
+			sample_set_property_ptr( v->current_sample, "volume", VEVO_ATOM_TYPE_INT, &(args[1]));
 		}
 #else
-		veejay_msg(VEEJAY_MSG_ERROR, "Audio support not compiled in");
+		veejay_msg(VEEJAY_MSG_ERROR, "Audio support not compiled in. Cannot change audio volume.");
 #endif
 	}
-	else
-	{
-		veejay_msg(VEEJAY_MSG_ERROR, "Use a value between 0-100 for audio volume");
-	}
 }
 
 void vj_event_sample_new(void *ptr, const char format[], va_list ap)
@@ -1118,7 +1084,7 @@ void vj_event_sample_new(void *ptr, const char format[], va_list ap)
 	else
 	{
 		void *sample = sample_new( args[0] );
-		if(sample_open( sample, token,1, v->video_info))
+		if(sample_open( sample, token,args[1], v->video_info))
 		{
 			new_id = samplebank_add_sample( sample );
 		 	veejay_msg(VEEJAY_MSG_INFO,"Created new %s from %s as Sample %d",
@@ -1196,12 +1162,21 @@ void vj_event_set_screen_size(void *ptr, const char format[], va_list ap)
 void vj_event_play_stop(void *ptr, const char format[], va_list ap) 
 {
 	veejay_t *v = (veejay_t*) ptr;
-	int speed = sample_get_speed( v->current_sample );
+	int args[2];	
-	if(speed != 0)
+	char *s = NULL;
+	P_A(args,s,format,ap)
+
+	void *sample = which_sample( v,args );
+	if(sample)
 	{
-		speed = 0;
+		int speed = sample_get_speed( sample );
-		sample_set_property_ptr(
+		if(speed != 0)
-				v->current_sample, "speed", VEVO_ATOM_TYPE_INT, &speed );
+		{
+			speed = 0;
+			sample_set_property_ptr(
+					v->current_sample, "speed", VEVO_ATOM_TYPE_INT, &speed );
+		}
+
 	}
 }	
 
@@ -1209,164 +1184,254 @@ void vj_event_play_stop(void *ptr, const char format[], va_list ap)
 void vj_event_play_reverse(void *ptr,const char format[],va_list ap) 
 {
 	veejay_t *v = (veejay_t*) ptr;
-	int speed = sample_get_speed( v->current_sample );
+		
-	if(speed >= 0)
+	int args[2];	
+	char *s = NULL;
+	P_A(args,s,format,ap)
+
+	void *sample = which_sample( v,args );
+	if(sample)
 	{
-		if(speed == 0)
+		int speed = sample_get_speed( v->current_sample );
-			speed = 1;
+		if(speed >= 0)
-		speed *= -1;
+		{
-		sample_set_property_ptr(
+			if(speed == 0)
+				speed = 1;
+			speed *= -1;
+			sample_set_property_ptr(
 				v->current_sample, "speed", VEVO_ATOM_TYPE_INT, &speed );
+		}
 	}
 }
 
 void vj_event_play_forward(void *ptr, const char format[],va_list ap) 
 {
 	veejay_t *v = (veejay_t*) ptr;
-	int speed = sample_get_speed( v->current_sample );
+		
-	if(speed <= 0)
+	int args[2];	
+	char *s = NULL;
+	P_A(args,s,format,ap)
+	void *sample = which_sample( v,args );
+	if(sample)
 	{
-		if(speed == 0)
+		int speed = sample_get_speed( v->current_sample );
-			speed = -1;
+		if(speed <= 0)
-		speed *= -1;
+		{
-		sample_set_property_ptr(
+			if(speed == 0)
-				v->current_sample, "speed", VEVO_ATOM_TYPE_INT, &speed );
+				speed = -1;
+			speed *= -1;
+			sample_set_property_ptr(
+					v->current_sample, "speed", VEVO_ATOM_TYPE_INT, &speed );
+		}
 	}
 }
 
 void vj_event_play_speed(void *ptr, const char format[], va_list ap)
+{
+	veejay_t *v = (veejay_t*) ptr;
+		
+	int args[2];	
+	char *s = NULL;
+	P_A(args,s,format,ap)
+	void *sample = which_sample( v,args );
+	if(sample)
+	{
+		if( sample_valid_speed( v->current_sample, args[1] ))
+		{
+			sample_set_property_ptr(
+				v->current_sample, "speed", VEVO_ATOM_TYPE_INT, &(args[1]) );
+			int frame_repeat = (args[1] == 1 || args[1] == -1 ? 0 :
+				sample_get_repeat( v->current_sample ) );
+			sample_set_property_ptr(
+				v->current_sample, "repeat", VEVO_ATOM_TYPE_INT,&frame_repeat );
+			veejay_msg(VEEJAY_MSG_INFO, "Playback speed changed to %d (repeat is %d)", args[1],
+					frame_repeat);
+		}
+		else
+		{
+			veejay_msg(VEEJAY_MSG_ERROR, "Playback speed %d bounces beyond sample boundaries", args[1]);
+		}
+	}
+}
+
+void vj_event_play_repeat(void *ptr, const char format[], va_list ap)
 {
 	int args[5];
 	veejay_t *v = (veejay_t*) ptr;
 	char *s = NULL;
 	P_A(args,s,format,ap);
 	
-	int speed = sample_get_speed( v->current_sample );
+	void *sample = which_sample(v,args);
-	if(speed != args[0])
+	
+	if(sample)
 	{
-		if( sample_valid_speed( v->current_sample, args[0] ))
+		int speed = (sample_get_speed(v->current_sample) < 0 ? -1 : 1 );
-		{
+			
-			sample_set_property_ptr(
+		sample_set_property_ptr( v->current_sample,
-					v->current_sample, "speed", VEVO_ATOM_TYPE_INT, &(args[0]) );
+				"speed", VEVO_ATOM_TYPE_INT, &speed);
-			veejay_msg(VEEJAY_MSG_INFO, "Playback speed changed to %d", args[0]);
+		sample_set_property_ptr( v->current_sample,
-		}
+				"repeat", VEVO_ATOM_TYPE_INT, &(args[1]) );
-		else
+		veejay_msg(VEEJAY_MSG_ERROR, "Playback repeat set to %d", args[1]);
-		{
-			veejay_msg(VEEJAY_MSG_ERROR, "Playback speed %d bounces beyond sample boundaries", args[0]);
-		}
 	}
 }
 
+
+
 void vj_event_set_frame(void *ptr, const char format[], va_list ap)
 {
-	uint64_t args[2];
+	int args[2];
 	veejay_t *v = (veejay_t*) ptr;
 	char *s = NULL;
+	P_A(args,s,format,ap);
 	
-//	P_A(args,s,format,ap);
+	void *sample = which_sample(v,args);
 	
-	uint64_t pos = sample_get_current_pos( v->current_sample );
+	if(sample)
-	if(pos != args[0])
 	{
-		if( sample_valid_pos( v->current_sample, args[0] ))
+		uint64_t pos = sample_get_current_pos( v->current_sample );
+		if(pos != args[1])
 		{
-			uint64_t new_pos = (uint64_t) args[0];
+			if( sample_valid_pos( v->current_sample, args[1] ))
-			sample_set_property_ptr(
+			{
-					v->current_sample, "current_pos", VEVO_ATOM_TYPE_UINT64, &new_pos );
+				uint64_t new_pos = (uint64_t) args[1];
-			veejay_msg(VEEJAY_MSG_INFO, "Position changed to %d", args[0]);
+				sample_set_property_ptr(
-		}
+						v->current_sample, "current_pos", VEVO_ATOM_TYPE_UINT64, &new_pos );
-		else
+				veejay_msg(VEEJAY_MSG_INFO, "Position changed to %d", args[1]);
-		{
+			}
-			veejay_msg(VEEJAY_MSG_ERROR, "Position %d outside sample boundaries", args[0]);
+			else
+			{
+				veejay_msg(VEEJAY_MSG_ERROR, "Position %d outside sample boundaries", args[1]);
+			}
 		}
 	}
 
-
 }
 
 void vj_event_inc_frame(void *ptr, const char format[], va_list ap)
 {
+	int args[2];
 	veejay_t *v = (veejay_t*) ptr;
-	uint64_t pos = sample_get_current_pos( v->current_sample );
+	char *s = NULL;
-	pos += 1;
+	P_A(args,s,format,ap);
 	
-	if( sample_valid_pos( v->current_sample, pos ))
+	void *sample = which_sample(v,args);
+	
+	if(sample)
 	{
-		sample_set_property_ptr(
+		uint64_t pos = sample_get_current_pos( v->current_sample );
-				v->current_sample, "current_pos", VEVO_ATOM_TYPE_UINT64, &pos );
+		pos += args[1];
-		veejay_msg(VEEJAY_MSG_INFO, "Position changed to %lld",pos);
+		if( sample_valid_pos( v->current_sample, pos ))
+		{
+			sample_set_property_ptr(
+					v->current_sample, "current_pos", VEVO_ATOM_TYPE_UINT64, &pos );
+			veejay_msg(VEEJAY_MSG_INFO, "Position changed to %lld",pos);
+		}
 	}
 }
 
 void vj_event_dec_frame(void *ptr, const char format[], va_list ap)
 {
+	int args[2];
 	veejay_t *v = (veejay_t*) ptr;
+	char *s = NULL;
+	P_A(args,s,format,ap);
 	
-	uint64_t pos = sample_get_current_pos( v->current_sample );
+	void *sample = which_sample(v,args);
-	pos -= 1;
 	
-	if( sample_valid_pos( v->current_sample, pos ))
+	if(sample)
 	{
-		sample_set_property_ptr(
+		uint64_t pos = sample_get_current_pos( v->current_sample );
-				v->current_sample, "current_pos", VEVO_ATOM_TYPE_UINT64, &pos );
+		pos -= args[1];
-		veejay_msg(VEEJAY_MSG_INFO, "Position changed to %lld", pos);
+		if( sample_valid_pos( v->current_sample, pos ))
+		{
+			sample_set_property_ptr(
+					v->current_sample, "current_pos", VEVO_ATOM_TYPE_UINT64, &pos );
+			veejay_msg(VEEJAY_MSG_INFO, "Position changed to %lld", pos);
+		}
 	}
 }
 
 void vj_event_prev_second(void *ptr, const char format[], va_list ap)
 {
- 	veejay_t *v = (veejay_t*) ptr;
+	int args[2];
+	veejay_t *v = (veejay_t*) ptr;
+	char *s = NULL;
+	P_A(args,s,format,ap);
 	
- 	sample_video_info_t *svit = (sample_video_info_t*) v->video_info;
+	void *sample = which_sample(v,args);
-	uint64_t pos = sample_get_current_pos( v->current_sample );
 	
-	pos += svit->fps;
+	if(sample)
-	if( sample_valid_pos( v->current_sample, pos ))
 	{
-		sample_set_property_ptr(
+ 		sample_video_info_t *svit = (sample_video_info_t*) v->video_info;
-				v->current_sample, "current_pos", VEVO_ATOM_TYPE_UINT64, &pos );
+		uint64_t pos = sample_get_current_pos( v->current_sample );
-		veejay_msg(VEEJAY_MSG_INFO, "Position changed to %lld", pos);
+	
+		pos += (args[1] * svit->fps);
+		if( sample_valid_pos( v->current_sample, pos ))
+		{
+			sample_set_property_ptr(
+					v->current_sample, "current_pos", VEVO_ATOM_TYPE_UINT64, &pos );
+			veejay_msg(VEEJAY_MSG_INFO, "Position changed to %lld", pos);
+		}
 	}
+	
 }
 
 void vj_event_next_second(void *ptr, const char format[], va_list ap)
 {
+	int args[2];
 	veejay_t *v = (veejay_t*) ptr;
+	char *s = NULL;
+	P_A(args,s,format,ap);
 	
-        sample_video_info_t *svit = (sample_video_info_t*) v->video_info;
+	void *sample = which_sample(v,args);
-	uint64_t pos = sample_get_current_pos( v->current_sample );
 	
-	pos -= svit->fps;
+	if(sample)
-	if( sample_valid_pos( v->current_sample, pos ))
 	{
-		sample_set_property_ptr(
+		sample_video_info_t *svit = (sample_video_info_t*) v->video_info;
-				v->current_sample, "current_pos", VEVO_ATOM_TYPE_UINT64, &pos );
+		uint64_t pos = sample_get_current_pos( v->current_sample );
-		veejay_msg(VEEJAY_MSG_INFO, "Position changed to %lld", pos);
+	
+		pos -= (args[1] * svit->fps);
+		if( sample_valid_pos( v->current_sample, pos ))
+		{
+			sample_set_property_ptr(
+					v->current_sample, "current_pos", VEVO_ATOM_TYPE_UINT64, &pos );
+			veejay_msg(VEEJAY_MSG_INFO, "Position changed to %lld", pos);
+		}
 	}
 }
 
 void vj_event_goto_end(void *ptr, const char format[], va_list ap)
 {
+	int args[2];
 	veejay_t *v = (veejay_t*) ptr;
+	char *s = NULL;
+	P_A(args,s,format,ap);
 	
-	sample_video_info_t *svit = (sample_video_info_t*) v->video_info;
+	void *sample = which_sample(v,args);
-	uint64_t pos = sample_get_end_pos( v->current_sample );
+	if(sample)
-	
+	{	
-	sample_set_property_ptr(
+		uint64_t pos = sample_get_end_pos( v->current_sample );
+		sample_set_property_ptr(
 			v->current_sample, "current_pos", VEVO_ATOM_TYPE_UINT64, &pos );
-	veejay_msg(VEEJAY_MSG_INFO, "Position changed to %lld", pos);
+		veejay_msg(VEEJAY_MSG_INFO, "Position changed to %lld", pos);
+	}
 }
 
 void vj_event_goto_start(void *ptr, const char format[], va_list ap)
 {
+	int args[2];
 	veejay_t *v = (veejay_t*) ptr;
+	char *s = NULL;
+	P_A(args,s,format,ap);
 	
-	sample_video_info_t *svit = (sample_video_info_t*) v->video_info;
+	void *sample = which_sample(v,args);
-	uint64_t pos = sample_get_start_pos( v->current_sample );
+	if(sample)
-	
+	{	
-	sample_set_property_ptr(
+		uint64_t pos = sample_get_start_pos( v->current_sample );
+		sample_set_property_ptr(
 			v->current_sample, "current_pos", VEVO_ATOM_TYPE_UINT64, &pos );
-	veejay_msg(VEEJAY_MSG_INFO, "Position changed to %lld", pos);
+		veejay_msg(VEEJAY_MSG_INFO, "Position changed to %lld", pos);
+	}
 }
 
 void vj_event_set_property(void *ptr, const char format[], va_list ap)
@@ -1387,16 +1452,6 @@ void vj_event_get_property_value(void *ptr, const char format[], va_list ap)
 
 }
 
-#ifdef HAVE_XML2
-void vj_event_sample_save_list(void *ptr, const char format[], va_list ap)
-{
-}
-
-void vj_event_sample_load_list(void *ptr, const char format[], va_list ap)
-{
-}
-#endif
-
 void vj_event_sample_del(void *ptr, const char format[], va_list ap)
 {
 	int args[2];

veejay-ng/veejay/vj-event.h

@@ -53,14 +53,11 @@ void 	vj_event_none				(	void *ptr, 	const char format[], 	va_list ap	);
 void 	vj_event_play_forward			(	void *ptr, 	const char format[], 	va_list ap	);
 void 	vj_event_play_reverse			(	void *ptr,	const char format[], 	va_list ap	); 
 void 	vj_event_play_speed			(	void *ptr, 	const char format[], 	va_list ap	);
+void vj_event_play_repeat(void *ptr, const char format[], va_list ap);
 void 	vj_event_play_stop			(	void *ptr, 	const char format[], 	va_list ap	); 
 void 	vj_event_prev_second			(	void *ptr, 	const char format[], 	va_list ap	);
 void 	vj_event_sample_copy			(	void *ptr, 	const char format[], 	va_list ap	);
 void 	vj_event_sample_del			(	void *ptr, 	const char format[], 	va_list ap	);
-void 	vj_event_sample_load_list			(	void *ptr, 	const char format[], 	va_list ap	); 
-#ifdef HAVE_XML2
-void 	vj_event_sample_save_list			(	void *ptr, 	const char format[], 	va_list ap	); 
-#endif
 void	vj_event_sample_select			(	void *ptr, 	const char format[],	va_list ap	);
 void 	vj_event_set_property			(	void *ptr, 	const char format[], 	va_list ap	);
 void 	vj_event_get_property			(	void *ptr, 	const char format[], 	va_list ap	);
@@ -68,7 +65,6 @@ void 	vj_event_set_frame			(	void *ptr, 	const char format[], 	va_list ap	);
 #ifdef USE_DISPLAY
 void 	vj_event_set_screen_size		(	void *ptr, 	const char format[], 	va_list ap	);
 #endif
-void	vj_event_send_sample_list			(	void *ptr,	const char format[],	va_list ap	);
 void 	vj_event_sample_new			(	void *ptr,	const char format[],	va_list ap	);
 void	vj_event_quit				(	void *ptr,	const char format[],	va_list ap	);
 void	vj_event_set_volume			(	void *ptr,	const char format[],	va_list ap	);

veejay-ng/veejay/vj-eventman.c

@@ -370,14 +370,16 @@ void		vj_init_vevo_events(void)
 
 
 	index_map_[VIMS_SAMPLE_NEW] 		=	_new_event(
-				"%d %s",
+				"%d %d %s",
 				VIMS_SAMPLE_NEW,
 				"Create a new sample",
 				vj_event_sample_new,
-				2,
+				3,
 				VIMS_REQUIRE_ALL_PARAMS,
 				"Type",
 				0,
+				"Number",
+				0,
 				"Token",
 				NULL,
 				NULL );
@@ -503,6 +505,19 @@ void		vj_init_vevo_events(void)
 				1,	
 				NULL );
 
+	index_map_[VIMS_SAMPLE_SET_SLOW] 	= 	_new_event(
+				"%d %d",
+				VIMS_SAMPLE_SET_SLOW,
+				"Change repeat speed",
+				vj_event_play_repeat,
+				2,
+				VIMS_REQUIRE_ALL_PARAMS,
+				SAMPLE_ID_HELP,
+				0,
+				"Frame repeat",	
+				0,	
+				NULL );
+
 	index_map_[VIMS_SAMPLE_SET_FRAME]	= 	_new_event(
 				"%d %d",
 				VIMS_SAMPLE_SET_FRAME,
@@ -516,35 +531,6 @@ void		vj_init_vevo_events(void)
 				0,
 				NULL );
 
-#ifdef HAVE_XML2
-	index_map_[VIMS_SAMPLE_LOAD]		=	_new_event(
-				"%d %s",
-				VIMS_SAMPLE_LOAD,
-				"Load samples from file",
-				vj_event_sample_load_list,
-				2,
-				VIMS_REQUIRE_ALL_PARAMS,
-				SAMPLE_ID_HELP,
-				0,
-				"Filename",
-				NULL,
-				NULL );
-	
-	index_map_[VIMS_SAMPLE_SAVE]		=	_new_event(
-				"%d %s",
-				VIMS_SAMPLE_SAVE,
-				"Save samples to file",
-				vj_event_sample_save_list,
-				2,
-				VIMS_REQUIRE_ALL_PARAMS,
-				SAMPLE_ID_HELP,
-				0,
-				"Filename",
-				NULL,
-				NULL );
-#endif
-
-	
 	index_map_[VIMS_SAMPLE_DEL]				=	_new_event(
 				"%d",
 				VIMS_SAMPLE_DEL,
@@ -751,13 +737,15 @@ void		vj_init_vevo_events(void)
 				NULL,
 				NULL );
 
-	index_map_[VIMS_SET_VOLUME]			=	_new_event(
+	index_map_[VIMS_SAMPLE_SET_VOLUME]			=	_new_event(
-				"%d",
+				"%d %d",
-				VIMS_SET_VOLUME,
+				VIMS_SAMPLE_SET_VOLUME,
 				"Set audio volume",
 				vj_event_set_volume,
-				1,
+				2,
 				VIMS_REQUIRE_ALL_PARAMS,
+				SAMPLE_ID_HELP,
+				0,
 				"Volume 0-100",
 				0,
 				NULL );

veejay-ng/veejay/vj-jack.h

@@ -21,9 +21,8 @@
 
 #include <config.h>
 #ifdef HAVE_JACK
-#include <libel/vj-el.h>
 
-int vj_jack_init(editlist *el);
+int vj_jack_init(int bps, int chans, long rate);
 
 int vj_jack_update_buffer( uint8_t *buff, int bps, int num_channels, int buf_len);
 

veejay-ng/veejay/vj-pjack.c

@@ -43,17 +43,31 @@ int vj_jack_initialize()
 }
 static int _vj_jack_start(int *dri)
 {
-	int err = JACK_Open(dri, bits_per_sample,&audio_rate,audio_channels);
+	const char *port_name = NULL;
-	if(err == ERR_RATE_MISMATCH)
+	unsigned long port_flags = JackPortIsPhysical;
+	unsigned int port_count=0;
+	int err = JACK_OpenEx(dri, bits_per_sample,&audio_rate,0,audio_channels, &port_name, port_count, port_flags);
+	switch(err)
 	{
-		veejay_msg(2,
+		case ERR_TOO_MANY_OUTPUT_CHANNELS:
-			"(Jack) Sample rate mismatch (Retrying)");
+		veejay_msg(0, "(JACK) Too many output channels");
-
+		break;
-		err = JACK_Open(dri, bits_per_sample,&audio_rate,
+		case ERR_PORT_NAME_OUTPUT_CHANNEL_MISMATCH:
-			audio_channels);
+		veejay_msg(0, "(JACK) Mismatched output channel port name");
-
+		break;
+		case ERR_BYTES_PER_OUTPUT_FRAME_INVALID:
+		veejay_msg(0, "(JACK) Bytes per output frame invalid");
+		break;
+		case ERR_RATE_MISMATCH:
+		veejay_msg(0, "(JACK) Audio rate mismatch");
+		break;
+		case ERR_OPENING_JACK:
+		veejay_msg(0, "Is the device already used?");
+		break;
+		case ERR_SUCCESS:
+		veejay_msg(2, "Successfully connected to Jackd");
+		break;
 	}		
-
 	if(err != ERR_SUCCESS)
 	{
 		return 0;
@@ -62,55 +76,37 @@ static int _vj_jack_start(int *dri)
 	return 1;
 }
 
-int vj_jack_init(editlist *el)
+int vj_jack_init(int bits_ps, int audio_chans, int rate)
 {
 	int err;
-	int v_rate = el->audio_rate;
 	int i = 0;
 	int ret = 0;
-	JACK_Init();
-
-	bits_per_sample = 16;
-	audio_channels = el->audio_chans;
-	audio_rate = el->audio_rate;
-
-
-	if( !_vj_jack_start(&driver) )
-		return ret;
 
 	audio_bps = audio_rate * audio_channels;
-
+	audio_rate = rate;
+	audio_channels = audio_chans;
+	bits_per_sample = bits_ps;
 	buffer_len = vj_jack_get_space();
+	if( !_vj_jack_start(&driver) )
+		return 0;
 
-	veejay_msg(2,"Jack:  %d Hz/ %d Channels %d Bit ", audio_rate, audio_channels,bits_per_sample);
 
-	ret = 1;
+	veejay_msg(2,"Sample has Audio,  %d Hz/ %d Channels %d Bit ", audio_rate, audio_channels,bits_per_sample);
-
+	return 1;
-	if( v_rate != audio_rate )
-	{
-		el->play_rate = audio_rate;               	
-		ret = 2;
-	}
-
-	//JACK_SetState( driver, PLAYING);
-	return ret;
 }
 
-int	vj_jack_continue(int speed)
+void	vj_jack_continue(int speed)
 {
 	if(speed==0)
 	{
-		if(JACK_GetState(driver) == PAUSED) return 1;
+		if(JACK_GetState(driver) == PAUSED) return;
 		JACK_SetState(driver, PAUSED );
-		return 1;
 	}
-
+	else
 	if( JACK_GetState(driver) == PAUSED )
 	{
 		JACK_SetState(driver, PLAYING);
-		return 1;
 	}
-	return 0;
 }
 
 
@@ -129,6 +125,7 @@ int	vj_jack_stop()
 
 int	vj_jack_reset()
 {
+	veejay_msg(0, "%s: RESET",__FUNCTION__ );
 	JACK_Reset(driver);
 	buffer_len = 0;
 	return 1;
@@ -172,6 +169,7 @@ long	vj_jack_get_status(long int *sec, long int *usec)
 {
 //JACK_GetPosition(int deviceID, enum pos_enum position, int type);
 
-	return JACK_OutputStatus( driver, sec, usec);
+	return JACK_OutputStatus( driver , sec, usec ) + JACK_GetJackOutputLatency( driver ) + (JACK_GetJackBufferedBytes(driver) * 2);
+
 }
 #endif

veejay-ng/vevosample/Makefile.am

@@ -15,7 +15,7 @@ INCLUDES = 	-I$(top_srcdir) -I$(includedir) \
 		-I$(top_srcdir)/libvevo \
 		$(FFMPEG_AVCODEC_CFLAGS) $(FFMPEG_AVFORMAT_CFLAGS) \
 		${XML_CFLAGS} ${DV_FLAGS} ${GTK_CFLAGS} ${X_CFLAGS} ${XML_CPPFLAGS} \
-		${PTHREAD_CFLAGS} ${MJPEGTOOLS_CFLAGS} 
+		${PTHREAD_CFLAGS} ${MJPEGTOOLS_CFLAGS} ${UNICAP_CFLAGS} 
 
 VEVOSAMPLE_LIB_FILE = libvevosample.la
 
@@ -26,7 +26,7 @@ VEVOSAMPLE_ALL_LIB_OPTS = \
 	-release $(LT_RELEASE) \
 	-export-dynamic
 
-libvevosample_la_SOURCES = v4lutils.c vj-v4lvideo.c vj-yuv4mpeg.c vj-vloopback.c vevosample.c
+libvevosample_la_SOURCES = vj-unicap.c vj-yuv4mpeg.c vevosample.c
 libvevosample_la_LIBADD = \
 	-L$(top_builddir)/libhash -lhash \
 	-L$(top_builddir)/libvjmsg -lvjmsg \

veejay-ng/vevosample/Makefile.in

@@ -1,569 +0,0 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-# Makefile for veejay
-
-SOURCES = $(libvevosample_la_SOURCES)
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-target_triplet = @target@
-subdir = vevosample
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(libdir)"
-libLTLIBRARIES_INSTALL = $(INSTALL)
-LTLIBRARIES = $(lib_LTLIBRARIES)
-libvevosample_la_DEPENDENCIES =
-am_libvevosample_la_OBJECTS = v4lutils.lo vj-v4lvideo.lo \
-	vj-yuv4mpeg.lo vj-vloopback.lo vevosample.lo
-libvevosample_la_OBJECTS = $(am_libvevosample_la_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = $(libvevosample_la_SOURCES)
-DIST_SOURCES = $(libvevosample_la_SOURCES)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALTIVEC_CFLAGS = @ALTIVEC_CFLAGS@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
-AMTAR = @AMTAR@
-AR = @AR@
-AS = @AS@
-ASFLAGS = @ASFLAGS@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCAS = @CCAS@
-CCASFLAGS = @CCASFLAGS@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-ECHO = @ECHO@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
-FFMPEG_AVCODEC_CFLAGS = @FFMPEG_AVCODEC_CFLAGS@
-FFMPEG_AVCODEC_LIBS = @FFMPEG_AVCODEC_LIBS@
-FFMPEG_AVFORMAT_CFLAGS = @FFMPEG_AVFORMAT_CFLAGS@
-FFMPEG_AVFORMAT_LIBS = @FFMPEG_AVFORMAT_LIBS@
-GLIB_CFLAGS = @GLIB_CFLAGS@
-GLIB_CONFIG = @GLIB_CONFIG@
-GLIB_LIBS = @GLIB_LIBS@
-GL_CFLAGS = @GL_CFLAGS@
-GL_LIBS = @GL_LIBS@
-HAVE_ALTIVEC_FALSE = @HAVE_ALTIVEC_FALSE@
-HAVE_ALTIVEC_TRUE = @HAVE_ALTIVEC_TRUE@
-HAVE_ASM_MMX2_FALSE = @HAVE_ASM_MMX2_FALSE@
-HAVE_ASM_MMX2_TRUE = @HAVE_ASM_MMX2_TRUE@
-HAVE_ASM_MMX_FALSE = @HAVE_ASM_MMX_FALSE@
-HAVE_ASM_MMX_TRUE = @HAVE_ASM_MMX_TRUE@
-HAVE_ASM_NASM_FALSE = @HAVE_ASM_NASM_FALSE@
-HAVE_ASM_NASM_TRUE = @HAVE_ASM_NASM_TRUE@
-HAVE_ASM_SSE2_FALSE = @HAVE_ASM_SSE2_FALSE@
-HAVE_ASM_SSE2_TRUE = @HAVE_ASM_SSE2_TRUE@
-HAVE_ASM_SSE_FALSE = @HAVE_ASM_SSE_FALSE@
-HAVE_ASM_SSE_TRUE = @HAVE_ASM_SSE_TRUE@
-HAVE_DL_DLOPEN_FALSE = @HAVE_DL_DLOPEN_FALSE@
-HAVE_DL_DLOPEN_TRUE = @HAVE_DL_DLOPEN_TRUE@
-HAVE_JACK_FALSE = @HAVE_JACK_FALSE@
-HAVE_JACK_TRUE = @HAVE_JACK_TRUE@
-HAVE_MMX2_FALSE = @HAVE_MMX2_FALSE@
-HAVE_MMX2_TRUE = @HAVE_MMX2_TRUE@
-HAVE_MMX_FALSE = @HAVE_MMX_FALSE@
-HAVE_MMX_TRUE = @HAVE_MMX_TRUE@
-HAVE_PPCCPU_FALSE = @HAVE_PPCCPU_FALSE@
-HAVE_PPCCPU_TRUE = @HAVE_PPCCPU_TRUE@
-HAVE_SDL_FALSE = @HAVE_SDL_FALSE@
-HAVE_SDL_TRUE = @HAVE_SDL_TRUE@
-HAVE_SSE2_FALSE = @HAVE_SSE2_FALSE@
-HAVE_SSE2_TRUE = @HAVE_SSE2_TRUE@
-HAVE_SSE_FALSE = @HAVE_SSE_FALSE@
-HAVE_SSE_TRUE = @HAVE_SSE_TRUE@
-HAVE_V4L_FALSE = @HAVE_V4L_FALSE@
-HAVE_V4L_TRUE = @HAVE_V4L_TRUE@
-HAVE_X86CPU_FALSE = @HAVE_X86CPU_FALSE@
-HAVE_X86CPU_TRUE = @HAVE_X86CPU_TRUE@
-HAVE_XML2_FALSE = @HAVE_XML2_FALSE@
-HAVE_XML2_TRUE = @HAVE_XML2_TRUE@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
-LIBDV_CFLAGS = @LIBDV_CFLAGS@
-LIBDV_LIBS = @LIBDV_LIBS@
-LIBGETOPT_LIB = @LIBGETOPT_LIB@
-LIBM_LIBS = @LIBM_LIBS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-LT_AGE = @LT_AGE@
-LT_CURRENT = @LT_CURRENT@
-LT_RELEASE = @LT_RELEASE@
-LT_REVISION = @LT_REVISION@
-MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-MAKEINFO = @MAKEINFO@
-MJPEGTOOLS_CFLAGS = @MJPEGTOOLS_CFLAGS@
-MJPEGTOOLS_LIBS = @MJPEGTOOLS_LIBS@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PROGRAM_NOPIC = @PROGRAM_NOPIC@
-PTHREAD_LIBS = @PTHREAD_LIBS@
-RANLIB = @RANLIB@
-SDL_CFLAGS = @SDL_CFLAGS@
-SDL_CONFIG = @SDL_CONFIG@
-SDL_LIBS = @SDL_LIBS@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-SUPPORT_READ_DV2_FALSE = @SUPPORT_READ_DV2_FALSE@
-SUPPORT_READ_DV2_TRUE = @SUPPORT_READ_DV2_TRUE@
-V4LCONF_LIBS = @V4LCONF_LIBS@
-VERSION = @VERSION@
-XML2_CONFIG = @XML2_CONFIG@
-XML_CPPFLAGS = @XML_CPPFLAGS@
-XML_LIBS = @XML_LIBS@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-datadir = @datadir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target = @target@
-target_alias = @target_alias@
-target_cpu = @target_cpu@
-target_os = @target_os@
-target_vendor = @target_vendor@
-MAINTAINERCLEANFILES = Makefile.in
-INCLUDES = -I$(top_srcdir) -I$(includedir) \
-		-DG_LOG_DOMAIN=\"veejay\" -DVEEJAY_VERSION=\"$(VERSION)\" \
-     		-I /usr/X11R6/include -I$(top_srcdir)/libOSC \
-		-I$(top_srcdir)/libhash \
-		-I$(top_srcdir)/libplugger \
-		-I$(top_srcdir)/libvjmem \
-		-I$(top_srcdir)/libvjmsg \
-		-I$(top_srcdir)/libvjnet \
-		-I$(top_srcdir)/libel \
-		-I$(top_scrdir)/libyuv \
-		-I$(top_srcdir)/libvevo \
-		$(FFMPEG_AVCODEC_CFLAGS) $(FFMPEG_AVFORMAT_CFLAGS) \
-		${XML_CFLAGS} ${DV_FLAGS} ${GTK_CFLAGS} ${X_CFLAGS} ${XML_CPPFLAGS} \
-		${PTHREAD_CFLAGS} ${MJPEGTOOLS_CFLAGS} 
-
-VEVOSAMPLE_LIB_FILE = libvevosample.la
-lib_LTLIBRARIES = $(VEVOSAMPLE_LIB_FILE)
-VEVOSAMPLE_ALL_LIB_OPTS = \
-	-version-info $(LT_AGE):$(LT_REVISION):$(LT_AGE) \
-	-release $(LT_RELEASE) \
-	-export-dynamic
-
-libvevosample_la_SOURCES = v4lutils.c vj-v4lvideo.c vj-yuv4mpeg.c vj-vloopback.c vevosample.c
-libvevosample_la_LIBADD = \
-	-L$(top_builddir)/libhash -lhash \
-	-L$(top_builddir)/libvjmsg -lvjmsg \
-	-L$(top_builddir)/libvjmem -lvjmem \
-	-L$(top_builddir)/libel -lel \
-	-L$(top_builddir)/libyuv -lyuv \
-	-L$(top_builddir)/libvjnet -lvjnet \
-	-L$(top_builddir)/libvevo -lvevo \
-	-L$(top_builddir)/libplugger -lvjplug 
-
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  vevosample/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  vevosample/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-install-libLTLIBRARIES: $(lib_LTLIBRARIES)
-	@$(NORMAL_INSTALL)
-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	  if test -f $$p; then \
-	    f=$(am__strip_dir) \
-	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
-	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
-	  else :; fi; \
-	done
-
-uninstall-libLTLIBRARIES:
-	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	  p=$(am__strip_dir) \
-	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
-	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
-	done
-
-clean-libLTLIBRARIES:
-	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
-libvevosample.la: $(libvevosample_la_OBJECTS) $(libvevosample_la_DEPENDENCIES) 
-	$(LINK) -rpath $(libdir) $(libvevosample_la_LDFLAGS) $(libvevosample_la_OBJECTS) $(libvevosample_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/v4lutils.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vevosample.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vj-v4lvideo.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vj-vloopback.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vj-yuv4mpeg.Plo@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
-	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LTLIBRARIES)
-installdirs:
-	for dir in "$(DESTDIR)$(libdir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-clean: clean-am
-
-clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
-	mostlyclean-am
-
-distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-exec-am: install-libLTLIBRARIES
-
-install-info: install-info-am
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libLTLIBRARIES clean-libtool ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am \
-	install-libLTLIBRARIES install-man install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-info-am \
-	uninstall-libLTLIBRARIES
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

veejay-ng/vevosample/defs.h

@@ -21,12 +21,10 @@
 #define VJ_TAG_TYPE_NONE 0
 #define VJ_TAG_TYPE_PICTURE 5
 #define VJ_TAG_TYPE_COLOR 4
-#define VJ_TAG_TYPE_VLOOPBACK 3
+#define VJ_TAG_TYPE_CAPTURE 2
-#define VJ_TAG_TYPE_V4L 2
 #define VJ_TAG_TYPE_YUV4MPEG 1
 #define VJ_TAG_TYPE_SHM 11
 #define VJ_TAG_TYPE_NET 13
 #define VJ_TAG_TYPE_MCAST 14
-#define VJ_TAG_TYPE_DV1394 17
 #define VJ_TAG_TYPE_AVFORMAT 12
 #endif

veejay-ng/vevosample/v4lutils.c

@@ -1,677 +0,0 @@
-/*
- * v4lutils - utility library for Video4Linux
- * Copyright (C) 2001 FUKUCHI Kentarou
- *
- * v4lutils.c: utility functions
- *
- * veejay - Linux VeeJay
- * 	     (C) 2002-2004 Niels Elburg <nelburg@looze.net> 
- *
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-#include <config.h>
-#ifdef HAVE_V4L
-#include <stdio.h>
-#include <assert.h>
-#include <sys/ioctl.h>
-#include <sys/types.h>
-#include <sys/mman.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <linux/videodev.h>
-#include <pthread.h>
-#include <errno.h>
-#include <libvjmsg/vj-common.h>
-#include <vevosample/v4lutils.h>
-#ifdef V4L_DEBUG
-#undef V4L_DEBUG
-#endif
-/*
- * v4lperror - inhouse perror.
- *
- * name: device file
- * vd: v4l device object
- */
-static void v4lperror(const char *str)
-{
-    fprintf(stderr, "%s\n", str);
-}
-
-/*
- * v4lopen - open the v4l device.
- *
- * name: device file
- * vd: v4l device object
- */
-
-int v4lopen(char *name, v4ldevice * vd)
-{
-    int i;
-    if (name == NULL)
-		return -1;
-#ifdef V4L_DEBUG
-    fprintf(stderr, "v4lopen:adsfadf open...%s\n", name);
-#endif
-    if ((vd->fd = open(name, O_RDWR)) < 0) {
-	fprintf(stderr,"v4lopen: error opening device [%s]\n",name);
-	return -1;
-    }
-    if (v4lgetcapability(vd))
-	return -1;
-
-#ifdef V4L_DEBUG
-    fprintf(stderr, "v4lopen:VIDIOCGCHAN...\n");
-#endif
-    for (i = 0; i < vd->capability.channels; i++) {
-	vd->channel[i].channel = i;
-	if (ioctl(vd->fd, VIDIOCGCHAN, &(vd->channel[i])) < 0) {
-	    v4lperror("v4lopen:VIDIOCGCHAN");
-	    return -1;
-	}
-    }
-    v4lsetdefaultnorm(vd, vd->norm);
-
-    v4lgetpicture(vd);
-
-    pthread_mutex_init(&vd->mutex, NULL);
-#ifdef V4L_DEBUG
-    fprintf(stderr, "v4lopen:quit\n");
-#endif
-
-    return 0;
-}
-
-/*
- * v4lclose - close v4l device
- *
- * vd: v4l device object
- */
-int v4lclose(v4ldevice * vd)
-{
-#ifdef V4L_DEBUG
-    fprintf(stderr, "v4lclose:close...\n");
-#endif
-    close(vd->fd);
-#ifdef V4L_DEBUG
-    fprintf(stderr, "v4lclose:quit\n");
-#endif
-    return 0;
-}
-
-/*
- * v4lgetcapability - get the capability of v4l device
- *
- * vd: v4l device object
- */
-int v4lgetcapability(v4ldevice * vd)
-{
-#ifdef V4L_DEBUG
-    fprintf(stderr, "v4lgetcapability:VIDIOCGCAP...\n");
-#endif
-    if (ioctl(vd->fd, VIDIOCGCAP, &(vd->capability)) < 0) {
-	v4lperror("v4lopen:VIDIOCGCAP");
-	return -1;
-    }
-#ifdef V4L_DEBUG
-    fprintf(stderr, "v4lgetcapability:quit\n");
-#endif
-    return 0;
-}
-
-/*
- * v4lsetdefaultnorm - set default norm and reset parameters
- *
- * vd: v4l device object
- * norm: default norm
- */
-int v4lsetdefaultnorm(v4ldevice * vd, int norm)
-{
-    int i;
-
-    for (i = 0; i < vd->capability.channels; i++) {
-	v4lsetchannelnorm(vd, i, norm);
-    }
-    if (v4lgetcapability(vd) != 0)
-	return -1;
-    if (v4lgetpicture(vd) != 0)
-	return -1;
-    return 0;
-}
-
-/*
- * v4lgetsubcapture - get current status of subfield capturing
- *
- * vd: v4l device object
- */
-int v4lgetsubcapture(v4ldevice * vd)
-{
-    if (ioctl(vd->fd, VIDIOCGCAPTURE, &(vd->capture)) < 0) {
-	v4lperror("v4lgetsubcapture:VIDIOCGCAPTURE");
-	return -1;
-    }
-    return 0;
-}
-
-/*
- * v4lsetsubcapture - set parameters for subfield capturing
- *
- * vd: v4l device object
- * x,y: coordinate of source rectangle to grab
- * width: width of source rectangle to grab
- * height: height of source rectangle to grab
- * decimation: decimation to apply
- * flags: flag setting for grabbing odd/even frames
- */
-int v4lsetsubcapture(v4ldevice * vd, int x, int y, int width, int height,
-		     int decimation, int flags)
-{
-    vd->capture.x = x;
-    vd->capture.y = y;
-    vd->capture.width = width;
-    vd->capture.height = height;
-    vd->capture.decimation = decimation;
-    vd->capture.flags = flags;
-    if (ioctl(vd->fd, VIDIOCGCAPTURE, &(vd->capture)) < 0) {
-	v4lperror("v4lsetsubcapture:VIDIOCSCAPTURE");
-	return -1;
-    }
-    return 0;
-}
-
-/*
- * v4lgetframebuffer - get current status of frame buffer
- *
- * vd: v4l device object
- */
-int v4lgetframebuffer(v4ldevice * vd)
-{
-    if (ioctl(vd->fd, VIDIOCGFBUF, &(vd->buffer)) < 0) {
-	v4lperror("v4lgetframebuffer:VIDIOCGFBUF");
-	return -1;
-    }
-    return 0;
-}
-
-/*
- * v4lsetframebuffer - set parameters of frame buffer
- *
- * vd: v4l device object
- * base: base PHYSICAL address of the frame buffer
- * width: width of the frame buffer
- * height: height of the frame buffer
- * depth: color depth of the frame buffer
- * bpl: number of bytes of memory between the start of two adjacent lines
- */
-int v4lsetframebuffer(v4ldevice * vd, void *base, int width, int height,
-		      int depth, int bpl)
-{
-    vd->buffer.base = base;
-    vd->buffer.width = width;
-    vd->buffer.height = height;
-    vd->buffer.depth = depth;
-    vd->buffer.bytesperline = bpl;
-    if (ioctl(vd->fd, VIDIOCSFBUF, &(vd->buffer)) < 0) {
-	v4lperror("v4lsetframebuffer:VIDIOCSFBUF");
-	return -1;
-    }
-    return 0;
-}
-
-/*
- * v4loverlaystart - activate overlay capturing
- *
- * vd: v4l device object
- */
-int v4loverlaystart(v4ldevice * vd)
-{
-    if (ioctl(vd->fd, VIDIOCCAPTURE, 1) < 0) {
-	v4lperror("v4loverlaystart:VIDIOCCAPTURE");
-	return -1;
-    }
-    vd->overlay = 1;
-    return 0;
-}
-
-/*
- * v4loverlaystop - stop overlay capturing
- *
- * vd: v4l device object
- */
-int v4loverlaystop(v4ldevice * vd)
-{
-    if (ioctl(vd->fd, VIDIOCCAPTURE, 0) < 0) {
-	v4lperror("v4loverlaystop:VIDIOCCAPTURE");
-	return -1;
-    }
-    vd->overlay = 0;
-    return 0;
-}
-
-/*
- * v4lsetchannel - select the video source
- *
- * vd: v4l device object
- * ch: the channel number
- */
-int v4lsetchannel(v4ldevice * vd, int ch)
-{
-    if (ioctl(vd->fd, VIDIOCSCHAN, &(vd->channel[ch])) < 0) {
-	v4lperror("v4lsetchannel:VIDIOCSCHAN");
-	return -1;
-    }
-    return 0;
-}
-
-int v4lmaxchannel(v4ldevice * vd)
-{
-    return vd->capability.channels;
-}
-
-int v4lcancapture(v4ldevice * vd)
-{
-    if (!vd->capability.type & VID_TYPE_CAPTURE)
-		return -1;
-    return 0;
-}
-
-int v4lhastuner(v4ldevice * vd)
-{
-    if (vd->capability.type & VID_TYPE_TUNER)
-	return 0;
-    return -1;
-}
-
-int v4lhasdoublebuffer(v4ldevice * vd)
-{
-    if (vd->mbuf.frames < 2)
-		return -1;
-    return 0;
-}
-
-int v4lgetbrightness(v4ldevice * vd)
-{
-    return vd->picture.brightness;
-}
-
-int v4lgethue(v4ldevice * vd)
-{
-    return vd->picture.hue;
-}
-
-int v4lgetcolor(v4ldevice * vd)
-{
-    return vd->picture.colour;
-}
-
-int v4lgetcontrast(v4ldevice * vd)
-{
-    return vd->picture.contrast;
-}
-
-int v4lsetcontinuous(v4ldevice * vd)
-{
-    vd->frame = 0;
-    if (v4lgrabstart(vd, 0) < 0)
-		return -1;
-    if (v4lgrabstart(vd, 1) < 0)
-		return -1;
-    return 0;
-}
-
-int v4lstopcontinuous(v4ldevice * vd)
-{
-    if (vd->framestat[vd->frame])
-	{
-		if (v4lsync(vd, vd->frame) < 0)
-		    return -1;
-    }
-    if (vd->framestat[vd->frame ^ 1])
-	{
-		if (v4lsync(vd, vd->frame ^ 1) < 0)
-		    return -1;
-    }
-    return 0;
-}
-
-/*
- * v4lsetfreq - set the frequency of tuner
- *
- * vd: v4l device object
- * ch: frequency in KHz
- */
-int v4lsetfreq(v4ldevice * vd, int freq)
-{
-    unsigned long longfreq = (freq * 16) / 1000;
-    if (ioctl(vd->fd, VIDIOCSFREQ, &longfreq) < 0) {
-	v4lperror("v4lsetfreq:VIDIOCSFREQ");
-	return -1;
-    }
-    return 0;
-}
-
-/*
- * v4lsetchannelnorm - set the norm of channel
- *
- * vd: v4l device object
- * ch: the channel number
- * norm: PAL/NTSC/OTHER (see videodev.h)
- */
-int v4lsetchannelnorm(v4ldevice * vd, int ch, int norm)
-{
-    vd->channel[ch].norm = norm;
-    return 0;
-}
-
-/*
- * v4lgetpicture - get current properties of the picture
- *
- * vd: v4l device object
- */
-int v4lgetpicture(v4ldevice * vd)
-{
-    if (ioctl(vd->fd, VIDIOCGPICT, &(vd->picture)) < 0) {
-	v4lperror("v4lgetpicture:VIDIOCGPICT");
-	return -1;
-    }
-    return 0;
-}
-
-/*
- * v4lsetpicture - set the image properties of the picture
- *
- * vd: v4l device object
- * br: picture brightness
- * hue: picture hue
- * col: picture color
- * cont: picture contrast
- * white: picture whiteness
- */
-int v4lsetpicture(v4ldevice * vd, int br, int hue, int col, int cont,
-		  int white)
-{
-    if (br >= 0)
-	vd->picture.brightness = br;
-    if (hue >= 0)
-	vd->picture.hue = hue;
-    if (col >= 0)
-	vd->picture.colour = col;
-    if (cont >= 0)
-	vd->picture.contrast = cont;
-    if (white >= 0)
-	vd->picture.whiteness = white;
-    if (ioctl(vd->fd, VIDIOCSPICT, &(vd->picture)) < 0) {
-	v4lperror("v4lsetpicture:VIDIOCSPICT");
-	return -1;
-    }
-    return 0;
-}
-
-/*
- * v4lsetpalette - set the palette for the images
- *
- * vd: v4l device object
- * palette: palette
- */
-int v4lsetpalette(v4ldevice * vd, int palette)
-{
-    if (!vd)
-	fprintf(stderr, "null error\n");
-    vd->picture.palette = palette;
-    vd->mmap.format = palette;
-    if (ioctl(vd->fd, VIDIOCSPICT, &(vd->picture)) < 0) {
-	v4lperror("v4lsetpalette:VIDIOCSPICT");
-	return -1;
-    }
-    return 0;
-}
-
-/*
- * v4lgetmbuf - get the size of the buffer to mmap
- *
- * vd: v4l device object
- */
-int v4lgetmbuf(v4ldevice * vd)
-{
-    if (ioctl(vd->fd, VIDIOCGMBUF, &(vd->mbuf)) < 0) {
-	v4lperror("v4lgetmbuf:VIDIOCGMBUF");
-	return -1;
-    }
-    return 0;
-}
-
-/*
- * v4lmmap - initialize mmap interface
- *
- * vd: v4l device object
- */
-int v4lmmap(v4ldevice * vd)
-{
-    if (v4lgetmbuf(vd) < 0)
-	return -1;
-    if ((vd->map =
-	 mmap(0, vd->mbuf.size, PROT_READ | PROT_WRITE, MAP_SHARED, vd->fd,
-	      0)) < 0) {
-	v4lperror("v4lmmap:mmap");
-	return -1;
-    }
-    return 0;
-}
-
-/*
- * v4lmunmap - free memory area for mmap interface
- *
- * vd: v4l device object
- */
-int v4lmunmap(v4ldevice * vd)
-{
-    if (munmap(vd->map, vd->mbuf.size) < 0) {
-	v4lperror("v4lmunmap:munmap");
-	return -1;
-    }
-    return 0;
-}
-
-/*
- * v4lgrabinit - set parameters for mmap interface
- *
- * vd: v4l device object
- * width: width of the buffer
- * height: height of the buffer
- */
-int v4lgrabinit(v4ldevice * vd, int width, int height)
-{
-    vd->mmap.width = width;
-    vd->mmap.height = height;
-    vd->mmap.format = vd->picture.palette;
-    vd->frame = 0;
-    vd->framestat[0] = 0;
-    vd->framestat[1] = 0;
-    return 0;
-}
-
-/*
- * v4lgrabstart - activate mmap capturing
- *
- * vd: v4l device object
- * frame: frame number for storing captured image
- */
-int v4lgrabstart(v4ldevice * vd, int frame)
-{
-#ifdef V4L_DEBUG
-    fprintf(stderr, "v4lgrabstart: grab frame %d.\n", frame);
-#endif
-    if (vd->framestat[frame]) {
-		return -1;
-	}
-    vd->mmap.frame = frame;
-    if (ioctl(vd->fd, VIDIOCMCAPTURE, &(vd->mmap)) < 0) {
-		return -1;
-    }
-    vd->framestat[frame] = 1;
-    return 0;
-}
-
-/*
- * v4lsync - wait until mmap capturing of the frame is finished
- *
- * vd: v4l device object
- * frame: frame number
- */
-int v4lsync(v4ldevice * vd, int frame)
-{
-#ifdef V4L_DEBUG
-    fprintf(stderr, "v4lsync: sync frame %d.\n", frame);
-#endif
-    if (vd->framestat[frame] == 0) {
-	fprintf(stderr, "v4lsync: grabbing to frame %d is not started.\n",
-		frame);
-    }
-    if (ioctl(vd->fd, VIDIOCSYNC, &frame) < 0) {
-	v4lperror("v4lsync:VIDIOCSYNC");
-	return -1;
-    }
-    vd->framestat[frame] = 0;
-    return 0;
-}
-
-/*
- * v4llock - lock the Video4Linux device object
- *
- * vd: v4l device object
- */
-int v4llock(v4ldevice * vd)
-{
-    return pthread_mutex_lock(&vd->mutex);
-}
-
-/*
- * v4lunlock - unlock the Video4Linux device object
- *
- * vd: v4l device object
- */
-int v4lunlock(v4ldevice * vd)
-{
-    return pthread_mutex_unlock(&vd->mutex);
-}
-
-/*
- * v4ltrylock - lock the Video4Linux device object (non-blocking mode)
- *
- * vd: v4l device object
- */
-int v4ltrylock(v4ldevice * vd)
-{
-    return pthread_mutex_trylock(&vd->mutex);
-}
-
-/*
- * v4lsyncf - flip-flop sync
- *
- * vd: v4l device object
- */
-int v4lsyncf(v4ldevice * vd)
-{
-    return v4lsync(vd, vd->frame);
-}
-
-/*
- * v4lgrabf - flip-flop grabbing
- *
- * vd: v4l device object
- */
-int v4lgrabf(v4ldevice * vd)
-{
-    int f;
-
-    f = vd->frame;
-    vd->frame = vd->frame ^ 1;
-    return v4lgrabstart(vd, f);
-}
-
-/*
- * v4lgetaddress - returns a offset addres of buffer for mmap capturing
- *
- * vd: v4l device object
- */
-uint8_t *v4lgetaddress(v4ldevice * vd)
-{
-    return (vd->map + vd->mbuf.offsets[vd->frame]);
-}
-
-/*
- * v4lreadframe - grab one frame by calling read system call
- * vd: v4l device object
- * buf: buffer where a grabbed imaged is stored
- */
-
-int v4lreadframe(v4ldevice * vd, uint8_t * buf, int width, int height)
-{
-    /* to do */
-    if(vd->preferred_palette == VIDEO_PALETTE_YUV420P)
-	{
-	int len = (width*height*2) - (width*height)/4;
-	int n = 
-		read(vd->fd,buf,len);
-	if ( n < 0)
-		return -1;
-	}
-	else 
-	{
-	    if (read(vd->fd, buf, (width * height * 3)) != (width * height * 3)) 
-		{
-		return -1;
-		  }
-	}
-    return 0;
-}
-
-/*
- * v4lprint - print v4l device object
- *
- * vd: v4l device object
- */
-void v4lprint(v4ldevice * vd)
-{
-    char descr[30];
-    veejay_msg(VEEJAY_MSG_INFO,"\tDevice\t\t%s", vd->capability.name);
-    if (vd->capability.type & VID_TYPE_CAPTURE)
-	sprintf(descr,"VID_TYPE_CAPTURE");
-    if (vd->capability.type & VID_TYPE_OVERLAY)
-	sprintf(descr,"VID_TYPE_OVERLAY");
-    if (vd->capability.type & VID_TYPE_CLIPPING)
-	sprintf(descr,"VID_TYPE_CLIPPING");
-    if (vd->capability.type & VID_TYPE_FRAMERAM)
-	sprintf(descr,"VID_TYPE_FRAMERAM");
-    if (vd->capability.type & VID_TYPE_SCALES)
-	sprintf(descr,"VID_TYPE_SCALES");
-    if (vd->capability.type & VID_TYPE_MONOCHROME)
-	sprintf(descr,"VID_TYPE_MONOCHROME");
-    if (vd->capability.type & VID_TYPE_SUBCAPTURE)
-	sprintf(descr,"VID_TYPE_SUBCAPTURE");
-
-
-    veejay_msg(VEEJAY_MSG_INFO,"\tDevice Type\t%s",descr);
-    veejay_msg(VEEJAY_MSG_INFO,"\tChannels:\t%d", vd->capability.channels);
-    veejay_msg(VEEJAY_MSG_INFO,"\tMax geometry\t%dx%d",
-	    vd->capability.maxwidth, vd->capability.maxheight);
-    veejay_msg(VEEJAY_MSG_INFO,"\tMin geometry\t%dx%d",
-	    vd->capability.minwidth, vd->capability.minheight);
-    veejay_msg(VEEJAY_MSG_INFO,"\tDepth\t\t%d", vd->picture.depth);
-    veejay_msg(VEEJAY_MSG_INFO,"\tNorm\t\t%s",
-		(vd->norm == 0 ? "PAL" : "NTSC"));
-}
-#endif

veejay-ng/vevosample/v4lutils.h

@@ -1,110 +0,0 @@
-/*
- * v4lutils - utility library for Video4Linux
- * Copyright (C) 2001 FUKUCHI Kentarou
- *
- * v4lutils.h: header file
- *
- */
-/* veejay - Linux VeeJay
- * 	     (C) 2002-2004 Niels Elburg <nelburg@looze.net> 
- *
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-#ifndef __V4LUTILS_H__
-#define __V4LUTILS_H__
-#include <sys/types.h>
-#include <stdint.h>
-#include <linux/videodev.h>
-#include <pthread.h>
-
-/*
- * Error message displaying level
- */
-#define V4L_PERROR_NONE (0)
-#define V4L_PERROR_ALL (1)
-//#define V4L_DEBUG 0
-/*
- * Video4Linux Device Structure
- */
-
-
-#define DEFAULT_VIDEO_DEVICE "/dev/video"
-
-typedef struct {
-    int fd;
-    struct video_capability capability;
-    struct video_channel channel[10];
-    struct video_picture picture;
-    struct video_window window;
-    struct video_capture capture;
-    struct video_buffer buffer;
-    struct video_mmap mmap;
-    struct video_mbuf mbuf;
-    struct video_unit unit;
-    unsigned char *map;
-    pthread_mutex_t mutex;
-    int norm;
-    int frame;
-    int framestat[2];
-    int overlay;
-    int preferred_palette;
-} v4ldevice;
-
-
-
-int v4lopen(char *, v4ldevice *);
-int v4lopenvloopback(char *name, v4ldevice * vd, int palette);
-int v4lclose(v4ldevice *);
-int v4lgetcapability(v4ldevice *);
-int v4lsetdefaultnorm(v4ldevice *, int);
-int v4lgetsubcapture(v4ldevice *);
-int v4lsetsubcapture(v4ldevice *, int, int, int, int, int, int);
-int v4lgetframebuffer(v4ldevice *);
-int v4lsetframebuffer(v4ldevice *, void *, int, int, int, int);
-int v4loverlaystart(v4ldevice *);
-int v4loverlaystop(v4ldevice *);
-int v4lsetchannel(v4ldevice *, int);
-int v4lmaxchannel(v4ldevice *);
-int v4lcancapture(v4ldevice *);
-int v4lhastuner(v4ldevice *);
-int v4lhasdoublebuffer(v4ldevice *);
-int v4lgetbrightness(v4ldevice *);
-int v4lgethue(v4ldevice *);
-int v4lgetcolor(v4ldevice *);
-int v4lgetcontrast(v4ldevice *);
-int v4lsetcontinuous(v4ldevice *);
-int v4lstopcontinuous(v4ldevice *);
-int v4lsetfreq(v4ldevice *, int);
-int v4lsetchannelnorm(v4ldevice * vd, int, int);
-int v4lgetpicture(v4ldevice *);
-int v4lsetpicture(v4ldevice *, int, int, int, int, int);
-int v4lsetpalette(v4ldevice *, int);
-int v4lgetmbuf(v4ldevice *);
-int v4lmmap(v4ldevice *);
-int v4lmunmap(v4ldevice *);
-int v4lgrabinit(v4ldevice *, int, int);
-int v4lgrabstart(v4ldevice *, int);
-int v4lsync(v4ldevice *, int);
-int v4llock(v4ldevice *);
-int v4ltrylock(v4ldevice *);
-int v4lunlock(v4ldevice *);
-int v4lsyncf(v4ldevice *);
-int v4lgrabf(v4ldevice *);
-uint8_t *v4lgetaddress(v4ldevice *);
-int v4lreadframe(v4ldevice *, uint8_t *, int, int);
-void v4lprint(v4ldevice *);
-
-#endif				/* __V4LUTILS_H__ */

veejay-ng/vevosample/vevosample.c

@@ -25,8 +25,6 @@
  *     -# Edit Descision Lists
  *     -# MJPEG avi file(s)
  *     -# YUV4MPEG stream
- *     -# DV1394 Digital Camera
- *     -# V4L Video4Linux 
  *     -# Source generator (solid color)
  */
 #ifdef STRICT_CHECKING
@@ -49,13 +47,8 @@
 #include	<vevosample/vevosample.h>
 #include	<libplugger/plugload.h>
 #include	<libvjnet/vj-client.h>
-#include	<vevosample/v4lutils.h>
-#ifdef HAVE_DV1394
-#include	<vevosample/vj-dv1394.h>
-#endif
-#include	<vevosample/vj-v4lvideo.h>
-#include	<vevosample/vj-vloopback.h>
 #include	<vevosample/vj-yuv4mpeg.h>
+#include	<libvjaudio/audio.h>
 #ifdef USE_GDK_PIXBUF
 #include	<libel/pixbuf.h>
 #endif
@@ -83,7 +76,7 @@ static	int	num_samples_ = 0;				/* total count of samples */
 static	int	free_slots_[SAMPLE_LIMIT];				/* deleted sample id's */
 
 static	void	*sample_bank_ = NULL;				/* root of samplebank */
-
+static	void	*unicap_data_ = NULL;
 
 //! \typedef sampleinfo_t Sample A/V Information structure
 typedef struct
@@ -92,13 +85,20 @@ typedef struct
 	uint64_t	end_pos;	//!< Ending position 
 	int		looptype;	//!< Looptype
 	int		speed;		//!< Playback speed
+	int		repeat;	
 	uint64_t	in_point;	//!< In point (overrides start_pos)
 	uint64_t	out_point;	//!< Out point (overrides end_pos)
 	uint64_t	current_pos;	//!< Current position
 	int		marker_lock;	//!< Keep in-out point length constant
 	int		rel_pos;	//!< Relative position
 	int		has_audio;	//!< Audio available
+	int		repeat_count;
 	int		type;		//!< Type of Sample
+	uint64_t	rate;		//!< AudioRate
+	double		fps;		//!< Frame rate of Sample
+	int		bps;
+	int		bits;
+	int		channels;
 } sampleinfo_t;
 
 //! \typedef sample_runtime_data Sample Runtime Data structure
@@ -153,6 +153,7 @@ static struct
 	{	"start_pos",	VEVO_ATOM_TYPE_UINT64	},	/* Starting position */
 	{	"end_pos",	VEVO_ATOM_TYPE_UINT64	},	/* Ending position */
 	{	"speed",	VEVO_ATOM_TYPE_INT	},	/* Trickplay, speed */
+	{	"repeat",	VEVO_ATOM_TYPE_INT	},
 	{	"current_pos",  VEVO_ATOM_TYPE_UINT64	},	/* Current position */
 	{	"fps",		VEVO_ATOM_TYPE_DOUBLE	},	/* video fps */
 	{	"looptype",	VEVO_ATOM_TYPE_INT	},	/* Loop type , normal, pingpong or none */
@@ -232,7 +233,7 @@ static	struct
 {
 	const char *name;
 	int atom_type;
-} stream_v4l_list[] = {
+} stream_capture_list[] = {
 	{	"device",	VEVO_ATOM_TYPE_STRING	},
 	{	"channel",	VEVO_ATOM_TYPE_INT	},
 	{	NULL,		0			}
@@ -258,16 +259,6 @@ static	struct
 	{	NULL,		0			}
 };
 
-static	struct
-{
-	const char *name;
-	int	atom_type;
-} stream_dv1394_list[] = {
-	{	"device",	VEVO_ATOM_TYPE_STRING	},
-	{	"channel",	VEVO_ATOM_TYPE_INT	},
-	{	NULL,		0			}
-};
-
 static	struct
 {
 	const char *name;
@@ -830,6 +821,11 @@ void	 sample_get_property( int id, const char *key, void *dst )
 	if(info)
 		vevo_property_get( info->info_port, key, 0, dst );	
 }
+void	 sample_get_property_ptr( void *ptr, const char *key, void *dst )
+{
+	sample_runtime_data *info = (sample_runtime_data*) ptr;
+	vevo_property_get( info->info_port, key, 0, dst );	
+}
 
 static int	sample_new_ext(void *info )
 {
@@ -858,9 +854,9 @@ static int	sample_new_stream(void *info, int type )
 			for(i = 0 ; stream_color_list[i].name != NULL ; i ++ )
 				vevo_property_set( info, stream_color_list[i].name, stream_color_list[i].atom_type, 1, &v );
 			break;
-		case	VJ_TAG_TYPE_V4L:
+		case	VJ_TAG_TYPE_CAPTURE:
-			for( i = 0 ; stream_v4l_list[i].name != NULL; i ++ )
+			for( i = 0 ; stream_capture_list[i].name != NULL; i ++ )
-				vevo_property_set( info, stream_v4l_list[i].name, stream_v4l_list[i].atom_type, 0, NULL );
+				vevo_property_set( info, stream_capture_list[i].name, stream_capture_list[i].atom_type, 0, NULL );
 			break;
 		case	VJ_TAG_TYPE_YUV4MPEG:
 			for( i = 0; stream_file_list[i].name != NULL; i ++ )
@@ -874,12 +870,6 @@ static int	sample_new_stream(void *info, int type )
 			for( i = 0; stream_mcast_list[i].name != NULL; i ++ )
 				vevo_property_set( info, stream_mcast_list[i].name, stream_mcast_list[i].atom_type,0,NULL);
 			break;
-#ifdef HAVE_DV1394
-		case	VJ_TAG_TYPE_DV1394:
-			for( i = 0; stream_dv1394_list[i].name != NULL; i ++ )
-				vevo_property_set( info, stream_dv1394_list[i].name, stream_dv1394_list[i].atom_type,0,NULL);
-			break;
-#endif
 		default:
 #ifdef STRICT_CHECKING
 			assert(0);
@@ -900,7 +890,7 @@ const	char	*sample_describe_type( int type )
 		case	VJ_TAG_TYPE_COLOR:
 			return "Solid Color stream";
 			break;
-		case	VJ_TAG_TYPE_V4L:
+		case	VJ_TAG_TYPE_CAPTURE:
 			return "Video4Linux stream";
 			break;
 		case	VJ_TAG_TYPE_YUV4MPEG:
@@ -915,10 +905,6 @@ const	char	*sample_describe_type( int type )
 		case 	VJ_TAG_TYPE_NONE:
 			return "AVI Sample";
 			break;
-#ifdef HAVE_DV1394
-		case	VJ_TAG_TYPE_DV1394:
-			break;
-#endif
 		default:
 			break;	
 	}
@@ -1072,12 +1058,22 @@ void	*sample_new( int type )
 	return res;
 }
 
+int	vevo_num_devices()
+{
+	return vj_unicap_num_capture_devices( unicap_data_ );
+}
+
 void	samplebank_init()
 {
 	sample_bank_ = (void*) vevo_port_new( VEVO_SAMPLE_BANK_PORT );
 #ifdef STRICT_CHECKING
 	veejay_msg(2,"VEVO Sampler initialized. (max=%d)", SAMPLE_LIMIT );
 #endif
+
+	unicap_data_ = (void*) vj_unicap_init();
+#ifdef STRICT_CHECKING
+	assert( unicap_data_ != NULL );
+#endif	
 }
 
 void	samplebank_free()
@@ -1106,7 +1102,8 @@ void	samplebank_free()
 	port_frees_ ++;
 #endif*/
 	num_samples_ = 0;
-	veejay_msg(2, "Shutting down VEVO Sampler");
+
+	vj_unicap_deinit( unicap_data_ );
 }
 
 
@@ -1160,11 +1157,13 @@ int	sample_open( void *sample, const char *token, int extra_token , sample_video
 {
 //	void *info = find_sample(id);
 	int	res = 0;
+	int	n_samples = 0;
 	int 	my_palette = 0;
 	if(!sample)
 		return 0;
 
 	sample_runtime_data *srd = (sample_runtime_data*) sample;
+	sampleinfo_t *sit = srd->info;
 			
 	switch(srd->type)
 	{
@@ -1189,27 +1188,47 @@ int	sample_open( void *sample, const char *token, int extra_token , sample_video
 			//	return 0;
 			}
 			vj_el_setup_cache( srd->data );
-			sampleinfo_t *sit = srd->info;
 			sit->end_pos = vj_el_get_num_frames(srd->data);
 			sit->looptype = 1;
 			sit->speed = 1;
+			sit->repeat = 0;
+			sit->fps = (double) vj_el_get_fps(srd->data);
+			sit->has_audio = vj_el_get_audio_rate( srd->data ) > 0 ? 1:0;
+			sit->rate = (uint64_t) vj_el_get_audio_rate( srd->data );
+			sit->bits = vj_el_get_audio_bits( srd->data );
+			sit->bps = vj_el_get_audio_bps( srd->data );
+			sit->channels = vj_el_get_audio_chans( srd->data );
+			n_samples = sit->rate / sit->fps;
 			sample_set_property_ptr( sample, "end_pos", VEVO_ATOM_TYPE_INT, &(sit->end_pos));
 			sample_set_property_ptr( sample, "looptype",VEVO_ATOM_TYPE_INT, &(sit->looptype));
 			sample_set_property_ptr( sample, "speed", VEVO_ATOM_TYPE_INT,&(sit->speed));
+			sample_set_property_ptr( sample, "fps", VEVO_ATOM_TYPE_DOUBLE,&(sit->fps) );
+			sample_set_property_ptr( sample, "has_audio", VEVO_ATOM_TYPE_INT, &(sit->has_audio) );
+			sample_set_property_ptr( sample, "rate", VEVO_ATOM_TYPE_UINT64, &(sit->rate));
+			sample_set_property_ptr( sample, "repeat", VEVO_ATOM_TYPE_INT, &(sit->repeat));
+			sample_set_property_ptr( sample, "bps", VEVO_ATOM_TYPE_INT, &(sit->bps));
+			sample_set_property_ptr( sample, "bits", VEVO_ATOM_TYPE_INT, &(sit->bits));
+			sample_set_property_ptr( sample, "channels", VEVO_ATOM_TYPE_INT,&(sit->channels));
+			sample_set_property_ptr( sample, "audio_spas", VEVO_ATOM_TYPE_INT, &n_samples);
+			
 			break;
 
-		case VJ_TAG_TYPE_V4L:
+		case VJ_TAG_TYPE_CAPTURE:
-			srd->data = (void*) vj_v4lvideo_alloc();
+			srd->data = vj_unicap_new_device( unicap_data_,
-			res = vj_v4lvideo_init(
+						extra_token );
-				(v4l_video*) srd->data,
+			if(!vj_unicap_configure_device( srd->data,
-				token,
+						project_settings->fmt,
-				extra_token,
+						project_settings->w,
-				project_settings->norm, // NOTE: THIS IS PROBABLY CHAR
+						project_settings->h ))
-				0,
+			{
-				project_settings->w,
+				veejay_msg(0, "Unable to configure device %d", extra_token);
-				project_settings->h,
+				vj_unicap_free_device( srd->data );
-				project_settings->fmt ); // NOTE THIS SHOULD BE PALETTE, convert to V4L palette in v4l componenet!
+				return NULL;
-			//	my_palette );
+			}
+			res=1;
+			sit->speed = 1;
+			sample_set_property_ptr( sample, "speed", VEVO_ATOM_TYPE_INT,&(sit->speed));
+			
 			break;
 		case VJ_TAG_TYPE_NET:
 			srd->data = (void*) vj_client_alloc( project_settings->w,project_settings->h, project_settings->fmt );
@@ -1226,11 +1245,6 @@ int	sample_open( void *sample, const char *token, int extra_token , sample_video
 			if(!res)
 				vj_yuv4mpeg_free( srd->data );
 			break;
-#ifdef HAVE_DV1394
-		case VJ_TAG_TYPE_DV1394:
-	//		srd->data = (void*) vj_dv1394_init( (void*)el, extra_token,1 ); // DV1394 componenet like YUV and V4L comp.
-			break;
-#endif
 #ifdef USE_GDK_PIXBUF
 		case VJ_TAG_TYPE_PICTURE:
 			if( vj_picture_probe ( token )  )
@@ -1239,6 +1253,35 @@ int	sample_open( void *sample, const char *token, int extra_token , sample_video
 			break;
 #endif
 		case VJ_TAG_TYPE_COLOR:
+			sit->fps = (double) project_settings->fps;
+			sit->has_audio = project_settings->has_audio;
+			sit->rate = (uint64_t) project_settings->rate;
+			sit->bits = project_settings->bits;
+			sit->bps = project_settings->bps;
+			sit->channels = project_settings->chans;
+			srd->data = vj_audio_init( 16384 * 100, sit->channels, 0 );
+			sit->speed = 1;
+			sit->end_pos = 32;
+			sit->looptype = 1;
+
+			double freq = 200.94;
+			double amp = 5.0;
+			n_samples = vj_audio_gen_tone( srd->data, 0.04 , sit->rate,freq,amp );
+			veejay_msg(2, "Generated tone of %d samples. Freq %2.2f. Amplitude %2.2f", n_samples,freq,amp);
+
+
+			uint64_t rate = (uint64_t) project_settings->rate;
+			sample_set_property_ptr( sample, "rate", VEVO_ATOM_TYPE_UINT64, &(sit->rate));
+			sample_set_property_ptr( sample, "has_audio", VEVO_ATOM_TYPE_INT, &(sit->has_audio ));
+			sample_set_property_ptr( sample, "bps", VEVO_ATOM_TYPE_INT, &(sit->bps));
+			sample_set_property_ptr( sample, "bits", VEVO_ATOM_TYPE_INT, &(sit->bits));
+			sample_set_property_ptr( sample, "channels", VEVO_ATOM_TYPE_INT,&(sit->channels));
+			sample_set_property_ptr( sample, "audio_spas", VEVO_ATOM_TYPE_INT, &n_samples);
+			sample_set_property_ptr( sample, "speed", VEVO_ATOM_TYPE_INT, &(sit->speed));
+			sample_set_property_ptr( sample, "end_pos", VEVO_ATOM_TYPE_INT, &(sit->end_pos));
+			sample_set_property_ptr( sample, "looptype",VEVO_ATOM_TYPE_INT, &(sit->looptype));
+
+			res = 1;
 			break;
 	}
 	return res;
@@ -1276,9 +1319,27 @@ int	sample_append_file( const char *filename, long n1, long n2, long n3 )
 	return 1;
 }
 
+int	sample_get_audio_properties( void *current_sample, int *bits, int *bps, int *num_chans, long *rate )
+{
+	sample_runtime_data *srd = (sample_runtime_data*) current_sample;
+	sampleinfo_t *sit = srd->info;
+		
+	*rate = (long) sit->rate;
+	*bits  = sit->bits;
+	*bps   = sit->bps;
+	*num_chans = sit->channels;
+	return 1;
+}
+
 int	sample_edl_copy( void *current_sample, uint64_t start, uint64_t end )
 {
 	sample_runtime_data *srd = (sample_runtime_data*) current_sample;
+	if(srd->type != VJ_TAG_TYPE_NONE )
+	{
+		veejay_msg(0, "This sample has no EDL");
+		return 0;
+	}
+
 	uint64_t n = vj_el_get_num_frames( srd->data );
 	if( start < 0 || start >= n || end < 0 || end >= n )
 	{
@@ -1316,6 +1377,12 @@ int	sample_edl_copy( void *current_sample, uint64_t start, uint64_t end )
 int	sample_edl_delete( void *current_sample, uint64_t start, uint64_t end )
 {
 	sample_runtime_data *srd = (sample_runtime_data*) current_sample;
+	if(srd->type != VJ_TAG_TYPE_NONE )
+	{
+		veejay_msg(0, "This sample has no EDL");
+		return 0;
+	}
+
 	uint64_t n = vj_el_get_num_frames( srd->data );
 	if( start < 0 || start >= n || end < 0 || end >= n )
 	{
@@ -1340,6 +1407,11 @@ int	sample_edl_delete( void *current_sample, uint64_t start, uint64_t end )
 int	sample_edl_paste_from_buffer( void *current_sample, uint64_t insert_at )
 {
 	sample_runtime_data *srd = (sample_runtime_data*) current_sample;
+	if(srd->type != VJ_TAG_TYPE_NONE )
+	{
+		veejay_msg(0, "This sample has no EDL");
+		return 0;
+	}
 
 	void *prevlist = NULL;
 	if( vevo_property_get( srd->info_port, "edl_buffer", 0, &prevlist ) != VEVO_NO_ERROR )
@@ -1432,8 +1504,16 @@ void	sample_increase_frame( void *current_sample )
 		return;
 	}
 
-	uint64_t cf = sit->current_pos + sit->speed;
 
+	
+	uint64_t cf = sit->current_pos;
+	if(sit->repeat_count > 0)
+		sit->repeat_count --;
+	else	
+	{
+		cf += sit->speed;
+		sit->repeat_count = sit->repeat;
+	}
 	sit->current_pos = cf;	
 
 	if(sit->speed >= 0 )	
@@ -1541,7 +1621,41 @@ static	void	sample_produce_frame( sample_runtime_data *srd, VJFrame *slot )
 	memset( slot->data[1], u, slot->uv_len );
 	memset( slot->data[2], v, slot->uv_len );	
 }
+int	sample_get_audio_frame( void *current_sample, void *buffer, int n_packets )
+{
+	sample_runtime_data *srd = (sample_runtime_data*) current_sample;
+	sampleinfo_t *sit = srd->info;
+	int tmp = 0;	
+	int error = 0;
+#ifdef STRICT_CHECKING
+	assert( srd->info );
+#endif
+	long frame_num = srd->info->current_pos;
+	void *ptr = NULL;
 
+	switch(srd->type)
+	{
+		case VJ_TAG_TYPE_NONE:
+#ifdef STRICT_CHECKING
+			assert( srd->data != NULL );
+#endif
+			return vj_el_get_audio_frame ( srd->data, frame_num,buffer, n_packets);
+			break;
+		case VJ_TAG_TYPE_COLOR:
+			
+				error = vevo_property_get( srd->info_port, "audio_spas",0,&tmp);
+#ifdef STRICT_CHECKING
+				assert( error == VEVO_NO_ERROR );
+#endif
+				return vj_audio_noise_pack( srd->data, buffer , tmp, sit->bps, n_packets );
+			break;
+
+		default:
+			
+			break;
+	}
+	return 0;
+}
 int	sample_get_frame( void *current_sample , VJFrame *slot )
 {
 	sample_runtime_data *srd = (sample_runtime_data*) current_sample;
@@ -1562,7 +1676,9 @@ int	sample_get_frame( void *current_sample , VJFrame *slot )
 #endif
 			vj_el_get_video_frame ( srd->data, frame_num,slot);
 			break;
-		case VJ_TAG_TYPE_V4L:
+		case VJ_TAG_TYPE_CAPTURE:
+			vj_unicap_grab_frame( srd->data, (void*) slot );
+
 			break;
 		case VJ_TAG_TYPE_NET:
 			break;
@@ -1594,17 +1710,12 @@ static	void	sample_close( sample_runtime_data *srd )
 		case VJ_TAG_TYPE_NONE:
 			vj_el_free( srd->data );
 			break;
-		case VJ_TAG_TYPE_V4L:
+		case VJ_TAG_TYPE_CAPTURE:
-			vj_v4l_video_grab_stop( srd->data );
+			vj_unicap_free_device( srd->data );
 			break;
 		case VJ_TAG_TYPE_YUV4MPEG:
 			vj_yuv_stream_stop_read( srd->data );
 			break;
-#ifdef HAVE_DV1394
-		case VJ_TAG_TYPE_DV1394:
-			vj_dv1394_close( srd->data );
-			break;
-#endif
 #ifdef USE_GDK_PIXBUF
 		case VJ_TAG_TYPE_PICTURE:
 			//vj_picture_cleanup( 
@@ -1810,12 +1921,12 @@ static int	sample_identify_xml_token( int sample_type, const unsigned char *name
 			if( strcasecmp( (const char*) name, stream_property_list[i].name ) == 0 )
 				return stream_property_list[i].atom_type;
 		}
-		if( sample_type == VJ_TAG_TYPE_V4L )
+		if( sample_type == VJ_TAG_TYPE_CAPTURE )
 		{
-			for( i = 0; stream_v4l_list[i].name != NULL ; i ++ )
+			for( i = 0; stream_capture_list[i].name != NULL ; i ++ )
 			{
-				if( strcasecmp( (const char*) name, stream_v4l_list[i].name ) == 0 )
+				if( strcasecmp( (const char*) name, stream_capture_list[i].name ) == 0 )
-					return stream_v4l_list[i].atom_type;
+					return stream_capture_list[i].atom_type;
 			}
 		}
 		if( sample_type == VJ_TAG_TYPE_NET )
@@ -1834,16 +1945,6 @@ static int	sample_identify_xml_token( int sample_type, const unsigned char *name
 					return stream_mcast_list[i].atom_type;
 			}
 		}
-#ifdef HAVE_DV1394
-		if( sample_type == VJ_TAG_TYPE_DV1394 )
-		{
-			for( i = 0; stream_dv1394_list[i].name != NULL ; i ++ )
-			{
-				if( strcasecmp( (const char*) name, stream_dv1394_list[i].name ) == 0 )
-					return stream_dv1394_list[i].atom_type;
-			}
-		}
-#endif
 		if( sample_type == VJ_TAG_TYPE_COLOR )
 		{
 			for( i = 0; stream_color_list[i].name != NULL ; i ++ )
@@ -2011,12 +2112,6 @@ static void	sample_get_position_info(void *port , uint64_t *start, uint64_t *end
 	vevo_property_get( port, "looptype",0, loop );
 	vevo_property_get( port, "speed",0,speed );
 }
-static	void	sample_get_position_loop(void *port, int start, int end)
-{
-	double fps = 0.0;
-	vevo_property_get( port, "fps",0,&fps );
-	
-}
 void	sample_cache_data( void *info )
 {
 #ifdef STRICT_CHECKING
@@ -2032,7 +2127,10 @@ void	sample_cache_data( void *info )
 	vevo_property_get( srd->info_port, "current_pos",0,&(sit->current_pos));
 	vevo_property_get( srd->info_port, "in_point",0,&(sit->in_point));
 	vevo_property_get( srd->info_port, "out_point",0,&(sit->out_point));
-
+	vevo_property_get( srd->info_port, "fps",0,&(sit->fps));
+	vevo_property_get( srd->info_port, "has_audio",0,&(sit->has_audio));
+	vevo_property_get( srd->info_port, "rate",0,&(sit->rate));
+	vevo_property_get( srd->info_port, "repeat",0,&(sit->repeat));
 //	veejay_msg(0, "start %d - end %d - speed %d - loop %d - position %d -  in %d - out %d",
 //			sit->start_pos,sit->end_pos,sit->speed,sit->looptype,sit->current_pos,
 //			sit->in_point, sit->out_point );
@@ -2056,8 +2154,10 @@ void		sample_save_cache_data( void *info)
 	vevo_property_set( srd->info_port, "current_pos", VEVO_ATOM_TYPE_UINT64,1,&(sit->current_pos));
 	vevo_property_set( srd->info_port, "in_point",VEVO_ATOM_TYPE_UINT64,1,&(sit->in_point));
 	vevo_property_set( srd->info_port, "out_point",VEVO_ATOM_TYPE_UINT64,1,&(sit->out_point));
-
+	vevo_property_set( srd->info_port, "fps", VEVO_ATOM_TYPE_DOUBLE,1,&(sit->fps));
-
+	vevo_property_set( srd->info_port, "has_audio", VEVO_ATOM_TYPE_INT,1,&(sit->has_audio));
+	vevo_property_set( srd->info_port, "rate", VEVO_ATOM_TYPE_UINT64,1,&(sit->rate));
+	vevo_property_set( srd->info_port, "repeat",VEVO_ATOM_TYPE_INT,1,&(sit->repeat));
 }
 
 int	sample_valid_speed(void *sample, int new_speed)
@@ -2077,6 +2177,21 @@ int	sample_valid_pos(void *sample, uint64_t pos)
 		return 1;
 	return 0;
 }
+
+uint64_t	sample_get_audio_rate( void *sample )
+{
+	sample_runtime_data *srd = (sample_runtime_data*) sample;
+	sampleinfo_t *sit = srd->info;
+	return sit->rate;
+}
+
+double		sample_get_fps( void *sample )
+{
+	sample_runtime_data *srd = (sample_runtime_data*) sample;
+	sampleinfo_t *sit = srd->info;
+	return sit->fps;
+}
+
 uint64_t	sample_get_start_pos( void *sample )
 {
 	sample_runtime_data *srd = (sample_runtime_data*) sample;
@@ -2095,6 +2210,18 @@ int	sample_get_speed( void *sample )
 	sampleinfo_t *sit = srd->info;
 	return sit->speed;
 }
+int	sample_get_repeat( void *sample )
+{
+	sample_runtime_data *srd = (sample_runtime_data*) sample;
+	sampleinfo_t *sit = srd->info;
+	return sit->repeat;
+}
+int	sample_get_repeat_count( void *sample )
+{
+	sample_runtime_data *srd = (sample_runtime_data*) sample;
+	sampleinfo_t *sit = srd->info;
+	return sit->repeat_count;
+}
 uint64_t	sample_get_current_pos( void *sample )
 {
 	sample_runtime_data *srd = (sample_runtime_data*) sample;

veejay-ng/vevosample/vevosample.h

@@ -38,7 +38,7 @@ typedef	struct
 	int type;
 } sample_video_info_t;
 
-
+int	vevo_num_devices();
 void	samplebank_init();
 void	samplebank_free();
 int	samplebank_size();
@@ -82,6 +82,9 @@ void	sample_save_cache_data( void *sample );
 int	sample_fx_set_in_channel( void *info, int fx_entry, int seq_num, const int sample_id );
 
 
+int	sample_edl_get_audio_properties( void *current_sample, int *bits, int *bps, int *num_chans, long *rate );
+
+int	sample_get_audio_frame( void *current_sample, void *buffer , int n);
 
 uint64_t	sample_get_start_pos( void *sample );
 uint64_t	sample_get_end_pos( void *sample );

veejay-ng/vevosample/vj-dv1394.c

@@ -1,227 +0,0 @@
-/* veejay - Linux VeeJay
- * 	     (C) 2002-2004 Niels Elburg <nelburg@looze.net> 
- *
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-/*
-	inspired by ffmpeg/ffmpeg/libavformat/dv1394.c
-	dv1394 has no audio apparently ...
-*/
-#include <config.h>
-#ifdef SUPPORT_READ_DV2
-#include <stdint.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <fcntl.h>
-#include <libel/vj-el.h>
-#include <libel/vj-dv.h>
-#include <libvjmsg/vj-common.h>
-#include <vevosample/vj-dv1394.h>
-#include <vevosample/defs.h>
-#include <sys/mman.h>
-#include <sys/poll.h>
-#include <errno.h>
-#define DV_PAL_SIZE 144000
-#define DV_NTSC_SIZE 120000
-
-
-#define DV1394_DEFAULT_CHANNEL 63
-#define DV1394_DEFAULT_CARD    0
-#define DV1394_RING_FRAMES     10
-
-static	int	vj_dv1394_reset(vj_dv1394 *v  )
-{
-	struct dv1394_init init;
-	init.channel = v->channel;
-	init.api_version = DV1394_API_VERSION;
-	init.n_frames = DV1394_RING_FRAMES;
-	init.format = v->norm;
-
-	if( ioctl( v->handle, DV1394_INIT, &init ) < 0 )
-	{
-		veejay_msg(VEEJAY_MSG_ERROR, "Cannot initialize ieee1394 device");
-		return 0;
-	}
-	v->done = v->avail = 0;
-	return 1;
-}
-
-static	int	vj_dv1394_start(vj_dv1394 *v )
-{
-	/* enable receiver */
-	if( ioctl( v->handle, DV1394_START_RECEIVE, 0) < 0)
-	{
-		veejay_msg(VEEJAY_MSG_ERROR, "Cannot start receiver");
-		return 0;
-	}
-	return 1;
-}
-
-vj_dv1394      *vj_dv1394_init(void *e, int channel, int quality)
-{
-	editlist *el = (editlist*)e;
-
-	if(el->video_width != 720 && ( el->video_height != 576 || el->video_height != 480) )
-	{
-		veejay_msg(VEEJAY_MSG_ERROR, "No software scaling to %d x %d",el->video_width,
-			el->video_height);
-		return NULL;
-	}
-
-	vj_dv1394 *v = (vj_dv1394*)vj_malloc(sizeof(vj_dv1394));
-
-	v->map_size = (el->video_norm == 'p' ? DV_PAL_SIZE: DV_NTSC_SIZE);
-	v->handle = -1;
-	v->width = el->video_width;
-	v->height = el->video_height;
-	v->norm = (el->video_norm == 'p' ? DV1394_PAL: DV1394_NTSC );
-	v->handle = open( "/dev/dv1394", O_RDONLY);
-	v->channel = channel == -1 ? DV1394_DEFAULT_CHANNEL : channel;
-	v->index = 0;
-	v->quality = quality;
-	if( v->handle <= 0 )
-	{
-		veejay_msg(VEEJAY_MSG_ERROR, "opening /dev/dv1394'");
-		if(v) free(v);
-		return NULL;
-	}
-	if( vj_dv1394_reset(v) <= 0 )
-	{
-		veejay_msg(VEEJAY_MSG_ERROR, "Failed to initialize DV interface");
-		close(v->handle);
-		if(v) free(v);
-		return NULL;
-	}
-
-	v->map = mmap( NULL, v->map_size * DV1394_RING_FRAMES, PROT_READ,
-			MAP_PRIVATE, v->handle, 0);
-	if(v->map == MAP_FAILED)
-	{
-		veejay_msg(VEEJAY_MSG_ERROR, "Failed to mmap dv ring buffer");
-		close(v->handle);
-		if(v)free(v);
-		return NULL;
-	}
-	if( vj_dv1394_start(v) <= 0)
-	{
-		veejay_msg(VEEJAY_MSG_ERROR, "Failed to start capturing");
-		if(v)free(v);
-		close(v->handle);
-		return NULL;
-	}
-
-
-	v->decoder = (void*)vj_dv_decoder_init( v->quality,v->width,v->height, el->pixel_format );
-	if(!v->decoder)
-	{
-		veejay_msg(VEEJAY_MSG_ERROR, "Failed to initailize DV decoder");
-	}
-
-	return v;
-}
-
-
-void	vj_dv1394_close(vj_dv1394 *v)
-{
-	if(v)
-	{
-		if( ioctl( v->handle, DV1394_SHUTDOWN, 0) < 0)
-		{
-			veejay_msg(VEEJAY_MSG_ERROR, "Failed to shutdown dv1394");
-		}
-		if( munmap( v->map, v->map_size * DV1394_RING_FRAMES ) < 0 )
-		{
-			veejay_msg(VEEJAY_MSG_ERROR, "Failed to munmap dv1394 ring buffer");
-		}
-		close(v->handle);
-		if(v->decoder)
-			vj_dv_free_decoder( (vj_dv_decoder*) v->decoder );
-		free(v);
-	}
-
-}
-
-int	vj_dv1394_read_frame(vj_dv1394 *v, uint8_t *frame[3], uint8_t *audio, int fmt)
-{
-	if( !v->avail )
-	{
-		struct dv1394_status s;
-		struct pollfd p;
-		if( v->done )
-		{
-			/* request more frames */
-			if( ioctl( v->handle, DV1394_RECEIVE_FRAMES, v->done ) < 0 )
-			{
-				veejay_msg(VEEJAY_MSG_DEBUG, "Ring buffer overflow,reset");
-				vj_dv1394_reset( v );	
-				vj_dv1394_start( v );
-			}
-			v->done = 0;
-		}
-
-restart_poll:
-		p.fd = v->handle;
-		p.events = POLLIN | POLLERR | POLLHUP;
-		if( poll(&p, 1, -1 ) < 0 )
-		{
-			if( errno == EAGAIN || errno == EINTR )
-			{
-				veejay_msg(VEEJAY_MSG_DEBUG, "Waiting for DV");
-				goto restart_poll;
-			}
-			veejay_msg(VEEJAY_MSG_ERROR, "Poll failed");
-			return 0;
-		}
-
-		if( ioctl( v->handle, DV1394_GET_STATUS, &s ) < 0 )
-		{
-			veejay_msg(VEEJAY_MSG_ERROR, "Failed to get status");
-			return 0;
-		}
-                s.active_frame, s.first_clear_frame,
-
-		v->avail = s.n_clear_frames;
-		v->index = s.first_clear_frame;
-		v->done	= 0;
-
-		if( s.dropped_frames )
-		{
-			veejay_msg(VEEJAY_MSG_ERROR, "dv1394: frame drop detected %d",
-				s.dropped_frames);
-		//	vj_dv1394_reset( v );
-		//	vj_dv1394_start( v );
-		}
-	}
-
-	if(!vj_dv_decode_frame( 
-		(vj_dv_decoder*) v->decoder,
-		v->map + (v->index * v->map_size),
-		frame[0],frame[1],frame[2],
-		v->width,
-		v->height, fmt ))
-		{
-			veejay_msg(VEEJAY_MSG_ERROR, "decoding DV frame");
-			return 0;
-		}
-
-	v->index = (v->index + 1) % DV1394_RING_FRAMES;
-	v->done ++ ;
-	v->avail --;
-
-	return 1;
-}
-#endif 

veejay-ng/vevosample/vj-unicap.c

@@ -0,0 +1,469 @@
+/* veejay - Linux VeeJay Unicap interface
+ * 	     (C) 2002-2006 Niels Elburg <nelburg@looze.net> 
+ *
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+#include <config.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h> // for memset
+#include <unicap.h>
+#include <unicap_status.h>
+
+#include <libvjmsg/vj-common.h>
+#include <libvjmem/vjmem.h>
+#include <libyuv/yuvconv.h>
+#include <libvevo/libvevo.h>
+#include <vevosample/vj-unicap.h>
+#include <veejay/defs.h>
+#ifdef STRICT_CHECKING
+#include <assert.h>
+#endif
+
+typedef struct
+{
+	unicap_handle_t handle;
+	unicap_device_t device;
+	unicap_format_t format_spec;
+	unicap_format_t format;
+	unicap_data_buffer_t buffer;
+	unicap_data_buffer_t *returned_buffer;
+	int	 deviceID;
+	int	 sizes[3];
+	int	active;
+	void	*sampler;
+} vj_unicap_t;
+
+
+typedef struct
+{
+	unicap_handle_t handle;
+	unicap_device_t device;
+	unicap_format_t format_spec;
+	unicap_format_t format;
+	unicap_data_buffer_t buffer;
+	unicap_data_buffer_t *returned_buffer;
+	void	*device_list;
+	int	 num_devices;
+} unicap_driver_t;
+
+static	void	*vj_unicap_convert_property( unicap_property_t *property, void *device_port)
+{
+/*	void *port = vevo_port_new( VEVO_ANONYMOUS_PORT );
+	int error = vevo_property_set( device_port, property->identifier,VEVO_ATOM_TYPE_PORTPTR,1,&port );
+#ifdef STRICT_CHECKING
+	assert ( error == VEVO_NO_ERROR );
+#endif
+
+	if( property->type == UNICAP_PROPERTY_TYPE_RANGE )
+	{
+		double value = (double) property->range.min;
+		error = vevo_property_set( port, "min", VEVO_ATOM_TYPE_DOUBLE,1,&value );
+#ifdef STRICT_CHECKING
+		assert ( error == VEVO_NO_ERROR );
+#endif
+		value = (double) property->range.max;
+		error = vevo_property_set( port, "max", VEVO_ATOM_TYPE_DOUBLE,1,&value );
+#ifdef STRICT_CHECKING
+		assert ( error == VEVO_NO_ERROR );
+#endif
+		value = (double) property->range.value;
+		error = vevo_property_set( port, "value", VEVO_ATOM_TYPE_DOUBLE,1,&value );
+	}
+
+	if( property->type == UNICAP_PROPERTY_TYPE_MENU )
+	{
+		//used for source and norm
+		int n = property->menu.menu_item_count ;
+		int j;
+		for( j = 0; j < n ; j ++ )
+		{
+			char key[64];
+			sprintf(key, "%d",j);
+			error = vevo_property_set( port, key, VEVO_ATOM_TYPE_STRING,1,&(property->menu.menu_items[j]));
+#ifdef STRICT_CHECKING
+			assert ( error == VEVO_NO_ERROR );
+#endif
+			if( !strcmp( property->menu.menu_items[i], property->menu_item ))
+			{
+				error = vevo_property_set( port, "selected", VEVO_ATOM_TYPE_INT,1,&j );
+#ifdef STRICT_CHECKING
+			assert ( error == VEVO_NO_ERROR );
+#endif
+
+			}
+		}
+	}
+	return port;*/
+	return NULL;
+
+}
+
+static int	vj_unicap_scan_enumerate_devices(void *unicap)
+{
+	int i;
+	unicap_driver_t *ud = (unicap_driver_t*) unicap;
+	char key[64];
+	
+	for( i = 0; SUCCESS( unicap_enumerate_devices( NULL, &(ud->device), i ) ); i++ )
+	{
+		unicap_property_t property;
+		unicap_format_t format;
+		int property_count = 0;
+		int format_count = 0;
+		int j;
+
+		if( !SUCCESS( unicap_open( &(ud->handle), &(ud->device) ) ) )
+		{
+			veejay_msg(0, "Failed to open: %s\n", &(ud->device.identifier) );
+			continue;
+		}
+	
+	
+		
+		unicap_reenumerate_properties( ud->handle, &property_count );
+		unicap_reenumerate_formats( ud->handle, &format_count );
+		void	*device_port = vevo_port_new( VEVO_ANONYMOUS_PORT );
+
+		char *device_name = strdup( ud->device.identifier );
+		char *device_location = strdup( ud->device.device );
+		
+		int error = vevo_property_set( device_port,
+					       "name",
+					       VEVO_ATOM_TYPE_STRING,
+					       1,
+					       &device_name);
+
+#ifdef STRICT_CHECKING
+		assert( error ==  VEVO_NO_ERROR );
+#endif
+		sprintf(key ,"%d", i );
+		error = vevo_property_set( ud->device_list, key, VEVO_ATOM_TYPE_PORTPTR,1,&device_port );
+		
+#ifdef STRICT_CHECKING
+		assert( error ==  VEVO_NO_ERROR );
+#endif
+
+		
+		error = vevo_property_set( device_port,
+						"device",
+						VEVO_ATOM_TYPE_STRING,
+						1,
+						&device_location );
+
+		
+		veejay_msg(2, "\t'%s' at device %s",device_name, device_location ); 
+	
+		free( device_location );
+		free( device_name );
+		
+#ifdef STRICT_CHECKING
+		assert( error ==  VEVO_NO_ERROR );
+#endif
+
+		for( j = 0; SUCCESS( unicap_enumerate_properties( ud->handle, NULL, &property, j ) ); j++ )
+		{
+			unicap_get_property( ud->handle, &property );
+			void *props = vj_unicap_convert_property( &property, device_port);
+		}
+		
+		unicap_close( ud->handle );
+	}
+	return i;
+}
+
+void	*vj_unicap_init(void)
+{
+	unicap_driver_t *ud = (unicap_driver_t*) vj_malloc(sizeof(unicap_driver_t));
+	memset( ud,0,sizeof(unicap_driver_t));
+	ud->device_list = vevo_port_new( VEVO_ANONYMOUS_PORT );
+
+	ud->num_devices = vj_unicap_scan_enumerate_devices( (void*) ud );
+	veejay_msg(2, "Found %d capture devices on this system", ud->num_devices);
+	return ud;
+}
+
+void	vj_unicap_deinit(void *dud )
+{
+	unicap_driver_t *ud = (unicap_driver_t*) dud;
+	vevo_port_recursive_free( ud->device_list );
+	free(ud);
+	dud = NULL;
+}
+
+int	vj_unicap_set_property( void *ud, char *key, int atom_type, void *val )
+{
+	unicap_property_t property;
+        unicap_property_t property_spec;
+	int i;
+	if(atom_type != VEVO_ATOM_TYPE_STRING && atom_type != VEVO_ATOM_TYPE_DOUBLE )
+		return 0;
+	
+	unicap_void_property( &property_spec );
+	vj_unicap_t *vut = (vj_unicap_t*) ud;
+
+	for( i = 0; SUCCESS( unicap_enumerate_properties( vut->handle,
+					&property_spec, &property, i ) ); i ++ )
+	{
+		unicap_get_property( vut->handle, &property);
+		if( strcmp(property.identifier, key) == 0 )
+		{
+			if(atom_type == VEVO_ATOM_TYPE_STRING)
+			{
+				char *str = (char*) val;
+				sprintf( property.menu_item , "%s", str);
+			}
+			else
+			{	
+				if(atom_type == VEVO_ATOM_TYPE_DOUBLE)
+				{
+					memcpy(&property.value, val, sizeof(double));
+				}
+			}
+				
+			unicap_set_property( vut->handle, &property );
+			break;
+		}
+	}
+	return 1;
+}
+
+int	vj_unicap_get_property( void *ud, char *key,int atom_type, void *dst )
+{
+	unicap_property_t property;
+        unicap_property_t property_spec;
+	int i;
+	if(atom_type != VEVO_ATOM_TYPE_STRING && atom_type != VEVO_ATOM_TYPE_DOUBLE )
+		return 0;
+	
+	unicap_void_property( &property_spec );
+	vj_unicap_t *vut = (vj_unicap_t*) ud;
+
+	for( i = 0; SUCCESS( unicap_enumerate_properties( vut->handle,
+					&property_spec, &property, i ) ); i ++ )
+	{
+		unicap_get_property( vut->handle, &property);
+		if( strcmp(property.identifier, key) == 0 )
+		{
+			if(atom_type == VEVO_ATOM_TYPE_STRING)
+			{
+				char *d = (char*) dst;
+				d = strdup( (char*)property.menu_item );
+			}
+			else
+			{	
+				if(atom_type == VEVO_ATOM_TYPE_DOUBLE)
+				{
+					memcpy(dst, &property.value, sizeof(double));
+				}
+			}
+			break;
+		}
+	}
+	return 1;
+}
+
+
+
+int	vj_unicap_num_capture_devices( void *dud )
+{
+	unicap_driver_t *ud = (unicap_driver_t*) dud;
+	return ud->num_devices;
+}
+
+void	*vj_unicap_new_device( void *dud, int device_id )
+{
+	unicap_driver_t *ud = (unicap_driver_t*) dud;
+	
+	if( ud->num_devices <= 0 )
+	{
+		veejay_msg(0, "I didn't find any capture devices");
+		return NULL;
+	}
+	
+	if( device_id < 0 || device_id >= ud->num_devices )
+	{
+		veejay_msg(0, "I only found %d devices", ud->num_devices );
+		return NULL;
+	}
+	
+	vj_unicap_t *vut = (vj_unicap_t*) vj_malloc(sizeof(vj_unicap_t));
+	memset(vut,0,sizeof(vj_unicap_t));
+
+	vut->deviceID = device_id;
+
+	if( !SUCCESS( unicap_enumerate_devices( NULL, &(vut->device), device_id ) ) )
+	{
+		veejay_msg(0, "Failed to get info for device '%s'\n", vut->device.identifier );
+		free(vut);
+		return NULL;
+	}
+
+	if( !SUCCESS( unicap_open( &(vut->handle), &(vut->device) ) ) )
+	{
+		veejay_msg(0, "Failed to open capture device '%s'\n", vut->device.identifier );
+	}
+	veejay_msg(2, "Using device '%s'", vut->device.identifier);
+	return (void*) vut;
+}
+static unsigned int
+get_fourcc(char * fourcc)
+{
+  return ((((unsigned int)(fourcc[0])<<0)|
+           ((unsigned int)(fourcc[1])<<8)|
+           ((unsigned int)(fourcc[2])<<16)|
+           ((unsigned int)(fourcc[3])<<24)));
+}
+int	vj_unicap_configure_device( void *ud, int pixel_format, int w, int h )
+{
+	vj_unicap_t *vut = (vj_unicap_t*) ud;
+	
+	unicap_void_format( &(vut->format_spec));
+
+	unsigned int fourcc = 0;
+	vut->sizes[0] = w * h;
+	
+	switch(pixel_format)
+	{
+		case FMT_420:
+			fourcc = get_fourcc( "420P" );
+			vut->sizes[1] = (w*h)/4;
+			vut->sizes[2] = vut->sizes[1];
+			break;
+		case FMT_422:
+			fourcc = get_fourcc( "422P" );
+			vut->sizes[1] = (w*h)/2;
+			vut->sizes[2] = vut->sizes[1];
+			break;
+		case FMT_444:
+			fourcc = get_fourcc( "422P" );
+			vut->sampler = subsample_init( w );
+			vut->sizes[1] = (w*h)/2;
+			vut->sizes[2] = vut->sizes[1];
+			vut->sampler = subsample_init( w );
+			break;
+	}	
+	
+	int i;
+	for( i = 0;  SUCCESS( unicap_enumerate_formats( vut->handle, &(vut->format_spec), &(vut->format), i ) ); i ++ )
+	{
+		if( fourcc == vut->format.fourcc )
+			break;
+	}
+
+	vut->format.size.width = w;
+	vut->format.size.height = h;
+
+	if( !SUCCESS( unicap_set_format( vut->handle, &(vut->format) ) ) )
+	{
+		veejay_msg(0,"Failed to set pixel format");
+		return 0;
+	}
+
+	char *comp = "Composite1";
+	if(vj_unicap_set_property( vut, "video source", VEVO_ATOM_TYPE_STRING, &comp ) )
+	{
+		veejay_msg(2, "Changed channel to Composite1");
+	}
+	
+	veejay_msg(0, "Capture video in %d x %d, format is %s", vut->format.size.width,
+					    vut->format.size.height,
+		 			vut->format.identifier );
+//	memset( &(vut->buffer), 0x0, sizeof( unicap_data_buffer_t ) );
+	vut->buffer.data = vj_malloc( w * h * 8 );
+	vut->buffer.buffer_size = (sizeof(unsigned char) * 4 * w * h );
+	
+	return 1;
+}
+
+int	vj_unicap_start_capture( void *vut, void *slot )
+{
+	VJFrame *f = (VJFrame*)slot;
+	vj_unicap_t *v = (vj_unicap_t*) vut;
+
+	if( !SUCCESS( unicap_start_capture( v->handle ) ) )
+   	{
+      		veejay_msg( 0, "Failed to start capture on device: %s\n", v->device.identifier );
+		return 0;
+     	}
+	v->active = 1;
+	return 1;
+}
+
+int	vj_unicap_grab_frame( void *vut, void *slot )
+{
+	VJFrame *f = (VJFrame*)slot;
+	vj_unicap_t *v = (vj_unicap_t*) vut;
+	if(!v->active)
+	{
+		if(!vj_unicap_start_capture( vut, slot ))
+			return 0;	
+	}
+	
+   	if( !SUCCESS( unicap_queue_buffer( v->handle, &(v->buffer) ) ) )
+   	{
+		veejay_msg( 0, "Failed to queue a buffer on device: %s\n", v->device.identifier );
+		return 0;
+	}
+		
+	if( !SUCCESS( unicap_wait_buffer( v->handle, &(v->returned_buffer )) ) )
+	{
+		veejay_msg(0,"Failed to wait for buffer on device: %s\n", v->device.identifier );
+		return 0;
+	}
+	veejay_memcpy( f->data[0], v->buffer.data, v->sizes[0] );
+	veejay_memcpy( f->data[1], v->buffer.data + v->sizes[0], v->sizes[1] );
+	veejay_memcpy( f->data[2], v->buffer.data + v->sizes[0] +v->sizes[1] , v->sizes[2]);
+
+	if( v->sampler )
+	{
+		chroma_supersample( SSM_422_444, v->sampler, f->data, f->width,f->height );
+	}
+	
+//	f->data[0] = v->buffer->data;
+//	f->data[1] = v->buffer->data + v->sizes[0];
+//	f->data[2] = v->buffer->data + v->sizes[1];
+	return 1;
+}
+
+
+int	vj_unicap_stop_capture( void *vut )
+{
+	vj_unicap_t *v = (vj_unicap_t*) vut;
+   	 
+	if( !SUCCESS( unicap_stop_capture( v->handle ) ) )
+   	{
+   	 	veejay_msg(0,"Failed to stop capture on device: %s\n", v->device.identifier );
+		return 0;
+	}
+	v->active = 0;
+	return 1;
+}
+
+void	vj_unicap_free_device( void *vut )
+{
+	vj_unicap_t *v = (vj_unicap_t*) vut;
+   
+	if( v->active )
+		vj_unicap_stop_capture( vut );
+	
+	if( !SUCCESS( unicap_close( v->handle ) ) )
+   	{
+   	 	veejay_msg(0, "Failed to close the device: %s\n", v->device.identifier );
+	}
+
+}
+

veejay-ng/vevosample/vj-unicap.h

@@ -1,5 +1,5 @@
-/* veejay - Linux VeeJay
+/* veejay - Linux VeeJay Unicap interface
- * 	     (C) 2002-2004 Niels Elburg <nelburg@looze.net> 
+ * 	     (C) 2002-2006 Niels Elburg <nelburg@looze.net> 
  *
  *
  * This program is free software; you can redistribute it and/or modify
@@ -17,30 +17,20 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#ifndef VJDV1394
+void	*vj_unicap_init(void);
-#define VJDV1394
+#ifndef VJUNICAP_H
+#define VJUNICAP_H
+void	vj_unicap_deinit(void *dud );
+int	vj_unicap_num_capture_devices( void *dud );
 
 
-typedef struct
-{
-	int handle; 
-	int map_size;
-	uint8_t *map;
-	int width;
-	int height;
-	int channel;
-	int norm;
-	int avail;
-	int done;
-	int index;
-	int quality;
-	void *decoder;
-} vj_dv1394;
 
-vj_dv1394*	vj_dv1394_init(void *el, int channel_nr, int quality);
+void	*vj_unicap_new_device( void *ud, int device_id );
-
+int	vj_unicap_configure_device( void *ud, int pixel_format, int w, int h );
-void		vj_dv1394_close( vj_dv1394 *v );
+int	vj_unicap_start_capture( void *vut, void *slot );
-
+int	vj_unicap_grab_frame( void *vut, void *slot );
-int		vj_dv1394_read_frame( vj_dv1394 *v, uint8_t *frame[3] , uint8_t *audio, int fmt );
+int	vj_unicap_stop_capture( void *vut );
+void	vj_unicap_free_device( void *vut );
 
 #endif
+

veejay-ng/vevosample/vj-v4lvideo.c

@@ -1,357 +0,0 @@
-/* 
- * Linux VeeJay
- *
- * Copyright(C)2002-2004 Niels Elburg <nelburg@looze.net>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License , or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- */
-#include <config.h>
-#ifdef HAVE_V4L
-#include <stdio.h>
-#include <stdlib.h>
-#include <vevosample/vj-v4lvideo.h>
-#include <vevosample/v4lutils.h>
-#include <string.h>
-#include <libvjmsg/vj-common.h>
-#include <libvjmem/vjmem.h>
-#include <vevosample/defs.h>
-#define VJ_V4L_DEBUG
-
-
-v4l_video *vj_v4lvideo_alloc()
-{
-    v4l_video *v4l = (v4l_video *) malloc(sizeof(v4l_video));
-    return v4l;
-}
-
-void vj_v4lvideo_free(v4l_video * v4l)
-{
-    if (v4l) {
-	if (v4l->framebuffer)
-	    free(v4l->framebuffer);
-	//if (v4l->device)
-	  //  free(v4l->device);
-	free(v4l);
-	v4l = NULL;
-    }
-}
-
-int vj_v4lvideo_init(v4l_video * v4l, char *filename, int channel,
-		     int norm, int freq, int width, int height,
-		     int palette )
-{
-
-	veejay_msg(VEEJAY_MSG_WARNING,
-		   "\tInput Channel\t %s",
-		(channel==1 ? "Composite" : ( channel==0 ? "TV Tuner" : "S-Video") ));
-    
-    v4l->vloopback = 0;
-
-    if (filename == NULL)
-	    sprintf(filename, "%s", "/dev/video0");
-
-    v4l->device = (v4ldevice *) malloc(sizeof(v4ldevice));
-    if (v4l->device == NULL)
-		return -1;
-
- 	if (v4lopen(filename, v4l->device))
-	    return -1;
-
-	v4lsetdefaultnorm(v4l->device, norm);
-	v4lgetcapability(v4l->device);
-
-	if (v4lcancapture(v4l->device) != 0) {
-	    veejay_msg(VEEJAY_MSG_ERROR,
-		       "This device (%s) seems not to support capturing\n",
-		       filename);
-		return -1;
-	}
-
-	v4l->width = width;
-    v4l->height = height;
-    v4l->area = width * height * 3;
-    v4l->device->norm = norm;
-    v4l->framebuffer = (uint8_t *) vj_malloc(v4l->area * sizeof(uint8_t));
-
-	if(!v4l->framebuffer )
-		return -1;
-
-	if (v4lmaxchannel(v4l->device)) {
-	    if (v4lsetchannel(v4l->device, channel) != 0)
-		{
-			veejay_msg(VEEJAY_MSG_ERROR, "Cannot open channel %d",channel);
-			return -1;
-		}
-	}
-
-	if (v4lmmap(v4l->device) != 0) {
-	    veejay_msg(VEEJAY_MSG_ERROR,
-		       "Mmap() not supported by driver of device [%s]\n",
-		       filename);
-	    return -1;
-	}
-
-	if (v4lgrabinit(v4l->device, width, height) != 0) {
-		veejay_msg(VEEJAY_MSG_ERROR, "Cannot initialize grabbing!");
-	    return -1;
-	}
-
-	if (v4lhasdoublebuffer(v4l->device) != 0) {
-	    veejay_msg(VEEJAY_MSG_ERROR,
-		       "Mmap() double buffering capture not supported by driver of device [%s]\n",
-		       filename);
-	    return -1;
-	}
-	if (vj_v4l_video_palette_ok(v4l, palette) == -1) {
-	}
-
-	v4lgetpicture(v4l->device);
-
-	v4l->brightness = v4lgetbrightness(v4l->device);
-	v4l->contrast 	= v4lgetcontrast(v4l->device);
-	v4l->color 		= v4lgetcolor(v4l->device);
-	v4l->hue 		= v4lgethue(v4l->device);
-
-    v4l->palette = palette;
-
-    return 0;
-}
-
-int vj_v4l_video_dealloc(v4l_video * v4l)
-{
-	v4lmunmap(v4l->device);
-    v4lclose(v4l->device);
-    return 1;
-}
-
-int vj_v4l_video_palette_ok(v4l_video * v4l, int palette)
-{
-    int ret;
-    switch (palette) {
-	case VIDEO_PALETTE_YUV422P:
-		veejay_msg(VEEJAY_MSG_INFO, "Using video palette YUV 4:2:2\n");
-		break;
-    case VIDEO_PALETTE_YUV420P:
-		veejay_msg(VEEJAY_MSG_INFO, "Using video palette YUV 4:2:0\n");
-	break;
-    default:
-		veejay_msg(VEEJAY_MSG_INFO, "Unknown video palette\n");
-		return -1;
-    }
-
-	if (vj_v4l_video_set_palette(v4l, palette) != 0) {
-		veejay_msg(VEEJAY_MSG_ERROR, "Cannot set video palette!");
-	    return -1;
-	}
-
-	if (v4lgrabstart(v4l->device, 0) != 0) {
-		veejay_msg(VEEJAY_MSG_ERROR, "Cannot start grabbing!"); 
-	    ret = -1;
-	} else {
-	    ret = v4lsync(v4l->device, 0);
-	    if(ret !=0 )
-	{
-		veejay_msg(VEEJAY_MSG_ERROR, "Cannot sync frame");
-		return -1;
-	}
-	}
-
-    return ret;
-}
-
-/* return 0 if type matches type in proc (hardware or other)*/
-int vj_v4l_video_get_proc(int match_type, char *filename)
-{
-    FILE *proc_info;
-    char buffer[255];
-    char path[255];
-    char *hardware, *type;
-    sprintf(path, "/proc/video/dev/%s", filename);
-    proc_info = fopen(path, "r");
-    if (!proc_info) {
-	sprintf(path, "/proc/video/%s", filename);
-	proc_info = fopen(path,"r");
-	if(!proc_info) {
-	  sprintf(path, "/proc/video/%s",filename);
-	  proc_info = fopen(path, "r");
-  	  if(!proc_info) {
-		veejay_msg(VEEJAY_MSG_ERROR,
-		   "Is V4L information in /proc/video or in /proc/video/dev ? Did you load all necessary modules?\n");
-		return -1;
-	}
-	}
-    }
-
-
-
-    if (!fgets(buffer, 255, proc_info)) {
-	veejay_msg(VEEJAY_MSG_ERROR, "Error reading from proc!\n");
-	return -1;		/* name */
-    }
-    if (!fgets(buffer, 255, proc_info)) {
-	veejay_msg(VEEJAY_MSG_ERROR, "Error reading from proc!\n");
-	return -1;		/* type */
-    }
-    if (!fgets(buffer, 255, proc_info)) {	/* hardware */
-	veejay_msg(VEEJAY_MSG_ERROR, "Error reading from proc!\n");
-    }
-    buffer[strlen(buffer) - 1] = 0;
-    hardware = strtok(buffer, ":");
-    type = strtok(NULL, "\t");
-    if (strcmp(type, " 0x1") == 0 || strcmp(type, "0x1") == 0) {
-	if (match_type == VJ_TAG_TYPE_V4L) {
-	    fclose(proc_info);
-	    return 0;
-	}
-	veejay_msg(VEEJAY_MSG_INFO,
-		   "Device %s is a video4linux device\n",
-		   filename);
-    }
-    if (strcmp(type, " 0x0") == 0 || strcmp(type, "0x0") == 0) {
-	if (match_type == VJ_TAG_TYPE_VLOOPBACK) {
-	    fclose(proc_info);
-	    return 0;
-	}
-	veejay_msg(VEEJAY_MSG_INFO,
-		   "Device %s is a vloopback device\n",
-		   filename);
-    }
-    fclose(proc_info);
-    return -1;
-}
-
-int vj_v4l_video_get_palette(v4l_video * v4l)
-{
-    return v4l->palette;
-}
-
-int vj_v4l_video_set_palette(v4l_video * v4l, int palette)
-{
-    return v4lsetpalette(v4l->device, palette);
-}
-
-int vj_v4l_video_grab_start(v4l_video * v4l)
-{
-    if (v4l->vloopback == 1)
-	return -1;
-    return v4lsetcontinuous(v4l->device);
-}
-
-int vj_v4l_video_grab_stop(v4l_video * v4l)
-{
-    if (v4l->vloopback == 1)
-	return -1;
-    return v4lstopcontinuous(v4l->device);
-}
-
-int vj_v4l_video_sync_frame(v4l_video * v4l)
-{
-    if (v4l->vloopback == 1)
-	return -1;
-    return v4lsyncf(v4l->device);
-}
-
-int vj_v4l_video_grab_frame(v4l_video * v4l)
-{
-    return v4lgrabf(v4l->device);
-}
-
-uint8_t *vj_v4l_video_get_address(v4l_video * v4l)
-{
-    return v4lgetaddress(v4l->device);
-}
-
-int vj_vloopback_get_frame(v4l_video * v4l, uint8_t ** dst)
-{
-    return -1;
-}
-
-int vj_v4l_video_change_size(v4l_video * v4l, int w, int h)
-{
-    if (!w || !h)
-	return -1;
-    v4l->width = w;
-    v4l->height = h;
-    return v4lgrabinit(v4l->device, w, h);
-}
-
-int vj_v4l_video_set_freq(v4l_video * v4l, int v)
-{
-    if (v4l->tuner == 1 && v4l->frequency_table >= 0) {
-	v4l->TVchannel += v;
-	/*
-	   while(v4l->TVchannel < 0) {
-	   v4l->TVchannel += 
-	   }
-	 */
-	//return v4lsetfreq( v4l->device, );
-    }
-    return 0;
-}
-
-void vj_v4l_video_set_brightness(v4l_video * v4l, int v)
-{
-    v4l->brightness += v;
-    if (v4l->brightness < 0)
-	v4l->brightness = 0;
-    if (v4l->brightness > 65535)
-	v4l->brightness = 65535;
-    v4lsetpicture(v4l->device, v4l->brightness, -1, -1, -1, -1);
-}
-
-void vj_v4l_video_set_hue(v4l_video * v4l, int v)
-{
-    v4l->hue += v;
-    if (v4l->hue < 0)
-	v4l->hue = 0;
-    if (v4l->hue > 65535)
-	v4l->hue = 65535;
-    v4lsetpicture(v4l->device, -1, v4l->hue, -1, -1, -1);
-}
-
-void vj_v4l_video_set_color(v4l_video * v4l, int v)
-{
-    v4l->color += v;
-    if (v4l->color < 0)
-	v4l->color = 0;
-    if (v4l->color > 65535)
-	v4l->color = 65535;
-    v4lsetpicture(v4l->device, -1, -1, v4l->color, -1, -1);
-}
-
-void vj_v4l_video_set_contrast(v4l_video * v4l, int v)
-{
-    v4l->contrast += v;
-    if (v4l->contrast < 0)
-	v4l->contrast = 0;
-    if (v4l->color > 65535)
-	v4l->contrast = 65535;
-    v4lsetpicture(v4l->device, -1, -1, -1, v4l->contrast, -1);
-}
-
-int vj_v4l_video_get_norm(v4l_video * v4l, const char *name)
-{
-    return -1;
-}
-
-int vj_v4l_video_get_freq(v4l_video * v4l, const char *name)
-{
-    return -1;
-}
-
-void vj_v4l_print_info(v4l_video * v4l)
-{
-	v4lprint(v4l->device);
-}
-#endif

veejay-ng/vevosample/vj-v4lvideo.h

@@ -1,103 +0,0 @@
-/* veejay - Linux VeeJay
- * 	     (C) 2002-2004 Niels Elburg <nelburg@looze.net> 
- *
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-#ifndef VJ_V4LUTILS
-#define VJ_V4LUTILS
-#include <config.h>
-#include <stdint.h>
-#include "v4lutils.h"
-
-typedef struct {
-    int brightness;
-    int hue;
-    int color;
-    int contrast;
-    int width;
-    int height;
-    int area;
-    int palette;
-    int frequency_table;
-    int TVchannel;
-    int tuner;
-    int vloopback;
-    uint8_t *framebuffer;
-    v4ldevice *device;
-
-} v4l_video;
-
-/* allocate memory to hold v4l_video object */
-v4l_video *vj_v4lvideo_alloc();
-
-void vj_v4lvideo_free(v4l_video * v4l);
-
-int vj_v4l_video_get_palette(v4l_video * v4l);
-/* free memory in use by object */
-int vj_v4l_video_dealloc(v4l_video * v4l);
-
-/* open the video device and set channel,norm etc. */
-int vj_v4lvideo_init(v4l_video * v4l, char *filename, int channel,
-		     int norm, int freq, int width, int height,
-		     int palette);
-
-/* check to see if the palette is supported */
-int vj_v4l_video_palette_ok(v4l_video * v4l, int palette);
-
-/* return 0 if type matches type in proc (hardware or other)*/
-int vj_v4l_video_get_proc(int match_type, char *filename);
-
-/* set a palette */
-int vj_v4l_video_set_palette(v4l_video * v4l, int palette);
-
-/* set continuous grabbing */
-int vj_v4l_video_grab_start(v4l_video * v4l);
-
-/* stop continuous grabbing */
-int vj_v4l_video_grab_stop(v4l_video * v4l);
-
-/* wait until frame is captured */
-int vj_v4l_video_sync_frame(v4l_video * v4l);
-
-/* start capturing next frame */
-int vj_v4l_video_grab_frame(v4l_video * v4l);
-
-/* buffer is a pointer to a linear buffer */
-uint8_t *vj_v4l_video_get_address(v4l_video * v4l);
-
-/* buffer is a pointer to a 2D buffer ([0][1] and [2]) */
-//int vj_v4l_video_get_planar(v4l_video *v4l, void **buffer);
-
-int vj_v4l_video_change_size(v4l_video * v4l, int w, int h);
-
-int vj_v4l_video_change_size(v4l_video * v4l, int w, int h);
-
-int vj_v4l_video_set_freq(v4l_video * v4l, int v);
-
-void vj_v4l_video_set_brightness(v4l_video * v4l, int v);
-
-void vj_v4l_video_set_hue(v4l_video * v4l, int v);
-
-void vj_v4l_video_set_color(v4l_video * v4l, int v);
-
-void vj_v4l_video_set_contrast(v4l_video * v4l, int v);
-
-int vj_v4l_video_get_norm(v4l_video * v4l, const char *name);
-
-int vj_v4l_video_get_freq(v4l_video * v4l, const char *name);
-
-void vj_v4l_print_info(v4l_video * v4l);
-#endif

veejay-ng/vevosample/vj-vloopback.c

@@ -1,492 +0,0 @@
-/* veejay - Linux VeeJay
- * 	     (C) 2002-2005 Niels Elburg <nelburg@looze.net> 
- *
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-/*
-	Put vloopback back in place
-	Re-used large portions of dc1394_vloopback.c 
-	from Dan Dennedy <dan@dennedy.org>
-
-*/
-
-/*
-	vloopback pusher (using pipes)
-	If someone wants to implement mmap, add SIGIO to the signal catcher
-	and use mutexes for asynchronosouly handling IO. I am too lazy.
- */
-
-#include <config.h>
-#ifdef HAVE_V4L
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/ioctl.h>
-#include <sys/poll.h>
-#include <signal.h>
-#include <unistd.h>
-#include <stdint.h>
-#include <sys/mman.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-
-#include <linux/videodev.h>
-#include <libvjmem/vjmem.h>
-#include <libvjmsg/vj-common.h>
-
-#define VLOOPBACK_MMAP 0 	// commented out
-#define VLOOPBACK_PIPE 1
-#define VLOOPBACK_N_BUFS 2
-
-typedef struct
-{
-	char *dev_name;		/* device name */
-	int   palette;		/* palette from vjframe */
-	int   width;
-	int   height;
-	int   norm;
-        int   mode;		/* PAL or NTSC */
-	int   fd;
-	int   size;		/* size of image out_buf */
-	uint8_t *out_buf;
-	uint8_t *out_map;	/* mmap segment */
-} vj_vloopback_t;
-
-
-/* Open the vloopback device */
-
-void *vj_vloopback_open(const char *device_name, int norm, int mode,
-		int w, int h, int pixel_format)
-{
-	void *ret = NULL;
-	vj_vloopback_t *v = (vj_vloopback_t*) vj_malloc(sizeof(vj_vloopback_t));
-	if(!v) return ret;
-
-	memset(v , 0, sizeof(vj_vloopback_t ));
-
-	v->fd = open( device_name, O_RDWR );
-	v->norm = norm;
-	v->mode = mode;
-	v->width = w;
-	v->height = h;
-	v->palette = (pixel_format == 1 ? VIDEO_PALETTE_YUV422P :
-				VIDEO_PALETTE_YUV420P );
-
-	if(!v->fd)
-	{
-		if(v) free(v);
-		veejay_msg(VEEJAY_MSG_ERROR, "Cannot open vloopback %s",
-			device_name );
-		return ret;
-	}
-
-	v->dev_name = strdup( device_name );
-
-	ret = (void*) v;
-
-	veejay_msg(VEEJAY_MSG_DEBUG,
-		"Vloopback %s size %d x %d, palette YUV42%sP",
-		v->dev_name,
-		v->width,
-		v->height,
-		(pixel_format == 1  ? "2" : "0" ) );
-
-	return (void*) ret;
-}
-
-int	vj_vloopback_get_mode( void *vloop )
-{
-	vj_vloopback_t *v = (vj_vloopback_t*) vloop;
-	return v->mode;
-}
-
-/* write mode*/
-int	vj_vloopback_start_pipe( void *vloop )
-{
-	struct video_capability caps;
-	struct video_window	win;
-	struct video_picture 	pic;
-
-	vj_vloopback_t *v = (vj_vloopback_t*) vloop;
-
-	if(!v) return 0;
-
-	if(v->mode != VLOOPBACK_PIPE)
-		veejay_msg(VEEJAY_MSG_ERROR,"Program error");
-
-	/* the out_palette defines what format ! */
-
-	/* get capabilities */
-	if( ioctl( v->fd, VIDIOCGCAP, &caps ) < 0 )
-	{
-		veejay_msg(VEEJAY_MSG_DEBUG, "Cant get video capabilities");
-		return 0;
-	}
-	/* get picture */
-	if( ioctl( v->fd, VIDIOCGPICT, &pic ) < 0 )
-	{
-		veejay_msg(VEEJAY_MSG_DEBUG, "Cant get video picture");
-		return 0;
-	}
-	/* set palette */
-	pic.palette = v->palette;
-	if( ioctl( v->fd, VIDIOCSPICT, &pic ) < 0 )
-	{
-		veejay_msg(VEEJAY_MSG_DEBUG, "Cant set video picture (palette %d)",v->palette);
-		return 0;
-	}
-	/* set window */
-	win.width  = v->width;
-	win.height = v->height;
-	if( ioctl( v->fd, VIDIOCSWIN, &win ) < 0 )
-	{
-		veejay_msg(VEEJAY_MSG_DEBUG ,"Cant set video window %d x %d",
-			v->width,v->height );
-		return 0;
-	}
-
-	int len = v->width * v->height ;
-	int vshift = (v->palette == 
-		VIDEO_PALETTE_YUV422P ? 0 : 1 );
-	int uv_len = (v->width >> 1 ) * (v->height >> vshift);
-
-	v->size = len + (2 * uv_len);
-
-	veejay_msg(VEEJAY_MSG_DEBUG,
-	   "vloopback pipe (Y plane %d bytes, UV plane %d bytes) H=%d, V=%d",
-		len,uv_len,1,vshift );
-
-	v->out_buf = (uint8_t*) vj_malloc(sizeof(uint8_t) * v->size );
-
-	memset(v->out_buf, 0 , v->size );
-
-	if(!v->out_buf)
-	{
-		veejay_msg(VEEJAY_MSG_ERROR, "Cant allocate sufficient memory for vloopback");
-		return 0;
-	}
-	return 1;
-}
-
-int	vj_vloopback_write_pipe( void *vloop  )
-{
-	vj_vloopback_t *v = (vj_vloopback_t*) vloop;
-	if(!v) return 0;
-	int res = write( v->fd, v->out_buf, v->size );
-	if(res <= 0)
-		return 0;
-	return 1;
-}
-
-int	vj_vloopback_fill_buffer( void *vloop, uint8_t **frame )
-{
-	// write frame to v->out_buf (veejay_memcpy)
-	vj_vloopback_t *v = (vj_vloopback_t*) vloop;
-	if(!v) return 0;
-
-	int len = v->width * v->height ;
-	int hshift = (v->palette == 
-		VIDEO_PALETTE_YUV422P ? 0 : 1 );
-	int uv_len = (v->width >> hshift ) * (v->height >> 1);
-
-	// copy data to linear buffer */	
-	veejay_memcpy( v->out_buf, frame[0], len );
-
-	veejay_memcpy( v->out_buf + len,
-					frame[1], uv_len );
-	veejay_memcpy( v->out_buf + len + uv_len,
-					frame[2], uv_len );
-	
-	return 1;
-}
-
-/*
-int	vj_vloopback_start_mmap( void *vloop )
-{
-	vj_vloopback_t *v = (vj_vloopback_t*) vloop;
-	if(!v)
-	 return 0;
-	
-
-	int len = v->width * v->height ;
-	int hshift = (v->palette == 
-		VIDEO_PALETTE_YUV422P ? 0 : 1 );
-	int uv_len = (v->width >> hshift ) * (v->height >> 1);
-	v->size = len + (2 * uv_len);
-	v->out_buf = (uint8_t*) vj_malloc(
-			sizeof(uint8_t) * v->size * VLOOPBACK_N_BUFS );
-
-	if(!v->out_buf)
-		return 0;
-
-	v->out_map = mmap( 0,  (v->size * VLOOPBACK_N_BUFS), PROT_READ| PROT_WRITE,
-				MAP_SHARED, v->fd , 0 );
-	if( v->out_map == (uint8_t*) -1 )
-	{
-		veejay_msg(VEEJAY_MSG_ERROR, "Cannot mmap memory");
-		return 0;
-	}
-	veejay_msg(VEEJAY_MSG_ERROR, "%s", __FUNCTION__ );
-	return 1;
-}
-
-int	vj_vloopback_write_mmap( void *vloop, int frame )
-{
-	vj_vloopback_t *v = (vj_vloopback_t*) vloop;
-	veejay_memcpy( v->out_map + (v->size * frame), v->out_buf, v->size );
-	return 1;
-}
-
-int	vj_vloopback_ioctl( void *vloop, unsigned long int cmd, void *arg )
-{
-	vj_vloopback_t *v = (vj_vloopback_t*) vloop;
-			veejay_msg(VEEJAY_MSG_INFO, "%s %d / %d",
-				__FUNCTION__, __LINE__ , cmd);
-
-	switch(cmd)
-	{
-		case VIDIOCGCAP:
-		{
-			veejay_msg(VEEJAY_MSG_INFO, "%s %d",
-				__FUNCTION__, __LINE__ );
-			struct video_capability *cap = arg;
-			sprintf( cap->name, "Veejay Digital Sampler");
-			cap->type = VID_TYPE_CAPTURE;
-			cap->channels = 1;
-			cap->audios = 0;
-			cap->maxwidth = v->width;
-			cap->maxheight = v->height;
-			cap->minwidth = v->width;
-			cap->minheight = v->height;
-			break;
-		}
-		case VIDIOCGTUNER:
-		{
-			veejay_msg(VEEJAY_MSG_INFO, "%s %d",
-				__FUNCTION__, __LINE__ );
-
-			struct video_tuner *tuner = arg;
-			sprintf( tuner->name, "Veejay Digital Sampler");
-			tuner->tuner = 0;
-			tuner->rangelow = 0;
-			tuner->rangehigh = 0;
-			tuner->flags = VIDEO_TUNER_PAL | VIDEO_TUNER_NTSC;
-			tuner->mode = (v->norm ? VIDEO_MODE_PAL : VIDEO_MODE_NTSC);
-			tuner->signal = 0;
-			break;
-		}
-		case VIDIOCGCHAN:
-		{
-			struct video_channel *vidchan=arg;
-			vidchan->channel = 0;
-			vidchan->flags = 0;
-			vidchan->tuners = 0;
-			vidchan->type = VIDEO_TYPE_CAMERA;
-			strcpy(vidchan->name, "Veejay Dummy channel");
-			break;
-		}
-		case VIDIOCGPICT:
-		{
-			veejay_msg(VEEJAY_MSG_INFO, "%s %d",
-				__FUNCTION__, __LINE__ );
-
-			struct video_picture *vidpic=arg;
-
-			vidpic->colour = 0xffff;
-			vidpic->hue = 0xffff;
-			vidpic->brightness = 0xffff;
-			vidpic->contrast = 0xffff;
-			vidpic->whiteness = 0xffff;
-			
-			vidpic->palette = v->palette;
-			vidpic->depth = (
-					v->palette == VIDEO_PALETTE_YUV420P ?
-					12 : 16 );
-			break;
-		}
-		case VIDIOCSPICT:
-		{
-			veejay_msg(VEEJAY_MSG_INFO, "%s %d",
-				__FUNCTION__, __LINE__ );
-
-			struct video_picture *vidpic=arg;
-			if(vidpic->palette != v->palette )
-				veejay_msg(VEEJAY_MSG_ERROR,
-				 "requested palette %d, but only using %d now",
-					vidpic->palette, v->palette );
-			return 1;
-		}
-
-		case VIDIOCCAPTURE:
-		{
-				veejay_msg(VEEJAY_MSG_INFO, "%s %d",
-				__FUNCTION__, __LINE__ );
-	
-	break;
-		}
-
-		case VIDIOCGWIN:
-		{
-			veejay_msg(VEEJAY_MSG_INFO, "%s %d",
-				__FUNCTION__, __LINE__ );
-
-			struct video_window *vidwin=arg;
-
-			vidwin->x=0;
-			vidwin->y=0;
-			vidwin->width=v->width;
-			vidwin->height=v->height;
-			vidwin->chromakey=0; 
-			vidwin->flags=0;
-			vidwin->samplecount=0;
-			break;
-		}
-		case VIDIOCSWIN:
-		{
-			veejay_msg(VEEJAY_MSG_ERROR, "Cannot change size ! ");
-			break;
-		}
-
-		case VIDIOCGMBUF:
-		{
-			veejay_msg(VEEJAY_MSG_INFO, "%s %d",
-				__FUNCTION__, __LINE__ );
-
-			struct video_mbuf *vidmbuf=arg;
-			int i;
-			
-			vidmbuf->size = v->size;
-			vidmbuf->frames = VLOOPBACK_N_BUFS;
-
-			for (i=0; i < VLOOPBACK_N_BUFS; i++)
-				vidmbuf->offsets[i] = i * vidmbuf->size;
-			vidmbuf->size *= vidmbuf->frames;
-			break;
-		}
-
-		case VIDIOCMCAPTURE:
-		{
-			veejay_msg(VEEJAY_MSG_INFO, "%s %d",
-				__FUNCTION__, __LINE__ );
-
-			struct video_mmap *vidmmap=arg;
-
-			if ( vidmmap->format != v->palette )
-			{
-				veejay_msg(VEEJAY_MSG_ERROR, "capture palette not current palette!");
-				return 1;
-			}
-				
-			if (vidmmap->height != v->height ||
-			    vidmmap->width != v->width) {
-				veejay_msg(VEEJAY_MSG_ERROR, "caputure: invalid size %dx%d\n", vidmmap->width, vidmmap->height );
-				return 1;
-			}
-			break;
-		}
-		case VIDIOCSYNC:
-		{
-			veejay_msg(VEEJAY_MSG_INFO, "%s %d",
-				__FUNCTION__, __LINE__ );
-
-			struct video_mmap *vidmmap=arg;
-			if(!vj_vloopback_write_mmap( vloop, vidmmap->frame ))
-				return 1;
-			break;
-		}
-		default:
-		{
-			veejay_msg(VEEJAY_MSG_INFO, "%s %d",
-				__FUNCTION__, __LINE__ );
-
-			veejay_msg(VEEJAY_MSG_ERROR, "ioctl %ld unhandled\n", cmd & 0xff);
-			break;
-		}
-
-
-	}
-	return 0;
-}
-*/
-void	vj_vloopback_close( void *vloop )
-{
-	vj_vloopback_t *v = (vj_vloopback_t*) vloop;
-	if(v)
-	{
-		if(v->fd)
-			close( v->fd );
-		if(v->out_buf)
-			free(v->out_buf);
-/*		if(v->out_map)
-			munmap( v->out_map,
-					v->size * VLOOPBACK_N_BUFS );*/
-		free(v);
-	}
-}	
-
-/*
-void	vj_vloopback_signal_handler( void *vloop, int sig_no )
-{
-	int size,ret;
-	unsigned long int cmd;
-	struct pollfd ufds;
-	char ioctlbuf[1024];
-	
-	vj_vloopback_t *v = (vj_vloopback_t*) vloop;
-
-	if(sig_no != SIGIO )
-		return;
-
-	
-	ufds.fd = v->fd;
-	ufds.events = POLLIN;
-	ufds.revents = 0;
-  
-	poll( &ufds, 1, 10 ); // 10 ms too small ?
-	
-	if( !ufds.revents & POLLIN )
-	{
-		veejay_msg(VEEJAY_MSG_ERROR,
-			"Received signal but got negative on poll");
-		return;
-	}
-
-	size = read( v->fd, ioctlbuf, 1024 );
-	if( size >= sizeof( unsigned long int )) 
-	{
-		veejay_memcpy( &cmd, ioctlbuf, sizeof(unsigned long int));
-		if( cmd == 0 )
-		{
-			veejay_msg(VEEJAY_MSG_ERROR,
-				"Client closed device");
-			return;
-		}
-		ret = vj_vloopback_ioctl( vloop, cmd, ioctlbuf + sizeof( unsigned long int ));
-		if(ret)
-		{
-			memset( ioctlbuf + sizeof( unsigned long int ), 1024 - sizeof( unsigned long int ),0xff);
-			veejay_msg(VEEJAY_MSG_ERROR,
-				"IOCTL %d unsuccessfull", cmd & 0xff);
-		}
-		ioctl( v->fd, cmd, ioctlbuf + sizeof( unsigned long int ));
-	}
-	return ;
-}
-*/
-#endif
-