From a4dd0ad63c00f4dee3b86dfd3075d1d61b2b3180 Mon Sep 17 00:00:00 2001
From: sanine <sanine.not@pm.me>
Date: Sat, 27 Aug 2022 23:52:56 -0500
Subject: add plibsys

---
 portaudio/bindings/cpp/include/Makefile.am         |  22 -
 portaudio/bindings/cpp/include/Makefile.in         | 571 ---------------------
 .../cpp/include/portaudiocpp/AsioDeviceAdapter.hxx |  44 --
 .../cpp/include/portaudiocpp/AutoSystem.hxx        |  62 ---
 .../cpp/include/portaudiocpp/BlockingStream.hxx    |  45 --
 .../include/portaudiocpp/CFunCallbackStream.hxx    |  49 --
 .../cpp/include/portaudiocpp/CallbackInterface.hxx |  45 --
 .../cpp/include/portaudiocpp/CallbackStream.hxx    |  40 --
 .../include/portaudiocpp/CppFunCallbackStream.hxx  |  86 ----
 .../bindings/cpp/include/portaudiocpp/Device.hxx   |  91 ----
 .../DirectionSpecificStreamParameters.hxx          |  77 ---
 .../cpp/include/portaudiocpp/Exception.hxx         | 108 ----
 .../bindings/cpp/include/portaudiocpp/HostApi.hxx  |  76 ---
 .../portaudiocpp/InterfaceCallbackStream.hxx       |  49 --
 .../include/portaudiocpp/MemFunCallbackStream.hxx  | 107 ----
 .../cpp/include/portaudiocpp/PortAudioCpp.hxx      | 109 ----
 .../cpp/include/portaudiocpp/SampleDataFormat.hxx  |  35 --
 .../bindings/cpp/include/portaudiocpp/Stream.hxx   |  82 ---
 .../cpp/include/portaudiocpp/StreamParameters.hxx  |  77 ---
 .../bindings/cpp/include/portaudiocpp/System.hxx   | 107 ----
 .../include/portaudiocpp/SystemDeviceIterator.hxx  |  66 ---
 .../include/portaudiocpp/SystemHostApiIterator.hxx |  61 ---
 22 files changed, 2009 deletions(-)
 delete mode 100644 portaudio/bindings/cpp/include/Makefile.am
 delete mode 100644 portaudio/bindings/cpp/include/Makefile.in
 delete mode 100644 portaudio/bindings/cpp/include/portaudiocpp/AsioDeviceAdapter.hxx
 delete mode 100644 portaudio/bindings/cpp/include/portaudiocpp/AutoSystem.hxx
 delete mode 100644 portaudio/bindings/cpp/include/portaudiocpp/BlockingStream.hxx
 delete mode 100644 portaudio/bindings/cpp/include/portaudiocpp/CFunCallbackStream.hxx
 delete mode 100644 portaudio/bindings/cpp/include/portaudiocpp/CallbackInterface.hxx
 delete mode 100644 portaudio/bindings/cpp/include/portaudiocpp/CallbackStream.hxx
 delete mode 100644 portaudio/bindings/cpp/include/portaudiocpp/CppFunCallbackStream.hxx
 delete mode 100644 portaudio/bindings/cpp/include/portaudiocpp/Device.hxx
 delete mode 100644 portaudio/bindings/cpp/include/portaudiocpp/DirectionSpecificStreamParameters.hxx
 delete mode 100644 portaudio/bindings/cpp/include/portaudiocpp/Exception.hxx
 delete mode 100644 portaudio/bindings/cpp/include/portaudiocpp/HostApi.hxx
 delete mode 100644 portaudio/bindings/cpp/include/portaudiocpp/InterfaceCallbackStream.hxx
 delete mode 100644 portaudio/bindings/cpp/include/portaudiocpp/MemFunCallbackStream.hxx
 delete mode 100644 portaudio/bindings/cpp/include/portaudiocpp/PortAudioCpp.hxx
 delete mode 100644 portaudio/bindings/cpp/include/portaudiocpp/SampleDataFormat.hxx
 delete mode 100644 portaudio/bindings/cpp/include/portaudiocpp/Stream.hxx
 delete mode 100644 portaudio/bindings/cpp/include/portaudiocpp/StreamParameters.hxx
 delete mode 100644 portaudio/bindings/cpp/include/portaudiocpp/System.hxx
 delete mode 100644 portaudio/bindings/cpp/include/portaudiocpp/SystemDeviceIterator.hxx
 delete mode 100644 portaudio/bindings/cpp/include/portaudiocpp/SystemHostApiIterator.hxx

(limited to 'portaudio/bindings/cpp/include')

