moved trunk into place

bindings/cpp/build/gnu/Makefile.in

@@ -0,0 +1,106 @@
+#
+# Makefile template for PortAudioCpp
+# Ludwig Schwardt
+# 01/10/2003
+#
+# Not much to edit here - rather check configure.ac
+#
+
+PREFIX = @prefix@
+CC = @CC@
+CXX = @CXX@
+CFLAGS = @CFLAGS@ @DEFS@
+CXXFLAGS = @CXXFLAGS@
+SHARED_FLAGS = @SHARED_FLAGS@
+LIBS = @LIBS@
+DLL_LIBS = @DLL_LIBS@
+AR = @AR@
+RANLIB = @RANLIB@
+INSTALL = @INSTALL@
+
+PACPP_ROOT = @PACPP_ROOT@
+PORTAUDIO = @PORTAUDIO@
+PADLL = @PADLL@
+PACPP_DLL = @PACPP_DLL@
+PALIB = libportaudio.a
+PACPP_LIB = libportaudiocpp.a
+PACPP_DLLV = $(PACPP_DLL).0.0.12
+
+SRCDIR = $(PACPP_ROOT)/source/portaudiocpp
+BINDIR = $(PACPP_ROOT)/example
+LIBDIR = $(PACPP_ROOT)/lib
+DOCDIR = $(PACPP_ROOT)/doc
+
+OBJS = \
+       $(SRCDIR)/BlockingStream.o \
+       $(SRCDIR)/CallbackInterface.o \
+       $(SRCDIR)/CallbackStream.o \
+       $(SRCDIR)/CFunCallbackStream.o \
+       $(SRCDIR)/CppFunCallbackStream.o \
+       $(SRCDIR)/Device.o \
+       $(SRCDIR)/DirectionSpecificStreamParameters.o \
+       $(SRCDIR)/Exception.o \
+       $(SRCDIR)/HostApi.o \
+       $(SRCDIR)/InterfaceCallbackStream.o \
+       $(SRCDIR)/MemFunCallbackStream.o \
+       $(SRCDIR)/Stream.o \
+       $(SRCDIR)/StreamParameters.o \
+       $(SRCDIR)/System.o \
+       $(SRCDIR)/SystemDeviceIterator.o \
+       $(SRCDIR)/SystemHostApiIterator.o
+
+# Not supported yet
+#      $(SRCDIR)/AsioDeviceAdapter.o
+
+EXAMPLES = \
+           $(BINDIR)/devs \
+	   $(BINDIR)/sine
+
+.PHONY: all clean docs
+
+all: $(EXAMPLES) $(LIBDIR)/$(PACPP_LIB) $(LIBDIR)/$(PACPP_DLL)
+
+clean:
+	rm -rf $(SRCDIR)/*.o $(BINDIR)/*.o $(EXAMPLES) $(LIBDIR) $(DOCDIR)/api_reference 
+	rm -rf autom4te.cache config.status config.log
+
+docs:
+	cd $(DOCDIR); doxygen config.doxy.linux
+	
+%.o: %.c
+	$(CC) -c $(CFLAGS) $< -o $@
+		
+%.o: %.cxx
+	$(CXX) -c $(CXXFLAGS) $< -o $@
+
+
+$(EXAMPLES): $(BINDIR)/%: $(BINDIR)/%.o $(OBJS)
+	$(CXX) $^ -o $@ $(LIBS)
+
+$(LIBDIR)/$(PACPP_LIB): $(LIBDIR) $(OBJS)
+	$(AR) ruv $(LIBDIR)/$(PACPP_LIB) $(OBJS)
+	$(RANLIB) $(LIBDIR)/$(PACPP_LIB)
+
+$(LIBDIR)/$(PACPP_DLLV): $(LIBDIR) $(OBJS)
+	$(CXX) $(SHARED_FLAGS) -o $(LIBDIR)/$(PACPP_DLLV) $(OBJS) $(DLL_LIBS)
+
+$(LIBDIR)/$(PACPP_DLL): $(LIBDIR) $(OBJS)
+	$(CXX) $(SHARED_FLAGS) -o $(LIBDIR)/$(PACPP_DLL) $(OBJS) $(DLL_LIBS)
+
+#install: $(LIBDIR)/$(PACPP_LIB) $(LIBDIR)/$(PACPP_DLLV)
+#	$(INSTALL) -m 644 $(LIBDIR)/$(PACPP_DLLV) $(PREFIX)/lib/$(PACPP_DLLV)
+#	$(INSTALL) -m 644 $(LIBDIR)/$(PACPP_LIB) $(PREFIX)/lib/$(PACPP_LIB)
+#	cd $(PREFIX)/lib && rm -f $(PACPP_DLL) && ln -s $(PACPP_DLLV) $(PACPP_DLL)
+#	@echo ""
+#	@echo "------------------------------------------------------------"
+#	@echo "PortAudioCpp was successfully installed."
+#	@echo ""
+#	@echo "On some systems (e.g. Linux) you should run 'ldconfig' now"
+#	@echo "to make the shared object available.  You may also need to"
+#	@echo "modify your LD_LIBRARY_PATH environment variable to include"
+#	@echo "the directory $(PREFIX)/lib"
+#	@echo "------------------------------------------------------------"
+#	@echo ""
+
+$(LIBDIR):
+	mkdir $(LIBDIR)

bindings/cpp/build/gnu/aclocal.m4

@@ -0,0 +1,57 @@
+
+dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not)
+dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page
+dnl also defines GSTUFF_PKG_ERRORS on error
+AC_DEFUN(PKG_CHECK_MODULES, [
+  succeeded=no
+
+  if test -z "$PKG_CONFIG"; then
+    AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+  fi
+
+  if test "$PKG_CONFIG" = "no" ; then
+     echo "*** The pkg-config script could not be found. Make sure it is"
+     echo "*** in your path, or set the PKG_CONFIG environment variable"
+     echo "*** to the full path to pkg-config."
+     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
+  else
+     PKG_CONFIG_MIN_VERSION=0.9.0
+     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
+        AC_MSG_CHECKING(for $2)
+
+        if $PKG_CONFIG --exists "$2" ; then
+            AC_MSG_RESULT(yes)
+            succeeded=yes
+
+            AC_MSG_CHECKING($1_CFLAGS)
+            $1_CFLAGS=`$PKG_CONFIG --cflags "$2"`
+            AC_MSG_RESULT($$1_CFLAGS)
+
+            AC_MSG_CHECKING($1_LIBS)
+            $1_LIBS=`$PKG_CONFIG --libs "$2"`
+            AC_MSG_RESULT($$1_LIBS)
+        else
+            $1_CFLAGS=""
+            $1_LIBS=""
+            ## If we have a custom action on failure, don't print errors, but 
+            ## do set a variable so people can do so.
+            $1_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
+            ifelse([$4], ,echo $$1_PKG_ERRORS,)
+        fi
+
+        AC_SUBST($1_CFLAGS)
+        AC_SUBST($1_LIBS)
+     else
+        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
+        echo "*** See http://www.freedesktop.org/software/pkgconfig"
+     fi
+  fi
+
+  if test $succeeded = yes; then
+     ifelse([$3], , :, [$3])
+  else
+     ifelse([$4], , AC_MSG_ERROR([Library requirements ($2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.]), [$4])
+  fi
+])
+
+

bindings/cpp/build/gnu/configure.ac

@@ -0,0 +1,214 @@
+#
+# PortAudioCpp V19 autoconf input file
+# Shamelessly ripped from the PortAudio one by Dominic Mazzoni
+# Ludwig Schwardt
+#
+
+# Require autoconf >= 2.13
+AC_PREREQ(2.13)
+
+AC_INIT([PortAudioCpp], [12])
+AC_CONFIG_SRCDIR([../../include/portaudiocpp/PortAudioCpp.hxx])
+
+###### Top-level directory of pacpp
+###### This makes it easy to shuffle the build directories
+###### Also edit AC_CONFIG_SRCDIR above (wouldn't accept this variable)!
+PACPP_ROOT="../.."
+
+######
+###### SET THIS TO PORTAUDIO DIRECTORY
+######
+PORTAUDIO="$PACPP_ROOT/../portaudio"
+
+# Various other variables and flags
+
+PACPP_INC="$PACPP_ROOT/include"
+INCLUDES="-I$PACPP_INC -I$PORTAUDIO -I$PORTAUDIO/pa_common"
+CFLAGS="-g -O2 -Wall -ansi -pedantic $INCLUDES"
+CXXFLAGS="$CFLAGS"
+PALIBDIR="$PORTAUDIO/lib"
+
+# Checks for programs
+
+AC_PROG_CC
+AC_PROG_CXX
+AC_PROG_LN_S
+AC_PROG_RANLIB
+AC_PROG_INSTALL
+AC_PATH_PROG(AR, ar, no)
+if [[ $AR = "no" ]] ; then
+    AC_MSG_ERROR("Could not find ar - needed to create a library");
+fi
+
+# This must be one of the first tests we do or it will fail...
+AC_C_BIGENDIAN
+
+# Transfer these variables to the Makefile
+AC_SUBST(PACPP_ROOT)
+AC_SUBST(PORTAUDIO)
+AC_SUBST(PADLL)
+AC_SUBST(PACPP_DLL)
+AC_SUBST(PACPP_INC)
+AC_SUBST(SHARED_FLAGS)
+AC_SUBST(DLL_LIBS)
+AC_SUBST(CXXFLAGS)
+
+##################### CHECK FOR INSTALLED PACKAGES ############################
+
+# checks for various host APIs and arguments to configure that
+# turn them on or off
+
+AC_CHECK_LIB(asound, snd_pcm_open, have_alsa=yes, have_alsa=no)
+
+# Determine the host description for the subsequent test.
+# PKG_CHECK_MODULES seems to check and set the host variable also, but
+# that then requires pkg-config availability which is not standard on
+# MinGW systems and can be a pain to install.
+AC_CANONICAL_HOST
+
+PKG_CHECK_MODULES(JACK, jack, have_jack=yes, have_jack=no)
+
+AC_ARG_WITH(alsa, 
+            [  --with-alsa (default=auto)],
+            with_alsa=$withval, with_alsa="yes")
+
+AC_ARG_WITH(jack, 
+            [  --with-jack (default=auto)],
+            with_jack=$withval, with_jack="yes")
+
+AC_ARG_WITH(oss, 
+            [  --with-oss (default=yes)],
+            with_oss=$withval, with_oss="yes")
+
+AC_ARG_WITH(host_os, 
+            [  --with-host_os (no default)],
+            host_os=$withval)
+
+AC_ARG_WITH(winapi,
+            [  --with-winapi ((wmme/directx/asio) default=wmme)],
+            with_winapi=$withval, with_winapi="wmme")
+
+# Mac API added for ASIO, can have other api's listed
+AC_ARG_WITH(macapi,
+            [  --with-macapi (asio) default=asio)],
+            with_macapi=$withval, with_macapi="asio")
+
+AC_ARG_WITH(asiodir,
+            [  --with-asiodir (default=/usr/local/asiosdk2)],
+            with_asiodir=$withval, with_asiodir="/usr/local/asiosdk2")
+
+AC_ARG_WITH(dxdir,
+            [  --with-dxdir (default=/usr/local/dx7sdk)],
+            with_dxdir=$withval, with_dxdir="/usr/local/dx7sdk")
+
+
+##################### HOST-SPECIFIC LIBRARY SETTINGS ##########################
+
+case "${host_os}" in
+  darwin* )
+	# Mac OS X configuration
+
+	LIBS="-framework AudioUnit -framework AudioToolbox -framework CoreAudio";
+	PADLL="libportaudio.dylib";
+	PACPP_DLL="libportaudiocpp.dylib";
+	SHARED_FLAGS="-framework AudioUnit -framework AudioToolbox";
+	SHARED_FLAGS="$SHARED_FLAGS -framework CoreAudio -dynamiclib";
+        if [[ $with_macapi = "asio" ]] ; then
+            if [[ $with_asiodir ]] ; then
+              ASIODIR="$with_asiodir";
+            else
+              ASIODIR="/usr/local/asiosdk2";
+            fi
+            echo "ASIODIR: $ASIODIR";
+        fi
+	;;
+
+  mingw* )
+        # MingW configuration
+
+        echo "WINAPI: $with_winapi"
+        if [[ $with_winapi = "directx" ]] ; then
+            if [[ $with_dxdir ]] ; then
+              DXDIR="$with_dxdir";
+            else
+              DXDIR="/usr/local/dx7sdk";
+            fi
+            echo "DXDIR: $DXDIR"
+	    LIBS="-L$PALIBDIR -lportaudio"
+            LIBS="$LIBS -lwinmm -lm -ldsound -lole32";
+            PADLL="portaudio.dll";
+            PACPP_DLL="portaudiocpp.dll";
+            SHARED_FLAGS="-shared -mthreads";
+            DLL_LIBS="-lwinmm -lm -L./dx7sdk/lib -ldsound -lole32";
+            CFLAGS="$CFLAGS -DPA_NO_WMME -DPA_NO_ASIO";
+	    CXXFLAGS="$CFLAGS"
+        elif [[ $with_winapi = "asio" ]] ; then
+            if [[ $with_asiodir ]] ; then
+              ASIODIR="$with_asiodir";
+            else
+              ASIODIR="/usr/local/asiosdk2";
+            fi
+            echo "ASIODIR: $ASIODIR"
+
+	    LIBS="-L$PALIBDIR -lportaudio"
+            LIBS="$LIBS -lwinmm -lm -lstdc++ -lole32 -luuid";
+            PADLL="portaudio.dll";
+            PACPP_DLL="portaudiocpp.dll";
+            SHARED_FLAGS="-shared -mthreads";
+            DLL_LIBS="-lwinmm -lm -lstdc++ -lole32 -luuid";
+            CFLAGS="$CFLAGS -ffast-math -fomit-frame-pointer -DPA_NO_WMME -DPA_NO_DS -DWINDOWS";
+            CXXFLAGS="$CFLAGS";
+        else   # WMME default
+	    LIBS="-L$PALIBDIR -lportaudio"
+            LIBS="$LIBS -lwinmm -lm -lstdc++ -lole32 -luuid";
+            PADLL="portaudio.dll";
+            PACPP_DLL="portaudiocpp.dll";
+            SHARED_FLAGS="-shared -mthreads";
+            DLL_LIBS="-lwinmm";
+            CFLAGS="$CFLAGS -DPA_NO_DS -DPA_NO_ASIO";
+            CXXFLAGS="$CFLAGS";
+        fi
+        ;;
+
+  cygwin* )
+	# Cygwin configuration
+
+	LIBS="-L$PALIBDIR -lportaudio"
+	LIBS="$LIBS -lwinmm -lm";
+	PADLL="portaudio.dll";
+	PACPP_DLL="portaudiocpp.dll";
+	SHARED_FLAGS="-shared -mthreads";
+	DLL_LIBS="-lwinmm";
+	;;
+
+  *)
+	# Unix OSS configuration
+
+   AC_CHECK_LIB(pthread, pthread_create,
+                ,
+                AC_MSG_ERROR([libpthread not found!]))
+	
+	LIBS="$LIBS -L$PALIBDIR -lportaudio"
+	
+	if [[ $have_jack = "yes" ] && [ $with_jack != "no" ]] ; then
+   	      	LIBS="$LIBS $JACK_LIBS"
+		CFLAGS="$CFLAGS $JACK_CFLAGS"
+                AC_DEFINE(PA_USE_JACK)
+	fi
+
+	if [[ $have_alsa = "yes" ] && [ $with_alsa != "no" ]] ; then
+                LIBS="$LIBS -lasound"
+                AC_DEFINE(PA_USE_ALSA)
+	fi
+
+	if [[ $with_oss != "no" ]] ; then
+		AC_DEFINE(PA_USE_OSS)
+	fi
+	LIBS="$LIBS -lm -lpthread";
+	PADLL="libportaudio.so";
+	PACPP_DLL="libportaudiocpp.so";
+	SHARED_FLAGS="-shared";
+esac
+
+AC_CONFIG_FILES([Makefile])
+AC_OUTPUT