diff --git a/portaudio/bindings/cpp/include/Makefile.am b/portaudio/bindings/cpp/include/Makefile.am
deleted file mode 100644
index f925657..0000000
--- a/portaudio/bindings/cpp/include/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-pkginclude_HEADERS = \
-       portaudiocpp/AutoSystem.hxx \
-       portaudiocpp/BlockingStream.hxx \
-       portaudiocpp/CallbackInterface.hxx \
-       portaudiocpp/CallbackStream.hxx \
-       portaudiocpp/CFunCallbackStream.hxx \
-       portaudiocpp/CppFunCallbackStream.hxx \
-       portaudiocpp/Device.hxx \
-       portaudiocpp/DirectionSpecificStreamParameters.hxx \
-       portaudiocpp/Exception.hxx \
-       portaudiocpp/HostApi.hxx \
-       portaudiocpp/InterfaceCallbackStream.hxx \
-       portaudiocpp/MemFunCallbackStream.hxx \
-       portaudiocpp/PortAudioCpp.hxx \
-       portaudiocpp/SampleDataFormat.hxx \
-       portaudiocpp/Stream.hxx \
-       portaudiocpp/StreamParameters.hxx \
-       portaudiocpp/SystemDeviceIterator.hxx \
-       portaudiocpp/SystemHostApiIterator.hxx \
-       portaudiocpp/System.hxx
-
-#       portaudiocpp/AsioDeviceAdapter.hxx
diff --git a/portaudio/bindings/cpp/include/Makefile.in b/portaudio/bindings/cpp/include/Makefile.in
deleted file mode 100644
index 986651d..0000000
--- a/portaudio/bindings/cpp/include/Makefile.in
+++ /dev/null
@@ -1,571 +0,0 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994-2013 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@
-
-VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -[dEDm]) skip_next=yes;; \
-      -[JT]) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = include
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(pkginclude_HEADERS)
-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_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 = 
-SOURCES =
-DIST_SOURCES =
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
-  test -z "$$files" \
-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-         $(am__cd) "$$dir" && rm -f $$files; }; \
-  }
-am__installdirs = "$(DESTDIR)$(pkgincludedir)"
-HEADERS = $(pkginclude_HEADERS)
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-# Read a list of newline-separated strings from the standard input,
-# and print each of them once, without duplicates.  Input order is
-# *not* preserved.
-am__uniquify_input = $(AWK) '\
-  BEGIN { nonempty = 0; } \
-  { items[$$0] = 1; nonempty = 1; } \
-  END { if (nonempty) { for (i in items) print i; }; } \
-'
-# Make sure the list of sources is unique.  This is necessary because,
-# e.g., the same source file might be shared among _SOURCES variables
-# for different programs/libraries.
-am__define_uniq_tagged_files = \
-  list='$(am__tagged_files)'; \
-  unique=`for i in $$list; do \
-    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-  done | $(am__uniquify_input)`
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AR = @AR@
-AS = @AS@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFAULT_INCLUDES = @DEFAULT_INCLUDES@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-GREP = @GREP@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-LT_VERSION_INFO = @LT_VERSION_INFO@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR_P = @MKDIR_P@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PORTAUDIO_ROOT = @PORTAUDIO_ROOT@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-VERSION = @VERSION@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-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@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-pkginclude_HEADERS = \
-       portaudiocpp/AutoSystem.hxx \
-       portaudiocpp/BlockingStream.hxx \
-       portaudiocpp/CallbackInterface.hxx \
-       portaudiocpp/CallbackStream.hxx \
-       portaudiocpp/CFunCallbackStream.hxx \
-       portaudiocpp/CppFunCallbackStream.hxx \
-       portaudiocpp/Device.hxx \
-       portaudiocpp/DirectionSpecificStreamParameters.hxx \
-       portaudiocpp/Exception.hxx \
-       portaudiocpp/HostApi.hxx \
-       portaudiocpp/InterfaceCallbackStream.hxx \
-       portaudiocpp/MemFunCallbackStream.hxx \
-       portaudiocpp/PortAudioCpp.hxx \
-       portaudiocpp/SampleDataFormat.hxx \
-       portaudiocpp/Stream.hxx \
-       portaudiocpp/StreamParameters.hxx \
-       portaudiocpp/SystemDeviceIterator.hxx \
-       portaudiocpp/SystemHostApiIterator.hxx \
-       portaudiocpp/System.hxx
-
-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 ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu include/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu include/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
-$(am__aclocal_m4_deps):
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-install-pkgincludeHEADERS: $(pkginclude_HEADERS)
-	@$(NORMAL_INSTALL)
-	@list='$(pkginclude_HEADERS)'; test -n "$(pkgincludedir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(pkgincludedir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(pkgincludedir)" || exit 1; \
-	fi; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(pkgincludedir)'"; \
-	  $(INSTALL_HEADER) $$files "$(DESTDIR)$(pkgincludedir)" || exit $$?; \
-	done
-
-uninstall-pkgincludeHEADERS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(pkginclude_HEADERS)'; test -n "$(pkgincludedir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(pkgincludedir)'; $(am__uninstall_files_from_dir)
-
-ID: $(am__tagged_files)
-	$(am__define_uniq_tagged_files); mkid -fID $$unique
-tags: tags-am
-TAGS: tags
-
-tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-	set x; \
-	here=`pwd`; \
-	$(am__define_uniq_tagged_files); \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: ctags-am
-
-CTAGS: ctags
-ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-	$(am__define_uniq_tagged_files); \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-cscopelist: cscopelist-am
-
-cscopelist-am: $(am__tagged_files)
-	list='$(am__tagged_files)'; \
-	case "$(srcdir)" in \
-	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
-	  *) sdir=$(subdir)/$(srcdir) ;; \
-	esac; \
-	for i in $$list; do \
-	  if test -f "$$i"; then \
-	    echo "$(subdir)/$$i"; \
-	  else \
-	    echo "$$sdir/$$i"; \
-	  fi; \
-	done >> $(top_builddir)/cscope.files
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(HEADERS)
-installdirs:
-	for dir in "$(DESTDIR)$(pkgincludedir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-pkgincludeHEADERS
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -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-pkgincludeHEADERS
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
-	clean-libtool cscopelist-am ctags ctags-am distclean \
-	distclean-generic distclean-libtool distclean-tags distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-pkgincludeHEADERS install-ps \
-	install-ps-am install-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
-	ps ps-am tags tags-am uninstall uninstall-am \
-	uninstall-pkgincludeHEADERS
-
-
-#       portaudiocpp/AsioDeviceAdapter.hxx
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/portaudio/bindings/cpp/include/portaudiocpp/AsioDeviceAdapter.hxx b/portaudio/bindings/cpp/include/portaudiocpp/AsioDeviceAdapter.hxx
deleted file mode 100644
index 59f6095..0000000
--- a/portaudio/bindings/cpp/include/portaudiocpp/AsioDeviceAdapter.hxx
+++ /dev/null
@@ -1,44 +0,0 @@
-#ifndef INCLUDED_PORTAUDIO_ASIODEVICEADAPTER_HXX
-#define INCLUDED_PORTAUDIO_ASIODEVICEADAPTER_HXX
-
-namespace portaudio
-{
-
-	// Forward declaration(s):
-	class Device;
-
-	// Declaration(s):
-	//////
-	/// @brief Adapts the given Device to an ASIO specific extension.
-	///
-	/// Deleting the AsioDeviceAdapter does not affect the underlying 
-	/// Device.
-	//////
-	class AsioDeviceAdapter
-	{
-	public:
-		AsioDeviceAdapter(Device &device);
-
-		Device &device();
-
-		long minBufferSize() const;
-		long maxBufferSize() const;
-		long preferredBufferSize() const;
-		long granularity() const;
-
-		void showControlPanel(void *systemSpecific);
-
-		const char *inputChannelName(int channelIndex) const;
-		const char *outputChannelName(int channelIndex) const;
-
-	private:
-		Device *device_;
-
-		long minBufferSize_;
-		long maxBufferSize_;
-		long preferredBufferSize_;
-		long granularity_;
-	};
-}
-
-#endif // INCLUDED_PORTAUDIO_ASIODEVICEADAPTER_HXX
diff --git a/portaudio/bindings/cpp/include/portaudiocpp/AutoSystem.hxx b/portaudio/bindings/cpp/include/portaudiocpp/AutoSystem.hxx
deleted file mode 100644
index 47e2ec1..0000000
--- a/portaudio/bindings/cpp/include/portaudiocpp/AutoSystem.hxx
+++ /dev/null
@@ -1,62 +0,0 @@
-#ifndef INCLUDED_PORTAUDIO_AUTOSYSTEM_HXX
-#define INCLUDED_PORTAUDIO_AUTOSYSTEM_HXX
-
-// ---------------------------------------------------------------------------------------
-
-#include "portaudiocpp/System.hxx"
-
-// ---------------------------------------------------------------------------------------
-
-namespace portaudio
-{
-
-
-	//////
-	/// @brief A RAII idiom class to ensure automatic clean-up when an exception is 
-	/// raised.
-	///
-	/// A simple helper class which uses the 'Resource Acquisition is Initialization' 
-	/// idiom (RAII). Use this class to initialize/terminate the System rather than 
-	/// using System directly. AutoSystem must be created on stack and must be valid 
-	/// throughout the time you wish to use PortAudioCpp. Your 'main' function might be 
-	/// a good place for it.
-	///
-	/// To avoid having to type portaudio::System::instance().xyz() all the time, it's usually 
-	/// a good idea to make a reference to the System which can be accessed directly.
-	/// @verbatim
-	/// portaudio::AutoSys autoSys;
-	/// portaudio::System &sys = portaudio::System::instance();
-	/// @endverbatim
-	//////
-	class AutoSystem
-	{
-	public:
-		AutoSystem(bool initialize = true)
-		{
-			if (initialize)
-				System::initialize();
-		}
-
-		~AutoSystem()
-		{
-			if (System::exists())
-				System::terminate();
-		}
-
-		void initialize()
-		{
-			System::initialize();
-		}
-
-		void terminate()
-		{
-			System::terminate();
-		}
-	};
-
-
-} // namespace portaudio
-
-// ---------------------------------------------------------------------------------------
-
-#endif // INCLUDED_PORTAUDIO_AUTOSYSTEM_HXX
diff --git a/portaudio/bindings/cpp/include/portaudiocpp/BlockingStream.hxx b/portaudio/bindings/cpp/include/portaudiocpp/BlockingStream.hxx
deleted file mode 100644
index 158dfa0..0000000
--- a/portaudio/bindings/cpp/include/portaudiocpp/BlockingStream.hxx
+++ /dev/null
@@ -1,45 +0,0 @@
-#ifndef INCLUDED_PORTAUDIO_BLOCKINGSTREAM_HXX
-#define INCLUDED_PORTAUDIO_BLOCKINGSTREAM_HXX
-
-// ---------------------------------------------------------------------------------------
-
-#include "portaudiocpp/Stream.hxx"
-
-// ---------------------------------------------------------------------------------------
-
-namespace portaudio
-{
-
-
-
-	//////
-	/// @brief Stream class for blocking read/write-style input and output.
-	//////
-	class BlockingStream : public Stream
-	{
-	public:
-		BlockingStream();
-		BlockingStream(const StreamParameters &parameters);
-		~BlockingStream();
-
-		void open(const StreamParameters &parameters);
-
-		void read(void *buffer, unsigned long numFrames);
-		void write(const void *buffer, unsigned long numFrames);
-
-		signed long availableReadSize() const;
-		signed long availableWriteSize() const;
-
-	private:
-		BlockingStream(const BlockingStream &); // non-copyable
-		BlockingStream &operator=(const BlockingStream &); // non-copyable
-	};
-
-
-
-} // portaudio
-
-// ---------------------------------------------------------------------------------------
-
-#endif // INCLUDED_PORTAUDIO_BLOCKINGSTREAM_HXX
-
diff --git a/portaudio/bindings/cpp/include/portaudiocpp/CFunCallbackStream.hxx b/portaudio/bindings/cpp/include/portaudiocpp/CFunCallbackStream.hxx
deleted file mode 100644
index 1c7faa8..0000000
--- a/portaudio/bindings/cpp/include/portaudiocpp/CFunCallbackStream.hxx
+++ /dev/null
@@ -1,49 +0,0 @@
-#ifndef INCLUDED_PORTAUDIO_CFUNCALLBACKSTREAM_HXX
-#define INCLUDED_PORTAUDIO_CFUNCALLBACKSTREAM_HXX
-
-// ---------------------------------------------------------------------------------------
-
-#include "portaudio.h"
-
-#include "portaudiocpp/CallbackStream.hxx"
-
-// ---------------------------------------------------------------------------------------
-
-// Forward declaration(s)
-namespace portaudio
-{
-	class StreamParameters;
-}
-
-// ---------------------------------------------------------------------------------------
-
-// Declaration(s):
-namespace portaudio
-{
-	// -----------------------------------------------------------------------------------
-
-	//////
-	/// @brief Callback stream using a free function with C linkage. It's important that the function 
-	/// the passed function pointer points to is declared ``extern "C"''.
-	//////
-	class CFunCallbackStream : public CallbackStream
-	{
-	public:
-		CFunCallbackStream();
-		CFunCallbackStream(const StreamParameters &parameters, PaStreamCallback *funPtr, void *userData);
-		~CFunCallbackStream();
-		
-		void open(const StreamParameters &parameters, PaStreamCallback *funPtr, void *userData);
-
-	private:
-		CFunCallbackStream(const CFunCallbackStream &); // non-copyable
-		CFunCallbackStream &operator=(const CFunCallbackStream &); // non-copyable
-	};
-
-	// -----------------------------------------------------------------------------------
-} // portaudio
-
-// ---------------------------------------------------------------------------------------
-
-#endif // INCLUDED_PORTAUDIO_MEMFUNCALLBACKSTREAM_HXX
-
diff --git a/portaudio/bindings/cpp/include/portaudiocpp/CallbackInterface.hxx b/portaudio/bindings/cpp/include/portaudiocpp/CallbackInterface.hxx
deleted file mode 100644
index b306148..0000000
--- a/portaudio/bindings/cpp/include/portaudiocpp/CallbackInterface.hxx
+++ /dev/null
@@ -1,45 +0,0 @@
-#ifndef INCLUDED_PORTAUDIO_CALLBACKINTERFACE_HXX
-#define INCLUDED_PORTAUDIO_CALLBACKINTERFACE_HXX
-
-// ---------------------------------------------------------------------------------------
-
-#include "portaudio.h"
-
-// ---------------------------------------------------------------------------------------
-
-namespace portaudio
-{
-	// -----------------------------------------------------------------------------------
-
-	//////
-	/// @brief Interface for an object that's callable as a PortAudioCpp callback object (ie that implements the 
-	/// paCallbackFun method).
-	//////
-	class CallbackInterface
-	{
-	public:
-		virtual ~CallbackInterface() {}
-
-		virtual int paCallbackFun(const void *inputBuffer, void *outputBuffer, unsigned long numFrames, 
-			const PaStreamCallbackTimeInfo *timeInfo, PaStreamCallbackFlags statusFlags) = 0;
-	};
-
-	// -----------------------------------------------------------------------------------
-
-	namespace impl
-	{
-		extern "C"
-		{
-			int callbackInterfaceToPaCallbackAdapter(const void *inputBuffer, void *outputBuffer, unsigned long numFrames, 
-				const PaStreamCallbackTimeInfo *timeInfo, PaStreamCallbackFlags statusFlags, 
-				void *userData);
-		} // extern "C"
-	}
-
-	// -----------------------------------------------------------------------------------
-
-} // namespace portaudio
-
-// ---------------------------------------------------------------------------------------
-
-#endif // INCLUDED_PORTAUDIO_CALLBACKINTERFACE_HXX
diff --git a/portaudio/bindings/cpp/include/portaudiocpp/CallbackStream.hxx b/portaudio/bindings/cpp/include/portaudiocpp/CallbackStream.hxx
deleted file mode 100644
index 7268b14..0000000
--- a/portaudio/bindings/cpp/include/portaudiocpp/CallbackStream.hxx
+++ /dev/null
@@ -1,40 +0,0 @@
-#ifndef INCLUDED_PORTAUDIO_CALLBACKSTREAM_HXX
-#define INCLUDED_PORTAUDIO_CALLBACKSTREAM_HXX
-
-// ---------------------------------------------------------------------------------------
-
-#include "portaudio.h"
-
-#include "portaudiocpp/Stream.hxx"
-
-// ---------------------------------------------------------------------------------------
-
-// Declaration(s):
-namespace portaudio
-{
-
-
-	//////
-	/// @brief Base class for all Streams which use a callback-based mechanism.
-	//////
-	class CallbackStream : public Stream
-	{
-	protected:
-		CallbackStream();
-		virtual ~CallbackStream();
-
-	public:
-		// stream info (time-varying)
-		double cpuLoad() const;
-
-	private:
-		CallbackStream(const CallbackStream &); // non-copyable
-		CallbackStream &operator=(const CallbackStream &); // non-copyable
-	};
-
-
-} // namespace portaudio
-
-// ---------------------------------------------------------------------------------------
-
-#endif // INCLUDED_PORTAUDIO_CALLBACKSTREAM_HXX
diff --git a/portaudio/bindings/cpp/include/portaudiocpp/CppFunCallbackStream.hxx b/portaudio/bindings/cpp/include/portaudiocpp/CppFunCallbackStream.hxx
deleted file mode 100644
index 3f219ee..0000000
--- a/portaudio/bindings/cpp/include/portaudiocpp/CppFunCallbackStream.hxx
+++ /dev/null
@@ -1,86 +0,0 @@
-#ifndef INCLUDED_PORTAUDIO_CPPFUNCALLBACKSTREAM_HXX
-#define INCLUDED_PORTAUDIO_CPPFUNCALLBACKSTREAM_HXX
-
-// ---------------------------------------------------------------------------------------
-
-#include "portaudio.h"
-
-#include "portaudiocpp/CallbackStream.hxx"
-
-// ---------------------------------------------------------------------------------------
-
-// Forward declaration(s):
-namespace portaudio
-{
-	class StreamParameters;
-}
-
-// ---------------------------------------------------------------------------------------
-
-// Declaration(s):
-namespace portaudio
-{
-
-
-	namespace impl
-	{
-		extern "C"
-		{
-			int cppCallbackToPaCallbackAdapter(const void *inputBuffer, void *outputBuffer, unsigned long numFrames, 
-				const PaStreamCallbackTimeInfo *timeInfo, PaStreamCallbackFlags statusFlags, 
-				void *userData);
-		} // extern "C"
-	}
-
-	// -----------------------------------------------------------------------------------
-
-	//////
-	/// @brief Callback stream using a C++ function (either a free function or a static function) 
-	/// callback.
-	//////
-	class FunCallbackStream : public CallbackStream
-	{
-	public:
-		typedef int (*CallbackFunPtr)(const void *inputBuffer, void *outputBuffer, unsigned long numFrames, 
-			const PaStreamCallbackTimeInfo *timeInfo, PaStreamCallbackFlags statusFlags, 
-			void *userData);
-
-		// -------------------------------------------------------------------------------
-
-		//////
-		/// @brief Simple structure containing a function pointer to the C++ callback function and a 
-		/// (void) pointer to the user supplied data.
-		//////
-		struct CppToCCallbackData
-		{
-			CppToCCallbackData();
-			CppToCCallbackData(CallbackFunPtr funPtr, void *userData);
-			void init(CallbackFunPtr funPtr, void *userData);
-
-			CallbackFunPtr funPtr;
-			void *userData;
-		};
-
-		// -------------------------------------------------------------------------------
-
-		FunCallbackStream();
-		FunCallbackStream(const StreamParameters &parameters, CallbackFunPtr funPtr, void *userData);
-		~FunCallbackStream();
-
-		void open(const StreamParameters &parameters, CallbackFunPtr funPtr, void *userData);
-
-	private:
-		FunCallbackStream(const FunCallbackStream &); // non-copyable
-		FunCallbackStream &operator=(const FunCallbackStream &); // non-copyable
-
-		CppToCCallbackData adapterData_;
-
-		void open(const StreamParameters &parameters);
-	};
-
-
-} // portaudio
-
-// ---------------------------------------------------------------------------------------
-
-#endif // INCLUDED_PORTAUDIO_CPPFUNCALLBACKSTREAM_HXX
diff --git a/portaudio/bindings/cpp/include/portaudiocpp/Device.hxx b/portaudio/bindings/cpp/include/portaudiocpp/Device.hxx
deleted file mode 100644
index 0599582..0000000
--- a/portaudio/bindings/cpp/include/portaudiocpp/Device.hxx
+++ /dev/null
@@ -1,91 +0,0 @@
-#ifndef INCLUDED_PORTAUDIO_DEVICE_HXX
-#define INCLUDED_PORTAUDIO_DEVICE_HXX
-
-// ---------------------------------------------------------------------------------------
-
-#include <iterator>
-
-#include "portaudio.h"
-
-#include "portaudiocpp/SampleDataFormat.hxx"
-
-// ---------------------------------------------------------------------------------------
-
-// Forward declaration(s):
-namespace portaudio
-{
-	class System;
-	class HostApi;
-}
-
-// ---------------------------------------------------------------------------------------
-
-// Declaration(s):
-namespace portaudio
-{
-
-	//////
-	/// @brief Class which represents a PortAudio device in the System.
-	///
-	/// A single physical device in the system may have multiple PortAudio 
-	/// Device representations using different HostApi 's though. A Device 
-	/// can be half-duplex or full-duplex. A half-duplex Device can be used 
-	/// to create a half-duplex Stream. A full-duplex Device can be used to 
-	/// create a full-duplex Stream. If supported by the HostApi, two 
-	/// half-duplex Devices can even be used to create a full-duplex Stream.
-	///
-	/// Note that Device objects are very light-weight and can be passed around 
-	/// by-value.
-	//////
-	class Device
-	{
-	public:
-		// query info: name, max in channels, max out channels, 
-		// default low/high input/output latency, default sample rate
-		PaDeviceIndex index() const;
-		const char *name() const;
-		int maxInputChannels() const;
-		int maxOutputChannels() const;
-		PaTime defaultLowInputLatency() const;
-		PaTime defaultHighInputLatency() const;
-		PaTime defaultLowOutputLatency() const;
-		PaTime defaultHighOutputLatency() const;
-		double defaultSampleRate() const;
-
-		bool isInputOnlyDevice() const; // extended
-		bool isOutputOnlyDevice() const; // extended
-		bool isFullDuplexDevice() const; // extended
-		bool isSystemDefaultInputDevice() const; // extended
-		bool isSystemDefaultOutputDevice() const; // extended
-		bool isHostApiDefaultInputDevice() const; // extended
-		bool isHostApiDefaultOutputDevice() const; // extended
-
-		bool operator==(const Device &rhs) const;
-		bool operator!=(const Device &rhs) const;
-
-		// host api reference
-		HostApi &hostApi();
-		const HostApi &hostApi() const;
-
-	private:
-		PaDeviceIndex index_;
-		const PaDeviceInfo *info_;
-
-	private:
-		friend class System;
-		
-		explicit Device(PaDeviceIndex index);
-		~Device();
-
-		Device(const Device &); // non-copyable
-		Device &operator=(const Device &); // non-copyable
-	};
-
-	// -----------------------------------------------------------------------------------
-
-} // namespace portaudio
-
-// ---------------------------------------------------------------------------------------
-
-#endif // INCLUDED_PORTAUDIO_DEVICE_HXX
-
diff --git a/portaudio/bindings/cpp/include/portaudiocpp/DirectionSpecificStreamParameters.hxx b/portaudio/bindings/cpp/include/portaudiocpp/DirectionSpecificStreamParameters.hxx
deleted file mode 100644
index bc24742..0000000
--- a/portaudio/bindings/cpp/include/portaudiocpp/DirectionSpecificStreamParameters.hxx
+++ /dev/null
@@ -1,77 +0,0 @@
-#ifndef INCLUDED_PORTAUDIO_SINGLEDIRECTIONSTREAMPARAMETERS_HXX
-#define INCLUDED_PORTAUDIO_SINGLEDIRECTIONSTREAMPARAMETERS_HXX
-
-// ---------------------------------------------------------------------------------------
-
-#include <cstddef>
-
-#include "portaudio.h"
-
-#include "portaudiocpp/System.hxx"
-#include "portaudiocpp/SampleDataFormat.hxx"
-
-// ---------------------------------------------------------------------------------------
-
-// Forward declaration(s):
-namespace portaudio
-{
-	class Device;
-}
-
-// ---------------------------------------------------------------------------------------
-
-// Declaration(s):
-namespace portaudio
-{
-
-	//////
-	/// @brief All parameters for one direction (either in or out) of a Stream. Together with 
-	/// parameters common to both directions, two DirectionSpecificStreamParameters can make up 
-	/// a StreamParameters object which contains all parameters for a Stream.
-	//////
-	class DirectionSpecificStreamParameters
-	{
-	public:
-		static DirectionSpecificStreamParameters null();
-
-		DirectionSpecificStreamParameters();
-		DirectionSpecificStreamParameters(const Device &device, int numChannels, SampleDataFormat format, 
-			bool interleaved, PaTime suggestedLatency, void *hostApiSpecificStreamInfo);
-
-		// Set up methods:
-		void setDevice(const Device &device);
-		void setNumChannels(int numChannels);
-
-		void setSampleFormat(SampleDataFormat format, bool interleaved = true);
-		void setHostApiSpecificSampleFormat(PaSampleFormat format, bool interleaved = true);
-
-		void setSuggestedLatency(PaTime latency);
-
-		void setHostApiSpecificStreamInfo(void *streamInfo);
-
-		// Accessor methods:
-		PaStreamParameters *paStreamParameters();
-		const PaStreamParameters *paStreamParameters() const;
-
-		Device &device() const;
-		int numChannels() const;
-
-		SampleDataFormat sampleFormat() const;
-		bool isSampleFormatInterleaved() const;
-		bool isSampleFormatHostApiSpecific() const;
-		PaSampleFormat hostApiSpecificSampleFormat() const;
-
-		PaTime suggestedLatency() const;
-
-		void *hostApiSpecificStreamInfo() const;
-	
-	private:
-		PaStreamParameters paStreamParameters_;
-	};
-
-
-} // namespace portaudio
-
-// ---------------------------------------------------------------------------------------
-
-#endif // INCLUDED_PORTAUDIO_SINGLEDIRECTIONSTREAMPARAMETERS_HXX
diff --git a/portaudio/bindings/cpp/include/portaudiocpp/Exception.hxx b/portaudio/bindings/cpp/include/portaudiocpp/Exception.hxx
deleted file mode 100644
index 02d36b2..0000000
--- a/portaudio/bindings/cpp/include/portaudiocpp/Exception.hxx
+++ /dev/null
@@ -1,108 +0,0 @@
-#ifndef INCLUDED_PORTAUDIO_EXCEPTION_HXX
-#define INCLUDED_PORTAUDIO_EXCEPTION_HXX
-
-// ---------------------------------------------------------------------------------------
-
-#include <exception>
-
-#include "portaudio.h"
-
-// ---------------------------------------------------------------------------------------
-
-namespace portaudio
-{
-
-	//////
-	/// @brief Base class for all exceptions PortAudioCpp can throw.
-	///
-	/// Class is derived from std::exception.
-	//////
-	class Exception : public std::exception
-	{
-	public:
-		virtual ~Exception() throw() {}
-
-		virtual const char *what() const throw() = 0;
-	};
-	
-	// -----------------------------------------------------------------------------------
-
-	//////
-	/// @brief Wrapper for PortAudio error codes to C++ exceptions.
-	///
-	/// It wraps up PortAudio's error handling mechanism using 
-	/// C++ exceptions and is derived from std::exception for 
-	/// easy exception handling and to ease integration with 
-	/// other code.
-	///
-	/// To know what exceptions each function may throw, look up 
-	/// the errors that can occur in the PortAudio documentation 
-	/// for the equivalent functions.
-	///
-	/// Some functions are likely to throw an exception (such as 
-	/// Stream::open(), etc) and these should always be called in 
-	/// try{} catch{} blocks and the thrown exceptions should be 
-	/// handled properly (ie. the application shouldn't just abort, 
-	/// but merely display a warning dialog to the user or something).
-	/// However nearly all functions in PortAudioCpp are capable 
-	/// of throwing exceptions. When a function like Stream::isStopped() 
-	/// throws an exception, it's such an exceptional state that it's 
-	/// not likely that it can be recovered. PaExceptions such as these 
-	/// can ``safely'' be left to be handled by some outer catch-all-like 
-	/// mechanism for unrecoverable errors.
-	//////
-	class PaException : public Exception
-	{
-	public:
-		explicit PaException(PaError error);
-
-		const char *what() const throw();
-
-		PaError paError() const;
-		const char *paErrorText() const;
-
-		bool isHostApiError() const; // extended
-		long lastHostApiError() const;
-		const char *lastHostApiErrorText() const;
-
-		bool operator==(const PaException &rhs) const;
-		bool operator!=(const PaException &rhs) const;
-
-	private:
-		PaError error_;
- 	};
-
-	// -----------------------------------------------------------------------------------
-
-	//////
-	/// @brief Exceptions specific to PortAudioCpp (ie. exceptions which do not have an 
-	/// equivalent PortAudio error code).
-	//////
-	class PaCppException : public Exception
-	{
-	public:
-		enum ExceptionSpecifier
-		{
-			UNABLE_TO_ADAPT_DEVICE
-		};
-
-		PaCppException(ExceptionSpecifier specifier);
-
-		const char *what() const throw();
-
-		ExceptionSpecifier specifier() const;
-
-		bool operator==(const PaCppException &rhs) const;
-		bool operator!=(const PaCppException &rhs) const;
-
-	private:
-		ExceptionSpecifier specifier_;
-	};
-
-
-} // namespace portaudio
-
-// ---------------------------------------------------------------------------------------
-
-#endif // INCLUDED_PORTAUDIO_EXCEPTION_HXX
-
diff --git a/portaudio/bindings/cpp/include/portaudiocpp/HostApi.hxx b/portaudio/bindings/cpp/include/portaudiocpp/HostApi.hxx
deleted file mode 100644
index 113558c..0000000
--- a/portaudio/bindings/cpp/include/portaudiocpp/HostApi.hxx
+++ /dev/null
@@ -1,76 +0,0 @@
-#ifndef INCLUDED_PORTAUDIO_HOSTAPI_HXX
-#define INCLUDED_PORTAUDIO_HOSTAPI_HXX
-
-// ---------------------------------------------------------------------------------------
-
-#include "portaudio.h"
-
-#include "portaudiocpp/System.hxx"
-
-// ---------------------------------------------------------------------------------------
-
-// Forward declaration(s):
-namespace portaudio
-{
-	class Device;
-}
-
-// ---------------------------------------------------------------------------------------
-
-// Declaration(s):
-namespace portaudio
-{
-
-
-	//////
-	/// @brief HostApi represents a host API (usually type of driver) in the System.
-	///
-	/// A single System can support multiple HostApi's each one typically having 
-	/// a set of Devices using that HostApi (usually driver type). All Devices in 
-	/// the HostApi can be enumerated and the default input/output Device for this 
-	/// HostApi can be retrieved.
-	//////
-	class HostApi
-	{
-	public:
-		typedef System::DeviceIterator DeviceIterator;
-
-		// query info: id, name, numDevices
-		PaHostApiTypeId typeId() const;
-		PaHostApiIndex index() const;
-		const char *name() const;
-		int deviceCount() const;
-
-		// iterate devices
-		DeviceIterator devicesBegin();
-		DeviceIterator devicesEnd();
-
-		// default devices
-		Device &defaultInputDevice() const;
-		Device &defaultOutputDevice() const;
-
-		// comparison operators
-		bool operator==(const HostApi &rhs) const;
-		bool operator!=(const HostApi &rhs) const;
-
-	private:
-		const PaHostApiInfo *info_;
-		Device **devices_;
-
-	private:
-		friend class System;
-
-		explicit HostApi(PaHostApiIndex index);
-		~HostApi();
-
-		HostApi(const HostApi &); // non-copyable
-		HostApi &operator=(const HostApi &); // non-copyable
-	};
-
-
-}
-
-// ---------------------------------------------------------------------------------------
-
-#endif // INCLUDED_PORTAUDIO_HOSTAPI_HXX
-
diff --git a/portaudio/bindings/cpp/include/portaudiocpp/InterfaceCallbackStream.hxx b/portaudio/bindings/cpp/include/portaudiocpp/InterfaceCallbackStream.hxx
deleted file mode 100644
index 5aa49e7..0000000
--- a/portaudio/bindings/cpp/include/portaudiocpp/InterfaceCallbackStream.hxx
+++ /dev/null
@@ -1,49 +0,0 @@
-#ifndef INCLUDED_PORTAUDIO_INTERFACECALLBACKSTREAM_HXX
-#define INCLUDED_PORTAUDIO_INTERFACECALLBACKSTREAM_HXX
-
-// ---------------------------------------------------------------------------------------
-
-#include "portaudio.h"
-
-#include "portaudiocpp/CallbackStream.hxx"
-
-// ---------------------------------------------------------------------------------------
-
-// Forward declaration(s)
-namespace portaudio
-{
-	class StreamParameters;
-	class CallbackInterface;
-}
-
-// ---------------------------------------------------------------------------------------
-
-// Declaration(s):
-namespace portaudio
-{
-
-
-	//////
-	/// @brief Callback stream using an instance of an object that's derived from the CallbackInterface 
-	/// interface.
-	//////
-	class InterfaceCallbackStream : public CallbackStream
-	{
-	public:
-		InterfaceCallbackStream();
-		InterfaceCallbackStream(const StreamParameters &parameters, CallbackInterface &instance);
-		~InterfaceCallbackStream();
-		
-		void open(const StreamParameters &parameters, CallbackInterface &instance);
-
-	private:
-		InterfaceCallbackStream(const InterfaceCallbackStream &); // non-copyable
-		InterfaceCallbackStream &operator=(const InterfaceCallbackStream &); // non-copyable
-	};
-
-
-} // portaudio
-
-// ---------------------------------------------------------------------------------------
-
-#endif // INCLUDED_PORTAUDIO_INTERFACECALLBACKSTREAM_HXX
diff --git a/portaudio/bindings/cpp/include/portaudiocpp/MemFunCallbackStream.hxx b/portaudio/bindings/cpp/include/portaudiocpp/MemFunCallbackStream.hxx
deleted file mode 100644
index 01cf37b..0000000
--- a/portaudio/bindings/cpp/include/portaudiocpp/MemFunCallbackStream.hxx
+++ /dev/null
@@ -1,107 +0,0 @@
-#ifndef INCLUDED_PORTAUDIO_MEMFUNCALLBACKSTREAM_HXX
-#define INCLUDED_PORTAUDIO_MEMFUNCALLBACKSTREAM_HXX
-
-// ---------------------------------------------------------------------------------------
-
-#include "portaudio.h"
-
-#include "portaudiocpp/CallbackStream.hxx"
-#include "portaudiocpp/CallbackInterface.hxx"
-#include "portaudiocpp/StreamParameters.hxx"
-#include "portaudiocpp/Exception.hxx"
-#include "portaudiocpp/InterfaceCallbackStream.hxx"
-
-// ---------------------------------------------------------------------------------------
-
-namespace portaudio
-{
-
-
-	//////
-	/// @brief Callback stream using a class's member function as a callback. Template argument T is the type of the 
-	/// class of which a member function is going to be used.
-	///
-	/// Example usage:
-	/// @verbatim MemFunCallback<MyClass> stream = MemFunCallbackStream(parameters, *this, &MyClass::myCallbackFunction); @endverbatim
-	//////
-	template<typename T>
-	class MemFunCallbackStream : public CallbackStream
-	{
-	public:
-		typedef int (T::*CallbackFunPtr)(const void *, void *, unsigned long, const PaStreamCallbackTimeInfo *, 
-			PaStreamCallbackFlags);
-
-		// -------------------------------------------------------------------------------
-
-		MemFunCallbackStream()
-		{
-		}
-
-		MemFunCallbackStream(const StreamParameters &parameters, T &instance, CallbackFunPtr memFun) : adapter_(instance, memFun)
-		{
-			open(parameters);
-		}
-
-		~MemFunCallbackStream()
-		{
-			close();
-		}
-
-		void open(const StreamParameters &parameters, T &instance, CallbackFunPtr memFun)
-		{
-			// XXX:	need to check if already open?
-
-			adapter_.init(instance, memFun);
-			open(parameters);
-		}
-
-	private:
-		MemFunCallbackStream(const MemFunCallbackStream &); // non-copyable
-		MemFunCallbackStream &operator=(const MemFunCallbackStream &); // non-copyable
-
-		//////
-		/// @brief Inner class which adapts a member function callback to a CallbackInterface compliant 
-		/// class (so it can be adapted using the paCallbackAdapter function).
-		//////
-		class MemFunToCallbackInterfaceAdapter : public CallbackInterface
-		{
-		public:
-			MemFunToCallbackInterfaceAdapter() {}
-			MemFunToCallbackInterfaceAdapter(T &instance, CallbackFunPtr memFun) : instance_(&instance), memFun_(memFun) {}
-
-			void init(T &instance, CallbackFunPtr memFun)
-			{
-				instance_ = &instance;
-				memFun_ = memFun;
-			}
-
-			int paCallbackFun(const void *inputBuffer, void *outputBuffer, unsigned long numFrames, 
-				const PaStreamCallbackTimeInfo *timeInfo, PaStreamCallbackFlags statusFlags)
-			{
-				return (instance_->*memFun_)(inputBuffer, outputBuffer, numFrames, timeInfo, statusFlags);
-			}
-
-		private:
-			T *instance_;
-			CallbackFunPtr memFun_;
-		};
-
-		MemFunToCallbackInterfaceAdapter adapter_;
-
-		void open(const StreamParameters &parameters)
-		{
-			PaError err = Pa_OpenStream(&stream_, parameters.inputParameters().paStreamParameters(), parameters.outputParameters().paStreamParameters(), 
-				parameters.sampleRate(), parameters.framesPerBuffer(), parameters.flags(), &impl::callbackInterfaceToPaCallbackAdapter, 
-				static_cast<void *>(&adapter_));
-
-			if (err != paNoError)
-				throw PaException(err);
-		}
-	};
-
-
-} // portaudio
-
-// ---------------------------------------------------------------------------------------
-
-#endif // INCLUDED_PORTAUDIO_MEMFUNCALLBACKSTREAM_HXX
diff --git a/portaudio/bindings/cpp/include/portaudiocpp/PortAudioCpp.hxx b/portaudio/bindings/cpp/include/portaudiocpp/PortAudioCpp.hxx
deleted file mode 100644
index 1165550..0000000
--- a/portaudio/bindings/cpp/include/portaudiocpp/PortAudioCpp.hxx
+++ /dev/null
@@ -1,109 +0,0 @@
-#ifndef INCLUDED_PORTAUDIO_PORTAUDIOCPP_HXX
-#define INCLUDED_PORTAUDIO_PORTAUDIOCPP_HXX
-
-// ---------------------------------------------------------------------------------------
-
-//////
-/// @mainpage PortAudioCpp
-///
-///	<h1>PortAudioCpp - A Native C++ Binding of PortAudio V19</h1>
-/// <h2>PortAudio</h2>
-/// <p>
-///   PortAudio is a portable and mature C API for accessing audio hardware. It offers both callback-based and blocking 
-///   style input and output, deals with sample data format conversions, dithering and much more. There are a large number 
-///   of implementations available for various platforms including Windows MME, Windows DirectX, Windows and MacOS (Classic) 
-///   ASIO, MacOS Classic SoundManager, MacOS X CoreAudio, OSS (Linux), Linux ALSA, JACK (MacOS X and Linux) and SGI Irix 
-///   AL. Note that, currently not all of these implementations are equally complete or up-to-date (as PortAudio V19 is 
-///   still in development). Because PortAudio has a C API, it can easily be called from a variety of other programming 
-///   languages.
-/// </p>
-/// <h2>PortAudioCpp</h2>
-/// <p>
-///   Although, it is possible to use PortAudio's C API from within a C++ program, this is usually a little awkward 
-///   as procedural and object-oriented paradigms need to be mixed. PortAudioCpp aims to resolve this by encapsulating 
-///   PortAudio's C API to form an equivalent object-oriented C++ API. It provides a more natural integration of PortAudio 
-///   into C++ programs as well as a more structured interface. PortAudio's concepts were preserved as much as possible and 
-///   no additional features were added except for some `convenience methods'.
-/// </p>
-/// <p>
-///   PortAudioCpp's main features are:
-///   <ul>
-///     <li>Structured object model.</li>
-///     <li>C++ exception handling instead of C-style error return codes.</li>
-///     <li>Handling of callbacks using free functions (C and C++), static functions, member functions or instances of classes 
-///     derived from a given interface.</li>
-///     <li>STL compliant iterators to host APIs and devices.</li>
-///     <li>Some additional convenience functions to more easily set up and use PortAudio.</li>
-///   </ul>
-/// </p>
-/// <p>
-///   PortAudioCpp requires a recent version of the PortAudio V19 source code. This can be obtained from CVS or as a snapshot 
-///   from the website. The examples also require the ASIO 2 SDK which can be obtained from the Steinberg website. Alternatively, the 
-///   examples can easily be modified to compile without needing ASIO.
-/// </p>
-/// <p>
-///   Supported platforms:
-///   <ul>
-///     <li>Microsoft Visual C++ 6.0, 7.0 (.NET 2002) and 7.1 (.NET 2003).</li>
-///     <li>GNU G++ 2.95 and G++ 3.3.</li>
-///   </ul>
-///   Other platforms should be easily supported as PortAudioCpp is platform-independent and (reasonably) C++ standard compliant.
-/// </p>
-/// <p>
-///   This documentation mainly provides information specific to PortAudioCpp. For a more complete explanation of all of the 
-///   concepts used, please consult the PortAudio documentation.
-/// </p>
-/// <p>
-///   PortAudioCpp was developed by Merlijn Blaauw with many great suggestions and help from Ross Bencina. Ludwig Schwardt provided 
-///   GNU/Linux build files and checked G++ compatibility. PortAudioCpp may be used under the same licensing, conditions and 
-///   warranty as PortAudio. See <a href="http://www.portaudio.com/license.html">the PortAudio license</a> for more details.
-/// </p>
-/// <h2>Links</h2>
-/// <p>
-///   <a href="http://www.portaudio.com/">Official PortAudio site.</a><br>
-/// </p>
-//////
-
-// ---------------------------------------------------------------------------------------
-
-//////
-/// @namespace portaudio
-///
-/// To avoid name collision, everything in PortAudioCpp is in the portaudio 
-/// namespace. If this name is too long it's usually pretty safe to use an 
-/// alias like ``namespace pa = portaudio;''.
-//////
-
-// ---------------------------------------------------------------------------------------
-
-//////
-/// @file PortAudioCpp.hxx
-/// An include-all header file (for lazy programmers and using pre-compiled headers).
-//////
-
-// ---------------------------------------------------------------------------------------
-
-#include "portaudio.h"
-
-#include "portaudiocpp/AutoSystem.hxx"
-#include "portaudiocpp/BlockingStream.hxx"
-#include "portaudiocpp/CallbackInterface.hxx"
-#include "portaudiocpp/CallbackStream.hxx"
-#include "portaudiocpp/CFunCallbackStream.hxx"
-#include "portaudiocpp/CppFunCallbackStream.hxx"
-#include "portaudiocpp/Device.hxx"
-#include "portaudiocpp/Exception.hxx"
-#include "portaudiocpp/HostApi.hxx"
-#include "portaudiocpp/InterfaceCallbackStream.hxx"
-#include "portaudiocpp/MemFunCallbackStream.hxx"
-#include "portaudiocpp/SampleDataFormat.hxx"
-#include "portaudiocpp/DirectionSpecificStreamParameters.hxx"
-#include "portaudiocpp/Stream.hxx"
-#include "portaudiocpp/StreamParameters.hxx"
-#include "portaudiocpp/System.hxx"
-#include "portaudiocpp/SystemDeviceIterator.hxx"
-#include "portaudiocpp/SystemHostApiIterator.hxx"
-
-// ---------------------------------------------------------------------------------------
-
-#endif // INCLUDED_PORTAUDIO_PORTAUDIOCPP_HXX
diff --git a/portaudio/bindings/cpp/include/portaudiocpp/SampleDataFormat.hxx b/portaudio/bindings/cpp/include/portaudiocpp/SampleDataFormat.hxx
deleted file mode 100644
index 1d3a1d9..0000000
--- a/portaudio/bindings/cpp/include/portaudiocpp/SampleDataFormat.hxx
+++ /dev/null
@@ -1,35 +0,0 @@
-#ifndef INCLUDED_PORTAUDIO_SAMPLEDATAFORMAT_HXX
-#define INCLUDED_PORTAUDIO_SAMPLEDATAFORMAT_HXX
-
-// ---------------------------------------------------------------------------------------
-
-#include "portaudio.h"
-
-// ---------------------------------------------------------------------------------------
-
-namespace portaudio
-{
-
-
-	//////
-	/// @brief PortAudio sample data formats.
-	///
-	/// Small helper enum to wrap the PortAudio defines.
-	//////
-	enum SampleDataFormat
-	{
-		INVALID_FORMAT	= 0,
-		FLOAT32			= paFloat32,
-		INT32			= paInt32,
-		INT24			= paInt24,
-		INT16			= paInt16,
-		INT8			= paInt8,
-		UINT8			= paUInt8
-	};
-
-
-} // namespace portaudio
-
-// ---------------------------------------------------------------------------------------
-
-#endif // INCLUDED_PORTAUDIO_SAMPLEDATAFORMAT_HXX
diff --git a/portaudio/bindings/cpp/include/portaudiocpp/Stream.hxx b/portaudio/bindings/cpp/include/portaudiocpp/Stream.hxx
deleted file mode 100644
index a731930..0000000
--- a/portaudio/bindings/cpp/include/portaudiocpp/Stream.hxx
+++ /dev/null
@@ -1,82 +0,0 @@
-#ifndef INCLUDED_PORTAUDIO_STREAM_HXX
-#define INCLUDED_PORTAUDIO_STREAM_HXX
-
-#include "portaudio.h"
-
-// ---------------------------------------------------------------------------------------
-
-// Forward declaration(s):
-namespace portaudio
-{
-	class StreamParameters;
-}
-
-// ---------------------------------------------------------------------------------------
-
-// Declaration(s):
-namespace portaudio
-{
-
-
-	//////
-	/// @brief A Stream represents an active or inactive input and/or output data 
-	/// stream in the System.
-	/// 
-	/// Concrete Stream classes should ensure themselves being in a closed state at 
-	/// destruction (i.e. by calling their own close() method in their deconstructor). 
-	/// Following good C++ programming practices, care must be taken to ensure no 
-	/// exceptions are thrown by the deconstructor of these classes. As a consequence, 
-	/// clients need to explicitly call close() to ensure the stream closed successfully.
-	///
-	/// The Stream object can be used to manipulate the Stream's state. Also, time-constant 
-	/// and time-varying information about the Stream can be retrieved.
-	//////
-	class Stream
-	{
-	public:
-		// Opening/closing:
-		virtual ~Stream();
-
-		virtual void close();
-		bool isOpen() const;
-
-		// Additional set up:
-		void setStreamFinishedCallback(PaStreamFinishedCallback *callback);
-
-		// State management:
-		void start();
-		void stop();
-		void abort();
-
-		bool isStopped() const;
-		bool isActive() const;
-
-		// Stream info (time-constant, but might become time-variant soon):
-		PaTime inputLatency() const;
-		PaTime outputLatency() const;
-		double sampleRate() const;
-
-		// Stream info (time-varying):
-		PaTime time() const;
-
-		// Accessors for PortAudio PaStream, useful for interfacing 
-		// with PortAudio add-ons (such as PortMixer) for instance:
-		const PaStream *paStream() const;
-		PaStream *paStream();
-
-	protected:
-		Stream(); // abstract class
-
-		PaStream *stream_;
-
-	private:
-		Stream(const Stream &); // non-copyable
-		Stream &operator=(const Stream &); // non-copyable
-	};
-
-
-} // namespace portaudio
-
-
-#endif // INCLUDED_PORTAUDIO_STREAM_HXX
-
diff --git a/portaudio/bindings/cpp/include/portaudiocpp/StreamParameters.hxx b/portaudio/bindings/cpp/include/portaudiocpp/StreamParameters.hxx
deleted file mode 100644
index c0ec9a9..0000000
--- a/portaudio/bindings/cpp/include/portaudiocpp/StreamParameters.hxx
+++ /dev/null
@@ -1,77 +0,0 @@
-#ifndef INCLUDED_PORTAUDIO_STREAMPARAMETERS_HXX
-#define INCLUDED_PORTAUDIO_STREAMPARAMETERS_HXX
-
-// ---------------------------------------------------------------------------------------
-
-#include "portaudio.h"
-
-#include "portaudiocpp/DirectionSpecificStreamParameters.hxx"
-
-// ---------------------------------------------------------------------------------------
-
-// Declaration(s):
-namespace portaudio
-{
-
-	//////
-	/// @brief The entire set of parameters needed to configure and open 
-	/// a Stream.
-	///
-	/// It contains parameters of input, output and shared parameters. 
-	/// Using the isSupported() method, the StreamParameters can be 
-	/// checked if opening a Stream using this StreamParameters would 
-	/// succeed or not. Accessors are provided to higher-level parameters 
-	/// aswell as the lower-level parameters which are mainly intended for 
-	/// internal use.
-	//////
-	class StreamParameters
-	{
-	public:
-		StreamParameters();
-		StreamParameters(const DirectionSpecificStreamParameters &inputParameters, 
-			const DirectionSpecificStreamParameters &outputParameters, double sampleRate, 
-			unsigned long framesPerBuffer, PaStreamFlags flags);
-
-		// Set up for direction-specific:
-		void setInputParameters(const DirectionSpecificStreamParameters &parameters);
-		void setOutputParameters(const DirectionSpecificStreamParameters &parameters);
-
-		// Set up for common parameters:
-		void setSampleRate(double sampleRate);
-		void setFramesPerBuffer(unsigned long framesPerBuffer);
-		void setFlag(PaStreamFlags flag);
-		void unsetFlag(PaStreamFlags flag);
-		void clearFlags();
-
-		// Validation:
-		bool isSupported() const;
-
-		// Accessors (direction-specific):
-		DirectionSpecificStreamParameters &inputParameters();
-		const DirectionSpecificStreamParameters &inputParameters() const;
-		DirectionSpecificStreamParameters &outputParameters();
-		const DirectionSpecificStreamParameters &outputParameters() const;
-
-		// Accessors (common):
-		double sampleRate() const;
-		unsigned long framesPerBuffer() const;
-		PaStreamFlags flags() const;
-		bool isFlagSet(PaStreamFlags flag) const;
-
-	private:
-		// Half-duplex specific parameters:
-		DirectionSpecificStreamParameters inputParameters_;
-		DirectionSpecificStreamParameters outputParameters_;
-
-		// Common parameters:
-		double sampleRate_;
-		unsigned long framesPerBuffer_;
-		PaStreamFlags flags_;
-	};
-
-
-} // namespace portaudio
-
-// ---------------------------------------------------------------------------------------
-
-#endif // INCLUDED_PORTAUDIO_STREAMPARAMETERS_HXX
diff --git a/portaudio/bindings/cpp/include/portaudiocpp/System.hxx b/portaudio/bindings/cpp/include/portaudiocpp/System.hxx
deleted file mode 100644
index a159dc3..0000000
--- a/portaudio/bindings/cpp/include/portaudiocpp/System.hxx
+++ /dev/null
@@ -1,107 +0,0 @@
-#ifndef INCLUDED_PORTAUDIO_SYSTEM_HXX
-#define INCLUDED_PORTAUDIO_SYSTEM_HXX
-
-// ---------------------------------------------------------------------------------------
-
-#include "portaudio.h"
-
-// ---------------------------------------------------------------------------------------
-
-// Forward declaration(s):
-namespace portaudio
-{
-	class Device;
-	class Stream;
-	class HostApi;
-}
-
-// ---------------------------------------------------------------------------------------
-
-// Declaration(s):
-namespace portaudio
-{
-
-
-	//////
-	/// @brief System singleton which represents the PortAudio system.
-	///
-	/// The System is used to initialize/terminate PortAudio and provide 
-	/// a single access point to the PortAudio System (instance()).
-	/// It can be used to iterate through all HostApi 's in the System as 
-	/// well as all devices in the System. It also provides some utility 
-	/// functionality of PortAudio.
-	///
-	/// Terminating the System will also abort and close the open streams. 
-	/// The Stream objects will need to be deallocated by the client though 
-	/// (it's usually a good idea to have them cleaned up automatically).
-	//////
-	class System
-	{
-	public:
-		class HostApiIterator; // forward declaration
-		class DeviceIterator; // forward declaration
-
-		// -------------------------------------------------------------------------------
-
-		static int version();
-		static const char *versionText();
-
-		static void initialize();
-		static void terminate();
-
-		static System &instance();
-		static bool exists();
-
-		// -------------------------------------------------------------------------------
-
-		// host apis:
-		HostApiIterator hostApisBegin();
-		HostApiIterator hostApisEnd();
-
-		HostApi &defaultHostApi();
-
-		HostApi &hostApiByTypeId(PaHostApiTypeId type);
-		HostApi &hostApiByIndex(PaHostApiIndex index);
-
-		int hostApiCount();
-
-		// -------------------------------------------------------------------------------
-
-		// devices:
-		DeviceIterator devicesBegin();
-		DeviceIterator devicesEnd();
-
-		Device &defaultInputDevice();
-		Device &defaultOutputDevice();
-
-		Device &deviceByIndex(PaDeviceIndex index);
-
-		int deviceCount();
-
-		static Device &nullDevice();
-
-		// -------------------------------------------------------------------------------
-
-		// misc:
-		void sleep(long msec);
-		int sizeOfSample(PaSampleFormat format);
-
-	private:
-		System();
-		~System();
-
-		static System *instance_;
-		static int initCount_;
-
-		static HostApi **hostApis_;
-		static Device **devices_;
-
-		static Device *nullDevice_;
-	};
-
-
-} // namespace portaudio
-
-
-#endif // INCLUDED_PORTAUDIO_SYSTEM_HXX
-
diff --git a/portaudio/bindings/cpp/include/portaudiocpp/SystemDeviceIterator.hxx b/portaudio/bindings/cpp/include/portaudiocpp/SystemDeviceIterator.hxx
deleted file mode 100644
index ffa195d..0000000
--- a/portaudio/bindings/cpp/include/portaudiocpp/SystemDeviceIterator.hxx
+++ /dev/null
@@ -1,66 +0,0 @@
-#ifndef INCLUDED_PORTAUDIO_SYSTEMDEVICEITERATOR_HXX
-#define INCLUDED_PORTAUDIO_SYSTEMDEVICEITERATOR_HXX
-
-// ---------------------------------------------------------------------------------------
-
-#include <iterator>
-#include <cstddef>
-
-#include "portaudiocpp/System.hxx"
-
-// ---------------------------------------------------------------------------------------
-
-// Forward declaration(s):
-namespace portaudio
-{
-	class Device;
-	class HostApi;
-}
-
-// ---------------------------------------------------------------------------------------
-
-// Declaration(s):
-namespace portaudio
-{
-
-	
-	//////
-	/// @brief Iterator class for iterating through all Devices in a System.
-	///
-	/// Devices will be iterated by iterating all Devices in each 
-	/// HostApi in the System. Compliant with the STL bidirectional 
-	/// iterator concept.
-	//////
-	class System::DeviceIterator
-	{
-	public:
-		typedef std::bidirectional_iterator_tag iterator_category;
-		typedef Device value_type;
-		typedef ptrdiff_t difference_type;
-		typedef Device * pointer;
-		typedef Device & reference;
-
-		Device &operator*() const;
-		Device *operator->() const;
-
-		DeviceIterator &operator++();
-		DeviceIterator operator++(int);
-		DeviceIterator &operator--();
-		DeviceIterator operator--(int);
-
-		bool operator==(const DeviceIterator &rhs) const;
-		bool operator!=(const DeviceIterator &rhs) const;
-
-	private:
-		friend class System;
-		friend class HostApi;
-		Device **ptr_;
-	};
-
-
-} // namespace portaudio
-
-// ---------------------------------------------------------------------------------------
-
-#endif // INCLUDED_PORTAUDIO_SYSTEMDEVICEITERATOR_HXX
-
diff --git a/portaudio/bindings/cpp/include/portaudiocpp/SystemHostApiIterator.hxx b/portaudio/bindings/cpp/include/portaudiocpp/SystemHostApiIterator.hxx
deleted file mode 100644
index 3e6a978..0000000
--- a/portaudio/bindings/cpp/include/portaudiocpp/SystemHostApiIterator.hxx
+++ /dev/null
@@ -1,61 +0,0 @@
-#ifndef INCLUDED_PORTAUDIO_SYSTEMHOSTAPIITERATOR_HXX
-#define INCLUDED_PORTAUDIO_SYSTEMHOSTAPIITERATOR_HXX
-
-// ---------------------------------------------------------------------------------------
-
-#include <iterator>
-#include <cstddef>
-
-#include "portaudiocpp/System.hxx"
-
-// ---------------------------------------------------------------------------------------
-
-// Forward declaration(s):
-namespace portaudio
-{
-	class HostApi;
-}
-
-// ---------------------------------------------------------------------------------------
-
-// Declaration(s):
-namespace portaudio
-{
-
-
-	//////
-	/// @brief Iterator class for iterating through all HostApis in a System.
-	///
-	/// Compliant with the STL bidirectional iterator concept.
-	//////
-	class System::HostApiIterator
-	{
-	public:
-		typedef std::bidirectional_iterator_tag iterator_category;
-		typedef Device value_type;
-		typedef ptrdiff_t difference_type;
-		typedef HostApi * pointer;
-		typedef HostApi & reference;
-
-		HostApi &operator*() const;
-		HostApi *operator->() const;
-
-		HostApiIterator &operator++();
-		HostApiIterator operator++(int);
-		HostApiIterator &operator--();
-		HostApiIterator operator--(int);
-
-		bool operator==(const HostApiIterator &rhs) const;
-		bool operator!=(const HostApiIterator &rhs) const;
-
-	private:
-		friend class System;
-		HostApi **ptr_;
-	};
-
-
-} // namespace portaudio
-
-// ---------------------------------------------------------------------------------------
-
-#endif // INCLUDED_PORTAUDIO_SYSTEMHOSTAPIITERATOR_HXX
-- 
cgit v1.2.1