Menu
▾
▴
alpp-cvs — Mailing list for CVS commit messages.
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
(8) |
Mar
(7) |
Apr
(14) |
May
(6) |
Jun
(3) |
Jul
(3) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(12) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
|
Feb
|
Mar
(13) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(6) |
Oct
|
Nov
(14) |
Dec
|
| 2005 |
Jan
(2) |
Feb
(9) |
Mar
(5) |
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(6) |
Dec
|
| 2006 |
Jan
|
Feb
|
Mar
(1) |
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <vr-...@us...> - 2004-03-02 11:13:00
|
Update of /cvsroot/alpp/openalpp/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29181/src Modified Files: filestream.cpp nofilestream.cpp Log Message: Minor bugfixes. Cleaned up project files under windows. Index: filestream.cpp =================================================================== RCS file: /cvsroot/alpp/openalpp/src/filestream.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** filestream.cpp 2 Mar 2004 07:50:27 -0000 1.6 --- filestream.cpp 2 Mar 2004 11:01:14 -0000 1.7 *************** *** 33,42 **** using namespace openalpp; ! FileStream::FileStream(const char *filename,const int buffersize) throw (NameError,InitError,FileError) : Stream() { ! FILE *filehandle=fopen(filename,"r"); if(!filehandle) ! throw FileError("FileStream: Couldn't open file"); #ifdef _WIN32 /* We need to set stdin/stdout to binary mode. Damn windows. */ --- 33,42 ---- using namespace openalpp; ! FileStream::FileStream(const std::string& filename,const int buffersize) throw (NameError,InitError,FileError) : Stream() { ! FILE *filehandle=fopen(filename.c_str(),"r"); if(!filehandle) ! throw FileError("FileStream: Couldn't open file: "); #ifdef _WIN32 /* We need to set stdin/stdout to binary mode. Damn windows. */ Index: nofilestream.cpp =================================================================== RCS file: /cvsroot/alpp/openalpp/src/nofilestream.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** nofilestream.cpp 2 Mar 2004 07:50:27 -0000 1.5 --- nofilestream.cpp 2 Mar 2004 11:01:14 -0000 1.6 *************** *** 26,30 **** namespace openalpp { ! FileStream::FileStream(const char *,const int) throw (NameError,InitError,FileError) : Stream() { throw InitError("No support for streaming from files compiled in."); --- 26,30 ---- namespace openalpp { ! FileStream::FileStream(const std::string& ,const int) throw (NameError,InitError,FileError) : Stream() { throw InitError("No support for streaming from files compiled in."); |
|
From: <vr-...@us...> - 2004-03-02 11:13:00
|
Update of /cvsroot/alpp/openalpp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29181 Modified Files: INSTALL Makefile.in NEWS README Log Message: Minor bugfixes. Cleaned up project files under windows. Index: INSTALL =================================================================== RCS file: /cvsroot/alpp/openalpp/INSTALL,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** INSTALL 2 Mar 2004 07:50:10 -0000 1.5 --- INSTALL 2 Mar 2004 11:01:13 -0000 1.6 *************** *** 33,36 **** --- 33,41 ---- Windows ------- + Portaudio is not included by default. + If you want to use it, edit config.h to reflect your usage. + Also you have to add the necessary includepath, libpath and library to the project. + + DISCLAIMER!! Index: Makefile.in =================================================================== RCS file: /cvsroot/alpp/openalpp/Makefile.in,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** Makefile.in 2 Mar 2004 07:50:10 -0000 1.9 --- Makefile.in 2 Mar 2004 11:01:13 -0000 1.10 *************** *** 150,157 **** check-recursive installcheck-recursive DIST_COMMON = README AUTHORS COPYING INSTALL Makefile.am Makefile.in \ ! NEWS aclocal.m4 config/README config/config.guess \ ! config/config.sub config/depcomp config/install-sh \ ! config/ltmain.sh config/missing config/mkinstalldirs configure \ ! configure.in openalpp.pc.in DIST_SUBDIRS = $(SUBDIRS) all: all-recursive --- 150,157 ---- check-recursive installcheck-recursive DIST_COMMON = README AUTHORS COPYING INSTALL Makefile.am Makefile.in \ ! NEWS aclocal.m4 config/config.guess config/config.sub \ ! config/depcomp config/install-sh config/ltmain.sh \ ! config/missing config/mkinstalldirs configure configure.in \ ! openalpp.pc.in DIST_SUBDIRS = $(SUBDIRS) all: all-recursive Index: NEWS =================================================================== RCS file: /cvsroot/alpp/openalpp/NEWS,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** NEWS 2 Mar 2004 07:50:10 -0000 1.2 --- NEWS 2 Mar 2004 11:01:14 -0000 1.3 *************** *** 8,12 **** So a SetPosition() is now a setPosition() ! 2003-12-11 Anders Backman: --- 8,12 ---- So a SetPosition() is now a setPosition() ! Portaudio is not enabled by default anymore. 2003-12-11 Anders Backman: Index: README =================================================================== RCS file: /cvsroot/alpp/openalpp/README,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** README 2 Mar 2004 07:50:10 -0000 1.2 --- README 2 Mar 2004 11:01:14 -0000 1.3 *************** *** 27,29 **** Contact: ! Anders Backman, VRlab, an...@cs... \ No newline at end of file --- 27,29 ---- Contact: ! Anders Backman, VRlab, an...@cs... |
|
From: <vr-...@us...> - 2004-03-02 11:12:58
|
Update of /cvsroot/alpp/openalpp/include/openalpp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29181/include/openalpp Modified Files: config.h filestream.h Log Message: Minor bugfixes. Cleaned up project files under windows. Index: config.h =================================================================== RCS file: /cvsroot/alpp/openalpp/include/openalpp/config.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** config.h 2 Mar 2004 07:50:27 -0000 1.3 --- config.h 2 Mar 2004 11:01:14 -0000 1.4 *************** *** 34,38 **** */ #ifdef WIN32 ! #define WITH_PORTAUDIO #endif --- 34,38 ---- */ #ifdef WIN32 ! //#define WITH_PORTAUDIO #endif Index: filestream.h =================================================================== RCS file: /cvsroot/alpp/openalpp/include/openalpp/filestream.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** filestream.h 2 Mar 2004 07:50:27 -0000 1.6 --- filestream.h 2 Mar 2004 11:01:14 -0000 1.7 *************** *** 43,47 **** * buffer should be (in samples per second). */ ! FileStream(const char *filename,const int buffersize=65536) throw (NameError,InitError,FileError); --- 43,47 ---- * buffer should be (in samples per second). */ ! FileStream(const std::string& filename,const int buffersize=65536) throw (NameError,InitError,FileError); |
|
From: <vr-...@us...> - 2004-03-02 08:02:19
|
Update of /cvsroot/alpp/openalpp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26590 Modified Files: INSTALL Makefile.in NEWS README configure configure.in Log Message: Changed from initial capital letter for methods. i.e. SetPosition() is now setPosition() to be more C++ compliant. Removed dependency of CommonC++ for threading. CHanged to OpenThreads which is GPL licensed. Removed tests for streaming over the net... (Due to Commonc++ removal) Index: INSTALL =================================================================== RCS file: /cvsroot/alpp/openalpp/INSTALL,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** INSTALL 12 Dec 2003 06:55:04 -0000 1.4 --- INSTALL 2 Mar 2004 07:50:10 -0000 1.5 *************** *** 1,10 **** Installation instructions for OpenAL++ ************************************** ! OpenAL++ uses the libraries OpenAL, PortAudio and CommonC++. However, it is possible to compile OpenAL++ without PortAudio and CommonC++, but then some features will be disabled. Linux/Unix ---------- Start by running configure ($ is the prompt): ! $ ./configure This will create the Makefiles. Run configure --help to get information on the (optional) arguments. Now make the library: --- 1,18 ---- Installation instructions for OpenAL++ ************************************** ! OpenAL++ uses the libraries OpenAL, PortAudio and OpenThreads. However, it is possible to compile OpenAL++ without PortAudio, but then some features will be disabled. ! ! ! Download ! --------- ! Download OpenThreads from http://openthreads.sourceforge.net/ and install it. ! ! If you want to use PortAudio for microphone capture (not very tested!) download that from: http://www.portaudio.com/ and install it. ! Linux/Unix ---------- Start by running configure ($ is the prompt): ! $ ./autogen.sh This will create the Makefiles. Run configure --help to get information on the (optional) arguments. Now make the library: *************** *** 19,23 **** $ make install-docs ! By default, all the files will be installed under /usr/local (e.g. the include-files under /usr/local/include). This can be changed by using the --prefix flag for configure (e.g. configure --prefix=/usr). Windows --- 27,33 ---- $ make install-docs ! On some systems we have experienced problems with locking files. ("waiting for audioenvironment.o.lock) supplying --disable-libtool-lock to configure will remove that problem. This is done for you in the autogen.sh script. ! ! By default, all the files will be installed under /usr/local (e.g. the include-files under /usr/local/include). This can be changed by using the --prefix flag for autogen.sh (e.g. ./autogen.sh --prefix=/usr). Windows *************** *** 50,53 **** OpenAL++ has not been tested on other platforms than Linux and Windows. If you get it to work on another platform, contact me with information on how you did, and I'll add information to this file. Also be sure to tell me about any necessary changes to configure.in and other files to get it to work. ! /Tomas Hämälä, VRlab, 2002 ! (to...@hp...) --- 60,63 ---- OpenAL++ has not been tested on other platforms than Linux and Windows. If you get it to work on another platform, contact me with information on how you did, and I'll add information to this file. Also be sure to tell me about any necessary changes to configure.in and other files to get it to work. ! /Anders Backman, VRlab, 2004 ! (an...@cs...) Index: Makefile.in =================================================================== RCS file: /cvsroot/alpp/openalpp/Makefile.in,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** Makefile.in 16 Apr 2003 11:14:54 -0000 1.8 --- Makefile.in 2 Mar 2004 07:50:10 -0000 1.9 *************** *** 1,5 **** ! # Makefile.in generated automatically by automake 1.4-p6 from Makefile.am ! # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, --- 1,7 ---- ! # Makefile.in generated by automake 1.7.2 from Makefile.am. ! # @configure_input@ ! # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 ! # Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, *************** *** 11,55 **** # PARTICULAR PURPOSE. ! ! SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - - bindir = @bindir@ - sbindir = @sbindir@ - libexecdir = @libexecdir@ - datadir = @datadir@ - sysconfdir = @sysconfdir@ - sharedstatedir = @sharedstatedir@ - localstatedir = @localstatedir@ - libdir = @libdir@ - infodir = @infodir@ - mandir = @mandir@ - includedir = @includedir@ - oldincludedir = /usr/include - - DESTDIR = - pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ - top_builddir = . ! ACLOCAL = @ACLOCAL@ ! AUTOCONF = @AUTOCONF@ ! AUTOMAKE = @AUTOMAKE@ ! AUTOHEADER = @AUTOHEADER@ ! INSTALL = @INSTALL@ ! INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) ! INSTALL_DATA = @INSTALL_DATA@ ! INSTALL_SCRIPT = @INSTALL_SCRIPT@ ! transform = @program_transform_name@ ! NORMAL_INSTALL = : PRE_INSTALL = : --- 13,33 ---- # 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 = : *************** *** 58,81 **** PRE_UNINSTALL = : POST_UNINSTALL = : - host_alias = @host_alias@ host_triplet = @host@ ! AS = @AS@ CC = @CC@ ! CCGNUCFLAGS = @CCGNUCFLAGS@ ! CCGNULIBS = @CCGNULIBS@ CXX = @CXX@ CXXCPP = @CXXCPP@ ! DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ EXEEXT = @EXEEXT@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ MAKEINFO = @MAKEINFO@ - OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ RANLIB = @RANLIB@ STRIP = @STRIP@ VERSION = @VERSION@ SUBDIRS = src include tests --- 36,132 ---- PRE_UNINSTALL = : POST_UNINSTALL = : host_triplet = @host@ ! ACLOCAL = @ACLOCAL@ ! AMDEP_FALSE = @AMDEP_FALSE@ ! AMDEP_TRUE = @AMDEP_TRUE@ ! AMTAR = @AMTAR@ ! AUTOCONF = @AUTOCONF@ ! AUTOHEADER = @AUTOHEADER@ ! AUTOMAKE = @AUTOMAKE@ ! AWK = @AWK@ CC = @CC@ ! CCDEPMODE = @CCDEPMODE@ ! CFLAGS = @CFLAGS@ ! 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@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ + LDFLAGS = @LDFLAGS@ + LIBOBJS = @LIBOBJS@ + LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ 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@ RANLIB = @RANLIB@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ STRIP = @STRIP@ VERSION = @VERSION@ + WITH_CCGNU_FALSE = @WITH_CCGNU_FALSE@ + WITH_CCGNU_TRUE = @WITH_CCGNU_TRUE@ + WITH_OGGVORBIS_FALSE = @WITH_OGGVORBIS_FALSE@ + WITH_OGGVORBIS_TRUE = @WITH_OGGVORBIS_TRUE@ + WITH_PORTAUDIO_FALSE = @WITH_PORTAUDIO_FALSE@ + WITH_PORTAUDIO_TRUE = @WITH_PORTAUDIO_TRUE@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_RANLIB = @ac_ct_RANLIB@ + ac_ct_STRIP = @ac_ct_STRIP@ + 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__quote = @am__quote@ + 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@ + oldincludedir = @oldincludedir@ + prefix = @prefix@ + program_transform_name = @program_transform_name@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ SUBDIRS = src include tests *************** *** 85,137 **** pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = openalpp.pc ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs ! CONFIG_CLEAN_FILES = openalpp.pc ! DATA = $(pkgconfig_DATA) ! ! DIST_COMMON = COPYING INSTALL Makefile.am Makefile.in aclocal.m4 \ ! configure configure.in openalpp.pc.in ! DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) - TAR = tar - GZIP_ENV = --best - all: all-redirect .SUFFIXES: - $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile ! Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) ! cd $(top_builddir) \ ! && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status ! ! $(ACLOCAL_M4): configure.in ! cd $(srcdir) && $(ACLOCAL) ! config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck ! $(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) cd $(srcdir) && $(AUTOCONF) openalpp.pc: $(top_builddir)/config.status openalpp.pc.in ! cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status install-pkgconfigDATA: $(pkgconfig_DATA) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(pkgconfigdir) @list='$(pkgconfig_DATA)'; for p in $$list; do \ ! if test -f $(srcdir)/$$p; then \ ! echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkgconfigdir)/$$p"; \ ! $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkgconfigdir)/$$p; \ ! else if test -f $$p; then \ ! echo " $(INSTALL_DATA) $$p $(DESTDIR)$(pkgconfigdir)/$$p"; \ ! $(INSTALL_DATA) $$p $(DESTDIR)$(pkgconfigdir)/$$p; \ ! fi; fi; \ done uninstall-pkgconfigDATA: @$(NORMAL_UNINSTALL) ! list='$(pkgconfig_DATA)'; for p in $$list; do \ ! rm -f $(DESTDIR)$(pkgconfigdir)/$$p; \ done --- 136,206 ---- pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = openalpp.pc + subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs ! CONFIG_CLEAN_FILES = openalpp.pc ! DIST_SOURCES = ! DATA = $(pkgconfig_DATA) ! RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ ! ps-recursive install-info-recursive uninstall-info-recursive \ ! all-recursive install-data-recursive install-exec-recursive \ ! installdirs-recursive install-recursive uninstall-recursive \ ! check-recursive installcheck-recursive ! DIST_COMMON = README AUTHORS COPYING INSTALL Makefile.am Makefile.in \ ! NEWS aclocal.m4 config/README config/config.guess \ ! config/config.sub config/depcomp config/install-sh \ ! config/ltmain.sh config/missing config/mkinstalldirs configure \ ! configure.in openalpp.pc.in ! DIST_SUBDIRS = $(SUBDIRS) ! all: all-recursive .SUFFIXES: ! am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ ! configure.lineno ! $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) ! cd $(top_srcdir) && \ ! $(AUTOMAKE) --foreign Makefile ! Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ! cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe) ! $(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck ! $(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) cd $(srcdir) && $(AUTOCONF) + + $(ACLOCAL_M4): configure.in + cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) openalpp.pc: $(top_builddir)/config.status openalpp.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: + pkgconfigDATA_INSTALL = $(INSTALL_DATA) install-pkgconfigDATA: $(pkgconfig_DATA) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(pkgconfigdir) @list='$(pkgconfig_DATA)'; for p in $$list; do \ ! if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ ! f="`echo $$p | sed -e 's|^.*/||'`"; \ ! 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="`echo $$p | sed -e 's|^.*/||'`"; \ ! echo " rm -f $(DESTDIR)$(pkgconfigdir)/$$f"; \ ! rm -f $(DESTDIR)$(pkgconfigdir)/$$f; \ done *************** *** 142,152 **** # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. ! ! @SET_MAKE@ ! ! all-recursive install-data-recursive install-exec-recursive \ ! installdirs-recursive install-recursive uninstall-recursive \ ! check-recursive installcheck-recursive info-recursive dvi-recursive: ! @set fnord $(MAKEFLAGS); amf=$$2; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ --- 211,216 ---- # (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): ! @set fnord $$MAKEFLAGS; amf=$$2; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ *************** *** 168,178 **** mostlyclean-recursive clean-recursive distclean-recursive \ maintainer-clean-recursive: ! @set fnord $(MAKEFLAGS); amf=$$2; \ dot_seen=no; \ ! rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \ ! rev="$$subdir $$rev"; \ ! test "$$subdir" != "." || dot_seen=yes; \ done; \ ! test "$$dot_seen" = "no" && rev=". $$rev"; \ target=`echo $@ | sed s/-recursive//`; \ for subdir in $$rev; do \ --- 232,247 ---- mostlyclean-recursive clean-recursive distclean-recursive \ maintainer-clean-recursive: ! @set fnord $$MAKEFLAGS; amf=$$2; \ 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 \ *************** *** 190,319 **** test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ done tags: TAGS ! ID: $(HEADERS) $(SOURCES) $(LISP) ! list='$(SOURCES) $(HEADERS)'; \ ! unique=`for i in $$list; do echo $$i; done | \ ! awk ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ ! here=`pwd` && cd $(srcdir) \ ! && mkid -f$$here/ID $$unique $(LISP) ! TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ here=`pwd`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ ! if test "$$subdir" = .; then :; else \ test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \ ! fi; \ done; \ ! list='$(SOURCES) $(HEADERS)'; \ ! unique=`for i in $$list; do echo $$i; done | \ ! awk ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ ! test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ ! || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP)) ! mostlyclean-tags: ! clean-tags: distclean-tags: ! -rm -f TAGS ID ! ! maintainer-clean-tags: distdir = $(PACKAGE)-$(VERSION) - top_distdir = $(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 ! -rm -rf $(distdir) ! GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz ! mkdir $(distdir)/=build ! mkdir $(distdir)/=inst ! dc_install_base=`cd $(distdir)/=inst && pwd`; \ ! cd $(distdir)/=build \ ! && ../configure --srcdir=.. --prefix=$$dc_install_base \ ! && $(MAKE) $(AM_MAKEFLAGS) \ ! && $(MAKE) $(AM_MAKEFLAGS) dvi \ ! && $(MAKE) $(AM_MAKEFLAGS) check \ ! && $(MAKE) $(AM_MAKEFLAGS) install \ ! && $(MAKE) $(AM_MAKEFLAGS) installcheck \ ! && $(MAKE) $(AM_MAKEFLAGS) dist ! -rm -rf $(distdir) ! @banner="$(distdir).tar.gz is ready for distribution"; \ ! dashes=`echo "$$banner" | sed s/./=/g`; \ ! echo "$$dashes"; \ ! echo "$$banner"; \ ! echo "$$dashes" ! dist: distdir ! -chmod -R a+r $(distdir) ! GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir) ! -rm -rf $(distdir) ! dist-all: distdir ! -chmod -R a+r $(distdir) ! GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir) ! -rm -rf $(distdir) distdir: $(DISTFILES) ! -rm -rf $(distdir) mkdir $(distdir) ! -chmod 777 $(distdir) ! here=`cd $(top_builddir) && pwd`; \ ! top_distdir=`cd $(distdir) && pwd`; \ ! distdir=`cd $(distdir) && pwd`; \ ! cd $(top_srcdir) \ ! && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign Makefile ! @for file in $(DISTFILES); do \ ! d=$(srcdir); \ if test -d $$d/$$file; then \ ! cp -pr $$d/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ ! || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ ! || cp -p $$d/$$file $(distdir)/$$file || :; \ fi; \ done ! for subdir in $(SUBDIRS); do \ if test "$$subdir" = .; then :; else \ test -d $(distdir)/$$subdir \ || mkdir $(distdir)/$$subdir \ || exit 1; \ ! chmod 777 $(distdir)/$$subdir; \ ! (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(distdir) distdir=../$(distdir)/$$subdir distdir) \ || exit 1; \ fi; \ done ! info-am: ! info: info-recursive ! dvi-am: ! dvi: dvi-recursive check-am: all-am check: check-recursive ! installcheck-am: ! installcheck: installcheck-recursive ! install-exec-am: ! install-exec: install-exec-recursive ! install-data-am: install-pkgconfigDATA install-data: install-data-recursive install-am: all-am @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - install: install-recursive - uninstall-am: uninstall-pkgconfigDATA - uninstall: uninstall-recursive - all-am: Makefile $(DATA) - all-redirect: all-recursive - install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install - installdirs: installdirs-recursive - installdirs-am: - $(mkinstalldirs) $(DESTDIR)$(pkgconfigdir) - mostlyclean-generic: --- 259,472 ---- 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 + + ETAGS = etags + ETAGSFLAGS = + + CTAGS = ctags + CTAGSFLAGS = tags: TAGS ! 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-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ ! $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ ! if test "$$subdir" = .; then :; else \ test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \ ! fi; \ done; \ ! 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 "$(ETAGS_ARGS)$$tags$$unique" \ ! || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ! $$tags $$unique ! ctags: CTAGS ! CTAGS: ctags-recursive $(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 ! DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + top_distdir = . distdir = $(PACKAGE)-$(VERSION) ! am__remove_distdir = \ ! { test ! -d $(distdir) \ ! || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ ! && rm -fr $(distdir); }; } ! ! GZIP_ENV = --best ! distuninstallcheck_listfiles = find . -type f -print ! distcleancheck_listfiles = find . -type f -print ! distdir: $(DISTFILES) ! $(am__remove_distdir) mkdir $(distdir) ! $(mkinstalldirs) $(distdir)/. $(distdir)/config ! @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"; \ ! $(mkinstalldirs) "$(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='$(SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ test -d $(distdir)/$$subdir \ || mkdir $(distdir)/$$subdir \ || exit 1; \ ! (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 ! $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz ! $(am__remove_distdir) ! ! dist dist-all: distdir ! $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz ! $(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 ! $(am__remove_distdir) ! GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf - ! 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` \ ! && 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 ../.. && $(mkinstalldirs) "$$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-gzip \ ! && rm -f $(distdir).tar.gz \ ! && $(MAKE) $(AM_MAKEFLAGS) distcleancheck ! $(am__remove_distdir) ! @echo "$(distdir).tar.gz is ready for distribution" | \ ! sed 'h;s/./=/g;p;x;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) ! installdirs: installdirs-recursive ! installdirs-am: ! $(mkinstalldirs) $(DESTDIR)$(pkgconfigdir) ! 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_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: *************** *** 322,362 **** distclean-generic: -rm -f Makefile $(CONFIG_CLEAN_FILES) - -rm -f config.cache config.log stamp-h stamp-h[0-9]* maintainer-clean-generic: ! mostlyclean-am: mostlyclean-tags mostlyclean-generic ! mostlyclean: mostlyclean-recursive ! clean-am: clean-tags clean-generic mostlyclean-am ! clean: clean-recursive ! distclean-am: distclean-tags distclean-generic clean-am ! -rm -f libtool ! distclean: distclean-recursive ! -rm -f config.status ! maintainer-clean-am: maintainer-clean-tags maintainer-clean-generic \ ! distclean-am ! @echo "This command is intended for maintainers to use;" ! @echo "it deletes files that may require special tools to rebuild." maintainer-clean: maintainer-clean-recursive ! -rm -f config.status ! .PHONY: uninstall-pkgconfigDATA install-pkgconfigDATA \ ! install-data-recursive uninstall-data-recursive install-exec-recursive \ ! uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \ ! all-recursive check-recursive installcheck-recursive info-recursive \ ! dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \ ! maintainer-clean-recursive tags tags-recursive mostlyclean-tags \ ! distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ ! dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ ! install-exec install-data-am install-data install-am install \ ! uninstall-am uninstall all-redirect all-am all installdirs-am \ ! installdirs mostlyclean-generic distclean-generic clean-generic \ ! maintainer-clean-generic clean mostlyclean distclean maintainer-clean --- 475,548 ---- distclean-generic: -rm -f Makefile $(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-recursive ! clean-am: clean-generic clean-libtool mostlyclean-am ! distclean: distclean-recursive ! -rm -f $(am__CONFIG_DISTCLEAN_FILES) ! distclean-am: clean-am distclean-generic distclean-libtool \ ! distclean-tags ! dvi: dvi-recursive ! dvi-am: ! 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 autom4te.cache ! 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 check check-am clean \ ! clean-generic clean-libtool clean-recursive ctags \ ! ctags-recursive dist dist-all dist-gzip distcheck distclean \ ! distclean-generic distclean-libtool distclean-recursive \ ! distclean-tags distcleancheck distdir distuninstallcheck dvi \ ! dvi-am dvi-recursive info info-am info-recursive install \ ! install-am install-data install-data-am install-data-recursive \ ! install-exec install-exec-am install-exec-recursive \ ! install-info install-info-am install-info-recursive install-man \ ! install-pkgconfigDATA install-recursive install-strip \ ! installcheck installcheck-am installdirs installdirs-am \ ! installdirs-recursive maintainer-clean maintainer-clean-generic \ ! maintainer-clean-recursive mostlyclean mostlyclean-generic \ ! mostlyclean-libtool mostlyclean-recursive pdf pdf-am \ ! pdf-recursive ps ps-am ps-recursive tags tags-recursive \ ! uninstall uninstall-am uninstall-info-am \ ! uninstall-info-recursive uninstall-pkgconfigDATA \ ! uninstall-recursive *************** *** 368,372 **** ALL-install: cd $(top_builddir); make -j4 install - # 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. --- 554,557 ---- Index: NEWS =================================================================== RCS file: /cvsroot/alpp/openalpp/NEWS,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** NEWS 11 Dec 2003 09:32:49 -0000 1.1 --- NEWS 2 Mar 2004 07:50:10 -0000 1.2 *************** *** 1,9 **** NEWS 2003-12-11 Anders Backman: ! Recently (november 2003) there is a wrapper system for OpenAL. ! It searches for .dll files called *openal*.dll and loads them, thinking it is an implementation ! of OpenAL32. This does not work with the previous library name of this project (openalpp.lib/.dll). ! So for now it is called open++al.dll. Its not a nice name, but I cant find out any better solution to this ! problem. --- 1,18 ---- NEWS + 2004-02-11 Anders Backman: + + OpenAL++ used to depend on CommonC++, which caused problems as CommonC++ is GLP licensed, and OpenAL++ is LGPL which is not a valid situation. Therefore all dependency of CommonC++ is removed, for threading OpenThreads is used. This means that the netstreaming examples does not longer work. + + Also the initial capital letter of method names is now changed to lower-case. + So a SetPosition() is now a setPosition() + + + 2003-12-11 Anders Backman: ! Recently (november 2003) there is a wrapper system for OpenAL. ! It searches for .dll files called *openal*.dll and loads them, thinking it is an implementation ! of OpenAL32. This does not work with the previous library name of this project (openalpp.lib/.dll). ! So for now it is called open++al.dll. Its not a nice name, but I cant find out any better solution to this ! problem. Index: README =================================================================== RCS file: /cvsroot/alpp/openalpp/README,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** README 11 Dec 2003 09:32:49 -0000 1.1 --- README 2 Mar 2004 07:50:10 -0000 1.2 *************** *** 6,10 **** * OpenAL (http://www.openal.org), * PortAudio (http://www.portaudio.com/), and - * CommonC++ (http://cplusplus.sourceforge.net/) * * This library is free software; you can redistribute it and/or --- 6,9 ---- *************** *** 27,31 **** Compare OpenAL++ to a scenegraph for OpenGL! - Contact: Anders Backman, VRlab, an...@cs... \ No newline at end of file --- 26,29 ---- Index: configure =================================================================== RCS file: /cvsroot/alpp/openalpp/configure,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** configure 16 Apr 2003 11:14:56 -0000 1.7 --- configure 2 Mar 2004 07:50:10 -0000 1.8 *************** *** 1,23 **** #! /bin/sh - # Guess values for system-dependent variables and create Makefiles. ! # Generated automatically using autoconf version 2.13 ! # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. # # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. - # Defaults: [...10251 lines suppressed...] ! # config.status does its own redirection, appending to config.log. ! # Unfortunately, on DOS this fails, as config.log is still kept open ! # by configure, so config.status won't be able to write to it; its ! # output is simply discarded. So we exec the FD to /dev/null, ! # effectively closing config.log, so it can be properly (re)opened and ! # appended to by config.status. When coming back to configure, we ! # need to make the FD available again. ! if test "$no_create" != yes; then ! ac_cs_success=: ! ac_config_status_args= ! test "$silent" = yes && ! ac_config_status_args="$ac_config_status_args --quiet" ! exec 5>/dev/null ! $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false ! exec 5>>config.log ! # Use ||, not &&, to avoid exiting from the if with $? = 1, which ! # would make configure fail if this is the last instruction. ! $ac_cs_success || { (exit 1); exit 1; } ! fi Index: configure.in =================================================================== RCS file: /cvsroot/alpp/openalpp/configure.in,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** configure.in 21 Feb 2003 14:22:21 -0000 1.8 --- configure.in 2 Mar 2004 07:50:10 -0000 1.9 *************** *** 71,77 **** # Common C++ ! AC_CHECK_LIB(ccgnu2,main,WITH_CCGNU="yes",,-lpthread -ldl) ! AC_SUBST(CCGNULIBS) ! AC_SUBST(CCGNUCFLAGS) if test "$WITH_CCGNU" = "yes"; then CCGNULIBS="`ccgnu2-config --libs`" --- 71,79 ---- # Common C++ ! #AC_CHECK_LIB(ccgnu2,main,WITH_CCGNU="no",,-lpthread -ldl) ! #AC_SUBST(CCGNULIBS) ! #AC_SUBST(CCGNUCFLAGS) ! WITH_CCGNU="no" ! if test "$WITH_CCGNU" = "yes"; then CCGNULIBS="`ccgnu2-config --libs`" |
Update of /cvsroot/alpp/openalpp/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26590/src Modified Files: Makefile.am Makefile.in audiobase.cpp audioconvert.cpp audioenvironment.cpp error.cpp filestream.cpp filestreamupdater.cpp groupsource.cpp listener.cpp nofilestream.cpp noinputdevice.cpp nostreaming.cpp sample.cpp sounddata.cpp source.cpp sourcebase.cpp stream.cpp streamupdater.cpp Log Message: Changed from initial capital letter for methods. i.e. SetPosition() is now setPosition() to be more C++ compliant. Removed dependency of CommonC++ for threading. CHanged to OpenThreads which is GPL licensed. Removed tests for streaming over the net... (Due to Commonc++ removal) Index: Makefile.am =================================================================== RCS file: /cvsroot/alpp/openalpp/src/Makefile.am,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Makefile.am 21 Feb 2003 14:47:15 -0000 1.5 --- Makefile.am 2 Mar 2004 07:50:27 -0000 1.6 *************** *** 15,21 **** if WITH_CCGNU streamfiles = \ - netstream.cpp \ streamupdater.cpp \ - netupdater.cpp \ stream.cpp if WITH_OGGVORBIS --- 15,19 ---- Index: Makefile.in =================================================================== RCS file: /cvsroot/alpp/openalpp/src/Makefile.in,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** Makefile.in 16 Apr 2003 11:15:03 -0000 1.8 --- Makefile.in 2 Mar 2004 07:50:27 -0000 1.9 *************** *** 1,5 **** ! # Makefile.in generated automatically by automake 1.4-p6 from Makefile.am ! # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, --- 1,7 ---- ! # Makefile.in generated by automake 1.7.2 from Makefile.am. ! # @configure_input@ ! # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 [...990 lines suppressed...] ! 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-depend distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-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. Index: audiobase.cpp =================================================================== RCS file: /cvsroot/alpp/openalpp/src/audiobase.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** audiobase.cpp 16 Apr 2003 11:15:04 -0000 1.12 --- audiobase.cpp 2 Mar 2004 07:50:27 -0000 1.13 *************** *** 6,10 **** * OpenAL (http://www.openal.org), * PortAudio (http://www.portaudio.com/), and - * CommonC++ (http://cplusplus.sourceforge.net/) * * This library is free software; you can redistribute it and/or --- 6,9 ---- *************** *** 26,30 **** #include "openalpp/audiobase.h" #include "stdio.h" ! namespace openalpp { AudioBase::AudioBase(int frequency,int refresh,int synchronous) --- 25,29 ---- #include "openalpp/audiobase.h" #include "stdio.h" ! using namespace openalpp; AudioBase::AudioBase(int frequency,int refresh,int synchronous) *************** *** 112,114 **** #endif - } --- 111,112 ---- Index: audioconvert.cpp =================================================================== RCS file: /cvsroot/alpp/openalpp/src/audioconvert.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** audioconvert.cpp 28 Feb 2003 08:36:23 -0000 1.4 --- audioconvert.cpp 2 Mar 2004 07:50:27 -0000 1.5 *************** *** 10,14 **** * OpenAL (http://www.openal.org), * PortAudio (http://www.portaudio.com/), and - * CommonC++ (http://cplusplus.sourceforge.net/) * * This library is free software; you can redistribute it and/or --- 10,13 ---- *************** *** 40,44 **** */ ! namespace openalpp { void *acLoadWAV(void *data, ALuint *size, void **udata, --- 39,43 ---- */ ! using namespace openalpp; void *acLoadWAV(void *data, ALuint *size, void **udata, *************** *** 94,98 **** } ! void *AudioConvert::Apply(void *data,ALenum format, unsigned int frequency,unsigned int &size) { if(format==format_ && frequency==frequency_) { --- 93,97 ---- } ! void *AudioConvert::apply(void *data,ALenum format, unsigned int frequency,unsigned int &size) { if(format==format_ && frequency==frequency_) { *************** *** 1429,1431 **** } - } --- 1428,1429 ---- Index: audioenvironment.cpp =================================================================== RCS file: /cvsroot/alpp/openalpp/src/audioenvironment.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** audioenvironment.cpp 21 Feb 2003 14:47:15 -0000 1.6 --- audioenvironment.cpp 2 Mar 2004 07:50:27 -0000 1.7 *************** *** 6,10 **** * OpenAL (http://www.openal.org), * PortAudio (http://www.portaudio.com/), and - * CommonC++ (http://cplusplus.sourceforge.net/) * * This library is free software; you can redistribute it and/or --- 6,9 ---- *************** *** 25,29 **** #include "openalpp/audioenvironment.h" ! namespace openalpp { AudioEnvironment::AudioEnvironment() throw (InitError): AudioBase() { --- 24,28 ---- #include "openalpp/audioenvironment.h" ! using namespace openalpp; AudioEnvironment::AudioEnvironment() throw (InitError): AudioBase() { *************** *** 39,43 **** } ! void AudioEnvironment::SetSoundSpeed(float speed) throw(ValueError,FatalError){ alDopplerVelocity(speed); ALenum error; --- 38,42 ---- } ! void AudioEnvironment::setSoundVelocity(float speed) throw(ValueError,FatalError){ alDopplerVelocity(speed); ALenum error; *************** *** 53,65 **** } ! float AudioEnvironment::GetSoundSpeed() throw (FatalError) { ALfloat speed; alGetFloatv(AL_DOPPLER_VELOCITY,&speed); if(alGetError()!=AL_FALSE) // This isn't strictly necessary... ! throw FatalError("Unknown error in AudioEnviroment::GetSoundSpeed()"); return speed; } ! void AudioEnvironment::SetDopplerFactor(float factor) throw (ValueError,FatalError) { alDopplerFactor(factor); --- 52,64 ---- } ! float AudioEnvironment::getSoundVelocity() throw (FatalError) { ALfloat speed; alGetFloatv(AL_DOPPLER_VELOCITY,&speed); if(alGetError()!=AL_FALSE) // This isn't strictly necessary... ! throw FatalError("Unknown error in AudioEnviroment::GetSoundVelocity()"); return speed; } ! void AudioEnvironment::setDopplerFactor(float factor) throw (ValueError,FatalError) { alDopplerFactor(factor); *************** *** 76,80 **** } ! float AudioEnvironment::GetDopplerFactor() throw (FatalError) { ALfloat(factor); alGetFloatv(AL_DOPPLER_FACTOR,&factor); --- 75,79 ---- } ! float AudioEnvironment::getDopplerFactor() throw (FatalError) { ALfloat(factor); alGetFloatv(AL_DOPPLER_FACTOR,&factor); *************** *** 84,88 **** } ! void AudioEnvironment::SetGain(float gain) { alListenerf(AL_GAIN,gain); ALenum error=alGetError(); --- 83,87 ---- } ! void AudioEnvironment::setGain(float gain) { alListenerf(AL_GAIN,gain); ALenum error=alGetError(); *************** *** 97,101 **** } ! float AudioEnvironment::GetGain() throw (FatalError) { ALfloat gain; alGetListenerf(AL_GAIN,&gain); --- 96,100 ---- } ! float AudioEnvironment::getGain() throw (FatalError) { ALfloat gain; alGetListenerf(AL_GAIN,&gain); *************** *** 105,109 **** } ! void AudioEnvironment::SetDistanceModel(DistanceModel model) throw (FatalError){ switch(model) { --- 104,108 ---- } ! void AudioEnvironment::setDistanceModel(DistanceModel model) throw (FatalError){ switch(model) { *************** *** 124,128 **** } ! DistanceModel AudioEnvironment::GetDistanceModel() throw (FatalError) { int almodel; alGetIntegerv(AL_DISTANCE_MODEL,&almodel); --- 123,127 ---- } ! DistanceModel AudioEnvironment::getDistanceModel() throw (FatalError) { int almodel; alGetIntegerv(AL_DISTANCE_MODEL,&almodel); *************** *** 144,148 **** void (*AudioBase::alReverbDelay)(ALuint sid, ALfloat param); ! void AudioEnvironment::InitiateReverb() throw (InitError) { if (reverbinitiated_) return; --- 143,147 ---- void (*AudioBase::alReverbDelay)(ALuint sid, ALfloat param); ! void AudioEnvironment::initiateReverb() throw (InitError) { if (reverbinitiated_) return; *************** *** 158,161 **** } - - } --- 157,158 ---- Index: error.cpp =================================================================== RCS file: /cvsroot/alpp/openalpp/src/error.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** error.cpp 4 Dec 2002 07:13:13 -0000 1.4 --- error.cpp 2 Mar 2004 07:50:27 -0000 1.5 *************** *** 6,10 **** * OpenAL (http://www.openal.org), * PortAudio (http://www.portaudio.com/), and - * CommonC++ (http://cplusplus.sourceforge.net/) * * This library is free software; you can redistribute it and/or --- 6,9 ---- *************** *** 25,38 **** #include "openalpp/error.h" ! namespace openalpp { //##ModelId=3BDD35A001D5 ! std::ostream &Error::Put(std::ostream &stream) const { return (stream << what()); } ! std::ostream &operator<<(std::ostream &stream,const Error &error) { ! return error.Put(stream); } - } --- 24,36 ---- #include "openalpp/error.h" ! using namespace openalpp; //##ModelId=3BDD35A001D5 ! std::ostream &openalpp::Error::put(std::ostream &stream) const { return (stream << what()); } ! std::ostream &openalpp::operator<<(std::ostream &stream,const Error &error) { ! return error.put(stream); } Index: filestream.cpp =================================================================== RCS file: /cvsroot/alpp/openalpp/src/filestream.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** filestream.cpp 23 May 2003 14:47:10 -0000 1.5 --- filestream.cpp 2 Mar 2004 07:50:27 -0000 1.6 *************** *** 6,10 **** * OpenAL (http://www.openal.org), * PortAudio (http://www.portaudio.com/), and - * CommonC++ (http://cplusplus.sourceforge.net/) * * This library is free software; you can redistribute it and/or --- 6,9 ---- *************** *** 32,36 **** #endif ! namespace openalpp { FileStream::FileStream(const char *filename,const int buffersize) --- 31,35 ---- #endif ! using namespace openalpp; FileStream::FileStream(const char *filename,const int buffersize) *************** *** 58,65 **** else format=AL_FORMAT_STEREO16; updater_=new FileStreamUpdater(oggfile, ! buffername_,buffer2_->GetName(), format,ogginfo->rate, ! buffersize*SampleSize(format)); } else { fclose(filehandle); --- 57,65 ---- else format=AL_FORMAT_STEREO16; + updater_=new FileStreamUpdater(oggfile, ! buffername_,buffer2_->getName(), format,ogginfo->rate, ! buffersize*sampleSize(format)); } else { fclose(filehandle); *************** *** 82,88 **** } ! void FileStream::SetLooping(bool loop) { ! ((FileStreamUpdater *)updater_)->SetLooping(loop); } - } --- 82,87 ---- } ! void FileStream::setLooping(bool loop) { ! ((FileStreamUpdater *)updater_)->setLooping(loop); } Index: filestreamupdater.cpp =================================================================== RCS file: /cvsroot/alpp/openalpp/src/filestreamupdater.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** filestreamupdater.cpp 23 May 2003 14:49:07 -0000 1.3 --- filestreamupdater.cpp 2 Mar 2004 07:50:27 -0000 1.4 *************** *** 6,10 **** * OpenAL (http://www.openal.org), * PortAudio (http://www.portaudio.com/), and - * CommonC++ (http://cplusplus.sourceforge.net/) * * This library is free software; you can redistribute it and/or --- 6,9 ---- *************** *** 25,31 **** #include "openalpp/filestreamupdater.h" ! namespace openalpp { ! FileStreamUpdater::FileStreamUpdater(const OggVorbis_File &oggfile, const ALuint buffer1,ALuint buffer2, ALenum format,unsigned int frequency, --- 24,31 ---- #include "openalpp/filestreamupdater.h" ! using namespace openalpp; ! FileStreamUpdater::FileStreamUpdater( ! const OggVorbis_File &oggfile, const ALuint buffer1,ALuint buffer2, ALenum format,unsigned int frequency, *************** *** 45,51 **** ALshort *buffer=new ALshort[buffersize_/sizeof(ALshort)]; ! runmutex_.enterMutex(); while(!stoprunning_) { ! runmutex_.leaveMutex(); unsigned int count=0; --- 45,51 ---- ALshort *buffer=new ALshort[buffersize_/sizeof(ALshort)]; ! runmutex_.lock(); while(!stoprunning_) { ! runmutex_.unlock(); unsigned int count=0; *************** *** 54,66 **** unsigned int amt; do { ! amt=ov_read(oggfile_,&((char *)buffer)[count], buffersize_-count, 0,2,1,&stream); ! if(looping_ && amt==0) { ! if(!ov_seekable(oggfile_)) ! break; ! if(!ov_time_seek(oggfile_,0.0)) ! break; ! } } while(looping_ && amt==0); // We must break if: --- 54,66 ---- unsigned int amt; do { ! amt=ov_read(oggfile_,&((char *)buffer)[count], buffersize_-count, 0,2,1,&stream); ! if(looping_ && amt==0) { ! if(!ov_seekable(oggfile_)) ! break; ! if(!ov_time_seek(oggfile_,0.0)) ! break; ! } } while(looping_ && amt==0); // We must break if: *************** *** 69,89 **** // * We hit EOF and the file was looping, but we couldn't loop... if(amt<=0) ! break; count+=amt; } if(count) ! Update(buffer,count); ! runmutex_.enterMutex(); } ! runmutex_.leaveMutex(); delete []buffer; } ! void FileStreamUpdater::SetLooping(bool loop) { looping_=loop; } - - } --- 69,87 ---- // * We hit EOF and the file was looping, but we couldn't loop... if(amt<=0) ! break; count+=amt; } if(count) ! update(buffer,count); ! runmutex_.lock(); } ! runmutex_.unlock(); delete []buffer; } ! void FileStreamUpdater::setLooping(bool loop) { looping_=loop; } Index: groupsource.cpp =================================================================== RCS file: /cvsroot/alpp/openalpp/src/groupsource.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** groupsource.cpp 3 Dec 2003 08:39:09 -0000 1.7 --- groupsource.cpp 2 Mar 2004 07:50:27 -0000 1.8 *************** *** 6,10 **** * OpenAL (http://www.openal.org), * PortAudio (http://www.portaudio.com/), and - * CommonC++ (http://cplusplus.sourceforge.net/) * * This library is free software; you can redistribute it and/or --- 6,9 ---- *************** *** 25,30 **** #include "openalpp/groupsource.h" ! namespace openalpp { ! GroupSource::GroupSource(float x,float y,float z) throw (NameError) : SourceBase(x,y,z),mixed_(false) { --- 24,29 ---- #include "openalpp/groupsource.h" ! using namespace openalpp; ! GroupSource::GroupSource(float x,float y,float z) throw (NameError) : SourceBase(x,y,z),mixed_(false) { *************** *** 35,46 **** } ! void GroupSource::Play() throw (InitError,FileError) { try { if(!mixed_) ! MixSources(); } catch(InitError error) { throw InitError("Sources must be included before trying to play"); } ! SourceBase::Play(); } --- 34,45 ---- } ! void GroupSource::play() throw (InitError,FileError) { try { if(!mixed_) ! mixSources(); } catch(InitError error) { throw InitError("Sources must be included before trying to play"); } ! SourceBase::play(); } *************** *** 106,110 **** } ! ALfloat GroupSource::FilterDistance(ALuint source,Speaker speaker) { ALfloat gain,maxdist,refdist,rolloff,position[3],direction[3],orientation[6]; ALfloat iangle,oangle,ogain,dist,right[3]; --- 105,109 ---- } ! ALfloat GroupSource::filterDistance(ALuint source,Speaker speaker) { ALfloat gain,maxdist,refdist,rolloff,position[3],direction[3],orientation[6]; ALfloat iangle,oangle,ogain,dist,right[3]; *************** *** 244,248 **** } ! ALshort *GroupSource::FilterReverb(Source *source,ALshort *buffer, ALsizei &size,unsigned int frequency) { if(!reverbinitiated_) --- 243,247 ---- } ! ALshort *GroupSource::filterReverb(Source *source,ALshort *buffer, ALsizei &size,unsigned int frequency) { if(!reverbinitiated_) *************** *** 250,255 **** // out=in[i]+scale*in[i-delay] ALfloat delay,scale; ! delay=source->GetReverbDelay(); ! scale=source->GetReverbScale(); if(delay==0.0 || scale==0.0) return buffer; --- 249,254 ---- // out=in[i]+scale*in[i-delay] ALfloat delay,scale; ! delay=source->getReverbDelay(); ! scale=source->getReverbScale(); if(delay==0.0 || scale==0.0) return buffer; *************** *** 281,290 **** * Apply filters to source. */ ! ALshort *GroupSource::ApplyFilters(Source *source,ALshort *buffer, ALsizei &size,unsigned int frequency){ // Apply filters: doppler,pitch,{da,reverb,coning,minmax},listenergain // - * * * * * - ! ALuint sourcename=source->GetAlSource(); ALfloat pitch,lgain,rgain; --- 280,289 ---- * Apply filters to source. */ ! ALshort *GroupSource::applyFilters(Source *source,ALshort *buffer, ALsizei &size,unsigned int frequency){ // Apply filters: doppler,pitch,{da,reverb,coning,minmax},listenergain // - * * * * * - ! ALuint sourcename=source->getAlSource(); ALfloat pitch,lgain,rgain; *************** *** 327,333 **** } ! lgain=FilterDistance(sourcename,Left); ! rgain=FilterDistance(sourcename,Right); ! buffer=FilterReverb(source,buffer,size,frequency); ALfloat min,max; // minmax filter #ifndef WIN32 --- 326,332 ---- } ! lgain=filterDistance(sourcename,Left); ! rgain=filterDistance(sourcename,Right); ! buffer=filterReverb(source,buffer,size,frequency); ALfloat min,max; // minmax filter #ifndef WIN32 *************** *** 357,361 **** } ! void GroupSource::MixSources(unsigned int frequency) throw (InitError,FileError,FatalError,MemoryError,ValueError) { ALshort *loaddata=NULL,*data=NULL,*bdata=NULL; --- 356,360 ---- } ! void GroupSource::mixSources(unsigned int frequency) throw (InitError,FileError,FatalError,MemoryError,ValueError) { ALshort *loaddata=NULL,*data=NULL,*bdata=NULL; *************** *** 368,375 **** throw InitError("Sources must be included before trying to mix"); ! std::cerr << ((Sample &)sources_[0]->GetSound()).GetFileName().c_str() << "\n"; success= ! alutLoadWAV(((Sample &)sources_[0]->GetSound()).GetFileName().c_str(), (ALvoid **)&loaddata,&format,&loadsize,&bits,&freq); if(success==AL_FALSE || !loaddata) --- 367,374 ---- throw InitError("Sources must be included before trying to mix"); ! std::cerr << ((Sample &)sources_[0]->getSound()).getFileName() << "\n"; success= ! alutLoadWAV(((Sample &)sources_[0]->getSound()).getFileName().c_str(), (ALvoid **)&loaddata,&format,&loadsize,&bits,&freq); if(success==AL_FALSE || !loaddata) *************** *** 377,381 **** bsize=loadsize; ! bdata=(ALshort *)converter.Apply(loaddata,format, (unsigned int)freq,(unsigned int)bsize); --- 376,380 ---- bsize=loadsize; ! bdata=(ALshort *)converter.apply(loaddata,format, (unsigned int)freq,(unsigned int)bsize); *************** *** 385,393 **** free(loaddata); ! bdata=ApplyFilters(sources_[0],bdata,bsize,frequency); for(unsigned int s=1;s<sources_.size();s++) { success= ! alutLoadWAV(((Sample &)sources_[s]->GetSound()).GetFileName().c_str(), (ALvoid **)&loaddata,&format,&loadsize,&bits,&freq); if(success==AL_FALSE || !loaddata) --- 384,392 ---- free(loaddata); ! bdata=applyFilters(sources_[0],bdata,bsize,frequency); for(unsigned int s=1;s<sources_.size();s++) { success= ! alutLoadWAV(((Sample &)sources_[s]->getSound()).getFileName().c_str(), (ALvoid **)&loaddata,&format,&loadsize,&bits,&freq); if(success==AL_FALSE || !loaddata) *************** *** 395,399 **** size=loadsize; ! data=(ALshort *)converter.Apply(loaddata,format, (unsigned int)freq,(unsigned int)size); if(!data) --- 394,398 ---- size=loadsize; ! data=(ALshort *)converter.apply(loaddata,format, (unsigned int)freq,(unsigned int)size); if(!data) *************** *** 402,406 **** free(loaddata); ! data=ApplyFilters(sources_[s],data,size,frequency); if(size>bsize) { --- 401,405 ---- free(loaddata); ! data=applyFilters(sources_[s],data,size,frequency); if(size>bsize) { *************** *** 438,456 **** } ! ALuint GroupSource::IncludeSource(Source *source) throw (ValueError) { ! if(source->IsStreaming()) throw ValueError("Can't include streaming sources in group."); sources_.push_back(source); ! return source->GetAlSource(); } ! void GroupSource::ExcludeSource(const Source &source) throw (NameError) { ! ALuint sourcename=source.GetAlSource(); ! ExcludeSource(sourcename); } ! void GroupSource::ExcludeSource(ALuint sourcename) throw (NameError) { for(unsigned int i=0;i<sources_.size();i++) { ! if(sourcename==sources_[i]->GetAlSource()) { sources_[i]=sources_[sources_.size()-1]; sources_.pop_back(); --- 437,455 ---- } ! ALuint GroupSource::includeSource(Source *source) throw (ValueError) { ! if(source->isStreaming()) throw ValueError("Can't include streaming sources in group."); sources_.push_back(source); ! return source->getAlSource(); } ! void GroupSource::excludeSource(const Source &source) throw (NameError) { ! ALuint sourcename=source.getAlSource(); ! excludeSource(sourcename); } ! void GroupSource::excludeSource(ALuint sourcename) throw (NameError) { for(unsigned int i=0;i<sources_.size();i++) { ! if(sourcename==sources_[i]->getAlSource()) { sources_[i]=sources_[sources_.size()-1]; sources_.pop_back(); *************** *** 483,485 **** } ! } --- 482,484 ---- } ! Index: listener.cpp =================================================================== RCS file: /cvsroot/alpp/openalpp/src/listener.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** listener.cpp 18 Oct 2002 07:50:13 -0000 1.3 --- listener.cpp 2 Mar 2004 07:50:27 -0000 1.4 *************** *** 6,10 **** * OpenAL (http://www.openal.org), * PortAudio (http://www.portaudio.com/), and - * CommonC++ (http://cplusplus.sourceforge.net/) * * This library is free software; you can redistribute it and/or --- 6,9 ---- *************** *** 25,29 **** #include "openalpp/listener.h" ! namespace openalpp { Listener *Listener::selectedlistener_=NULL; --- 24,28 ---- #include "openalpp/listener.h" ! using namespace openalpp; Listener *Listener::selectedlistener_=NULL; *************** *** 32,55 **** * Internal function for initialisation. */ ! void Listener::Init(float x,float y,float z, float vx,float vy,float vz, float directionx, float directiony, float directionz, float upx, float upy, float upz) { ! SetPosition(x,y,z); ! SetVelocity(vx,vy,vz); ! SetOrientation(directionx,directiony,directionz, upx,upy,upz); if(!selectedlistener_) ! Select(); } Listener::Listener() : PositionedObject() { ! Init(0,0,0, 0,0,0, 0,0,-1, 0,1,0); } Listener::Listener(const Listener &listener) : PositionedObject() { ! listener.GetPosition(position_[0],position_[1],position_[2]); ! listener.GetVelocity(velocity_[0],velocity_[1],velocity_[2]); ! listener.GetOrientation(orientation_[0],orientation_[1],orientation_[2], orientation_[3],orientation_[4],orientation_[5]); } --- 31,54 ---- * Internal function for initialisation. */ ! void Listener::init(float x,float y,float z, float vx,float vy,float vz, float directionx, float directiony, float directionz, float upx, float upy, float upz) { ! setPosition(x,y,z); ! setVelocity(vx,vy,vz); ! setOrientation(directionx,directiony,directionz, upx,upy,upz); if(!selectedlistener_) ! select(); } Listener::Listener() : PositionedObject() { ! init(0,0,0, 0,0,0, 0,0,-1, 0,1,0); } Listener::Listener(const Listener &listener) : PositionedObject() { ! listener.getPosition(position_[0],position_[1],position_[2]); ! listener.getVelocity(velocity_[0],velocity_[1],velocity_[2]); ! listener.getOrientation(orientation_[0],orientation_[1],orientation_[2], orientation_[3],orientation_[4],orientation_[5]); } *************** *** 58,66 **** float directionx, float directiony, float directionz, float upx, float upy, float upz) : PositionedObject() { ! Init(x,y,z, 0,0,0, directionx,directiony,directionz, upx,upy,upz); } Listener::Listener(float x, float y, float z) : PositionedObject() { ! Init(x,y,z, 0,0,0, 0,0,-1, 0,1,0); } --- 57,67 ---- float directionx, float directiony, float directionz, float upx, float upy, float upz) : PositionedObject() { ! ! init(x,y,z, 0,0,0, directionx,directiony,directionz, upx,upy,upz); ! } Listener::Listener(float x, float y, float z) : PositionedObject() { ! init(x,y,z, 0,0,0, 0,0,-1, 0,1,0); } *************** *** 70,74 **** } ! void Listener::Select() { alListenerfv(AL_POSITION,position_); alListenerfv(AL_VELOCITY,velocity_); --- 71,75 ---- } ! void Listener::select() { alListenerfv(AL_POSITION,position_); alListenerfv(AL_VELOCITY,velocity_); *************** *** 77,85 **** } ! bool Listener::IsSelected() { return (selectedlistener_==this); } ! void Listener::SetOrientation(float directionx,float directiony, float directionz, float upx, float upy, float upz) { --- 78,86 ---- } ! bool Listener::isSelected() { return (selectedlistener_==this); } ! void Listener::setOrientation(float directionx,float directiony, float directionz, float upx, float upy, float upz) { *************** *** 90,98 **** orientation_[4]=upy; orientation_[5]=upz; ! if(IsSelected()) alListenerfv(AL_ORIENTATION,orientation_); } ! void Listener::GetOrientation(float &directionx,float &directiony, float &directionz, float &upx, float &upy, float &upz) const { --- 91,99 ---- orientation_[4]=upy; orientation_[5]=upz; ! if(isSelected()) alListenerfv(AL_ORIENTATION,orientation_); } ! void Listener::getOrientation(float &directionx,float &directiony, float &directionz, float &upx, float &upy, float &upz) const { *************** *** 107,113 **** Listener &Listener::operator=(const Listener &listener) { if(this!=&listener) { ! listener.GetPosition(position_[0],position_[1],position_[2]); ! listener.GetVelocity(velocity_[0],velocity_[1],velocity_[2]); ! listener.GetOrientation(orientation_[0],orientation_[1],orientation_[2], orientation_[3],orientation_[4],orientation_[5]); } --- 108,114 ---- Listener &Listener::operator=(const Listener &listener) { if(this!=&listener) { ! listener.getPosition(position_[0],position_[1],position_[2]); ! listener.getVelocity(velocity_[0],velocity_[1],velocity_[2]); ! listener.getOrientation(orientation_[0],orientation_[1],orientation_[2], orientation_[3],orientation_[4],orientation_[5]); } *************** *** 115,127 **** } ! void Listener::SetPosition(float x, float y, float z) { position_[0]=x; position_[1]=y; position_[2]=z; ! if(IsSelected()) alListenerfv(AL_POSITION,position_); } ! void Listener::GetPosition(float &x, float &y, float &z) const { x=position_[0]; y=position_[1]; --- 116,128 ---- } ! void Listener::setPosition(float x, float y, float z) { position_[0]=x; position_[1]=y; position_[2]=z; ! if(isSelected()) alListenerfv(AL_POSITION,position_); } ! void Listener::getPosition(float &x, float &y, float &z) const { x=position_[0]; y=position_[1]; *************** *** 129,141 **** } ! void Listener::SetVelocity(float vx, float vy, float vz) { velocity_[0]=vx; velocity_[1]=vy; velocity_[2]=vz; ! if(IsSelected()) alListenerfv(AL_VELOCITY,velocity_); } ! void Listener::GetVelocity(float &vx, float &vy, float &vz) const { vx=velocity_[0]; vy=velocity_[1]; --- 130,142 ---- } ! void Listener::setVelocity(float vx, float vy, float vz) { velocity_[0]=vx; velocity_[1]=vy; velocity_[2]=vz; ! if(isSelected()) alListenerfv(AL_VELOCITY,velocity_); } ! void Listener::getVelocity(float &vx, float &vy, float &vz) const { vx=velocity_[0]; vy=velocity_[1]; *************** *** 143,145 **** } - } --- 144,145 ---- Index: nofilestream.cpp =================================================================== RCS file: /cvsroot/alpp/openalpp/src/nofilestream.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** nofilestream.cpp 23 May 2003 22:13:20 -0000 1.4 --- nofilestream.cpp 2 Mar 2004 07:50:27 -0000 1.5 *************** *** 6,10 **** * OpenAL (http://www.openal.org), * PortAudio (http://www.portaudio.com/), and - * CommonC++ (http://cplusplus.sourceforge.net/) * * This library is free software; you can redistribute it and/or --- 6,9 ---- *************** *** 43,47 **** } ! void FileStream::SetLooping(bool loop) { } --- 42,46 ---- } ! void FileStream::setLooping(bool) { } Index: noinputdevice.cpp =================================================================== RCS file: /cvsroot/alpp/openalpp/src/noinputdevice.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** noinputdevice.cpp 28 Feb 2003 08:36:23 -0000 1.3 --- noinputdevice.cpp 2 Mar 2004 07:50:27 -0000 1.4 *************** *** 6,10 **** * OpenAL (http://www.openal.org), * PortAudio (http://www.portaudio.com/), and - * CommonC++ (http://cplusplus.sourceforge.net/) * * This library is free software; you can redistribute it and/or --- 6,9 ---- *************** *** 30,44 **** int InputDevice::nobjects_=0; ! void InputDevice::Init() { throw InitError("No input device support compiled in."); } InputDevice::InputDevice() { ! Init(); } InputDevice::InputDevice(int /*device*/, unsigned int /*samplerate*/, unsigned int /*buffersize*/, SampleFormat /*format*/) { ! Init(); } --- 29,43 ---- int InputDevice::nobjects_=0; ! void InputDevice::init() { throw InitError("No input device support compiled in."); } InputDevice::InputDevice() { ! init(); } InputDevice::InputDevice(int /*device*/, unsigned int /*samplerate*/, unsigned int /*buffersize*/, SampleFormat /*format*/) { ! init(); } Index: nostreaming.cpp =================================================================== RCS file: /cvsroot/alpp/openalpp/src/nostreaming.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** nostreaming.cpp 16 Apr 2003 11:15:06 -0000 1.2 --- nostreaming.cpp 2 Mar 2004 07:50:27 -0000 1.3 *************** *** 6,10 **** * OpenAL (http://www.openal.org), * PortAudio (http://www.portaudio.com/), and - * CommonC++ (http://cplusplus.sourceforge.net/) * * This library is free software; you can redistribute it and/or --- 6,9 ---- *************** *** 35,39 **** } ! Stream &Stream::operator=(const Stream &stream) { return *this; } --- 34,38 ---- } ! Stream &Stream::operator=(const Stream &) { return *this; } *************** *** 42,52 **** } ! void Stream::Record(ALuint sourcename) { } ! void Stream::Stop(ALuint sourcename) { } ! NetStream::NetStream(ost::UDPSocket *socket,ost::TCPStream *controlsocket) : Stream() { } --- 41,51 ---- } ! void Stream::record(ALuint) { } ! void Stream::stop(ALuint) { } ! /*NetStream::NetStream(ost::UDPSocket *socket,ost::TCPStream *controlsocket) : Stream() { } *************** *** 55,59 **** unsigned int frequency,unsigned int packetsize) : Stream() { ! } --- 54,58 ---- unsigned int frequency,unsigned int packetsize) : Stream() { ! }*/ *************** *** 64,68 **** } ! NetStream &NetStream::operator=(const NetStream &stream) { return *this; } --- 63,67 ---- } ! NetStream &NetStream::operator=(const NetStream&) { return *this; } Index: sample.cpp =================================================================== RCS file: /cvsroot/alpp/openalpp/src/sample.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** sample.cpp 7 Mar 2003 20:28:06 -0000 1.6 --- sample.cpp 2 Mar 2004 07:50:27 -0000 1.7 *************** *** 6,10 **** * OpenAL (http://www.openal.org), * PortAudio (http://www.portaudio.com/), and - * CommonC++ (http://cplusplus.sourceforge.net/) * * This library is free software; you can redistribute it and/or --- 6,9 ---- *************** *** 26,32 **** #include <sstream> ! namespace openalpp { ! Sample::Sample(const char *filename) throw (FileError) : SoundData(),filename_(filename) { ALsizei size,bits,freq; --- 25,31 ---- #include <sstream> ! using namespace openalpp; ! Sample::Sample(const std::string& filename) throw (FileError) : SoundData(),filename_(filename) { ALsizei size,bits,freq; *************** *** 35,39 **** ALboolean success; ! success=alutLoadWAV(filename,&data,&format,&size,&bits,&freq); if(success==AL_TRUE && data ) { alBufferData(buffername_,format,data,size,freq); --- 34,38 ---- ALboolean success; ! success=alutLoadWAV(filename.c_str(),&data,&format,&size,&bits,&freq); if(success==AL_TRUE && data ) { alBufferData(buffername_,format,data,size,freq); *************** *** 52,56 **** } ! std::string Sample::GetFileName() const { return filename_; } --- 51,55 ---- } ! std::string Sample::getFileName() const { return filename_; } *************** *** 65,69 **** // A couple of utility functions. Might move them to their own file later... ! unsigned int SampleSize(SampleFormat format) { switch(format) { case(Mono8): --- 64,68 ---- // A couple of utility functions. Might move them to their own file later... ! unsigned int openalpp::sampleSize(SampleFormat format) { switch(format) { case(Mono8): *************** *** 82,86 **** } ! unsigned int SampleSize(ALenum format) { switch(format) { case(AL_FORMAT_MONO8): --- 81,85 ---- } ! unsigned int openalpp::sampleSize(ALenum format) { switch(format) { case(AL_FORMAT_MONO8): *************** *** 99,101 **** } - } --- 98,99 ---- Index: sounddata.cpp =================================================================== RCS file: /cvsroot/alpp/openalpp/src/sounddata.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** sounddata.cpp 18 Oct 2002 07:50:14 -0000 1.3 --- sounddata.cpp 2 Mar 2004 07:50:27 -0000 1.4 *************** *** 6,10 **** * OpenAL (http://www.openal.org), * PortAudio (http://www.portaudio.com/), and - * CommonC++ (http://cplusplus.sourceforge.net/) * * This library is free software; you can redistribute it and/or --- 6,9 ---- *************** *** 25,29 **** #include "openalpp/sounddata.h" ! namespace openalpp { SoundData::SoundBuffer::SoundBuffer() throw (NameError) { --- 24,28 ---- #include "openalpp/sounddata.h" ! using namespace openalpp; SoundData::SoundBuffer::SoundBuffer() throw (NameError) { *************** *** 38,47 **** } ! SoundData::SoundBuffer *SoundData::SoundBuffer::Reference() { refcount_++; return this; } ! void SoundData::SoundBuffer::DeReference() throw (FatalError) { refcount_--; if(!refcount_) --- 37,46 ---- } ! SoundData::SoundBuffer *SoundData::SoundBuffer::reference() { refcount_++; return this; } ! void SoundData::SoundBuffer::deReference() throw (FatalError) { refcount_--; if(!refcount_) *************** *** 55,72 **** SoundData::SoundData() throw (NameError,InitError) : AudioBase() { buffer_=new SoundBuffer(); ! buffername_=buffer_->GetName(); } SoundData::SoundData(const SoundData &sounddata) : AudioBase(/*(const AudioBase &)sounddata*/) { ! buffer_=sounddata.buffer_->Reference(); ! buffername_=buffer_->GetName(); } SoundData::~SoundData() { ! buffer_->DeReference(); } ! ALuint SoundData::GetAlBuffer() const { return buffername_; } --- 54,71 ---- SoundData::SoundData() throw (NameError,InitError) : AudioBase() { buffer_=new SoundBuffer(); ! buffername_=buffer_->getName(); } SoundData::SoundData(const SoundData &sounddata) : AudioBase(/*(const AudioBase &)sounddata*/) { ! buffer_=sounddata.buffer_->reference(); ! buffername_=buffer_->getName(); } SoundData::~SoundData() { ! buffer_->deReference(); } ! ALuint SoundData::getAlBuffer() const { return buffername_; } *************** *** 74,83 **** SoundData &SoundData::operator=(const SoundData &sounddata) { if(this!=&sounddata) { ! buffer_->DeReference(); ! buffer_=sounddata.buffer_->Reference(); ! buffername_=buffer_->GetName(); } return *this; } - } --- 73,81 ---- SoundData &SoundData::operator=(const SoundData &sounddata) { if(this!=&sounddata) { ! buffer_->deReference(); ! buffer_=sounddata.buffer_->reference(); ! buffername_=buffer_->getName(); } return *this; } Index: source.cpp =================================================================== RCS file: /cvsroot/alpp/openalpp/src/source.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** source.cpp 19 Feb 2003 18:35:13 -0000 1.8 --- source.cpp 2 Mar 2004 07:50:27 -0000 1.9 *************** *** 6,10 **** * OpenAL (http://www.openal.org), * PortAudio (http://www.portaudio.com/), and - * CommonC++ (http://cplusplus.sourceforge.net/) * * This library is free software; you can redistribute it and/or --- 6,9 ---- *************** *** 25,29 **** #include "openalpp/source.h" ! namespace openalpp { Source::Source(float x, float y, float z) : SourceBase(x,y,z) { --- 24,28 ---- #include "openalpp/source.h" ! using namespace openalpp; Source::Source(float x, float y, float z) : SourceBase(x,y,z) { *************** *** 36,40 **** streaming_=false; sounddata_=new Sample(filename); ! alSourcei(sourcename_,AL_BUFFER,sounddata_->GetAlBuffer()); } --- 35,39 ---- streaming_=false; sounddata_=new Sample(filename); ! alSourcei(sourcename_,AL_BUFFER,sounddata_->getAlBuffer()); } *************** *** 43,50 **** streaming_=false; sounddata_=new Sample(buffer); ! alSourcei(sourcename_,AL_BUFFER,sounddata_->GetAlBuffer()); } ! Source::Source(const Stream &stream,float x,float y,float z) : SourceBase(x,y,z) { streaming_=true; --- 42,50 ---- streaming_=false; sounddata_=new Sample(buffer); ! alSourcei(sourcename_,AL_BUFFER,sounddata_->getAlBuffer()); } ! ! Source::Source(const Stream &stream,float x,float y,float z) : SourceBase(x,y,z) { streaming_=true; *************** *** 56,67 **** streaming_=source.streaming_; if(streaming_) ! sounddata_=new Stream((const Stream &)source.GetSound()); else ! sounddata_=new Sample((const Sample &)source.GetSound()); ! alSourcei(sourcename_,AL_BUFFER,sounddata_->GetAlBuffer()); } Source::~Source() { ! Stop(); if (sounddata_) delete sounddata_; --- 56,67 ---- streaming_=source.streaming_; if(streaming_) ! sounddata_=new Stream((const Stream &)source.getSound()); else ! sounddata_=new Sample((const Sample &)source.getSound()); ! alSourcei(sourcename_,AL_BUFFER,sounddata_->getAlBuffer()); } Source::~Source() { ! stop(); if (sounddata_) delete sounddata_; *************** *** 72,92 **** // TODO: Add flag for wether the sound should be loaded. This is useful for // dummy sources that will be used only for groupsources. ! void Source::SetSound(const char *filename) { streaming_=false; if (sounddata_) delete sounddata_; sounddata_=new Sample(filename); ! alSourcei(sourcename_,AL_BUFFER,sounddata_->GetAlBuffer()); } ! void Source::SetSound(const Sample &buffer) { streaming_=false; if (sounddata_) delete sounddata_; sounddata_=new Sample(buffer); ! alSourcei(sourcename_,AL_BUFFER,sounddata_->GetAlBuffer()); } ! void Source::SetSound(const Stream &stream) { streaming_=true; if (sounddata_) --- 72,92 ---- // TODO: Add flag for wether the sound should be loaded. This is useful for // dummy sources that will be used only for groupsources. ! void Source::setSound(const std::string& filename) { streaming_=false; if (sounddata_) delete sounddata_; sounddata_=new Sample(filename); ! alSourcei(sourcename_,AL_BUFFER,sounddata_->getAlBuffer()); } ! void Source::setSound(const Sample &buffer) { streaming_=false; if (sounddata_) delete sounddata_; sounddata_=new Sample(buffer); ! alSourcei(sourcename_,AL_BUFFER,sounddata_->getAlBuffer()); } ! void Source::setSound(const Stream &stream) { streaming_=true; if (sounddata_) *************** *** 95,139 **** } ! const SoundData &Source::GetSound() const { return *sounddata_; } ! void Source::Play(const char *filename) { ! SetSound(filename); ! SourceBase::Play(); } ! void Source::Play(const Sample &buffer) { ! SetSound(buffer); ! SourceBase::Play(); } ! void Source::Play(const Stream &stream) { alSourcei(sourcename_,AL_LOOPING,AL_FALSE); //Streaming sources can't loop... ! SetSound(stream); ! ((Stream *)sounddata_)->Record(sourcename_); ! SourceBase::Play(); } ! void Source::Play() { if(streaming_) { alSourcei(sourcename_,AL_LOOPING,AL_FALSE); //Streaming sources can't loop... ! ((Stream *)sounddata_)->Record(sourcename_); } ! SourceBase::Play(); } ! void Source::Stop() { if(streaming_) ! ((Stream *)sounddata_)->Stop(sourcename_); ! SourceBase::Stop(); } ! void Source::Pause() { ! SourceBase::Pause(); } ! bool Source::IsStreaming() { return streaming_; } --- 95,139 ---- } ! const SoundData &Source::getSound() const { return *sounddata_; } ! void Source::play(const std::string& filename) { ! setSound(filename.c_str()); ! SourceBase::play(); } ! void Source::play(const Sample &buffer) { ! setSound(buffer); ! SourceBase::play(); } ! void Source::play(const Stream &stream) { alSourcei(sourcename_,AL_LOOPING,AL_FALSE); //Streaming sources can't loop... ! setSound(stream); ! ((Stream *)sounddata_)->record(sourcename_); ! SourceBase::play(); } ! void Source::play() { if(streaming_) { alSourcei(sourcename_,AL_LOOPING,AL_FALSE); //Streaming sources can't loop... ! ((Stream *)sounddata_)->record(sourcename_); } ! SourceBase::play(); } ! void Source::stop() { if(streaming_) ! ((Stream *)sounddata_)->stop(sourcename_); ! SourceBase::stop(); } ! void Source::pause() { ! SourceBase::pause(); } ! bool Source::isStreaming() { return streaming_; } *************** *** 153,155 **** } - } --- 153,154 ---- Index: sourcebase.cpp =================================================================== RCS file: /cvsroot/alpp/openalpp/src/sourcebase.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** sourcebase.cpp 23 May 2003 14:20:33 -0000 1.7 --- sourcebase.cpp 2 Mar 2004 07:50:27 -0000 1.8 *************** *** 6,10 **** * OpenAL (http://www.openal.org), * PortAudio (http://www.portaudio.com/), and - * CommonC++ (http://cplusplus.sourceforge.net/) * * This library is free software; you can redistribute it and/or --- 6,9 ---- *************** *** 30,44 **** */ ! namespace openalpp { ! void SourceBase::Init() throw (MemoryError,NameError) { alGenSources(1,&sourcename_); if(alGetError()!=AL_FALSE) throw NameError("Couldn't generate source name"); nlinkedsources_=1; alloclinkedsources_=2; ! linkedsources_=(ALuint *)malloc(sizeof(ALuint)*alloclinkedsources_); if(!linkedsources_) ! throw MemoryError("malloc failed"); linkedsources_[0]=sourcename_; reverbscale_=0.25; --- 29,46 ---- */ ! using namespace openalpp; ! void SourceBase::init() throw (MemoryError,NameError) { alGenSources(1,&sourcename_); if(alGetError()!=AL_FALSE) throw NameError("Couldn't generate source name"); + nlinkedsources_=1; alloclinkedsources_=2; ! //linkedsources_=(ALuint *)malloc(sizeof(ALuint)*alloclinkedsources_); ! linkedsources_ = new ALuint[alloclinkedsources_]; ! if(!linkedsources_) ! throw MemoryError("new failed"); linkedsources_[0]=sourcename_; reverbscale_=0.25; *************** *** 48,52 **** SourceBase::SourceBase() throw (MemoryError,NameError) : PositionedObject() { ! Init(); } --- 50,54 ---- SourceBase::SourceBase() throw (MemoryError,NameError) : PositionedObject() { ! init(); } *************** *** 54,128 **** throw (MemoryError,NameError) : PositionedObject() { ! Init(); ! SetPosition(x,y,z); } SourceBase::~SourceBase() { ! Stop(); alDeleteSources(1,&sourcename_); ! free(linkedsources_); } SourceBase::SourceBase(const SourceBase &sourcebase) : PositionedObject(sourcebase) { ! float a,b,c; ! sourcebase.GetPosition(a,b,c); ! SetPosition(a,b,c); ! sourcebase.GetVelocity(a,b,c); ! SetVelocity(a,b,c); ! SetPitch(sourcebase.GetPitch()); ! sourcebase.GetDirection(a,b,c); ! SetDirection(a,b,c); ! sourcebase.GetSoundCone(a,b,c); ! SetSoundCone(a,b,c); ! sourcebase.GetMinMaxGain(a,b); ! SetMinMaxGain(a,b); ! SetReferenceDistance(sourcebase.GetReferenceDistance()); ! SetRolloffFactor(sourcebase.GetRolloffFactor()); ! SetMaxDistance(sourcebase.GetMaxDistance()); ! SetLooping(sourcebase.IsLooping()); ! SetGain(sourcebase.GetGain()); } SourceBase &SourceBase::operator=(const SourceBase &sourcebase) { ! if(this!=&sourcebase) { ! float a,b,c; ! sourcebase.GetPosition(a,b,c); ! SetPosition(a,b,c); ! sourcebase.GetVelocity(a,b,c); ! SetVelocity(a,b,c); ! SetPitch(sourcebase.GetPitch()); ! sourcebase.GetDirection(a,b,c); ! SetDirection(a,b,c); ! sourcebase.GetSoundCone(a,b,c); ! SetSoundCone(a,b,c); ! sourcebase.GetMinMaxGain(a,b); ! SetMinMaxGain(a,b); ! SetReferenceDistance(sourcebase.GetReferenceDistance()); ! SetRolloffFactor(sourcebase.GetRolloffFactor()); ! SetMaxDistance(sourcebase.GetMaxDistance()); ! SetLooping(sourcebase.IsLooping()); ! SetGain(sourcebase.GetGain()); ! } return *this; } ! void SourceBase::Play() { alSourcePlayv(nlinkedsources_,linkedsources_); } ! void SourceBase::Pause() { alSourcePausev(nlinkedsources_,linkedsources_); } ! void SourceBase::Stop() { alSourceStopv(nlinkedsources_,linkedsources_); } ! void SourceBase::Rewind() { alSourceRewindv(nlinkedsources_,linkedsources_); } ! SourceState SourceBase::GetState() const { ALint state; alGetSourceiv(sourcename_,AL_SOURCE_STATE,&state); --- 56,140 ---- throw (MemoryError,NameError) : PositionedObject() { ! init(); ! setPosition(x,y,z); } SourceBase::~SourceBase() { ! stop(); alDeleteSources(1,&sourcename_); ! //free(linkedsources_); ! delete [] linkedsources_; } SourceBase::SourceBase(const SourceBase &sourcebase) : PositionedObject(sourcebase) { ! ! if(this==&sourcebase) ! return; ! ! *this = sourcebase; ! ! ! /* float a,b,c; ! sourcebase.getPosition(a,b,c); ! setPosition(a,b,c); ! sourcebase.getVelocity(a,b,c); ! setVelocity(a,b,c); ! setPitch(sourcebase.getPitch()); ! sourcebase.getDirection(a,b,c); ! setDirection(a,b,c); ! sourcebase.getSoundCone(a,b,c); ! setSoundCone(a,b,c); ! sourcebase.getMinMaxGain(a,b); ! setMinMaxGain(a,b); ! setReferenceDistance(sourcebase.getReferenceDistance()); ! setRolloffFactor(sourcebase.getRolloffFactor()); ! setMaxDistance(sourcebase.getMaxDistance()); ! setLooping(sourcebase.isLooping()); ! setGain(sourcebase.getGain());*/ } SourceBase &SourceBase::operator=(const SourceBase &sourcebase) { ! if(this==&sourcebase) ! return *this; ! ! float a,b,c; ! sourcebase.getPosition(a,b,c); ! setPosition(a,b,c); ! sourcebase.getVelocity(a,b,c); ! setVelocity(a,b,c); ! setPitch(sourcebase.getPitch()); ! sourcebase.getDirection(a,b,c); ! setDirection(a,b,c); ! sourcebase.getSoundCone(a,b,c); ! setSoundCone(a,b,c); ! sourcebase.getMinMaxGain(a,b); ! setMinMaxGain(a,b); ! setReferenceDistance(sourcebase.getReferenceDistance()); ! setRolloffFactor(sourcebase.getRolloffFactor()); ! setMaxDistance(sourcebase.getMaxDistance()); ! setLooping(sourcebase.isLooping()); ! setGain(sourcebase.getGain()); ! return *this; } ! void SourceBase::play() { alSourcePlayv(nlinkedsources_,linkedsources_); } ! void SourceBase::pause() { alSourcePausev(nlinkedsources_,linkedsources_); } ! void SourceBase::stop() { alSourceStopv(nlinkedsources_,linkedsources_); } ! void SourceBase::rewind() { alSourceRewindv(nlinkedsources_,linkedsources_); } ! SourceState SourceBase::getState() const { ALint state; alGetSourceiv(sourcename_,AL_SOURCE_STATE,&state); *************** *** 141,145 **** } ! void SourceBase::SetLooping(bool loop) { if(loop && !streaming_) alSourcei(sourcename_,AL_LOOPING,AL_TRUE); --- 153,157 ---- } ! void SourceBase::setLooping(bool loop) { if(loop && !streaming_) alSourcei(sourcename_,AL_LOOPING,AL_TRUE); *************** *** 148,152 **** } ! bool SourceBase::IsLooping() const { ALint looping; alGetSourceiv(sourcename_,AL_LOOPING,&looping); --- 160,164 ---- } ! bool SourceBase::isLooping() const { ALint looping; alGetSourceiv(sourcename_,AL_LOOPING,&looping); *************** *** 154,162 **** } ! void SourceBase::SetDirection(float directionx, float directiony, float directionz) { alSource3f(sourcename_,AL_DIRECTION,directionx,directiony,directionz); } ! void SourceBase::GetDirection(float &directionx, float &directiony, float &directionz) const { ALfloat direction[3]; alGetSourcefv(sourcename_,AL_DIRECTION,direction); --- 166,174 ---- } ! void SourceBase::setDirection(float directionx, float directiony, float directionz) { alSource3f(sourcename_,AL_DIRECTION,directionx,directiony,directionz); } ! void SourceBase::getDirection(float &directionx, float &directiony, float &directionz) const { ALfloat direction[3]; alGetSourcefv(sourcename_,AL_DIRECTION,direction); *************** *** 166,174 **** } ! void SourceBase::MakeOmniDirectional() { alSource3f(sourcename_,AL_DIRECTION,0.0,0.0,0.0); } ! void SourceBase::SetSoundCone(float innerangle, float outerangle, float outergain) { alSourcef(sourcename_,AL_CONE_INNER_ANGLE,innerangle); alSourcef(sourcename_,AL_CONE_OUTER_ANGLE,outerangle); --- 178,186 ---- } ! void SourceBase::makeOmniDirectional() { alSource3f(sourcename_,AL_DIRECTION,0.0,0.0,0.0); } ! void SourceBase::setSoundCone(float innerangle, float outerangle, float outergain) { alSourcef(sourcename_,AL_CONE_INNER_ANGLE,innerangle); alSourcef(sourcename_,AL_CONE_OUTER_ANGLE,outerangle); *************** *** 176,180 **** } ! void SourceBase::GetSoundCone(float &innerangle, float &outerangle, float &outergain) const { alGetSourcefv(sourcename_,AL_CONE_INNER_ANGLE,&innerangle); alGetSourcefv(sourcename_,AL_CONE_OUTER_ANGLE,&outerangle); --- 188,192 ---- } ! void SourceBase::getSoundCone(float &innerangle, float &outerangle, float &outergain) const { alGetSourcefv(sourcename_,AL_CONE_INNER_ANGLE,&innerangle); alGetSourcefv(sourcename_,AL_CONE_OUTER_ANGLE,&outerangle); *************** *** 182,186 **** } ! void SourceBase::SetGain(float gain) { alSourcef(sourcename_,AL_GAIN,gain); ALenum error=alGetError(); --- 194,198 ---- } ! void SourceBase::setGain(float gain) { alSourcef(sourcename_,AL_GAIN,gain); ALenum error=alGetError(); *************** *** 195,199 **** } ! float SourceBase::GetGain() const { ALfloat gain; alGetSourcefv(sourcename_,AL_GAIN,&gain); --- 207,211 ---- } ! float SourceBase::getGain() const { ALfloat gain; alGetSourcefv(sourcename_,AL_GAIN,&gain); *************** *** 201,205 **** } ! void SourceBase::SetMinMaxGain(float min, float max) { alSourcef(sourcename_,AL_MIN_GAIN,min); alSourcef(sourcename_,AL_MAX_GAIN,max); --- 213,217 ---- } ! void SourceBase::setMinMaxGain(float min, float max) { alSourcef(sourcename_,AL_MIN_GAIN,min); alSourcef(sourcename_,AL_MAX_GAIN,max); *************** *** 215,224 **** } ! void SourceBase::GetMinMaxGain(float & min, float &max) const { alGetSourcefv(sourcename_,AL_MIN_GAIN,&min); alGetSourcefv(sourcename_,AL_MAX_GAIN,&max); } ! void SourceBase::SetAmbient(bool ambient) { if(ambient) { alSourcei(sourcename_,AL_SOURCE_RELATIVE,AL_TRUE); --- 227,236 ---- } ! void SourceBase::getMinMaxGain(float & min, float &max) const { alGetSourcefv(sourcename_,AL_MIN_GAIN,&min); alGetSourcefv(sourcename_,AL_MAX_GAIN,&max); } ! void SourceBase::setAmbient(bool ambient) { if(ambient) { alSourcei(sourcename_,AL_SOURCE_RELATIVE,AL_TRUE); *************** *** 226,230 **** // TODO: if AL_ROLLOFF_FACTOR doesn't work; set // AL_MAX_GAIN=AL_MIN_GAIN=AL_GAIN for this source.. ! MakeOmniDirectional(); } else { alSourcei(sourcename_,AL_SOURCE_RELATIVE,AL_FALSE); --- 238,242 ---- // TODO: if AL_ROLLOFF_FACTOR doesn't work; set // AL_MAX_GAIN=AL_MIN_GAIN=AL_GAIN for this source.. ! makeOmniDirectional(); } else { alSourcei(sourcename_,AL_SOURCE_RELATIVE,AL_FALSE); *************** *** 235,239 **** } ! bool SourceBase::IsAmbient() const { ALint relative; alGetSourceiv(sourcename_,AL_SOURCE_RELATIVE,&relative); --- 247,251 ---- } ! bool SourceBase::isAmbient() const { ALint relative; alGetSourceiv(sourcename_,AL_SOURCE_RELATIVE,&relative); *************** *** 243,247 **** } ! void SourceBase::SetRelative(bool relative) { if(relative) alSourcei(sourcename_,AL_SOURCE_RELATIVE,AL_TRUE); --- 255,259 ---- } ! void SourceBase::setRelative(bool relative) { if(relative) alSourcei(sourcename_,AL_SOURCE_RELATIVE,AL_TRUE); *************** *** 250,254 **** } ! bool SourceBase::IsRelative() const { ALint relative; alGetSourceiv(sourcename_,AL_SOURCE_RELATIVE,&relative); --- 262,266 ---- } ! bool SourceBase::isRelative() const { ALint relative; alGetSourceiv(sourcename_,AL_SOURCE_RELATIVE,&relative); *************** *** 256,260 **** } ! void SourceBase::SetReferenceDistance(float distance) { alSourcef(sourcename_,AL_REFERENCE_DISTANCE,distance); if(alGetError()!=AL_FALSE) --- 268,272 ---- } ! void SourceBase::setReferenceDistance(float distance) { alSourcef(sourcename_,AL_REFERENCE_DISTANCE,distance); if(alGetError()!=AL_FALSE) *************** *** 262,266 **** } ! float SourceBase::GetReferenceDistance() const { ALfloat ref; alGetSourcefv(sourcename_,AL_REFERENCE_DISTANCE,&ref); --- 274,278 ---- } ! float SourceBase::getReferenceDistance() const { ALfloat ref; alGetSourcefv(sourcename_,AL_REFERENCE_DISTANCE,&ref); *************** *** 268,272 **** } ! void SourceBase::SetMaxDistance(float distance) { alSourcef(sourcename_,AL_MAX_DISTANCE,distance); if(alGetError()!=AL_FALSE) --- 280,284 ---- } ! void SourceBase::setMaxDistance(float distance) { alSourcef(sourcename_,AL_MAX_DISTANCE,distance); if(alGetError()!=AL_FALSE) *************** *** 274,278 **** } ! float SourceBase::GetMaxDistance() const { ALfloat maxdistance; alGetSourcefv(sourcename_,AL_MAX_DISTANCE,&maxdistance); --- 286,290 ---- } ! float SourceBase::getMaxDistance() const { ALfloat maxdistance; alGetSourcefv(sourcename_,AL_MAX_DISTANCE,&maxdistance); *************** *** 280,284 **** } ! void SourceBase::SetRolloffFactor(float factor) { alSourcef(sourcename_,AL_ROLLOFF_FACTOR,factor); if(alGetError()!=AL_FALSE) --- 292,296 ---- } ! void SourceBase::setRolloffFactor(float factor) { alSourcef(sourcename_,AL_ROLLOFF_FACTOR,factor); if(alGetError()!=AL_FALSE) *************** *** 286,290 **** } ! float SourceBase::GetRolloffFactor() const { ALfloat factor; alGetSourcefv(sourcename_,AL_ROLLOFF_FACTOR,&factor); --- 298,302 ---- } ! float SourceBase::getRolloffFactor() const { ALfloat factor; alGetSourcefv(sourcename_,AL_ROLLOFF_FACTOR,&factor); *************** *** 292,296 **** } ! void SourceBase::SetPitch(float pitch) { alSourcef(sourcename_,AL_PITCH,pitch); ALenum error=alGetError(); --- 304,308 ---- } ! void SourceBase::setPitch(float pitch) { alSourcef(sourcename_,AL_PITCH,pitch); ALenum error=alGetError(); *************** *** 305,309 **** } ! float SourceBase::GetPitch() const { ALfloat pitch; alGetSourcefv(sourcename_,AL_PITCH,&pitch); --- 317,321 ---- } ! float SourceBase::getPitch() const { ALfloat pitch; alGetSourcefv(sourcename_,AL_PITCH,&pitch); *************** *** 311,315 **** } ! void SourceBase::SetReverbScale(float scale) throw (InitError,ValueError) { if(reverbinitiated_) { alReverbScale(sourcename_,scale); --- 323,327 ---- } ! void SourceBase::setReverbScale(float scale) throw (InitError,ValueError) { if(reverbinitiated_) { alReverbScale(sourcename_,scale); *************** *** 321,325 **** } ! void SourceBase::SetReverbDelay(float delay) throw (InitError,ValueError) { if(reverbinitiated_) { alReverbDelay(sourcename_,delay); --- 333,337 ---- } ! void SourceBase::setReverbDelay(float delay) throw (InitError,ValueError) { if(reverbinitiated_) { alReverbDelay(sourcename_,delay); *************** *** 331,335 **** } ! float SourceBase::GetReverbScale() throw (InitError) { if(!reverbinitiated_) throw InitError("Reverb not init... [truncated message content] |
Update of /cvsroot/alpp/openalpp/include/openalpp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26590/include/openalpp Modified Files: Makefile.am alpp.h audiobase.h audioconvert.h audioenvironment.h config.h error.h export.h filestream.h filestreamupdater.h groupsource.h inputdevice.h listener.h netstream.h positionedobject.h sample.h sounddata.h source.h sourcebase.h stream.h streamupdater.h windowsstuff.h Log Message: Changed from initial capital letter for methods. i.e. SetPosition() is now setPosition() to be more C++ compliant. Removed dependency of CommonC++ for threading. CHanged to OpenThreads which is GPL licensed. Removed tests for streaming over the net... (Due to Commonc++ removal) Index: Makefile.am =================================================================== RCS file: /cvsroot/alpp/openalpp/include/openalpp/Makefile.am,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Makefile.am 11 Dec 2003 09:32:49 -0000 1.4 --- Makefile.am 2 Mar 2004 07:50:27 -0000 1.5 *************** *** 10,15 **** inputdevice.h \ listener.h \ - netstream.h \ - netupdater.h \ positionedobject.h \ sample.h \ --- 10,13 ---- *************** *** 24,25 **** --- 22,26 ---- windowsstuff.h \ config.h + + # netstream.h \ + # netupdater.h \ Index: alpp.h =================================================================== RCS file: /cvsroot/alpp/openalpp/include/openalpp/alpp.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** alpp.h 16 Apr 2003 11:15:00 -0000 1.7 --- alpp.h 2 Mar 2004 07:50:27 -0000 1.8 *************** *** 6,10 **** * OpenAL (http://www.openal.org), * PortAudio (http://www.portaudio.com/), and - * CommonC++ (http://cplusplus.sourceforge.net/) * * This library is free software; you can redistribute it and/or --- 6,9 ---- *************** *** 38,43 **** #include "openalpp/groupsource.h" #include "openalpp/sample.h" ! #include "openalpp/inputdevice.h" ! #include "openalpp/netstream.h" #include "openalpp/filestream.h" --- 37,42 ---- #include "openalpp/groupsource.h" #include "openalpp/sample.h" ! //#include "openalpp/inputdevice.h" ! //#include "openalpp/netstream.h" #include "openalpp/filestream.h" Index: audiobase.h =================================================================== RCS file: /cvsroot/alpp/openalpp/include/openalpp/audiobase.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** audiobase.h 16 Apr 2003 11:15:00 -0000 1.5 --- audiobase.h 2 Mar 2004 07:50:27 -0000 1.6 *************** *** 6,10 **** * OpenAL (http://www.openal.org), * PortAudio (http://www.portaudio.com/), and - * CommonC++ (http://cplusplus.sourceforge.net/) * * This library is free software; you can redistribute it and/or --- 6,9 ---- *************** *** 39,48 **** * \mainpage * OpenAL++ is an object oriented API for OpenAL (www.openal.org). It also uses ! * PortAudio (www.portaudio.com) for audio capture and CommonC++ ! * (cplusplus.sourceforge.net) for portable threads and sockets. * In addition to the functionality of OpenAL and ALUT (the OpenAL utility ! * library), OpenAL++ has built-in support for streaming through network ! * sockets and input devices. OpenAL++ also supports "group sources," i.e. ! * sources that consist of several other sources mixed together. * * OpenAL++ has been tested on Windows and Linux. --- 38,44 ---- * \mainpage * OpenAL++ is an object oriented API for OpenAL (www.openal.org). It also uses ! * PortAudio (www.portaudio.com) for audio capture. * In addition to the functionality of OpenAL and ALUT (the OpenAL utility ! * library). * * OpenAL++ has been tested on Windows and Linux. Index: audioconvert.h =================================================================== RCS file: /cvsroot/alpp/openalpp/include/openalpp/audioconvert.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** audioconvert.h 16 Apr 2003 11:15:00 -0000 1.2 --- audioconvert.h 2 Mar 2004 07:50:27 -0000 1.3 *************** *** 10,14 **** * OpenAL (http://www.openal.org), * PortAudio (http://www.portaudio.com/), and - * CommonC++ (http://cplusplus.sourceforge.net/) * * This library is free software; you can redistribute it and/or --- 10,13 ---- *************** *** 60,64 **** * @param size is the size of the data. It will be updated to the new size. */ ! void *Apply(void *data,ALenum format,unsigned int frequency,unsigned int &size); }; --- 59,63 ---- * @param size is the size of the data. It will be updated to the new size. */ ! void *apply(void *data,ALenum format,unsigned int frequency,unsigned int &size); }; Index: audioenvironment.h =================================================================== RCS file: /cvsroot/alpp/openalpp/include/openalpp/audioenvironment.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** audioenvironment.h 16 Apr 2003 11:15:01 -0000 1.3 --- audioenvironment.h 2 Mar 2004 07:50:27 -0000 1.4 *************** *** 6,10 **** * OpenAL (http://www.openal.org), * PortAudio (http://www.portaudio.com/), and - * CommonC++ (http://cplusplus.sourceforge.net/) * * This library is free software; you can redistribute it and/or --- 6,9 ---- *************** *** 101,105 **** * @param speed is the speed of sound in length units per second. */ ! void SetSoundSpeed(float speed) throw (ValueError,FatalError); /** --- 100,104 ---- * @param speed is the speed of sound in length units per second. */ ! void setSoundVelocity(float speed) throw (ValueError,FatalError); /** *************** *** 107,111 **** * @return speed of sound in length units per second. */ ! float GetSoundSpeed() throw (FatalError); /** --- 106,110 ---- * @return speed of sound in length units per second. */ ! float getSoundVelocity() throw (FatalError); /** *************** *** 115,119 **** * @param factor has a default value of one. */ ! void SetDopplerFactor(float factor) throw (ValueError,FatalError); /** --- 114,118 ---- * @param factor has a default value of one. */ ! void setDopplerFactor(float factor) throw (ValueError,FatalError); /** *************** *** 121,125 **** * @return doppler factor. */ ! float GetDopplerFactor() throw (FatalError); /** --- 120,124 ---- * @return doppler factor. */ ! float getDopplerFactor() throw (FatalError); /** *************** *** 131,135 **** * @param gain is the gain [0.0,... */ ! void SetGain(float gain); /** --- 130,134 ---- * @param gain is the gain [0.0,... */ ! void setGain(float gain); /** *************** *** 137,141 **** * @return global gain */ ! float GetGain() throw (FatalError); /** --- 136,140 ---- * @return global gain */ ! float getGain() throw (FatalError); /** *************** *** 143,147 **** * @param model is one of: None, InverseDistance, InverseDistanceClamped. */ ! void SetDistanceModel(DistanceModel model) throw (FatalError); /** --- 142,146 ---- * @param model is one of: None, InverseDistance, InverseDistanceClamped. */ ! void setDistanceModel(DistanceModel model) throw (FatalError); /** *************** *** 149,158 **** * @return the model. */ ! DistanceModel GetDistanceModel() throw (FatalError); /** * Initiates Loki's reverb implementation. */ ! void InitiateReverb() throw (InitError); }; --- 148,157 ---- * @return the model. */ ! DistanceModel getDistanceModel() throw (FatalError); /** * Initiates Loki's reverb implementation. */ ! void initiateReverb() throw (InitError); }; *************** *** 160,166 **** #endif /* AUDIOENVIROMENT_H_INCLUDED_C4211030 */ - - - - - --- 159,160 ---- Index: config.h =================================================================== RCS file: /cvsroot/alpp/openalpp/include/openalpp/config.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** config.h 11 Dec 2003 09:36:37 -0000 1.2 --- config.h 2 Mar 2004 07:50:27 -0000 1.3 *************** *** 6,10 **** * OpenAL (http://www.openal.org), * PortAudio (http://www.portaudio.com/), and - * CommonC++ (http://cplusplus.sourceforge.net/) * * This library is free software; you can redistribute it and/or --- 6,9 ---- Index: error.h =================================================================== RCS file: /cvsroot/alpp/openalpp/include/openalpp/error.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** error.h 16 Apr 2003 11:15:01 -0000 1.4 --- error.h 2 Mar 2004 07:50:27 -0000 1.5 *************** *** 6,10 **** * OpenAL (http://www.openal.org), * PortAudio (http://www.portaudio.com/), and - * CommonC++ (http://cplusplus.sourceforge.net/) * * This library is free software; you can redistribute it and/or --- 6,9 ---- *************** *** 62,66 **** * @return the stream with the error message appended. */ ! std::ostream &Put(std::ostream &stream) const; protected: --- 61,65 ---- * @return the stream with the error message appended. */ ! std::ostream &put(std::ostream &stream) const; protected: Index: export.h =================================================================== RCS file: /cvsroot/alpp/openalpp/include/openalpp/export.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** export.h 16 Apr 2003 11:15:01 -0000 1.1 --- export.h 2 Mar 2004 07:50:27 -0000 1.2 *************** *** 1,8 **** ! // The following ifdef block is the standard way of creating macros which make exporting ! // from a DLL simpler. All files within this DLL are compiled with the OPENALPP_EXPORTS ! // symbol defined on the command line. this symbol should not be defined on any project ! // that uses this DLL. This way any other project whose source files include this file see ! // OPENALPP_API functions as being imported from a DLL, whereas this DLL sees symbols ! // defined with this macro as being exported. #ifndef __openalpp_export_h__ #define __openalpp_export_h__ --- 1,25 ---- ! /** ! * OpenAL++ - an object oriented toolkit for spatial sound ! * Copyright (C) 2002 VRlab, Umeå University ! * ! * OpenAL++ was created using the libraries: ! * OpenAL (http://www.openal.org), ! * PortAudio (http://www.portaudio.com/), and ! * ! * This library is free software; you can redistribute it and/or ! * modify it under the terms of the GNU Lesser General Public ! * License as published by the Free Software Foundation; either ! * version 2.1 of the License, or (at your option) any later version. ! * ! * This library 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 ! * Lesser General Public License for more details. ! * ! * You should have received a copy of the GNU Lesser General Public ! * License along with this library; if not, write to the Free Software ! * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. ! */ ! #ifndef __openalpp_export_h__ #define __openalpp_export_h__ Index: filestream.h =================================================================== RCS file: /cvsroot/alpp/openalpp/include/openalpp/filestream.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** filestream.h 23 May 2003 14:46:43 -0000 1.5 --- filestream.h 2 Mar 2004 07:50:27 -0000 1.6 *************** *** 6,10 **** * OpenAL (http://www.openal.org), * PortAudio (http://www.portaudio.com/), and - * CommonC++ (http://cplusplus.sourceforge.net/) * * This library is free software; you can redistribute it and/or --- 6,9 ---- *************** *** 63,67 **** * @param loop is true if the stream should loop, false otherwise. */ ! void SetLooping(bool loop = true); }; --- 62,66 ---- * @param loop is true if the stream should loop, false otherwise. */ ! void setLooping(bool loop = true); }; Index: filestreamupdater.h =================================================================== RCS file: /cvsroot/alpp/openalpp/include/openalpp/filestreamupdater.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** filestreamupdater.h 23 May 2003 14:46:43 -0000 1.4 --- filestreamupdater.h 2 Mar 2004 07:50:27 -0000 1.5 *************** *** 6,10 **** * OpenAL (http://www.openal.org), * PortAudio (http://www.portaudio.com/), and - * CommonC++ (http://cplusplus.sourceforge.net/) * * This library is free software; you can redistribute it and/or --- 6,9 ---- *************** *** 72,76 **** * @param loop is true if the stream should loop, false otherwise. */ ! void SetLooping(bool loop = true); }; --- 71,75 ---- * @param loop is true if the stream should loop, false otherwise. */ ! void setLooping(bool loop = true); }; Index: groupsource.h =================================================================== RCS file: /cvsroot/alpp/openalpp/include/openalpp/groupsource.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** groupsource.h 16 Apr 2003 11:39:43 -0000 1.5 --- groupsource.h 2 Mar 2004 07:50:27 -0000 1.6 *************** *** 6,10 **** * OpenAL (http://www.openal.org), * PortAudio (http://www.portaudio.com/), and - * CommonC++ (http://cplusplus.sourceforge.net/) * * This library is free software; you can redistribute it and/or --- 6,9 ---- *************** *** 64,68 **** * @return the gain. */ ! OPENALPP_API ALfloat GroupSource::FilterDistance(ALuint source,Speaker speaker); /** --- 63,67 ---- * @return the gain. */ ! OPENALPP_API ALfloat filterDistance(ALuint source,Speaker speaker); /** *************** *** 74,78 **** * @return new pointer to buffer. */ ! OPENALPP_API ALshort *GroupSource::FilterReverb(Source *source,ALshort *buffer, ALsizei &size,unsigned int frequency); --- 73,77 ---- * @return new pointer to buffer. */ ! OPENALPP_API ALshort *filterReverb(Source *source,ALshort *buffer, ALsizei &size,unsigned int frequency); *************** *** 85,89 **** * @return (new) pointer to buffer. */ ! OPENALPP_API ALshort *ApplyFilters(Source *source,ALshort *buffer,ALsizei &size, unsigned int frequency); public: --- 84,88 ---- * @return (new) pointer to buffer. */ ! OPENALPP_API ALshort *applyFilters(Source *source,ALshort *buffer,ALsizei &size, unsigned int frequency); public: *************** *** 101,105 **** * group if it haven't been done yet. */ ! OPENALPP_API void Play() throw (InitError,FileError); /** --- 100,104 ---- * group if it haven't been done yet. */ ! OPENALPP_API void play() throw (InitError,FileError); /** *************** *** 111,115 **** * @param frequency is the frequency that will be used when mixing. */ ! OPENALPP_API void MixSources(unsigned int frequency=22050) throw (InitError,FileError,FatalError,MemoryError,ValueError); --- 110,114 ---- * @param frequency is the frequency that will be used when mixing. */ ! OPENALPP_API void mixSources(unsigned int frequency=22050) throw (InitError,FileError,FatalError,MemoryError,ValueError); *************** *** 121,125 **** * @return identifier for the source. */ ! OPENALPP_API ALuint IncludeSource(Source *source) throw (ValueError); /** --- 120,124 ---- * @return identifier for the source. */ ! OPENALPP_API ALuint includeSource(Source *source) throw (ValueError); /** *************** *** 128,132 **** * @param source is the source to exclude. */ ! OPENALPP_API void ExcludeSource(const Source &source) throw (NameError); /** --- 127,131 ---- * @param source is the source to exclude. */ ! OPENALPP_API void excludeSource(const Source &source) throw (NameError); /** *************** *** 135,139 **** * @param source is the identifier of the source to exclude. */ ! OPENALPP_API void ExcludeSource(ALuint source) throw (NameError); /** --- 134,138 ---- * @param source is the identifier of the source to exclude. */ ! OPENALPP_API void excludeSource(ALuint source) throw (NameError); /** Index: inputdevice.h =================================================================== RCS file: /cvsroot/alpp/openalpp/include/openalpp/inputdevice.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** inputdevice.h 16 Apr 2003 11:15:01 -0000 1.6 --- inputdevice.h 2 Mar 2004 07:50:27 -0000 1.7 *************** *** 6,10 **** * OpenAL (http://www.openal.org), * PortAudio (http://www.portaudio.com/), and - * CommonC++ (http://cplusplus.sourceforge.net/) * * This library is free software; you can redistribute it and/or --- 6,9 ---- *************** *** 40,44 **** * Initialize input. Called by constructor(s). */ ! void Init(); public: /** --- 39,43 ---- * Initialize input. Called by constructor(s). */ ! void init(); public: /** Index: listener.h =================================================================== RCS file: /cvsroot/alpp/openalpp/include/openalpp/listener.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** listener.h 16 Apr 2003 11:15:01 -0000 1.2 --- listener.h 2 Mar 2004 07:50:27 -0000 1.3 *************** *** 6,10 **** * OpenAL (http://www.openal.org), * PortAudio (http://www.portaudio.com/), and - * CommonC++ (http://cplusplus.sourceforge.net/) * * This library is free software; you can redistribute it and/or --- 6,9 ---- *************** *** 40,44 **** float velocity_[3]; static Listener *selectedlistener_; ! void Init(float x,float y,float z, float vx,float vy,float vz, float directionx, float directiony, float directionz, --- 39,43 ---- float velocity_[3]; static Listener *selectedlistener_; ! void init(float x,float y,float z, float vx,float vy,float vz, float directionx, float directiony, float directionz, *************** *** 90,94 **** * Select this listener. */ ! void Select(); /** --- 89,93 ---- * Select this listener. */ ! void select(); /** *************** *** 96,100 **** * @return true if this listener is selected, false otherwise. */ ! bool IsSelected(); /** --- 95,99 ---- * @return true if this listener is selected, false otherwise. */ ! bool isSelected(); /** *************** *** 107,111 **** * @param upz z value of the up vector */ ! void SetOrientation(float directionx,float directiony,float directionz, float upx, float upy, float upz); --- 106,110 ---- * @param upz z value of the up vector */ ! void setOrientation(float directionx,float directiony,float directionz, float upx, float upy, float upz); *************** *** 119,123 **** * @param upz z value of the up vector */ ! void GetOrientation(float &directionx,float &directiony,float &directionz, float &upx, float &upy, float &upz) const; --- 118,122 ---- * @param upz z value of the up vector */ ! void getOrientation(float &directionx,float &directiony,float &directionz, float &upx, float &upy, float &upz) const; *************** *** 131,150 **** * Inherited from PositionedObject. */ ! void SetPosition(float x, float y, float z); /** * Inherited from PositionedObject. */ ! void GetPosition(float &x, float &y, float &z) const; /** * Inherited from PositionedObject. */ ! void SetVelocity(float vx, float vy, float vz); /** * Inherited from PositionedObject. */ ! void GetVelocity(float &vx, float &vy, float &vz) const; }; --- 130,149 ---- * Inherited from PositionedObject. */ ! void setPosition(float x, float y, float z); /** * Inherited from PositionedObject. */ ! void getPosition(float &x, float &y, float &z) const; /** * Inherited from PositionedObject. */ ! void setVelocity(float vx, float vy, float vz); /** * Inherited from PositionedObject. */ ! void getVelocity(float &vx, float &vy, float &vz) const; }; Index: netstream.h =================================================================== RCS file: /cvsroot/alpp/openalpp/include/openalpp/netstream.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** netstream.h 16 Apr 2003 11:15:01 -0000 1.6 --- netstream.h 2 Mar 2004 07:50:27 -0000 1.7 *************** *** 6,10 **** * OpenAL (http://www.openal.org), * PortAudio (http://www.portaudio.com/), and - * CommonC++ (http://cplusplus.sourceforge.net/) * * This library is free software; you can redistribute it and/or --- 6,9 ---- *************** *** 86,87 **** --- 85,87 ---- #endif /* NETSTREAM_H_INCLUDED_C419F72E */ + Index: positionedobject.h =================================================================== RCS file: /cvsroot/alpp/openalpp/include/openalpp/positionedobject.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** positionedobject.h 11 Dec 2003 09:32:49 -0000 1.4 --- positionedobject.h 2 Mar 2004 07:50:27 -0000 1.5 *************** *** 6,10 **** * OpenAL (http://www.openal.org), * PortAudio (http://www.portaudio.com/), and - * CommonC++ (http://cplusplus.sourceforge.net/) * * This library is free software; you can redistribute it and/or --- 6,9 ---- *************** *** 48,52 **** * @param z z coordinate. */ ! virtual void SetPosition(float x, float y, float z)=0; /** --- 47,51 ---- * @param z z coordinate. */ ! virtual void setPosition(float x, float y, float z)=0; /** *************** *** 56,60 **** * @param z z coordinate. */ ! virtual void GetPosition(float &x, float &y, float &z) const =0; /** --- 55,59 ---- * @param z z coordinate. */ ! virtual void getPosition(float &x, float &y, float &z) const =0; /** *************** *** 64,68 **** * @param vz z member of velocity vector. */ ! virtual void SetVelocity(float vx, float vy, float vz)=0; /** --- 63,67 ---- * @param vz z member of velocity vector. */ ! virtual void setVelocity(float vx, float vy, float vz)=0; /** *************** *** 72,76 **** * @param vz z member of velocity vector. */ ! virtual void GetVelocity(float &vx, float &vy, float &vz) const =0; }; --- 71,75 ---- * @param vz z member of velocity vector. */ ! virtual void getVelocity(float &vx, float &vy, float &vz) const =0; }; Index: sample.h =================================================================== RCS file: /cvsroot/alpp/openalpp/include/openalpp/sample.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** sample.h 16 Apr 2003 11:15:01 -0000 1.3 --- sample.h 2 Mar 2004 07:50:27 -0000 1.4 *************** *** 6,10 **** * OpenAL (http://www.openal.org), * PortAudio (http://www.portaudio.com/), and - * CommonC++ (http://cplusplus.sourceforge.net/) * * This library is free software; you can redistribute it and/or --- 6,9 ---- *************** *** 42,46 **** * @param filename is name of file to load. */ ! Sample(const char *filename) throw (FileError); /** --- 41,45 ---- * @param filename is name of file to load. */ ! Sample(const std::string& filename ) throw (FileError); /** *************** *** 53,57 **** * @return file name. */ ! std::string GetFileName() const; /** --- 52,56 ---- * @return file name. */ ! std::string getFileName() const; /** *************** *** 71,76 **** * Check how large a sample is in the given format. */ ! unsigned int SampleSize(SampleFormat format); ! unsigned int SampleSize(ALenum format); } --- 70,75 ---- * Check how large a sample is in the given format. */ ! unsigned int sampleSize(SampleFormat format); ! unsigned int sampleSize(ALenum format); } Index: sounddata.h =================================================================== RCS file: /cvsroot/alpp/openalpp/include/openalpp/sounddata.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** sounddata.h 16 Apr 2003 11:15:01 -0000 1.2 --- sounddata.h 2 Mar 2004 07:50:27 -0000 1.3 *************** *** 6,10 **** * OpenAL (http://www.openal.org), * PortAudio (http://www.portaudio.com/), and - * CommonC++ (http://cplusplus.sourceforge.net/) * * This library is free software; you can redistribute it and/or --- 6,9 ---- *************** *** 46,52 **** SoundBuffer() throw (NameError); ~SoundBuffer(); ! SoundBuffer *Reference(); ! void DeReference() throw (FatalError); ! ALuint GetName() {return buffername_;} }; public: --- 45,51 ---- SoundBuffer() throw (NameError); ~SoundBuffer(); ! SoundBuffer *reference(); ! void deReference() throw (FatalError); ! ALuint getName() {return buffername_;} }; public: *************** *** 55,59 **** * @return the OpenAL name. */ ! ALuint GetAlBuffer() const; /** --- 54,58 ---- * @return the OpenAL name. */ ! ALuint getAlBuffer() const; /** Index: source.h =================================================================== RCS file: /cvsroot/alpp/openalpp/include/openalpp/source.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** source.h 16 Apr 2003 11:15:01 -0000 1.3 --- source.h 2 Mar 2004 07:50:27 -0000 1.4 *************** *** 6,10 **** * OpenAL (http://www.openal.org), * PortAudio (http://www.portaudio.com/), and - * CommonC++ (http://cplusplus.sourceforge.net/) * * This library is free software; you can redistribute it and/or --- 6,9 ---- *************** *** 84,88 **** * @param filename is the name of the file. */ ! void SetSound(const char *filename); /** --- 83,87 ---- * @param filename is the name of the file. */ ! void setSound(const std::string& filename); /** *************** *** 91,95 **** * @param buffer is the new buffer. */ ! void SetSound(const Sample &buffer); /** --- 90,94 ---- * @param buffer is the new buffer. */ ! void setSound(const Sample &buffer); /** *************** *** 98,102 **** * @param stream is the new buffer. */ ! void SetSound(const Stream &stream); /** --- 97,101 ---- * @param stream is the new buffer. */ ! void setSound(const Stream &stream); /** *************** *** 104,108 **** * @return the buffer. */ ! const SoundData &GetSound() const; /** --- 103,107 ---- * @return the buffer. */ ! const SoundData &getSound() const; /** *************** *** 111,115 **** * @param filename is the name of the file to play. */ ! void Play(const char *filename); /** --- 110,114 ---- * @param filename is the name of the file to play. */ ! void play(const std::string& filename); /** *************** *** 118,122 **** * @param buffer is the buffer to play. */ ! void Play(const Sample &buffer); /** --- 117,121 ---- * @param buffer is the buffer to play. */ ! void play(const Sample &buffer); /** *************** *** 125,129 **** * @param stream is the stream to play. */ ! void Play(const Stream &stream); /** --- 124,128 ---- * @param stream is the stream to play. */ ! void play(const Stream &stream); /** *************** *** 131,135 **** * This is only here, because the above Play(...) hides SourceBase::Play() */ ! void Play(); /** --- 130,134 ---- * This is only here, because the above Play(...) hides SourceBase::Play() */ ! void play(); /** *************** *** 137,141 **** * This is needed here for streaming sources... */ ! void Stop(); /** --- 136,140 ---- * This is needed here for streaming sources... */ ! void stop(); /** *************** *** 143,147 **** * This is needed here for streaming sources... */ ! void Pause(); --- 142,146 ---- * This is needed here for streaming sources... */ ! void pause(); *************** *** 150,154 **** * @return true if the source is streaming, false otherwise. */ ! bool IsStreaming(); /** --- 149,153 ---- * @return true if the source is streaming, false otherwise. */ ! bool isStreaming(); /** Index: sourcebase.h =================================================================== RCS file: /cvsroot/alpp/openalpp/include/openalpp/sourcebase.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** sourcebase.h 16 Apr 2003 11:15:01 -0000 1.3 --- sourcebase.h 2 Mar 2004 07:50:27 -0000 1.4 *************** *** 6,10 **** * OpenAL (http://www.openal.org), * PortAudio (http://www.portaudio.com/), and - * CommonC++ (http://cplusplus.sourceforge.net/) * * This library is free software; you can redistribute it and/or --- 6,9 ---- *************** *** 50,69 **** * Play the source. */ ! void Play(); /** * Pause the source. */ ! void Pause(); /** * Stop the source. */ ! void Stop(); /** * Rewind the source. */ ! void Rewind(); /** --- 49,68 ---- * Play the source. */ ! void play(); /** * Pause the source. */ ! void pause(); /** * Stop the source. */ ! void stop(); /** * Rewind the source. */ ! void rewind(); /** *************** *** 71,75 **** * @return one of Initial,Playing,Paused,Stopped */ ! SourceState GetState() const; /** --- 70,74 ---- * @return one of Initial,Playing,Paused,Stopped */ ! SourceState getState() const; /** *************** *** 77,81 **** * @param loop is true if the source should loop, false otherwise. */ ! void SetLooping(bool loop = true); /** --- 76,80 ---- * @param loop is true if the source should loop, false otherwise. */ ! void setLooping(bool loop = true); /** *************** *** 83,87 **** * @return true if it's looping, false otherwise. */ ! bool IsLooping() const; /** --- 82,86 ---- * @return true if it's looping, false otherwise. */ ! bool isLooping() const; /** *************** *** 91,95 **** * @param directionz z value of the direction vector. */ ! void SetDirection(float directionx, float directiony, float directionz); /** --- 90,94 ---- * @param directionz z value of the direction vector. */ ! void setDirection(float directionx, float directiony, float directionz); /** *************** *** 99,103 **** * @param directionz z value of the direction vector. */ ! void GetDirection(float &directionx,float &directiony,float &directionz) const; /** --- 98,102 ---- * @param directionz z value of the direction vector. */ ! void getDirection(float &directionx,float &directiony,float &directionz) const; /** *************** *** 105,109 **** * The same effect can be achieved by calling SetDirection(0,0,0) */ ! void MakeOmniDirectional(); /** --- 104,108 ---- * The same effect can be achieved by calling SetDirection(0,0,0) */ ! void makeOmniDirectional(); /** *************** *** 120,124 **** * @param outergain specifies the gain outside the outer cone. */ ! void SetSoundCone(float innerangle, float outerangle=360.0,float outergain=0.0); --- 119,123 ---- * @param outergain specifies the gain outside the outer cone. */ ! void setSoundCone(float innerangle, float outerangle=360.0,float outergain=0.0); *************** *** 129,133 **** * @param outergain specifies the gain outside the outer cone. */ ! void GetSoundCone(float &innerangle,float &outerangle,float &outergain)const; /** --- 128,132 ---- * @param outergain specifies the gain outside the outer cone. */ ! void getSoundCone(float &innerangle,float &outerangle,float &outergain)const; /** *************** *** 139,143 **** * @param gain is the gain [0.0,... */ ! void SetGain(float gain); /** --- 138,142 ---- * @param gain is the gain [0.0,... */ ! void setGain(float gain); /** *************** *** 145,149 **** * @return gain. */ ! float GetGain() const; /** --- 144,148 ---- * @return gain. */ ! float getGain() const; /** *************** *** 153,157 **** * @param max is maximum gain. */ ! void SetMinMaxGain(float min = 0.0, float max = 1.0); /** --- 152,156 ---- * @param max is maximum gain. */ ! void setMinMaxGain(float min = 0.0, float max = 1.0); /** *************** *** 160,164 **** * @param max is maximum gain. */ ! void GetMinMaxGain(float & min, float &max) const; /** --- 159,163 ---- * @param max is maximum gain. */ ! void getMinMaxGain(float & min, float &max) const; /** *************** *** 168,172 **** * @param ambient is true if the source should be ambient, false otherwise. */ ! void SetAmbient(bool ambient = true); /** --- 167,171 ---- * @param ambient is true if the source should be ambient, false otherwise. */ ! void setAmbient(bool ambient = true); /** *************** *** 174,178 **** * @return true if the source is ambient, false otherwise. */ ! bool IsAmbient() const; /** --- 173,177 ---- * @return true if the source is ambient, false otherwise. */ ! bool isAmbient() const; /** *************** *** 182,186 **** * @param relative is true if the source should be relative, false otherwise. */ ! void SetRelative(bool relative = true); /** --- 181,185 ---- * @param relative is true if the source should be relative, false otherwise. */ ! void setRelative(bool relative = true); /** *************** *** 188,192 **** * @return true if the source is relative, false otherwise. */ ! bool IsRelative() const; /** --- 187,191 ---- * @return true if the source is relative, false otherwise. */ ! bool isRelative() const; /** *************** *** 195,199 **** * @param distance is the reference distance. */ ! void SetReferenceDistance(float distance = 1.0); /** --- 194,198 ---- * @param distance is the reference distance. */ ! void setReferenceDistance(float distance = 1.0); /** *************** *** 201,205 **** * @return reference distance. */ ! float GetReferenceDistance() const; /** --- 200,204 ---- * @return reference distance. */ ! float getReferenceDistance() const; /** *************** *** 209,213 **** * @param distance is the maximum distance. */ ! void SetMaxDistance(float distance); // = MAX_FLOAT); /** --- 208,212 ---- * @param distance is the maximum distance. */ ! void setMaxDistance(float distance); // = MAX_FLOAT); /** *************** *** 215,219 **** * @return maximum distance. */ ! float GetMaxDistance() const; /** --- 214,218 ---- * @return maximum distance. */ ! float getMaxDistance() const; /** *************** *** 222,226 **** * @param factor is the rolloff factor. */ ! void SetRolloffFactor(float factor = 1.0); /** --- 221,225 ---- * @param factor is the rolloff factor. */ ! void setRolloffFactor(float factor = 1.0); /** *************** *** 228,232 **** * @return rolloff factor. */ ! float GetRolloffFactor() const; /** --- 227,231 ---- * @return rolloff factor. */ ! float getRolloffFactor() const; /** *************** *** 235,239 **** * @param pitch is the pitch (0.0,1.0]. */ ! void SetPitch(float pitch = 1.0); /** --- 234,238 ---- * @param pitch is the pitch (0.0,1.0]. */ ! void setPitch(float pitch = 1.0); /** *************** *** 241,245 **** * @return pitch. */ ! float GetPitch() const; /** --- 240,244 ---- * @return pitch. */ ! float getPitch() const; /** *************** *** 249,253 **** * @param scale is the reverb scale [0.0-1.0]. */ ! void SetReverbScale(float scale) throw (InitError,ValueError); /** --- 248,252 ---- * @param scale is the reverb scale [0.0-1.0]. */ ! void setReverbScale(float scale) throw (InitError,ValueError); /** *************** *** 257,261 **** * @param delay is the delay [0.0-2.0] in seconds. */ ! void SetReverbDelay(float delay) throw (InitError,ValueError); /** --- 256,260 ---- * @param delay is the delay [0.0-2.0] in seconds. */ ! void setReverbDelay(float delay) throw (InitError,ValueError); /** *************** *** 263,267 **** * @return the delay. */ ! float GetReverbDelay() throw (InitError); /** --- 262,266 ---- * @return the delay. */ ! float getReverbDelay() throw (InitError); /** *************** *** 269,273 **** * @return the scale. */ ! float GetReverbScale() throw (InitError); /** --- 268,272 ---- * @return the scale. */ ! float getReverbScale() throw (InitError); /** *************** *** 279,283 **** * it. */ ! ALuint Link(const SourceBase &source) throw (MemoryError); /** --- 278,282 ---- * it. */ ! ALuint link(const SourceBase &source) throw (MemoryError); /** *************** *** 285,289 **** * @param source is the source to unlink. */ ! void Unlink(const SourceBase &source) throw (NameError); /** --- 284,288 ---- * @param source is the source to unlink. */ ! void unlink(const SourceBase &source) throw (NameError); /** *************** *** 291,300 **** * @param name is the name of the source to unlink. */ ! void Unlink(const ALuint name) throw (NameError); /** * Unlink all sources from this. */ ! void UnlinkAll(); /** --- 290,299 ---- * @param name is the name of the source to unlink. */ ! void unlink(const ALuint name) throw (NameError); /** * Unlink all sources from this. */ ! void unlinkAll(); /** *************** *** 302,326 **** * Can be used to directly modify the source with OpenAL functions. */ ! ALuint GetAlSource() const; /** * Inherited from PositionedObject. */ ! void SetPosition(float x, float y, float z); /** * Inherited from PositionedObject. */ ! void GetPosition(float &x, float &y, float &z) const; /** * Inherited from PositionedObject. */ ! void SetVelocity(float vx, float vy, float vz); /** * Inherited from PositionedObject. */ ! void GetVelocity(float &vx, float &vy, float &vz) const; /** --- 301,325 ---- * Can be used to directly modify the source with OpenAL functions. */ ! ALuint getAlSource() const; /** * Inherited from PositionedObject. */ ! void setPosition(float x, float y, float z); /** * Inherited from PositionedObject. */ ! void getPosition(float &x, float &y, float &z) const; /** * Inherited from PositionedObject. */ ! void setVelocity(float vx, float vy, float vz); /** * Inherited from PositionedObject. */ ! void getVelocity(float &vx, float &vy, float &vz) const; /** *************** *** 366,370 **** * Used by constructors. */ ! void Init() throw (MemoryError,NameError); /** --- 365,369 ---- * Used by constructors. */ ! void init() throw (MemoryError,NameError); /** Index: stream.h =================================================================== RCS file: /cvsroot/alpp/openalpp/include/openalpp/stream.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** stream.h 16 Apr 2003 11:15:01 -0000 1.5 --- stream.h 2 Mar 2004 07:50:27 -0000 1.6 *************** *** 6,10 **** * OpenAL (http://www.openal.org), * PortAudio (http://www.portaudio.com/), and - * CommonC++ (http://cplusplus.sourceforge.net/) * * This library is free software; you can redistribute it and/or --- 6,9 ---- *************** *** 71,75 **** * @param sourcename is the (OpenAL) name of the source. */ ! void Record(ALuint sourcename); /** --- 70,74 ---- * @param sourcename is the (OpenAL) name of the source. */ ! void record(ALuint sourcename); /** *************** *** 77,81 **** * @param sourcename is the (OpenAL) name of the source. */ ! void Stop(ALuint sourcename); }; --- 76,80 ---- * @param sourcename is the (OpenAL) name of the source. */ ! void stop(ALuint sourcename); }; Index: streamupdater.h =================================================================== RCS file: /cvsroot/alpp/openalpp/include/openalpp/streamupdater.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** streamupdater.h 16 Apr 2003 11:15:02 -0000 1.5 --- streamupdater.h 2 Mar 2004 07:50:27 -0000 1.6 *************** *** 6,10 **** * OpenAL (http://www.openal.org), * PortAudio (http://www.portaudio.com/), and - * CommonC++ (http://cplusplus.sourceforge.net/) * * This library is free software; you can redistribute it and/or --- 6,9 ---- *************** *** 27,31 **** ! #include <cc++/thread.h> #include <vector> --- 26,30 ---- ! //#include <cc++/thread.h> #include <vector> *************** *** 40,43 **** --- 39,44 ---- #include "openalpp/error.h" #include "openalpp/windowsstuff.h" + #include "OpenThreads/Thread" + #include "OpenThreads/Mutex" namespace openalpp { *************** *** 46,50 **** * Base class for (threaded) updating of stream buffers. */ ! class StreamUpdater : public ost::Thread,ost::Mutex { /** * #references to this instance. --- 47,51 ---- * Base class for (threaded) updating of stream buffers. */ ! class StreamUpdater : public OpenThreads::Thread, public OpenThreads::Mutex { //ost::Mutex { /** * #references to this instance. *************** *** 72,76 **** * @param sourcename is the OpenAL name of the source. */ ! OPENALPP_API void AddSource(ALuint sourcename); /** --- 73,77 ---- * @param sourcename is the OpenAL name of the source. */ ! OPENALPP_API void addSource(ALuint sourcename); /** *************** *** 78,82 **** * @param sourcename is the OpenAL name of the source. */ ! OPENALPP_API void RemoveSource(ALuint sourcename); /** --- 79,83 ---- * @param sourcename is the OpenAL name of the source. */ ! OPENALPP_API void removeSource(ALuint sourcename); /** *************** *** 87,97 **** * @return done flag. I.e. stoprunning_. */ ! OPENALPP_API bool Update(void *buffer,unsigned int length); /** * Inherited from Thread. ! * Is called after Run() finishes, and deletes this. */ ! OPENALPP_API void final(); /** --- 88,98 ---- * @return done flag. I.e. stoprunning_. */ ! OPENALPP_API bool update(void *buffer,unsigned int length); /** * Inherited from Thread. ! * Is called after run() finishes, and deletes this. */ ! OPENALPP_API void cancelCleanup(); /** *************** *** 99,108 **** * @return this. */ ! OPENALPP_API StreamUpdater *Reference(); /** * Dereference this updater. */ ! OPENALPP_API void DeReference() throw (FatalError); protected: /** --- 100,109 ---- * @return this. */ ! OPENALPP_API StreamUpdater *reference(); /** * Dereference this updater. */ ! OPENALPP_API void deReference() throw (FatalError); protected: /** *************** *** 134,138 **** * Mutex for stoprunning_. */ ! ost::Mutex runmutex_; }; --- 135,140 ---- * Mutex for stoprunning_. */ ! //ost::Mutex runmutex_; ! OpenThreads::Mutex runmutex_; }; Index: windowsstuff.h =================================================================== RCS file: /cvsroot/alpp/openalpp/include/openalpp/windowsstuff.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** windowsstuff.h 16 Apr 2003 11:15:02 -0000 1.2 --- windowsstuff.h 2 Mar 2004 07:50:27 -0000 1.3 *************** *** 6,10 **** * OpenAL (http://www.openal.org), * PortAudio (http://www.portaudio.com/), and - * CommonC++ (http://cplusplus.sourceforge.net/) * * This library is free software; you can redistribute it and/or --- 6,9 ---- *************** *** 31,34 **** --- 30,36 ---- #include "openalpp/export.h" + #include <windows.h> + #define usleep(x) Sleep((x)/1000) + #include <AL/alut.h> |
Update of /cvsroot/alpp/openalpp/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26590/tests Modified Files: CMakeLists.txt Makefile.am Makefile.in moving.cpp simple.cpp testfstream.cpp testmic.cpp Log Message: Changed from initial capital letter for methods. i.e. SetPosition() is now setPosition() to be more C++ compliant. Removed dependency of CommonC++ for threading. CHanged to OpenThreads which is GPL licensed. Removed tests for streaming over the net... (Due to Commonc++ removal) Index: CMakeLists.txt =================================================================== RCS file: /cvsroot/alpp/openalpp/tests/CMakeLists.txt,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** CMakeLists.txt 16 Jul 2003 19:20:02 -0000 1.2 --- CMakeLists.txt 2 Mar 2004 07:50:27 -0000 1.3 *************** *** 35,42 **** ADD_EXECUTABLE(testmic testmic.cpp) TARGET_LINK_LIBRARIES(testmic openalpp ${EXTRALIBS}) ! ADD_EXECUTABLE(testsend testsend.cpp) ! TARGET_LINK_LIBRARIES(testsend openalpp ${EXTRALIBS}) ! ADD_EXECUTABLE(teststream teststream.cpp) ! TARGET_LINK_LIBRARIES(teststream openalpp ${EXTRALIBS}) ENDIF(CCGNU_FOUND) ADD_EXECUTABLE(testfstream testfstream.cpp) --- 35,42 ---- ADD_EXECUTABLE(testmic testmic.cpp) TARGET_LINK_LIBRARIES(testmic openalpp ${EXTRALIBS}) ! # ADD_EXECUTABLE(testsend testsend.cpp) ! # TARGET_LINK_LIBRARIES(testsend openalpp ${EXTRALIBS}) ! # ADD_EXECUTABLE(teststream teststream.cpp) ! # TARGET_LINK_LIBRARIES(teststream openalpp ${EXTRALIBS}) ENDIF(CCGNU_FOUND) ADD_EXECUTABLE(testfstream testfstream.cpp) Index: Makefile.am =================================================================== RCS file: /cvsroot/alpp/openalpp/tests/Makefile.am,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Makefile.am 21 Feb 2003 14:48:24 -0000 1.5 --- Makefile.am 2 Mar 2004 07:50:27 -0000 1.6 *************** *** 4,7 **** --- 4,8 ---- if WITH_CCGNU ccgnulibs = @CCGNULIBS@ + endif if WITH_PORTAUDIO portaudiolibs = -lportaudio *************** *** 12,22 **** ! LDADD = ../src/libopenalpp.la $(ccgnulibs) -lopenal $(portaudiolibs) $(ogglibs) ! bin_PROGRAMS = teststream testsend testfstream testmic simple moving ! teststream_SOURCES = teststream.cpp ! testsend_SOURCES = testsend.cpp testmic_SOURCES = testmic.cpp --- 13,23 ---- ! LDADD = ../src/libopenalpp.la $(ccgnulibs) -lopenal $(portaudiolibs) $(ogglibs) -lOpenThreads ! bin_PROGRAMS = testfstream testmic simple moving #testsend teststream ! #teststream_SOURCES = teststream.cpp ! #testsend_SOURCES = testsend.cpp testmic_SOURCES = testmic.cpp *************** *** 28,30 **** testfstream_SOURCES = testfstream.cpp - endif --- 29,30 ---- Index: Makefile.in =================================================================== RCS file: /cvsroot/alpp/openalpp/tests/Makefile.in,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** Makefile.in 16 Apr 2003 11:15:07 -0000 1.9 --- Makefile.in 2 Mar 2004 07:50:27 -0000 1.10 *************** *** 1,5 **** ! # Makefile.in generated automatically by automake 1.4-p6 from Makefile.am ! # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, --- 1,7 ---- ! # Makefile.in generated by automake 1.7.2 from Makefile.am. ! # @configure_input@ ! # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 [...985 lines suppressed...] ! ps: ps-am ! ps-am: ! uninstall-am: uninstall-binPROGRAMS uninstall-info-am + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ + clean-generic clean-libtool ctags distclean distclean-compile \ + distclean-depend distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-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-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 # Tell versions [3.59,3.63) of GNU make to not export all variables. Index: moving.cpp =================================================================== RCS file: /cvsroot/alpp/openalpp/tests/moving.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** moving.cpp 11 Dec 2003 09:32:49 -0000 1.10 --- moving.cpp 2 Mar 2004 07:50:27 -0000 1.11 *************** *** 6,10 **** * OpenAL (http://www.openal.org), * PortAudio (http://www.portaudio.com/), and - * CommonC++ (http://cplusplus.sourceforge.net/) * * This library is free software; you can redistribute it and/or --- 6,9 ---- *************** *** 26,32 **** * Plays a file bee.wav and moves it left right. */ - #include <cc++/thread.h> #include <openalpp/alpp.h> #include <iostream> using namespace openalpp; --- 25,31 ---- * Plays a file bee.wav and moves it left right. */ #include <openalpp/alpp.h> #include <iostream> + #include <unistd.h> using namespace openalpp; *************** *** 39,46 **** int main() { try { - Source *asd = new Source("bee.wav"); Source beesound("bee.wav"); ! beesound.SetGain(1); ! beesound.SetLooping(); float limits[2] = {5,-15}; --- 38,44 ---- int main() { try { Source beesound("bee.wav"); ! beesound.setGain(1); ! beesound.setLooping(); float limits[2] = {5,-15}; *************** *** 48,61 **** float time=0,angle=0; ! beesound.SetPosition(limits[0],0.0,0.0); ! beesound.Play(); ! const int no_laps=5; ! std::cerr << "Moving sound 5 laps..." << std::endl; ! // Do a cheat time loop. while(angle<(M_PI*2.0*no_laps)) { ! ost::Thread::sleep(delay); // Wait for delay milliseconds time +=delay/1000; // Calculate the time in the loop --- 46,59 ---- float time=0,angle=0; ! beesound.setPosition(limits[0],0.0,0.0); ! beesound.play(); ! const int no_laps=5; ! std::cerr << "Moving sound 5 laps..." << std::endl; ! // Do a cheat time loop. while(angle<(M_PI*2.0*no_laps)) { ! usleep(delay*1000); // Wait for delay milliseconds time +=delay/1000; // Calculate the time in the loop *************** *** 63,68 **** // Calculate a new position ! beesound.SetPosition(limits[0]*cos(angle),0.0,limits[1]*sin(angle)); ! } } catch(Error e) { std::cerr << e << "\n"; --- 61,66 ---- // Calculate a new position ! beesound.setPosition(limits[0]*cos(angle),0.0,limits[1]*sin(angle)); ! } } catch(Error e) { std::cerr << e << "\n"; Index: simple.cpp =================================================================== RCS file: /cvsroot/alpp/openalpp/tests/simple.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** simple.cpp 12 Dec 2003 06:55:04 -0000 1.10 --- simple.cpp 2 Mar 2004 07:50:27 -0000 1.11 *************** *** 6,10 **** * OpenAL (http://www.openal.org), * PortAudio (http://www.portaudio.com/), and - * CommonC++ (http://cplusplus.sourceforge.net/) * * This library is free software; you can redistribute it and/or --- 6,9 ---- *************** *** 25,47 **** * Plays a file bee.wav in the background. */ - #include <cc++/thread.h> #include <openalpp/alpp.h> #include <iostream> using namespace openalpp; ! int main() { try { ! Source bgsound("bee.wav"); // Create source and load sound ! bgsound.SetGain(0.6f); // Lower gain (volume) ! bgsound.SetLooping(); ! bgsound.SetAmbient(); // Make sound ambient (i.e. not attenuated) ! bgsound.Play(); // Start playing std::cerr << "playing bee.wav for 3 seconds: " << std::endl; ! ost::Thread::sleep(3000); // Sleep for a while ! bgsound.Stop(); } catch(Error e) { --- 24,56 ---- * Plays a file bee.wav in the background. */ #include <openalpp/alpp.h> #include <iostream> + #include <unistd.h> using namespace openalpp; ! int main(int argc,char **argv) { ! ! std::string file; ! file = "bee.wav"; ! ! if (argc > 1) ! file = argv[1]; ! ! std::cout << "Playing " << file << "\n"; ! try { ! Source bgsound(file); // Create source and load sound ! bgsound.setGain(0.6f); // Lower gain (volume) ! bgsound.setLooping(); ! bgsound.setAmbient(); // Make sound ambient (i.e. not attenuated) ! bgsound.play(); // Start playing std::cerr << "playing bee.wav for 3 seconds: " << std::endl; ! usleep(3000*1000); // Sleep for a while ! std::cerr << "Done " << std::endl; ! bgsound.stop(); } catch(Error e) { Index: testfstream.cpp =================================================================== RCS file: /cvsroot/alpp/openalpp/tests/testfstream.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** testfstream.cpp 23 May 2003 14:51:43 -0000 1.5 --- testfstream.cpp 2 Mar 2004 07:50:27 -0000 1.6 *************** *** 6,10 **** * OpenAL (http://www.openal.org), * PortAudio (http://www.portaudio.com/), and - * CommonC++ (http://cplusplus.sourceforge.net/) * * This library is free software; you can redistribute it and/or --- 6,9 ---- *************** *** 42,54 **** try { FileStream stream(argv[1]); ! stream.SetLooping(); // Remove this to play file once only. Source source(stream); ! source.SetAmbient(); ! source.Play(); std::cerr << "Press return to continue\n"; std::cin.get(); ! source.Stop(); } catch(openalpp::Error e) { std::cerr << e << "\n"; --- 41,53 ---- try { FileStream stream(argv[1]); ! stream.setLooping(); // Remove this to play file once only. Source source(stream); ! source.setAmbient(); ! source.play(); std::cerr << "Press return to continue\n"; std::cin.get(); ! source.stop(); } catch(openalpp::Error e) { std::cerr << e << "\n"; Index: testmic.cpp =================================================================== RCS file: /cvsroot/alpp/openalpp/tests/testmic.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** testmic.cpp 11 Dec 2003 09:32:49 -0000 1.11 --- testmic.cpp 2 Mar 2004 07:50:27 -0000 1.12 *************** *** 6,10 **** * OpenAL (http://www.openal.org), * PortAudio (http://www.portaudio.com/), and - * CommonC++ (http://cplusplus.sourceforge.net/) * * This library is free software; you can redistribute it and/or --- 6,9 ---- *************** *** 24,28 **** * Example where sound is streamed from a microphone. */ - #include <cc++/thread.h> #include "openalpp/alpp.h" #include <iostream> --- 23,26 ---- *************** *** 43,50 **** Source source(mic); ! source.SetGain(2); //source.SetLooping(); ! source.Play(); ! ost::Thread::sleep(3000); float limits[2] = {0.5,-0.5}; --- 41,48 ---- Source source(mic); ! source.setGain(2); //source.SetLooping(); ! source.play(); ! usleep(3000*1000); float limits[2] = {0.5,-0.5}; *************** *** 52,57 **** //float time=0,angle=0; ! source.SetPosition(limits[0],0.0,0.0); ! source.Play(); //const int no_laps=5; --- 50,55 ---- //float time=0,angle=0; ! source.setPosition(limits[0],0.0,0.0); ! source.play(); //const int no_laps=5; *************** *** 62,66 **** #if 0 while(angle<(M_PI*no_laps)) { ! ccxx_sleep(delay); // Wait for delay milliseconds time +=delay/1000; // Calculate the time in the loop --- 60,64 ---- #if 0 while(angle<(M_PI*no_laps)) { ! usleep(delay*1000); // Wait for delay milliseconds time +=delay/1000; // Calculate the time in the loop *************** *** 69,81 **** // Calculate a new position std::cerr << cos(angle) << ", " << sin(angle) << std::endl; ! source.SetPosition(limits[0]*cos(0),0.0,limits[1]*sin(0)); } #else std::cerr << "Moved to the left" << std::endl; ! source.SetPosition(-0.5,0.0,0); ! ost::Thread::sleep(3000); std::cerr << "Moved to the right" << std::endl; ! source.SetPosition(+0.5,0.0,0); ! ost::Thread::sleep(3000); #endif } catch(Error e) { --- 67,79 ---- // Calculate a new position std::cerr << cos(angle) << ", " << sin(angle) << std::endl; ! source.setPosition(limits[0]*cos(0),0.0,limits[1]*sin(0)); } #else std::cerr << "Moved to the left" << std::endl; ! source.setPosition(-0.5,0.0,0); ! usleep(3000*1000); std::cerr << "Moved to the right" << std::endl; ! source.setPosition(+0.5,0.0,0); ! usleep(3000*1000); #endif } catch(Error e) { |
|
From: <vr-...@us...> - 2004-03-02 08:02:03
|
Update of /cvsroot/alpp/openalpp/VisualStudio In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26590/VisualStudio Modified Files: openalpp.sln openalpp.vcproj Log Message: Changed from initial capital letter for methods. i.e. SetPosition() is now setPosition() to be more C++ compliant. Removed dependency of CommonC++ for threading. CHanged to OpenThreads which is GPL licensed. Removed tests for streaming over the net... (Due to Commonc++ removal) Index: openalpp.sln =================================================================== RCS file: /cvsroot/alpp/openalpp/VisualStudio/openalpp.sln,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** openalpp.sln 11 Dec 2003 09:32:49 -0000 1.3 --- openalpp.sln 2 Mar 2004 07:50:10 -0000 1.4 *************** *** 15,28 **** EndProjectSection EndProject - Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testsend", "testsend.vcproj", "{9740C9CE-674E-4083-80FE-9ADE598B0000}" - ProjectSection(ProjectDependencies) = postProject - {2BA79A95-C0A7-4F13-9D84-7912AEA4A8B3} = {2BA79A95-C0A7-4F13-9D84-7912AEA4A8B3} - EndProjectSection - EndProject - Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "teststream", "teststream.vcproj", "{3B36C471-B270-4A97-8A7E-0681ACAFB492}" - ProjectSection(ProjectDependencies) = postProject - {2BA79A95-C0A7-4F13-9D84-7912AEA4A8B3} = {2BA79A95-C0A7-4F13-9D84-7912AEA4A8B3} - EndProjectSection - EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testfstream", "testfstream.vcproj", "{3B36C471-B270-4A97-8A7E-0681ACAFB492}" ProjectSection(ProjectDependencies) = postProject --- 15,18 ---- *************** *** 30,34 **** EndProjectSection EndProject ! Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "openalpp", "openalpp.vcproj", "{2BA79A95-C0A7-4F13-9D84-7912AEA4A8B3}" ProjectSection(ProjectDependencies) = postProject EndProjectSection --- 20,24 ---- EndProjectSection EndProject ! Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "oalpp", "openalpp.vcproj", "{2BA79A95-C0A7-4F13-9D84-7912AEA4A8B3}" ProjectSection(ProjectDependencies) = postProject EndProjectSection *************** *** 52,63 **** {F98212F5-A462-4F75-9AF6-4ED4E79A4B1F}.Release.ActiveCfg = Release|Win32 {F98212F5-A462-4F75-9AF6-4ED4E79A4B1F}.Release.Build.0 = Release|Win32 - {9740C9CE-674E-4083-80FE-9ADE598B0000}.Debug.ActiveCfg = Debug|Win32 - {9740C9CE-674E-4083-80FE-9ADE598B0000}.Debug.Build.0 = Debug|Win32 - {9740C9CE-674E-4083-80FE-9ADE598B0000}.Release.ActiveCfg = Release|Win32 - {9740C9CE-674E-4083-80FE-9ADE598B0000}.Release.Build.0 = Release|Win32 - {3B36C471-B270-4A97-8A7E-0681ACAFB492}.Debug.ActiveCfg = Debug|Win32 - {3B36C471-B270-4A97-8A7E-0681ACAFB492}.Debug.Build.0 = Debug|Win32 - {3B36C471-B270-4A97-8A7E-0681ACAFB492}.Release.ActiveCfg = Release|Win32 - {3B36C471-B270-4A97-8A7E-0681ACAFB492}.Release.Build.0 = Release|Win32 {3B36C471-B270-4A97-8A7E-0681ACAFB492}.Debug.ActiveCfg = Debug|Win32 {3B36C471-B270-4A97-8A7E-0681ACAFB492}.Debug.Build.0 = Debug|Win32 --- 42,45 ---- Index: openalpp.vcproj =================================================================== RCS file: /cvsroot/alpp/openalpp/VisualStudio/openalpp.vcproj,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** openalpp.vcproj 12 Dec 2003 06:55:04 -0000 1.6 --- openalpp.vcproj 2 Mar 2004 07:50:27 -0000 1.7 *************** *** 44,48 **** Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386" ! AdditionalDependencies="ccgnu2d.lib alut.lib openal32.lib vorbisfile_d.lib ogg_d.lib pastaticdsd.lib winmm.lib wsock32.lib dsound.lib" OutputFile="../bin/$(ProjectName)d.dll" LinkIncremental="2" --- 44,48 ---- Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386" ! AdditionalDependencies="openthreadswin32d.lib alut.lib openal32.lib winmm.lib dsound.lib vorbisfile.lib ogg.lib pastaticdsd.lib" OutputFile="../bin/$(ProjectName)d.dll" LinkIncremental="2" *************** *** 111,115 **** Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386" ! AdditionalDependencies="ccgnu2.lib alut.lib openal32.lib vorbisfile.lib ogg.lib pastaticdsd.lib winmm.lib wsock32.lib dsound.lib" OutputFile="../bin/$(ProjectName).dll" LinkIncremental="1" --- 111,115 ---- Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386" ! AdditionalDependencies="openthreadswin32.lib alut.lib openal32.lib vorbisfile.lib ogg.lib pastaticdsd.lib winmm.lib wsock32.lib dsound.lib" OutputFile="../bin/$(ProjectName).dll" LinkIncremental="1" *************** *** 164,170 **** </File> <File - RelativePath="..\src\deviceupdater.cpp"> - </File> - <File RelativePath="..\src\error.cpp"> </File> --- 164,167 ---- *************** *** 179,194 **** </File> <File - RelativePath="..\src\inputdevice.cpp"> - </File> - <File RelativePath="..\src\listener.cpp"> </File> <File - RelativePath="..\src\netstream.cpp"> - </File> - <File - RelativePath="..\src\netupdater.cpp"> - </File> - <File RelativePath="..\src\openalpp.cpp"> </File> --- 176,182 ---- *************** *** 228,234 **** </File> <File - RelativePath="..\include\openalpp\deviceupdater.h"> - </File> - <File RelativePath="..\include\openalpp\error.h"> </File> --- 216,219 ---- *************** *** 252,261 **** </File> <File - RelativePath="..\include\openalpp\netstream.h"> - </File> - <File - RelativePath="..\include\openalpp\netupdater.h"> - </File> - <File RelativePath="..\include\openalpp\positionedobject.h"> </File> --- 237,240 ---- |
|
From: <vr-...@us...> - 2003-12-12 06:55:08
|
Update of /cvsroot/alpp/openalpp/VisualStudio
In directory sc8-pr-cvs1:/tmp/cvs-serv25552/VisualStudio
Modified Files:
moving.dsp moving.vcproj openalpp.dsp openalpp.vcproj
simple.dsp simple.vcproj testfstream.vcproj testmic.dsp
testmic.vcproj testsend.dsp testsend.vcproj teststream.dsp
teststream.vcproj
Log Message:
Changed name to oalpp.dll, better name!
Index: moving.dsp
===================================================================
RCS file: /cvsroot/alpp/openalpp/VisualStudio/moving.dsp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** moving.dsp 11 Dec 2003 09:32:49 -0000 1.5
--- moving.dsp 12 Dec 2003 06:55:04 -0000 1.6
***************
*** 59,68 ****
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
! # PROP BASE Output_Dir ".\Release"
# PROP BASE Intermediate_Dir ".\Release"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
! # PROP Output_Dir ".\Release"
# PROP Intermediate_Dir ".\Release"
# PROP Target_Dir ""
--- 59,68 ----
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
! # PROP BASE Output_Dir "..\bin"
# PROP BASE Intermediate_Dir ".\Release"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
! # PROP Output_Dir "..\bin"
# PROP Intermediate_Dir ".\Release"
# PROP Target_Dir ""
***************
*** 77,82 ****
# ADD BSC32 /nologo
LINK32=link.exe
! # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ccgnu2.lib /nologo /out:".\Release\$(ProjectName).exe" /incremental:no /libpath:"..\lib" /pdb:".\Release\moving.pdb" /pdbtype:sept /subsystem:console /MACHINE:I386
! # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ccgnu2.lib /nologo /out:".\Release\$(ProjectName).exe" /incremental:no /libpath:"..\lib" /pdb:".\Release\moving.pdb" /pdbtype:sept /subsystem:console /MACHINE:I386
!ENDIF
--- 77,82 ----
# ADD BSC32 /nologo
LINK32=link.exe
! # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ccgnu2.lib /nologo /out:"..\bin\$(ProjectName).exe" /incremental:no /libpath:"..\lib" /pdb:".\Release\moving.pdb" /pdbtype:sept /subsystem:console /MACHINE:I386
! # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ccgnu2.lib /nologo /out:"..\bin\$(ProjectName).exe" /incremental:no /libpath:"..\lib" /pdb:".\Release\moving.pdb" /pdbtype:sept /subsystem:console /MACHINE:I386
!ENDIF
Index: moving.vcproj
===================================================================
RCS file: /cvsroot/alpp/openalpp/VisualStudio/moving.vcproj,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** moving.vcproj 11 Dec 2003 09:32:49 -0000 1.3
--- moving.vcproj 12 Dec 2003 06:55:04 -0000 1.4
***************
*** 77,81 ****
<Configuration
Name="Release|Win32"
! OutputDirectory=".\Release"
IntermediateDirectory=".\Release"
ConfigurationType="1"
--- 77,81 ----
<Configuration
Name="Release|Win32"
! OutputDirectory="..\bin"
IntermediateDirectory=".\Release"
ConfigurationType="1"
Index: openalpp.dsp
===================================================================
RCS file: /cvsroot/alpp/openalpp/VisualStudio/openalpp.dsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** openalpp.dsp 11 Dec 2003 09:32:49 -0000 1.3
--- openalpp.dsp 12 Dec 2003 06:55:04 -0000 1.4
***************
*** 1,3 ****
! # Microsoft Developer Studio Project File - Name="open++al" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
--- 1,3 ----
! # Microsoft Developer Studio Project File - Name="oalpp" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
***************
*** 5,23 ****
# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
! CFG=open++al - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
! !MESSAGE NMAKE /f "open++al.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
! !MESSAGE NMAKE /f "open++al.mak" CFG="open++al - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
! !MESSAGE "open++al - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
! !MESSAGE "open++al - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE
--- 5,23 ----
# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
! CFG=oalpp - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
! !MESSAGE NMAKE /f "oalpp.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
! !MESSAGE NMAKE /f "oalpp.mak" CFG="oalpp - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
! !MESSAGE "oalpp - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
! !MESSAGE "oalpp - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE
***************
*** 30,34 ****
RSC=rc.exe
! !IF "$(CFG)" == "open++al - Win32 Debug"
# PROP BASE Use_MFC 0
--- 30,34 ----
RSC=rc.exe
! !IF "$(CFG)" == "oalpp - Win32 Debug"
# PROP BASE Use_MFC 0
***************
*** 55,59 ****
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ccgnu2d.lib alut.lib openal32.lib vorbisfile_d.lib ogg_d.lib pastaticdsd.lib winmm.lib wsock32.lib dsound.lib /nologo /dll /out:"..\bin\$(ProjectName)d.dll" /incremental:yes /libpath:"../../portaudio/lib" /debug /pdb:".\..\lib\openalppd.pdb" /pdbtype:sept /subsystem:windows /implib:"../lib/$(ProjectName)d.lib" /MACHINE:I386
! !ELSEIF "$(CFG)" == "open++al - Win32 Release"
# PROP BASE Use_MFC 0
--- 55,59 ----
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ccgnu2d.lib alut.lib openal32.lib vorbisfile_d.lib ogg_d.lib pastaticdsd.lib winmm.lib wsock32.lib dsound.lib /nologo /dll /out:"..\bin\$(ProjectName)d.dll" /incremental:yes /libpath:"../../portaudio/lib" /debug /pdb:".\..\lib\openalppd.pdb" /pdbtype:sept /subsystem:windows /implib:"../lib/$(ProjectName)d.lib" /MACHINE:I386
! !ELSEIF "$(CFG)" == "oalpp - Win32 Release"
# PROP BASE Use_MFC 0
***************
*** 84,89 ****
# Begin Target
! # Name "open++al - Win32 Debug"
! # Name "open++al - Win32 Release"
# Begin Group "Source files"
--- 84,89 ----
# Begin Target
! # Name "oalpp - Win32 Debug"
! # Name "oalpp - Win32 Release"
# Begin Group "Source files"
Index: openalpp.vcproj
===================================================================
RCS file: /cvsroot/alpp/openalpp/VisualStudio/openalpp.vcproj,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** openalpp.vcproj 11 Dec 2003 09:32:49 -0000 1.5
--- openalpp.vcproj 12 Dec 2003 06:55:04 -0000 1.6
***************
*** 3,7 ****
ProjectType="Visual C++"
Version="7.10"
! Name="open++al"
ProjectGUID="{2BA79A95-C0A7-4F13-9D84-7912AEA4A8B3}"
SccProjectName=""
--- 3,7 ----
ProjectType="Visual C++"
Version="7.10"
! Name="oalpp"
ProjectGUID="{2BA79A95-C0A7-4F13-9D84-7912AEA4A8B3}"
SccProjectName=""
Index: simple.dsp
===================================================================
RCS file: /cvsroot/alpp/openalpp/VisualStudio/simple.dsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** simple.dsp 11 Dec 2003 09:32:49 -0000 1.3
--- simple.dsp 12 Dec 2003 06:55:04 -0000 1.4
***************
*** 34,43 ****
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
! # PROP BASE Output_Dir ".\Release"
# PROP BASE Intermediate_Dir ".\Release"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
! # PROP Output_Dir ".\Release"
# PROP Intermediate_Dir ".\Release"
# PROP Target_Dir ""
--- 34,43 ----
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
! # PROP BASE Output_Dir "..\bin"
# PROP BASE Intermediate_Dir ".\Release"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
! # PROP Output_Dir "..\bin"
# PROP Intermediate_Dir ".\Release"
# PROP Target_Dir ""
***************
*** 52,57 ****
# ADD BSC32 /nologo
LINK32=link.exe
! # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ccgnu2.lib /nologo /out:".\Release\$(ProjectName).exe" /incremental:no /libpath:"..\lib" /nodefaultlib:"MSVCRTD" /nodefaultlib:"libcd" /pdb:".\Release\simple.pdb" /pdbtype:sept /subsystem:console /MACHINE:I386
! # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ccgnu2.lib /nologo /out:".\Release\$(ProjectName).exe" /incremental:no /libpath:"..\lib" /nodefaultlib:"MSVCRTD" /nodefaultlib:"libcd" /pdb:".\Release\simple.pdb" /pdbtype:sept /subsystem:console /MACHINE:I386
!ELSEIF "$(CFG)" == "simple - Win32 Debug"
--- 52,57 ----
# ADD BSC32 /nologo
LINK32=link.exe
! # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ccgnu2.lib /nologo /out:"..\bin\$(ProjectName).exe" /incremental:no /libpath:"..\lib" /nodefaultlib:"MSVCRTD" /nodefaultlib:"libcd" /pdb:".\Release\simple.pdb" /pdbtype:sept /subsystem:console /MACHINE:I386
! # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ccgnu2.lib /nologo /out:"..\bin\$(ProjectName).exe" /incremental:no /libpath:"..\lib" /nodefaultlib:"MSVCRTD" /nodefaultlib:"libcd" /pdb:".\Release\simple.pdb" /pdbtype:sept /subsystem:console /MACHINE:I386
!ELSEIF "$(CFG)" == "simple - Win32 Debug"
Index: simple.vcproj
===================================================================
RCS file: /cvsroot/alpp/openalpp/VisualStudio/simple.vcproj,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** simple.vcproj 11 Dec 2003 09:32:49 -0000 1.3
--- simple.vcproj 12 Dec 2003 06:55:04 -0000 1.4
***************
*** 14,18 ****
<Configuration
Name="Release|Win32"
! OutputDirectory=".\Release"
IntermediateDirectory=".\Release"
ConfigurationType="1"
--- 14,18 ----
<Configuration
Name="Release|Win32"
! OutputDirectory="..\bin"
IntermediateDirectory=".\Release"
ConfigurationType="1"
Index: testfstream.vcproj
===================================================================
RCS file: /cvsroot/alpp/openalpp/VisualStudio/testfstream.vcproj,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** testfstream.vcproj 11 Dec 2003 09:32:49 -0000 1.2
--- testfstream.vcproj 12 Dec 2003 06:55:04 -0000 1.3
***************
*** 77,81 ****
<Configuration
Name="Release|Win32"
! OutputDirectory=".\testfstream___Win32_Release"
IntermediateDirectory=".\testfstream___Win32_Release"
ConfigurationType="1"
--- 77,81 ----
<Configuration
Name="Release|Win32"
! OutputDirectory="..\bin"
IntermediateDirectory=".\testfstream___Win32_Release"
ConfigurationType="1"
Index: testmic.dsp
===================================================================
RCS file: /cvsroot/alpp/openalpp/VisualStudio/testmic.dsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** testmic.dsp 11 Dec 2003 09:32:49 -0000 1.3
--- testmic.dsp 12 Dec 2003 06:55:04 -0000 1.4
***************
*** 34,43 ****
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
! # PROP BASE Output_Dir ".\testmic___Win32_Release"
# PROP BASE Intermediate_Dir ".\testmic___Win32_Release"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
! # PROP Output_Dir ".\testmic___Win32_Release"
# PROP Intermediate_Dir ".\testmic___Win32_Release"
# PROP Target_Dir ""
--- 34,43 ----
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
! # PROP BASE Output_Dir "..\bin"
# PROP BASE Intermediate_Dir ".\testmic___Win32_Release"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
! # PROP Output_Dir "..\bin"
# PROP Intermediate_Dir ".\testmic___Win32_Release"
# PROP Target_Dir ""
***************
*** 52,57 ****
# ADD BSC32 /nologo
LINK32=link.exe
! # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ccgnu2.lib pastaticdsd.lib dsound.lib winmm.lib /nologo /out:".\testmic___Win32_Release\$(ProjectName).exe" /incremental:no /libpath:"..\lib" /libpath:"..\..\portaudio\lib" /nodefaultlib:"libcd" /pdb:".\testmic___Win32_Release\testmic.pdb" /pdbtype:sept /subsystem:console /MACHINE:I386
! # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ccgnu2.lib pastaticdsd.lib dsound.lib winmm.lib /nologo /out:".\testmic___Win32_Release\$(ProjectName).exe" /incremental:no /libpath:"..\lib" /libpath:"..\..\portaudio\lib" /nodefaultlib:"libcd" /pdb:".\testmic___Win32_Release\testmic.pdb" /pdbtype:sept /subsystem:console /MACHINE:I386
!ELSEIF "$(CFG)" == "testmic - Win32 Debug"
--- 52,57 ----
# ADD BSC32 /nologo
LINK32=link.exe
! # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ccgnu2.lib pastaticdsd.lib dsound.lib winmm.lib /nologo /out:"..\bin\$(ProjectName).exe" /incremental:no /libpath:"..\lib" /libpath:"..\..\portaudio\lib" /nodefaultlib:"libcd" /pdb:".\testmic___Win32_Release\testmic.pdb" /pdbtype:sept /subsystem:console /MACHINE:I386
! # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ccgnu2.lib pastaticdsd.lib dsound.lib winmm.lib /nologo /out:"..\bin\$(ProjectName).exe" /incremental:no /libpath:"..\lib" /libpath:"..\..\portaudio\lib" /nodefaultlib:"libcd" /pdb:".\testmic___Win32_Release\testmic.pdb" /pdbtype:sept /subsystem:console /MACHINE:I386
!ELSEIF "$(CFG)" == "testmic - Win32 Debug"
Index: testmic.vcproj
===================================================================
RCS file: /cvsroot/alpp/openalpp/VisualStudio/testmic.vcproj,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** testmic.vcproj 11 Dec 2003 09:32:49 -0000 1.3
--- testmic.vcproj 12 Dec 2003 06:55:04 -0000 1.4
***************
*** 14,18 ****
<Configuration
Name="Release|Win32"
! OutputDirectory=".\testmic___Win32_Release"
IntermediateDirectory=".\testmic___Win32_Release"
ConfigurationType="1"
--- 14,18 ----
<Configuration
Name="Release|Win32"
! OutputDirectory="..\bin"
IntermediateDirectory=".\testmic___Win32_Release"
ConfigurationType="1"
Index: testsend.dsp
===================================================================
RCS file: /cvsroot/alpp/openalpp/VisualStudio/testsend.dsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** testsend.dsp 11 Dec 2003 09:32:49 -0000 1.3
--- testsend.dsp 12 Dec 2003 06:55:04 -0000 1.4
***************
*** 59,68 ****
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
! # PROP BASE Output_Dir ".\testsend___Win32_Release"
# PROP BASE Intermediate_Dir ".\testsend___Win32_Release"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
! # PROP Output_Dir ".\testsend___Win32_Release"
# PROP Intermediate_Dir ".\testsend___Win32_Release"
# PROP Target_Dir ""
--- 59,68 ----
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
! # PROP BASE Output_Dir "..\bin"
# PROP BASE Intermediate_Dir ".\testsend___Win32_Release"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
! # PROP Output_Dir "..\bin"
# PROP Intermediate_Dir ".\testsend___Win32_Release"
# PROP Target_Dir ""
***************
*** 77,82 ****
# ADD BSC32 /nologo
LINK32=link.exe
! # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ccgnu2.lib wsock32.lib /nologo /out:".\testsend___Win32_Release\$(ProjectName).exe" /incremental:no /libpath:"..\lib" /nodefaultlib:"libcd" /pdb:".\testsend___Win32_Release\testsend.pdb" /pdbtype:sept /subsystem:console /MACHINE:I386
! # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ccgnu2.lib wsock32.lib /nologo /out:".\testsend___Win32_Release\$(ProjectName).exe" /incremental:no /libpath:"..\lib" /nodefaultlib:"libcd" /pdb:".\testsend___Win32_Release\testsend.pdb" /pdbtype:sept /subsystem:console /MACHINE:I386
!ENDIF
--- 77,82 ----
# ADD BSC32 /nologo
LINK32=link.exe
! # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ccgnu2.lib wsock32.lib /nologo /out:"..\bin\$(ProjectName).exe" /incremental:no /libpath:"..\lib" /nodefaultlib:"libcd" /pdb:".\testsend___Win32_Release\testsend.pdb" /pdbtype:sept /subsystem:console /MACHINE:I386
! # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ccgnu2.lib wsock32.lib /nologo /out:"..\bin\$(ProjectName).exe" /incremental:no /libpath:"..\lib" /nodefaultlib:"libcd" /pdb:".\testsend___Win32_Release\testsend.pdb" /pdbtype:sept /subsystem:console /MACHINE:I386
!ENDIF
Index: testsend.vcproj
===================================================================
RCS file: /cvsroot/alpp/openalpp/VisualStudio/testsend.vcproj,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** testsend.vcproj 11 Dec 2003 09:32:49 -0000 1.3
--- testsend.vcproj 12 Dec 2003 06:55:04 -0000 1.4
***************
*** 75,79 ****
<Configuration
Name="Release|Win32"
! OutputDirectory=".\testsend___Win32_Release"
IntermediateDirectory=".\testsend___Win32_Release"
ConfigurationType="1"
--- 75,79 ----
<Configuration
Name="Release|Win32"
! OutputDirectory="..\bin"
IntermediateDirectory=".\testsend___Win32_Release"
ConfigurationType="1"
Index: teststream.dsp
===================================================================
RCS file: /cvsroot/alpp/openalpp/VisualStudio/teststream.dsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** teststream.dsp 11 Dec 2003 09:32:49 -0000 1.3
--- teststream.dsp 12 Dec 2003 06:55:04 -0000 1.4
***************
*** 59,68 ****
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
! # PROP BASE Output_Dir ".\teststream___Win32_Release"
# PROP BASE Intermediate_Dir ".\teststream___Win32_Release"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
! # PROP Output_Dir ".\teststream___Win32_Release"
# PROP Intermediate_Dir ".\teststream___Win32_Release"
# PROP Target_Dir ""
--- 59,68 ----
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
! # PROP BASE Output_Dir "..\bin"
# PROP BASE Intermediate_Dir ".\teststream___Win32_Release"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
! # PROP Output_Dir "..\bin"
# PROP Intermediate_Dir ".\teststream___Win32_Release"
# PROP Target_Dir ""
***************
*** 77,82 ****
# ADD BSC32 /nologo
LINK32=link.exe
! # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ccgnu2.lib wsock32.lib /nologo /out:".\teststream___Win32_Release\$(ProjectName).exe" /incremental:no /libpath:"..\lib" /pdb:".\teststream___Win32_Release\teststream.pdb" /pdbtype:sept /subsystem:console /MACHINE:I386
! # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ccgnu2.lib wsock32.lib /nologo /out:".\teststream___Win32_Release\$(ProjectName).exe" /incremental:no /libpath:"..\lib" /pdb:".\teststream___Win32_Release\teststream.pdb" /pdbtype:sept /subsystem:console /MACHINE:I386
!ENDIF
--- 77,82 ----
# ADD BSC32 /nologo
LINK32=link.exe
! # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ccgnu2.lib wsock32.lib /nologo /out:"..\bin\$(ProjectName).exe" /incremental:no /libpath:"..\lib" /pdb:".\teststream___Win32_Release\teststream.pdb" /pdbtype:sept /subsystem:console /MACHINE:I386
! # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ccgnu2.lib wsock32.lib /nologo /out:"..\bin\$(ProjectName).exe" /incremental:no /libpath:"..\lib" /pdb:".\teststream___Win32_Release\teststream.pdb" /pdbtype:sept /subsystem:console /MACHINE:I386
!ENDIF
Index: teststream.vcproj
===================================================================
RCS file: /cvsroot/alpp/openalpp/VisualStudio/teststream.vcproj,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** teststream.vcproj 11 Dec 2003 09:32:49 -0000 1.3
--- teststream.vcproj 12 Dec 2003 06:55:04 -0000 1.4
***************
*** 77,81 ****
<Configuration
Name="Release|Win32"
! OutputDirectory=".\teststream___Win32_Release"
IntermediateDirectory=".\teststream___Win32_Release"
ConfigurationType="1"
--- 77,81 ----
<Configuration
Name="Release|Win32"
! OutputDirectory="..\bin"
IntermediateDirectory=".\teststream___Win32_Release"
ConfigurationType="1"
|
|
From: <vr-...@us...> - 2003-12-12 06:55:07
|
Update of /cvsroot/alpp/openalpp/doc In directory sc8-pr-cvs1:/tmp/cvs-serv25552/doc Modified Files: Doxyfile Log Message: Changed name to oalpp.dll, better name! Index: Doxyfile =================================================================== RCS file: /cvsroot/alpp/openalpp/doc/Doxyfile,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Doxyfile 18 Oct 2002 07:50:06 -0000 1.1 --- Doxyfile 12 Dec 2003 06:55:04 -0000 1.2 *************** *** 305,309 **** # with spaces. ! INPUT = ./include # If the value of the INPUT tag contains directories, you can use the --- 305,309 ---- # with spaces. ! INPUT = ../include # If the value of the INPUT tag contains directories, you can use the *************** *** 318,322 **** # If left blank NO is used. ! RECURSIVE = NO # The EXCLUDE tag can be used to specify files and/or directories that should --- 318,322 ---- # If left blank NO is used. ! RECURSIVE = YES # The EXCLUDE tag can be used to specify files and/or directories that should |
|
From: <vr-...@us...> - 2003-12-12 06:55:07
|
Update of /cvsroot/alpp/openalpp/tests
In directory sc8-pr-cvs1:/tmp/cvs-serv25552/tests
Modified Files:
simple.cpp
Log Message:
Changed name to oalpp.dll, better name!
Index: simple.cpp
===================================================================
RCS file: /cvsroot/alpp/openalpp/tests/simple.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** simple.cpp 16 Apr 2003 11:15:09 -0000 1.9
--- simple.cpp 12 Dec 2003 06:55:04 -0000 1.10
***************
*** 31,34 ****
--- 31,35 ----
using namespace openalpp;
+
int main() {
try {
***************
*** 42,45 ****
--- 43,48 ----
std::cerr << "playing bee.wav for 3 seconds: " << std::endl;
ost::Thread::sleep(3000); // Sleep for a while
+ bgsound.Stop();
+
} catch(Error e) {
std::cerr << e << "\n";
|
|
From: <vr-...@us...> - 2003-12-12 06:55:07
|
Update of /cvsroot/alpp/openalpp In directory sc8-pr-cvs1:/tmp/cvs-serv25552 Modified Files: INSTALL Log Message: Changed name to oalpp.dll, better name! Index: INSTALL =================================================================== RCS file: /cvsroot/alpp/openalpp/INSTALL,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** INSTALL 11 Dec 2003 09:32:49 -0000 1.3 --- INSTALL 12 Dec 2003 06:55:04 -0000 1.4 *************** *** 28,32 **** It searches for .dll files called *openal*.dll and loads them, thinking it is an implementation of OpenAL32. This does not work with the previous library name of this project (openalpp.lib/.dll). ! So for now it is called open++al.dll. Its not a nice name, but I cant find out any better solution to this problem. --- 28,32 ---- It searches for .dll files called *openal*.dll and loads them, thinking it is an implementation of OpenAL32. This does not work with the previous library name of this project (openalpp.lib/.dll). ! So for now it is called oalpp.dll. Its not a nice name, but I cant find out any better solution to this problem. *************** *** 42,46 **** Also, if you have installed libraries in "non-standard" places, additional library paths should be set under Project/Settings/Link/Input/Additional library path. Build the library (hit F7) ! The library and dll files are named open++al.lib open++al.dll and resides in the lib and the bin directory in the project root. --- 42,46 ---- Also, if you have installed libraries in "non-standard" places, additional library paths should be set under Project/Settings/Link/Input/Additional library path. Build the library (hit F7) ! The library and dll files are named oalpp.lib oalpp.dll and resides in the lib and the bin directory in the project root. |
|
From: <vr-...@us...> - 2003-12-11 09:36:40
|
Update of /cvsroot/alpp/openalpp/include/openalpp
In directory sc8-pr-cvs1:/tmp/cvs-serv24001/include/openalpp
Modified Files:
config.h
Log Message:
Modified config.h to use WITH_PORTAUDIO
Index: config.h
===================================================================
RCS file: /cvsroot/alpp/openalpp/include/openalpp/config.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** config.h 11 Dec 2003 09:32:49 -0000 1.1
--- config.h 11 Dec 2003 09:36:37 -0000 1.2
***************
*** 34,40 ****
the use of device input (microphone etc).
*/
! #define USE_PORTAUDIO
! #ifdef USE_PORTAUDIO
#define ALPP_USE_PORTAUDIO 1
#endif
--- 34,42 ----
the use of device input (microphone etc).
*/
! #ifdef WIN32
! #define WITH_PORTAUDIO
! #endif
! #ifdef WITH_PORTAUDIO
#define ALPP_USE_PORTAUDIO 1
#endif
|
|
From: <vr-...@us...> - 2003-12-11 09:32:54
|
Update of /cvsroot/alpp/openalpp/VisualStudio
In directory sc8-pr-cvs1:/tmp/cvs-serv23117/VisualStudio
Modified Files:
moving.dsp moving.vcproj openalpp.dsp openalpp.dsw
openalpp.sln openalpp.vcproj simple.dsp simple.vcproj
testfstream.vcproj testmic.dsp testmic.vcproj testsend.dsp
testsend.vcproj teststream.dsp teststream.vcproj
Log Message:
Updated .dsw and .dsp files for VC6
Added a config.h for various configuration switches.
Added ALPP_USE_PORTAUDIO to reflect if PortAudio is available or not.
Changed libraryname under windows to open++al.lib/.dll due to clash with
wrapper search algorithm for OpenAL
Index: moving.dsp
===================================================================
RCS file: /cvsroot/alpp/openalpp/VisualStudio/moving.dsp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** moving.dsp 18 Dec 2002 10:26:00 -0000 1.4
--- moving.dsp 11 Dec 2003 09:32:49 -0000 1.5
***************
*** 1,94 ****
! # Microsoft Developer Studio Project File - Name="moving" - Package Owner=<4>
! # Microsoft Developer Studio Generated Build File, Format Version 6.00
! # ** DO NOT EDIT **
!
! # TARGTYPE "Win32 (x86) Console Application" 0x0103
!
! CFG=moving - Win32 Debug
! !MESSAGE This is not a valid makefile. To build this project using NMAKE,
! !MESSAGE use the Export Makefile command and run
! !MESSAGE
! !MESSAGE NMAKE /f "moving.mak".
! !MESSAGE
! !MESSAGE You can specify a configuration when running NMAKE
! !MESSAGE by defining the macro CFG on the command line. For example:
! !MESSAGE
! !MESSAGE NMAKE /f "moving.mak" CFG="moving - Win32 Debug"
! !MESSAGE
! !MESSAGE Possible choices for configuration are:
! !MESSAGE
! !MESSAGE "moving - Win32 Release" (based on "Win32 (x86) Console Application")
! !MESSAGE "moving - Win32 Debug" (based on "Win32 (x86) Console Application")
! !MESSAGE
!
! # Begin Project
! # PROP AllowPerConfigDependencies 0
! # PROP Scc_ProjName ""
! # PROP Scc_LocalPath ""
! CPP=cl.exe
! RSC=rc.exe
!
! !IF "$(CFG)" == "moving - Win32 Release"
!
! # PROP BASE Use_MFC 0
! # PROP BASE Use_Debug_Libraries 0
! # PROP BASE Output_Dir "Release"
! # PROP BASE Intermediate_Dir "Release"
! # PROP BASE Target_Dir ""
! # PROP Use_MFC 0
! # PROP Use_Debug_Libraries 0
! # PROP Output_Dir "Release"
! # PROP Intermediate_Dir "Release"
! # PROP Ignore_Export_Lib 0
! # PROP Target_Dir ""
! # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
! # ADD CPP /nologo /G5 /MD /W3 /GX /O2 /I "..\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FR /YX /FD /c
! # ADD BASE RSC /l 0x41d /d "NDEBUG"
! # ADD RSC /l 0x41d /d "NDEBUG"
! BSC32=bscmake.exe
! # ADD BASE BSC32 /nologo
! # ADD BSC32 /nologo
! LINK32=link.exe
! # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
! # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib openalpp.lib openal32.lib alut.lib ccgnu2.lib /nologo /subsystem:console /machine:I386 /out:"../bin/moving.exe" /libpath:"..\lib"
!
! !ELSEIF "$(CFG)" == "moving - Win32 Debug"
!
! # PROP BASE Use_MFC 0
! # PROP BASE Use_Debug_Libraries 1
! # PROP BASE Output_Dir "Debug"
! # PROP BASE Intermediate_Dir "Debug"
! # PROP BASE Target_Dir ""
! # PROP Use_MFC 0
! # PROP Use_Debug_Libraries 1
! # PROP Output_Dir "Debug"
! # PROP Intermediate_Dir "Debug"
! # PROP Ignore_Export_Lib 0
! # PROP Target_Dir ""
! # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
! # ADD CPP /nologo /G5 /MDd /W3 /Gm /GX /ZI /Od /I "..\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /YX /FD /GZ /c
! # ADD BASE RSC /l 0x41d /d "_DEBUG"
! # ADD RSC /l 0x41d /d "_DEBUG"
! BSC32=bscmake.exe
! # ADD BASE BSC32 /nologo
! # ADD BSC32 /nologo
! LINK32=link.exe
! # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
! # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib openalppd.lib openal32.lib alut.lib ccgnu2.lib /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libcd.lib" /out:"../bin/moving.exe" /pdbtype:sept /libpath:"..\lib"
!
! !ENDIF
!
! # Begin Target
!
! # Name "moving - Win32 Release"
! # Name "moving - Win32 Debug"
! # Begin Group "Source Files"
!
! # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
! # Begin Source File
!
! SOURCE=..\tests\moving.cpp
! # End Source File
! # End Group
! # End Target
! # End Project
--- 1,98 ----
! # Microsoft Developer Studio Project File - Name="moving" - Package Owner=<4>
! # Microsoft Developer Studio Generated Build File, Format Version 6.00
! # ** DO NOT EDIT **
!
! # TARGTYPE "Win32 (x86) Console Application" 0x0103
!
! CFG=moving - Win32 Debug
! !MESSAGE This is not a valid makefile. To build this project using NMAKE,
! !MESSAGE use the Export Makefile command and run
! !MESSAGE
! !MESSAGE NMAKE /f "moving.mak".
! !MESSAGE
! !MESSAGE You can specify a configuration when running NMAKE
! !MESSAGE by defining the macro CFG on the command line. For example:
! !MESSAGE
! !MESSAGE NMAKE /f "moving.mak" CFG="moving - Win32 Debug"
! !MESSAGE
! !MESSAGE Possible choices for configuration are:
! !MESSAGE
! !MESSAGE "moving - Win32 Debug" (based on "Win32 (x86) Console Application")
! !MESSAGE "moving - Win32 Release" (based on "Win32 (x86) Console Application")
! !MESSAGE
!
! # Begin Project
! # PROP AllowPerConfigDependencies 0
! # PROP Scc_ProjName ""
! # PROP Scc_LocalPath ""
! CPP=cl.exe
! MTL=midl.exe
! RSC=rc.exe
!
! !IF "$(CFG)" == "moving - Win32 Debug"
!
! # PROP BASE Use_MFC 0
! # PROP BASE Use_Debug_Libraries 1
! # PROP BASE Output_Dir "..\bin"
! # PROP BASE Intermediate_Dir ".\Debug"
! # PROP BASE Target_Dir ""
! # PROP Use_MFC 0
! # PROP Use_Debug_Libraries 1
! # PROP Output_Dir "..\bin"
! # PROP Intermediate_Dir ".\Debug"
! # PROP Target_Dir ""
! # ADD BASE CPP /nologo /MDd /I "../include" /I "../../portaudio/pa_common" /ZI /W3 /Od /G5 /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /Fp".\Debug/moving.pch" /Fo".\Debug/" /Fd".\Debug/" /GZ /c /GX
! # ADD CPP /nologo /MDd /I "../include" /I "../../portaudio/pa_common" /ZI /W3 /Od /G5 /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /Fp".\Debug/moving.pch" /Fo".\Debug/" /Fd".\Debug/" /GZ /c /GX
! # ADD BASE MTL /nologo /tlb".\Debug\moving.tlb" /win32
! # ADD MTL /nologo /tlb".\Debug\moving.tlb" /win32
! # ADD BASE RSC /l 1053 /d "_DEBUG"
! # ADD RSC /l 1053 /d "_DEBUG"
! BSC32=bscmake.exe
! # ADD BASE BSC32 /nologo
! # ADD BSC32 /nologo
! LINK32=link.exe
! # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ccgnu2d.lib /nologo /out:"..\bin\$(ProjectName)d.exe" /incremental:yes /libpath:"..\lib" /nodefaultlib:"libcd.lib" /debug /pdb:".\Debug\moving.pdb" /pdbtype:sept /subsystem:console /MACHINE:I386
! # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ccgnu2d.lib /nologo /out:"..\bin\$(ProjectName)d.exe" /incremental:yes /libpath:"..\lib" /nodefaultlib:"libcd.lib" /debug /pdb:".\Debug\moving.pdb" /pdbtype:sept /subsystem:console /MACHINE:I386
!
! !ELSEIF "$(CFG)" == "moving - Win32 Release"
!
! # PROP BASE Use_MFC 0
! # PROP BASE Use_Debug_Libraries 0
! # PROP BASE Output_Dir ".\Release"
! # PROP BASE Intermediate_Dir ".\Release"
! # PROP BASE Target_Dir ""
! # PROP Use_MFC 0
! # PROP Use_Debug_Libraries 0
! # PROP Output_Dir ".\Release"
! # PROP Intermediate_Dir ".\Release"
! # PROP Target_Dir ""
! # ADD BASE CPP /nologo /MD /I "../include" /I "../../portaudio/pa_common" /W3 /Ob1 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /GF /Gy /YX /Fp".\Release/moving.pch" /Fo".\Release/" /Fd".\Release/" /c /GX
! # ADD CPP /nologo /MD /I "../include" /I "../../portaudio/pa_common" /W3 /Ob1 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /GF /Gy /YX /Fp".\Release/moving.pch" /Fo".\Release/" /Fd".\Release/" /c /GX
! # ADD BASE MTL /nologo /tlb".\Release\moving.tlb" /win32
! # ADD MTL /nologo /tlb".\Release\moving.tlb" /win32
! # ADD BASE RSC /l 1053 /d "NDEBUG"
! # ADD RSC /l 1053 /d "NDEBUG"
! BSC32=bscmake.exe
! # ADD BASE BSC32 /nologo
! # ADD BSC32 /nologo
! LINK32=link.exe
! # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ccgnu2.lib /nologo /out:".\Release\$(ProjectName).exe" /incremental:no /libpath:"..\lib" /pdb:".\Release\moving.pdb" /pdbtype:sept /subsystem:console /MACHINE:I386
! # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ccgnu2.lib /nologo /out:".\Release\$(ProjectName).exe" /incremental:no /libpath:"..\lib" /pdb:".\Release\moving.pdb" /pdbtype:sept /subsystem:console /MACHINE:I386
!
! !ENDIF
!
! # Begin Target
!
! # Name "moving - Win32 Debug"
! # Name "moving - Win32 Release"
! # Begin Group "Source Files"
!
! # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
! # Begin Source File
!
! SOURCE=..\tests\moving.cpp
! # End Source File
! # End Group
! # End Target
! # End Project
!
Index: moving.vcproj
===================================================================
RCS file: /cvsroot/alpp/openalpp/VisualStudio/moving.vcproj,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** moving.vcproj 16 Apr 2003 11:14:59 -0000 1.2
--- moving.vcproj 11 Dec 2003 09:32:49 -0000 1.3
***************
*** 1,6 ****
! <?xml version="1.0" encoding = "Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
! Version="7.00"
Name="moving"
ProjectGUID="{B9EDEBD3-BCC0-4ADB-A2BE-CAA2FBCD587E}"
--- 1,6 ----
! <?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
! Version="7.10"
Name="moving"
ProjectGUID="{B9EDEBD3-BCC0-4ADB-A2BE-CAA2FBCD587E}"
***************
*** 24,28 ****
Optimization="0"
OptimizeForProcessor="1"
! AdditionalIncludeDirectories="..\include"
PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE"
BasicRuntimeChecks="3"
--- 24,28 ----
Optimization="0"
OptimizeForProcessor="1"
! AdditionalIncludeDirectories="../include,../../portaudio/pa_common"
PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE"
BasicRuntimeChecks="3"
***************
*** 67,71 ****
--- 67,77 ----
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
***************
*** 80,85 ****
Name="VCCLCompilerTool"
InlineFunctionExpansion="1"
! OptimizeForProcessor="1"
! AdditionalIncludeDirectories="..\include"
PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE"
StringPooling="TRUE"
--- 86,91 ----
Name="VCCLCompilerTool"
InlineFunctionExpansion="1"
! OptimizeForProcessor="3"
! AdditionalIncludeDirectories="../include,../../portaudio/pa_common"
PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE"
StringPooling="TRUE"
***************
*** 122,128 ****
--- 128,142 ----
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
+ <References>
+ </References>
<Files>
<Filter
Index: openalpp.dsp
===================================================================
RCS file: /cvsroot/alpp/openalpp/VisualStudio/openalpp.dsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** openalpp.dsp 18 Oct 2002 12:46:08 -0000 1.2
--- openalpp.dsp 11 Dec 2003 09:32:49 -0000 1.3
***************
*** 1,232 ****
! # Microsoft Developer Studio Project File - Name="openalpp" - Package Owner=<4>
! # Microsoft Developer Studio Generated Build File, Format Version 6.00
! # ** DO NOT EDIT **
!
! # TARGTYPE "Win32 (x86) Static Library" 0x0104
!
! CFG=openalpp - Win32 Debug
! !MESSAGE This is not a valid makefile. To build this project using NMAKE,
! !MESSAGE use the Export Makefile command and run
! !MESSAGE
! !MESSAGE NMAKE /f "openalpp.mak".
! !MESSAGE
! !MESSAGE You can specify a configuration when running NMAKE
! !MESSAGE by defining the macro CFG on the command line. For example:
! !MESSAGE
! !MESSAGE NMAKE /f "openalpp.mak" CFG="openalpp - Win32 Debug"
! !MESSAGE
! !MESSAGE Possible choices for configuration are:
! !MESSAGE
! !MESSAGE "openalpp - Win32 Release" (based on "Win32 (x86) Static Library")
! !MESSAGE "openalpp - Win32 Debug" (based on "Win32 (x86) Static Library")
! !MESSAGE
!
! # Begin Project
! # PROP AllowPerConfigDependencies 0
! # PROP Scc_ProjName ""
! # PROP Scc_LocalPath ""
! CPP=cl.exe
! RSC=rc.exe
!
! !IF "$(CFG)" == "openalpp - Win32 Release"
!
! # PROP BASE Use_MFC 0
! # PROP BASE Use_Debug_Libraries 0
! # PROP BASE Output_Dir "Release"
! # PROP BASE Intermediate_Dir "Release"
! # PROP BASE Target_Dir ""
! # PROP Use_MFC 0
! # PROP Use_Debug_Libraries 0
! # PROP Output_Dir "Release"
! # PROP Intermediate_Dir "Release"
! # PROP Target_Dir ""
! # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
! # ADD CPP /nologo /G5 /MD /W3 /GX /O2 /I "../include" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
! # ADD BASE RSC /l 0x41d /d "NDEBUG"
! # ADD RSC /l 0x41d /d "NDEBUG"
! BSC32=bscmake.exe
! # ADD BASE BSC32 /nologo
! # ADD BSC32 /nologo
! LIB32=link.exe -lib
! # ADD BASE LIB32 /nologo
! # ADD LIB32 /nologo /out:"../lib\openalpp.lib"
!
! !ELSEIF "$(CFG)" == "openalpp - Win32 Debug"
!
! # PROP BASE Use_MFC 0
! # PROP BASE Use_Debug_Libraries 1
! # PROP BASE Output_Dir "Debug"
! # PROP BASE Intermediate_Dir "Debug"
! # PROP BASE Target_Dir ""
! # PROP Use_MFC 0
! # PROP Use_Debug_Libraries 1
! # PROP Output_Dir "Debug"
! # PROP Intermediate_Dir "Debug"
! # PROP Target_Dir ""
! # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
! # ADD CPP /nologo /G5 /MDd /W3 /Gm /GX /ZI /Od /I "../include" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
! # ADD BASE RSC /l 0x41d /d "_DEBUG"
! # ADD RSC /l 0x41d /d "_DEBUG"
! BSC32=bscmake.exe
! # ADD BASE BSC32 /nologo
! # ADD BSC32 /nologo
! LIB32=link.exe -lib
! # ADD BASE LIB32 /nologo
! # ADD LIB32 /nologo /out:"../lib\openalppd.lib"
!
! !ENDIF
!
! # Begin Target
!
! # Name "openalpp - Win32 Release"
! # Name "openalpp - Win32 Debug"
! # Begin Group "Source"
!
! # PROP Default_Filter ""
! # Begin Source File
!
! SOURCE=..\src\audiobase.cpp
! # End Source File
! # Begin Source File
!
! SOURCE=..\src\audioconvert.cpp
! # End Source File
! # Begin Source File
!
! SOURCE=..\src\audioenvironment.cpp
! # End Source File
! # Begin Source File
!
! SOURCE=..\src\deviceupdater.cpp
! # End Source File
! # Begin Source File
!
! SOURCE=..\src\error.cpp
! # End Source File
! # Begin Source File
!
! SOURCE=..\src\groupsource.cpp
! # End Source File
! # Begin Source File
!
! SOURCE=..\src\inputdevice.cpp
! # End Source File
! # Begin Source File
!
! SOURCE=..\src\listener.cpp
! # End Source File
! # Begin Source File
!
! SOURCE=..\src\netstream.cpp
! # End Source File
! # Begin Source File
!
! SOURCE=..\src\netupdater.cpp
! # End Source File
! # Begin Source File
!
! SOURCE=..\src\sample.cpp
! # End Source File
! # Begin Source File
!
! SOURCE=..\src\sounddata.cpp
! # End Source File
! # Begin Source File
!
! SOURCE=..\src\source.cpp
! # End Source File
! # Begin Source File
!
! SOURCE=..\src\sourcebase.cpp
! # End Source File
! # Begin Source File
!
! SOURCE=..\src\stream.cpp
! # End Source File
! # Begin Source File
!
! SOURCE=..\src\streamupdater.cpp
! # End Source File
! # End Group
! # Begin Group "Include"
!
! # PROP Default_Filter ""
! # Begin Source File
!
! SOURCE=..\include\openalpp\alpp.h
! # End Source File
! # Begin Source File
!
! SOURCE=..\include\openalpp\audiobase.h
! # End Source File
! # Begin Source File
!
! SOURCE=..\include\openalpp\audioconvert.h
! # End Source File
! # Begin Source File
!
! SOURCE=..\include\openalpp\audioenvironment.h
! # End Source File
! # Begin Source File
!
! SOURCE=..\include\openalpp\deviceupdater.h
! # End Source File
! # Begin Source File
!
! SOURCE=..\include\openalpp\error.h
! # End Source File
! # Begin Source File
!
! SOURCE=..\include\openalpp\groupsource.h
! # End Source File
! # Begin Source File
!
! SOURCE=..\include\openalpp\inputdevice.h
! # End Source File
! # Begin Source File
!
! SOURCE=..\include\openalpp\listener.h
! # End Source File
! # Begin Source File
!
! SOURCE=..\include\openalpp\netstream.h
! # End Source File
! # Begin Source File
!
! SOURCE=..\include\openalpp\netupdater.h
! # End Source File
! # Begin Source File
!
! SOURCE=..\include\openalpp\positionedobject.h
! # End Source File
! # Begin Source File
!
! SOURCE=..\include\openalpp\sample.h
! # End Source File
! # Begin Source File
!
! SOURCE=..\include\openalpp\sounddata.h
! # End Source File
! # Begin Source File
!
! SOURCE=..\include\openalpp\source.h
! # End Source File
! # Begin Source File
!
! SOURCE=..\include\openalpp\sourcebase.h
! # End Source File
! # Begin Source File
!
! SOURCE=..\include\openalpp\stream.h
! # End Source File
! # Begin Source File
!
! SOURCE=..\include\openalpp\streamupdater.h
! # End Source File
! # Begin Source File
!
! SOURCE=..\include\openalpp\windowsstuff.h
! # End Source File
! # End Group
! # End Target
! # End Project
--- 1,262 ----
! # Microsoft Developer Studio Project File - Name="open++al" - Package Owner=<4>
! # Microsoft Developer Studio Generated Build File, Format Version 6.00
! # ** DO NOT EDIT **
!
! # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
!
! CFG=open++al - Win32 Debug
! !MESSAGE This is not a valid makefile. To build this project using NMAKE,
! !MESSAGE use the Export Makefile command and run
! !MESSAGE
! !MESSAGE NMAKE /f "open++al.mak".
! !MESSAGE
! !MESSAGE You can specify a configuration when running NMAKE
! !MESSAGE by defining the macro CFG on the command line. For example:
! !MESSAGE
! !MESSAGE NMAKE /f "open++al.mak" CFG="open++al - Win32 Debug"
! !MESSAGE
! !MESSAGE Possible choices for configuration are:
! !MESSAGE
! !MESSAGE "open++al - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
! !MESSAGE "open++al - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
! !MESSAGE
!
! # Begin Project
! # PROP AllowPerConfigDependencies 0
! # PROP Scc_ProjName ""
! # PROP Scc_LocalPath ""
! CPP=cl.exe
! MTL=midl.exe
! RSC=rc.exe
!
! !IF "$(CFG)" == "open++al - Win32 Debug"
!
! # PROP BASE Use_MFC 0
! # PROP BASE Use_Debug_Libraries 1
! # PROP BASE Output_Dir "../lib"
! # PROP BASE Intermediate_Dir ".\Debug"
! # PROP BASE Target_Dir ""
! # PROP Use_MFC 0
! # PROP Use_Debug_Libraries 1
! # PROP Output_Dir "../lib"
! # PROP Intermediate_Dir ".\Debug"
! # PROP Target_Dir ""
! # ADD BASE CPP /nologo /MDd /I "../include" /I "../../portaudio/pa_common" /ZI /W3 /Od /G6 /D "_DEBUG" /D "_WINDOWS" /D "_USRDLL" /D "OPENALPP_EXPORTS" /D "WIN32" /D "_MBCS" /GR /YX /Fp".\Debug/openalpp.pch" /Fo".\Debug/" /Fd".\Debug/" /FR /GZ /c /GX
! # ADD CPP /nologo /MDd /I "../include" /I "../../portaudio/pa_common" /ZI /W3 /Od /G6 /D "_DEBUG" /D "_WINDOWS" /D "_USRDLL" /D "OPENALPP_EXPORTS" /D "WIN32" /D "_MBCS" /GR /YX /Fp".\Debug/openalpp.pch" /Fo".\Debug/" /Fd".\Debug/" /FR /GZ /c /GX
! # ADD BASE MTL /nologo /D"_DEBUG" /mktyplib203 /tlb".\..\lib\openalpp.tlb" /win32
! # ADD MTL /nologo /D"_DEBUG" /mktyplib203 /tlb".\..\lib\openalpp.tlb" /win32
! # ADD BASE RSC /l 1053 /d "_DEBUG"
! # ADD RSC /l 1053 /d "_DEBUG"
! BSC32=bscmake.exe
! # ADD BASE BSC32 /nologo
! # ADD BSC32 /nologo
! LINK32=link.exe
! # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ccgnu2d.lib alut.lib openal32.lib vorbisfile_d.lib ogg_d.lib pastaticdsd.lib winmm.lib wsock32.lib dsound.lib /nologo /dll /out:"..\bin\$(ProjectName)d.dll" /incremental:yes /libpath:"../../portaudio/lib" /debug /pdb:".\..\lib\openalppd.pdb" /pdbtype:sept /subsystem:windows /implib:"../lib/$(ProjectName)d.lib" /MACHINE:I386
! # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ccgnu2d.lib alut.lib openal32.lib vorbisfile_d.lib ogg_d.lib pastaticdsd.lib winmm.lib wsock32.lib dsound.lib /nologo /dll /out:"..\bin\$(ProjectName)d.dll" /incremental:yes /libpath:"../../portaudio/lib" /debug /pdb:".\..\lib\openalppd.pdb" /pdbtype:sept /subsystem:windows /implib:"../lib/$(ProjectName)d.lib" /MACHINE:I386
!
! !ELSEIF "$(CFG)" == "open++al - Win32 Release"
!
! # PROP BASE Use_MFC 0
! # PROP BASE Use_Debug_Libraries 0
! # PROP BASE Output_Dir "../lib"
! # PROP BASE Intermediate_Dir ".\Release"
! # PROP BASE Target_Dir ""
! # PROP Use_MFC 0
! # PROP Use_Debug_Libraries 0
! # PROP Output_Dir "../lib"
! # PROP Intermediate_Dir ".\Release"
! # PROP Target_Dir ""
! # ADD BASE CPP /nologo /MD /I "../include" /I "../../portaudio/pa_common" /W3 /Ob1 /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "OPENALPP_EXPORTS" /D "WIN32" /D "_MBCS" /GF /Gy /GR /YX /Fp".\Release/openalpp.pch" /Fo".\Release/" /Fd".\Release/" /c /GX
! # ADD CPP /nologo /MD /I "../include" /I "../../portaudio/pa_common" /W3 /Ob1 /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "OPENALPP_EXPORTS" /D "WIN32" /D "_MBCS" /GF /Gy /GR /YX /Fp".\Release/openalpp.pch" /Fo".\Release/" /Fd".\Release/" /c /GX
! # ADD BASE MTL /nologo /D"NDEBUG" /mktyplib203 /tlb".\..\lib\openalpp.tlb" /win32
! # ADD MTL /nologo /D"NDEBUG" /mktyplib203 /tlb".\..\lib\openalpp.tlb" /win32
! # ADD BASE RSC /l 1053 /d "NDEBUG"
! # ADD RSC /l 1053 /d "NDEBUG"
! BSC32=bscmake.exe
! # ADD BASE BSC32 /nologo
! # ADD BSC32 /nologo
! LINK32=link.exe
! # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ccgnu2.lib alut.lib openal32.lib vorbisfile.lib ogg.lib pastaticdsd.lib winmm.lib wsock32.lib dsound.lib /nologo /dll /out:"..\bin\$(ProjectName).dll" /incremental:no /libpath:"../../portaudio/lib" /nodefaultlib:"LIBCD" /nodefaultlib:"MSVCRTD" /pdb:".\..\lib\openalpp.pdb" /pdbtype:sept /subsystem:windows /implib:"../lib/$(ProjectName).lib" /MACHINE:I386
! # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ccgnu2.lib alut.lib openal32.lib vorbisfile.lib ogg.lib pastaticdsd.lib winmm.lib wsock32.lib dsound.lib /nologo /dll /out:"..\bin\$(ProjectName).dll" /incremental:no /libpath:"../../portaudio/lib" /nodefaultlib:"LIBCD" /nodefaultlib:"MSVCRTD" /pdb:".\..\lib\openalpp.pdb" /pdbtype:sept /subsystem:windows /implib:"../lib/$(ProjectName).lib" /MACHINE:I386
!
! !ENDIF
!
! # Begin Target
!
! # Name "open++al - Win32 Debug"
! # Name "open++al - Win32 Release"
! # Begin Group "Source files"
!
! # PROP Default_Filter ""
! # Begin Source File
!
! SOURCE=..\src\audiobase.cpp
! # End Source File
! # Begin Source File
!
! SOURCE=..\src\audioconvert.cpp
! # End Source File
! # Begin Source File
!
! SOURCE=..\src\audioenvironment.cpp
! # End Source File
! # Begin Source File
!
! SOURCE=..\src\deviceupdater.cpp
! # End Source File
! # Begin Source File
!
! SOURCE=..\src\error.cpp
! # End Source File
! # Begin Source File
!
! SOURCE=..\src\filestream.cpp
! # End Source File
! # Begin Source File
!
! SOURCE=..\src\filestreamupdater.cpp
! # End Source File
! # Begin Source File
!
! SOURCE=..\src\groupsource.cpp
! # End Source File
! # Begin Source File
!
! SOURCE=..\src\inputdevice.cpp
! # End Source File
! # Begin Source File
!
! SOURCE=..\src\listener.cpp
! # End Source File
! # Begin Source File
!
! SOURCE=..\src\netstream.cpp
! # End Source File
! # Begin Source File
!
! SOURCE=..\src\netupdater.cpp
! # End Source File
! # Begin Source File
!
! SOURCE=..\src\openalpp.cpp
! # End Source File
! # Begin Source File
!
! SOURCE=..\src\sample.cpp
! # End Source File
! # Begin Source File
!
! SOURCE=..\src\sounddata.cpp
! # End Source File
! # Begin Source File
!
! SOURCE=..\src\source.cpp
! # End Source File
! # Begin Source File
!
! SOURCE=..\src\sourcebase.cpp
! # End Source File
! # Begin Source File
!
! SOURCE=..\src\stream.cpp
! # End Source File
! # Begin Source File
!
! SOURCE=..\src\streamupdater.cpp
! # End Source File
! # End Group
! # Begin Group "Header files"
!
! # PROP Default_Filter ""
! # Begin Source File
!
! SOURCE=..\include\openalpp\alpp.h
! # End Source File
! # Begin Source File
!
! SOURCE=..\include\openalpp\audiobase.h
! # End Source File
! # Begin Source File
!
! SOURCE=..\include\openalpp\audioconvert.h
! # End Source File
! # Begin Source File
!
! SOURCE=..\include\openalpp\audioenvironment.h
! # End Source File
! # Begin Source File
!
! SOURCE=..\include\openalpp\deviceupdater.h
! # End Source File
! # Begin Source File
!
! SOURCE=..\include\openalpp\error.h
! # End Source File
! # Begin Source File
!
! SOURCE=..\include\openalpp\export.h
! # End Source File
! # Begin Source File
!
! SOURCE=..\include\openalpp\filestream.h
! # End Source File
! # Begin Source File
!
! SOURCE=..\include\openalpp\filestreamupdater.h
! # End Source File
! # Begin Source File
!
! SOURCE=..\include\openalpp\groupsource.h
! # End Source File
! # Begin Source File
!
! SOURCE=..\include\openalpp\inputdevice.h
! # End Source File
! # Begin Source File
!
! SOURCE=..\include\openalpp\listener.h
! # End Source File
! # Begin Source File
!
! SOURCE=..\include\openalpp\netstream.h
! # End Source File
! # Begin Source File
!
! SOURCE=..\include\openalpp\netupdater.h
! # End Source File
! # Begin Source File
!
! SOURCE=..\include\openalpp\positionedobject.h
! # End Source File
! # Begin Source File
!
! SOURCE=..\include\openalpp\sample.h
! # End Source File
! # Begin Source File
!
! SOURCE=..\include\openalpp\sounddata.h
! # End Source File
! # Begin Source File
!
! SOURCE=..\include\openalpp\source.h
! # End Source File
! # Begin Source File
!
! SOURCE=..\include\openalpp\sourcebase.h
! # End Source File
! # Begin Source File
!
! SOURCE=..\include\openalpp\stream.h
! # End Source File
! # Begin Source File
!
! SOURCE=..\include\openalpp\streamupdater.h
! # End Source File
! # Begin Source File
!
! SOURCE=..\include\openalpp\windowsstuff.h
! # End Source File
! # End Group
! # End Target
! # End Project
!
Index: openalpp.dsw
===================================================================
RCS file: /cvsroot/alpp/openalpp/VisualStudio/openalpp.dsw,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** openalpp.dsw 18 Oct 2002 12:46:08 -0000 1.2
--- openalpp.dsw 11 Dec 2003 09:32:49 -0000 1.3
***************
*** 1,104 ****
! Microsoft Developer Studio Workspace File, Format Version 6.00
! # WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
!
! ###############################################################################
!
! Project: "moving"=.\moving.dsp - Package Owner=<4>
!
! Package=<5>
! {{{
! }}}
!
! Package=<4>
! {{{
! Begin Project Dependency
! Project_Dep_Name openalpp
! End Project Dependency
! }}}
!
! ###############################################################################
!
! Project: "openalpp"=.\openalpp.dsp - Package Owner=<4>
!
! Package=<5>
! {{{
! }}}
!
! Package=<4>
! {{{
! }}}
!
! ###############################################################################
!
! Project: "simple"=.\simple.dsp - Package Owner=<4>
!
! Package=<5>
! {{{
! }}}
!
! Package=<4>
! {{{
! Begin Project Dependency
! Project_Dep_Name openalpp
! End Project Dependency
! }}}
!
! ###############################################################################
!
! Project: "testmic"=.\testmic.dsp - Package Owner=<4>
!
! Package=<5>
! {{{
! }}}
!
! Package=<4>
! {{{
! Begin Project Dependency
! Project_Dep_Name openalpp
! End Project Dependency
! }}}
!
! ###############################################################################
!
! Project: "testsend"=.\testsend.dsp - Package Owner=<4>
!
! Package=<5>
! {{{
! }}}
!
! Package=<4>
! {{{
! Begin Project Dependency
! Project_Dep_Name openalpp
! End Project Dependency
! }}}
!
! ###############################################################################
!
! Project: "teststream"=.\teststream.dsp - Package Owner=<4>
!
! Package=<5>
! {{{
! }}}
!
! Package=<4>
! {{{
! Begin Project Dependency
! Project_Dep_Name openalpp
! End Project Dependency
! }}}
!
! ###############################################################################
!
! Global:
!
! Package=<5>
! {{{
! }}}
!
! Package=<3>
! {{{
! }}}
!
! ###############################################################################
!
--- 1,101 ----
! Microsoft Developer Studio Workspace File, Format Version 6.00
! # WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
!
! ###############################################################################
!
! Project: "moving"=moving.dsp - Package Owner=<4>
!
! Package=<5>
! {{{
! }}}
!
! Package=<4>
! {{{
! }}}
!
! ###############################################################################
!
! Project: "simple"=simple.dsp - Package Owner=<4>
!
! Package=<5>
! {{{
! }}}
!
! Package=<4>
! {{{
! }}}
!
! ###############################################################################
!
! Project: "testmic"=testmic.dsp - Package Owner=<4>
!
! Package=<5>
! {{{
! }}}
!
! Package=<4>
! {{{
! }}}
!
! ###############################################################################
!
! Project: "testsend"=testsend.dsp - Package Owner=<4>
!
! Package=<5>
! {{{
! }}}
!
! Package=<4>
! {{{
! }}}
!
! ###############################################################################
!
! Project: "teststream"=teststream.dsp - Package Owner=<4>
!
! Package=<5>
! {{{
! }}}
!
! Package=<4>
! {{{
! }}}
!
! ###############################################################################
!
! Project: "testfstream"=testfstream.dsp - Package Owner=<4>
!
! Package=<5>
! {{{
! }}}
!
! Package=<4>
! {{{
! }}}
!
! ###############################################################################
!
! Project: "openalpp"=openalpp.dsp - Package Owner=<4>
!
! Package=<5>
! {{{
! }}}
!
! Package=<4>
! {{{
! }}}
!
! ###############################################################################
!
! Global:
!
! Package=<5>
! {{{
! }}}
!
! Package=<3>
! {{{
! }}}
!
! ###############################################################################
!
Index: openalpp.sln
===================================================================
RCS file: /cvsroot/alpp/openalpp/VisualStudio/openalpp.sln,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** openalpp.sln 16 Apr 2003 11:15:00 -0000 1.2
--- openalpp.sln 11 Dec 2003 09:32:49 -0000 1.3
***************
*** 1,29 ****
! Microsoft Visual Studio Solution File, Format Version 7.00
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "moving", "moving.vcproj", "{B9EDEBD3-BCC0-4ADB-A2BE-CAA2FBCD587E}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "simple", "simple.vcproj", "{33F6F3B5-3247-476A-A2D9-19316B88423B}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testmic", "testmic.vcproj", "{F98212F5-A462-4F75-9AF6-4ED4E79A4B1F}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testsend", "testsend.vcproj", "{9740C9CE-674E-4083-80FE-9ADE598B0000}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "teststream", "teststream.vcproj", "{3B36C471-B270-4A97-8A7E-0681ACAFB492}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testfstream", "testfstream.vcproj", "{3B36C471-B270-4A97-8A7E-0681ACAFB492}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "openalpp", "openalpp.vcproj", "{2BA79A95-C0A7-4F13-9D84-7912AEA4A8B3}"
EndProject
Global
GlobalSection(SolutionConfiguration) = preSolution
! ConfigName.0 = Debug
! ConfigName.1 = Release
! EndGlobalSection
! GlobalSection(ProjectDependencies) = postSolution
! {B9EDEBD3-BCC0-4ADB-A2BE-CAA2FBCD587E}.0 = {2BA79A95-C0A7-4F13-9D84-7912AEA4A8B3}
! {33F6F3B5-3247-476A-A2D9-19316B88423B}.0 = {2BA79A95-C0A7-4F13-9D84-7912AEA4A8B3}
! {F98212F5-A462-4F75-9AF6-4ED4E79A4B1F}.0 = {2BA79A95-C0A7-4F13-9D84-7912AEA4A8B3}
! {9740C9CE-674E-4083-80FE-9ADE598B0000}.0 = {2BA79A95-C0A7-4F13-9D84-7912AEA4A8B3}
! {3B36C471-B270-4A97-8A7E-0681ACAFB492}.0 = {2BA79A95-C0A7-4F13-9D84-7912AEA4A8B3}
! {3B36C471-B270-4A97-8A7E-0681ACAFB492}.0 = {2BA79A95-C0A7-4F13-9D84-7912AEA4A8B3}
EndGlobalSection
GlobalSection(ProjectConfiguration) = postSolution
--- 1,41 ----
! Microsoft Visual Studio Solution File, Format Version 8.00
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "moving", "moving.vcproj", "{B9EDEBD3-BCC0-4ADB-A2BE-CAA2FBCD587E}"
+ ProjectSection(ProjectDependencies) = postProject
+ {2BA79A95-C0A7-4F13-9D84-7912AEA4A8B3} = {2BA79A95-C0A7-4F13-9D84-7912AEA4A8B3}
+ EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "simple", "simple.vcproj", "{33F6F3B5-3247-476A-A2D9-19316B88423B}"
+ ProjectSection(ProjectDependencies) = postProject
+ {2BA79A95-C0A7-4F13-9D84-7912AEA4A8B3} = {2BA79A95-C0A7-4F13-9D84-7912AEA4A8B3}
+ EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testmic", "testmic.vcproj", "{F98212F5-A462-4F75-9AF6-4ED4E79A4B1F}"
+ ProjectSection(ProjectDependencies) = postProject
+ {2BA79A95-C0A7-4F13-9D84-7912AEA4A8B3} = {2BA79A95-C0A7-4F13-9D84-7912AEA4A8B3}
+ EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testsend", "testsend.vcproj", "{9740C9CE-674E-4083-80FE-9ADE598B0000}"
+ ProjectSection(ProjectDependencies) = postProject
+ {2BA79A95-C0A7-4F13-9D84-7912AEA4A8B3} = {2BA79A95-C0A7-4F13-9D84-7912AEA4A8B3}
+ EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "teststream", "teststream.vcproj", "{3B36C471-B270-4A97-8A7E-0681ACAFB492}"
+ ProjectSection(ProjectDependencies) = postProject
+ {2BA79A95-C0A7-4F13-9D84-7912AEA4A8B3} = {2BA79A95-C0A7-4F13-9D84-7912AEA4A8B3}
+ EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testfstream", "testfstream.vcproj", "{3B36C471-B270-4A97-8A7E-0681ACAFB492}"
+ ProjectSection(ProjectDependencies) = postProject
+ {2BA79A95-C0A7-4F13-9D84-7912AEA4A8B3} = {2BA79A95-C0A7-4F13-9D84-7912AEA4A8B3}
+ EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "openalpp", "openalpp.vcproj", "{2BA79A95-C0A7-4F13-9D84-7912AEA4A8B3}"
+ ProjectSection(ProjectDependencies) = postProject
+ EndProjectSection
EndProject
Global
GlobalSection(SolutionConfiguration) = preSolution
! Debug = Debug
! Release = Release
EndGlobalSection
GlobalSection(ProjectConfiguration) = postSolution
Index: openalpp.vcproj
===================================================================
RCS file: /cvsroot/alpp/openalpp/VisualStudio/openalpp.vcproj,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** openalpp.vcproj 9 Dec 2003 14:55:51 -0000 1.4
--- openalpp.vcproj 11 Dec 2003 09:32:49 -0000 1.5
***************
*** 1,7 ****
! <?xml version="1.0" encoding = "Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
! Version="7.00"
! Name="openalpp"
ProjectGUID="{2BA79A95-C0A7-4F13-9D84-7912AEA4A8B3}"
SccProjectName=""
--- 1,7 ----
! <?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
! Version="7.10"
! Name="open++al"
ProjectGUID="{2BA79A95-C0A7-4F13-9D84-7912AEA4A8B3}"
SccProjectName=""
***************
*** 24,28 ****
Optimization="0"
OptimizeForProcessor="2"
! AdditionalIncludeDirectories="../include"
PreprocessorDefinitions="_DEBUG;_WINDOWS;_USRDLL;OPENALPP_EXPORTS;WIN32"
BasicRuntimeChecks="3"
--- 24,28 ----
Optimization="0"
OptimizeForProcessor="2"
! AdditionalIncludeDirectories="../include,../../portaudio/pa_common"
PreprocessorDefinitions="_DEBUG;_WINDOWS;_USRDLL;OPENALPP_EXPORTS;WIN32"
BasicRuntimeChecks="3"
***************
*** 48,55 ****
LinkIncremental="2"
SuppressStartupBanner="TRUE"
! AdditionalLibraryDirectories="../lib,c:\projects\osgvr\lib,c:\projects\ConfigScript\lib,c:\projects\vrutils\lib,C:\tools\cmltoolkit\lib.chk\win32_single_msvcrt,c:\projects\openalpp\lib"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile=".\../lib/openalppd.pdb"
! ImportLibrary=".\../lib/openalppd.lib"/>
<Tool
Name="VCMIDLTool"
--- 48,55 ----
LinkIncremental="2"
SuppressStartupBanner="TRUE"
! AdditionalLibraryDirectories="../../portaudio/lib"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile=".\../lib/openalppd.pdb"
! ImportLibrary="../lib/$(ProjectName)d.lib"/>
<Tool
Name="VCMIDLTool"
***************
*** 72,76 ****
--- 72,82 ----
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
***************
*** 85,90 ****
Name="VCCLCompilerTool"
InlineFunctionExpansion="1"
! OptimizeForProcessor="2"
! AdditionalIncludeDirectories="../include"
PreprocessorDefinitions="NDEBUG;_WINDOWS;_USRDLL;OPENALPP_EXPORTS;WIN32"
StringPooling="TRUE"
--- 91,96 ----
Name="VCCLCompilerTool"
InlineFunctionExpansion="1"
! OptimizeForProcessor="3"
! AdditionalIncludeDirectories="../include,../../portaudio/pa_common"
PreprocessorDefinitions="NDEBUG;_WINDOWS;_USRDLL;OPENALPP_EXPORTS;WIN32"
StringPooling="TRUE"
***************
*** 109,116 ****
LinkIncremental="1"
SuppressStartupBanner="TRUE"
! AdditionalLibraryDirectories="./lib,c:\projects\osgvr\lib,c:\projects\ConfigScript\lib,c:\projects\vrutils\lib,C:\tools\cmltoolkit\lib.rel\win32_single_msvcrt,c:\projects\openalpp\lib"
IgnoreDefaultLibraryNames="LIBCD,MSVCRTD"
ProgramDatabaseFile=".\../lib/openalpp.pdb"
! ImportLibrary=".\../lib/openalpp.lib"/>
<Tool
Name="VCMIDLTool"
--- 115,122 ----
LinkIncremental="1"
SuppressStartupBanner="TRUE"
! AdditionalLibraryDirectories="../../portaudio/lib"
IgnoreDefaultLibraryNames="LIBCD,MSVCRTD"
ProgramDatabaseFile=".\../lib/openalpp.pdb"
! ImportLibrary="../lib/$(ProjectName).lib"/>
<Tool
Name="VCMIDLTool"
***************
*** 133,139 ****
--- 139,153 ----
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
+ <References>
+ </References>
<Files>
<Filter
Index: simple.dsp
===================================================================
RCS file: /cvsroot/alpp/openalpp/VisualStudio/simple.dsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** simple.dsp 18 Oct 2002 12:46:08 -0000 1.2
--- simple.dsp 11 Dec 2003 09:32:49 -0000 1.3
***************
*** 1,94 ****
! # Microsoft Developer Studio Project File - Name="simple" - Package Owner=<4>
! # Microsoft Developer Studio Generated Build File, Format Version 6.00
! # ** DO NOT EDIT **
!
! # TARGTYPE "Win32 (x86) Console Application" 0x0103
!
! CFG=simple - Win32 Debug
! !MESSAGE This is not a valid makefile. To build this project using NMAKE,
! !MESSAGE use the Export Makefile command and run
! !MESSAGE
! !MESSAGE NMAKE /f "simple.mak".
! !MESSAGE
! !MESSAGE You can specify a configuration when running NMAKE
! !MESSAGE by defining the macro CFG on the command line. For example:
! !MESSAGE
! !MESSAGE NMAKE /f "simple.mak" CFG="simple - Win32 Debug"
! !MESSAGE
! !MESSAGE Possible choices for configuration are:
! !MESSAGE
! !MESSAGE "simple - Win32 Release" (based on "Win32 (x86) Console Application")
! !MESSAGE "simple - Win32 Debug" (based on "Win32 (x86) Console Application")
! !MESSAGE
!
! # Begin Project
! # PROP AllowPerConfigDependencies 0
! # PROP Scc_ProjName ""
! # PROP Scc_LocalPath ""
! CPP=cl.exe
! RSC=rc.exe
!
! !IF "$(CFG)" == "simple - Win32 Release"
!
! # PROP BASE Use_MFC 0
! # PROP BASE Use_Debug_Libraries 0
! # PROP BASE Output_Dir "Release"
! # PROP BASE Intermediate_Dir "Release"
! # PROP BASE Target_Dir ""
! # PROP Use_MFC 0
! # PROP Use_Debug_Libraries 0
! # PROP Output_Dir "Release"
! # PROP Intermediate_Dir "Release"
! # PROP Ignore_Export_Lib 0
! # PROP Target_Dir ""
! # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
! # ADD CPP /nologo /G5 /MD /W3 /GX /O2 /I "..\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
! # ADD BASE RSC /l 0x41d /d "NDEBUG"
! # ADD RSC /l 0x41d /d "NDEBUG"
! BSC32=bscmake.exe
! # ADD BASE BSC32 /nologo
! # ADD BSC32 /nologo
! LINK32=link.exe
! # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
! # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib openalpp.lib openal32.lib alut.lib ccgnu2.lib /nologo /subsystem:console /machine:I386 /out:"../bin\simple.exe" /libpath:"..\lib"
!
! !ELSEIF "$(CFG)" == "simple - Win32 Debug"
!
! # PROP BASE Use_MFC 0
! # PROP BASE Use_Debug_Libraries 1
! # PROP BASE Output_Dir "Debug"
! # PROP BASE Intermediate_Dir "Debug"
! # PROP BASE Target_Dir ""
! # PROP Use_MFC 0
! # PROP Use_Debug_Libraries 1
! # PROP Output_Dir "Debug"
! # PROP Intermediate_Dir "Debug"
! # PROP Ignore_Export_Lib 0
! # PROP Target_Dir ""
! # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
! # ADD CPP /nologo /G5 /MDd /W3 /Gm /GX /ZI /Od /I "..\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
! # ADD BASE RSC /l 0x41d /d "_DEBUG"
! # ADD RSC /l 0x41d /d "_DEBUG"
! BSC32=bscmake.exe
! # ADD BASE BSC32 /nologo
! # ADD BSC32 /nologo
! LINK32=link.exe
! # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
! # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib openalppd.lib openal32.lib alut.lib ccgnu2.lib /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libcd.lib" /out:"../bin\simple.exe" /pdbtype:sept /libpath:"..\lib"
!
! !ENDIF
!
! # Begin Target
!
! # Name "simple - Win32 Release"
! # Name "simple - Win32 Debug"
! # Begin Group "Source Files"
!
! # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
! # Begin Source File
!
! SOURCE=..\tests\simple.cpp
! # End Source File
! # End Group
! # End Target
! # End Project
--- 1,98 ----
! # Microsoft Developer Studio Project File - Name="simple" - Package Owner=<4>
! # Microsoft Developer Studio Generated Build File, Format Version 6.00
! # ** DO NOT EDIT **
!
! # TARGTYPE "Win32 (x86) Console Application" 0x0103
!
! CFG=simple - Win32 Release
! !MESSAGE This is not a valid makefile. To build this project using NMAKE,
! !MESSAGE use the Export Makefile command and run
! !MESSAGE
! !MESSAGE NMAKE /f "simple.mak".
! !MESSAGE
! !MESSAGE You can specify a configuration when running NMAKE
! !MESSAGE by defining the macro CFG on the command line. For example:
! !MESSAGE
! !MESSAGE NMAKE /f "simple.mak" CFG="simple - Win32 Release"
! !MESSAGE
! !MESSAGE Possible choices for configuration are:
! !MESSAGE
! !MESSAGE "simple - Win32 Release" (based on "Win32 (x86) Console Application")
! !MESSAGE "simple - Win32 Debug" (based on "Win32 (x86) Console Application")
! !MESSAGE
!
! # Begin Project
! # PROP AllowPerConfigDependencies 0
! # PROP Scc_ProjName ""
! # PROP Scc_LocalPath ""
! CPP=cl.exe
! MTL=midl.exe
! RSC=rc.exe
!
! !IF "$(CFG)" == "simple - Win32 Release"
!
! # PROP BASE Use_MFC 0
! # PROP BASE Use_Debug_Libraries 0
! # PROP BASE Output_Dir ".\Release"
! # PROP BASE Intermediate_Dir ".\Release"
! # PROP BASE Target_Dir ""
! # PROP Use_MFC 0
! # PROP Use_Debug_Libraries 0
! # PROP Output_Dir ".\Release"
! # PROP Intermediate_Dir ".\Release"
! # PROP Target_Dir ""
! # ADD BASE CPP /nologo /MD /I "../include" /I "../../portaudio/pa_common" /W3 /Ob1 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /GF /Gy /YX /Fp".\Release/simple.pch" /Fo".\Release/" /Fd".\Release/" /c /GX
! # ADD CPP /nologo /MD /I "../include" /I "../../portaudio/pa_common" /W3 /Ob1 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /GF /Gy /YX /Fp".\Release/simple.pch" /Fo".\Release/" /Fd".\Release/" /c /GX
! # ADD BASE MTL /nologo /tlb".\Release\simple.tlb" /win32
! # ADD MTL /nologo /tlb".\Release\simple.tlb" /win32
! # ADD BASE RSC /l 1053 /d "NDEBUG"
! # ADD RSC /l 1053 /d "NDEBUG"
! BSC32=bscmake.exe
! # ADD BASE BSC32 /nologo
! # ADD BSC32 /nologo
! LINK32=link.exe
! # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ccgnu2.lib /nologo /out:".\Release\$(ProjectName).exe" /incremental:no /libpath:"..\lib" /nodefaultlib:"MSVCRTD" /nodefaultlib:"libcd" /pdb:".\Release\simple.pdb" /pdbtype:sept /subsystem:console /MACHINE:I386
! # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ccgnu2.lib /nologo /out:".\Release\$(ProjectName).exe" /incremental:no /libpath:"..\lib" /nodefaultlib:"MSVCRTD" /nodefaultlib:"libcd" /pdb:".\Release\simple.pdb" /pdbtype:sept /subsystem:console /MACHINE:I386
!
! !ELSEIF "$(CFG)" == "simple - Win32 Debug"
!
! # PROP BASE Use_MFC 0
! # PROP BASE Use_Debug_Libraries 1
! # PROP BASE Output_Dir "..\bin"
! # PROP BASE Intermediate_Dir ".\Debug"
! # PROP BASE Target_Dir ""
! # PROP Use_MFC 0
! # PROP Use_Debug_Libraries 1
! # PROP Output_Dir "..\bin"
! # PROP Intermediate_Dir ".\Debug"
! # PROP Target_Dir ""
! # ADD BASE CPP /nologo /MDd /I "../include" /I "../../portaudio/pa_common" /ZI /W3 /Od /G6 /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /Fp".\Debug/simple.pch" /Fo".\Debug/" /Fd".\Debug/" /GZ /c /GX
! # ADD CPP /nologo /MDd /I "../include" /I "../../portaudio/pa_common" /ZI /W3 /Od /G6 /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /Fp".\Debug/simple.pch" /Fo".\Debug/" /Fd".\Debug/" /GZ /c /GX
! # ADD BASE MTL /nologo /tlb".\Debug\simple.tlb" /win32
! # ADD MTL /nologo /tlb".\Debug\simple.tlb" /win32
! # ADD BASE RSC /l 1053 /d "_DEBUG"
! # ADD RSC /l 1053 /d "_DEBUG"
! BSC32=bscmake.exe
! # ADD BASE BSC32 /nologo
! # ADD BSC32 /nologo
! LINK32=link.exe
! # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ccgnu2d.lib /nologo /out:"..\bin\$(ProjectName)d.exe" /incremental:yes /libpath:"..\lib" /nodefaultlib:"libcd.lib" /debug /pdb:".\Debug\simple.pdb" /pdbtype:sept /subsystem:console /MACHINE:I386
! # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ccgnu2d.lib /nologo /out:"..\bin\$(ProjectName)d.exe" /incremental:yes /libpath:"..\lib" /nodefaultlib:"libcd.lib" /debug /pdb:".\Debug\simple.pdb" /pdbtype:sept /subsystem:console /MACHINE:I386
!
! !ENDIF
!
! # Begin Target
!
! # Name "simple - Win32 Release"
! # Name "simple - Win32 Debug"
! # Begin Group "Source Files"
!
! # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
! # Begin Source File
!
! SOURCE=..\tests\simple.cpp
! # End Source File
! # End Group
! # End Target
! # End Project
!
Index: simple.vcproj
===================================================================
RCS file: /cvsroot/alpp/openalpp/VisualStudio/simple.vcproj,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** simple.vcproj 16 Apr 2003 11:15:00 -0000 1.2
--- simple.vcproj 11 Dec 2003 09:32:49 -0000 1.3
***************
*** 1,6 ****
! <?xml version="1.0" encoding = "Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
! Version="7.00"
Name="simple"
ProjectGUID="{33F6F3B5-3247-476A-A2D9-19316B88423B}"
--- 1,6 ----
! <?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
! Version="7.10"
Name="simple"
ProjectGUID="{33F6F3B5-3247-476A-A2D9-19316B88423B}"
***************
*** 23,28 ****
Name="VCCLCompilerTool"
InlineFunctionExpansion="1"
! OptimizeForProcessor="2"
! AdditionalIncludeDirectories="..\include"
PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE"
StringPooling="TRUE"
--- 23,28 ----
Name="VCCLCompilerTool"
InlineFunctionExpansion="1"
! OptimizeForProcessor="3"
! AdditionalIncludeDirectories="../include,../../portaudio/pa_common"
PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE"
StringPooling="TRUE"
***************
*** 66,70 ****
--- 66,76 ----
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
***************
*** 80,84 ****
Optimization="0"
OptimizeForProcessor="2"
! AdditionalIncludeDirectories="..\include"
PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE"
BasicRuntimeChecks="3"
--- 86,90 ----
Optimization="0"
OptimizeForProcessor="2"
! AdditionalIncludeDirectories="../include,../../portaudio/pa_common"
PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE"
BasicRuntimeChecks="3"
***************
*** 123,129 ****
--- 129,143 ----
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
+ <References>
+ </References>
<Files>
<Filter
Index: testfstream.vcproj
===================================================================
RCS file: /cvsroot/alpp/openalpp/VisualStudio/testfstream.vcproj,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** testfstream.vcproj 16 Apr 2003 11:15:00 -0000 1.1
--- testfstream.vcproj 11 Dec 2003 09:32:49 -0000 1.2
***************
*** 1,6 ****
! <?xml version="1.0" encoding = "Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
! Version="7.00"
Name="testfstream"
ProjectGUID="{3B36C471-B270-4A97-8A7E-0681ACAFB492}"
--- 1,6 ----
! <?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
! Version="7.10"
Name="testfstream"
ProjectGUID="{3B36C471-B270-4A97-8A7E-0681ACAFB492}"
***************
*** 24,28 ****
Optimization="0"
OptimizeForProcessor="2"
! AdditionalIncludeDirectories="..\include"
PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE"
BasicRuntimeChecks="3"
--- 24,28 ----
Optimization="0"
OptimizeForProcessor="2"
! AdditionalIncludeDirectories="../include,../../portaudio/pa_common"
PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE"
BasicRuntimeChecks="3"
***************
*** 42,46 ****
Name="VCLinkerTool"
AdditionalOptions="/MACHINE:I386"
! AdditionalDependencies="ccgnu2.lib"
OutputFile="$(OutDir)/$(ProjectName)d.exe"
LinkIncremental="2"
--- 42,46 ----
Name="VCLinkerTool"
AdditionalOptions="/MACHINE:I386"
! AdditionalDependencies="ccgnu2d.lib"
OutputFile="$(OutDir)/$(ProjectName)d.exe"
LinkIncremental="2"
***************
*** 67,71 ****
--- 67,77 ----
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
***************
*** 80,85 ****
Name="VCCLCompilerTool"
InlineFunctionExpansion="1"
! OptimizeForProcessor="2"
! AdditionalIncludeDirectories="..\include"
PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE"
StringPooling="TRUE"
--- 86,91 ----
Name="VCCLCompilerTool"
InlineFunctionExpansion="1"
! OptimizeForProcessor="3"
! AdditionalIncludeDirectories="../include,../../portaudio/pa_common"
PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE"
StringPooling="TRUE"
***************
*** 99,103 ****
Name="VCLinkerTool"
AdditionalOptions="/MACHINE:I386"
! AdditionalDependencies="odbc32.lib odbccp32.lib openal32.lib alut.lib ccgnu2.lib wsock32.lib"
OutputFile="$(OutDir)/$(ProjectName).exe"
LinkIncremental="1"
--- 105,109 ----
Name="VCLinkerTool"
AdditionalOptions="/MACHINE:I386"
! AdditionalDependencies="ccgnu2.lib"
OutputFile="$(OutDir)/$(ProjectName).exe"
LinkIncremental="1"
***************
*** 122,128 ****
--- 128,142 ----
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
+ <References>
+ </References>
<Files>
<Filter
Index: testmic.dsp
===================================================================
RCS file: /cvsroot/alpp/openalpp/VisualStudio/testmic.dsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** testmic.dsp 18 Oct 2002 12:46:08 -0000 1.2
--- testmic.dsp 11 Dec 2003 09:32:49 -0000 1.3
***************
*** 1,94 ****
! # Microsoft Developer Studio Project File - Name="testmic" - Package Owner=<4>
! # Microsoft Developer Studio Generated Build File, Format Version 6.00
! # ** DO NOT EDIT **
!
! # TARGTYPE "Win32 (x86) Console Application" 0x0103
!
! CFG=testmic - Win32 Debug
! !MESSAGE This is not a valid makefile. To build this project using NMAKE,
! !MESSAGE use the Export Makefile command and run
! !MESSAGE
! !MESSAGE NMAKE /f "testmic.mak".
! !MESSAGE
! !MESSAGE You can specify a configuration when running NMAKE
! !MESSAGE by defining the macro CFG on the command line. For example:
! !MESSAGE
! !MESSAGE NMAKE /f "testmic.mak" CFG="testmic - Win32 Debug"
! !MESSAGE
! !MESSAGE Possible choices for configuration are:
! !MESSAGE
! !MESSAGE "testmic - Win32 Release" (based on "Win32 (x86) Console Application")
! !MESSAGE "testmic - Win32 Debug" (based on "Win32 (x86) Console Application")
! !MESSAGE
!
! # Begin Project
! # PROP AllowPerConfigDependencies 0
! # PROP Scc_ProjName ""
! # PROP Scc_LocalPath ""
! CPP=cl.exe
! RSC=rc.exe
!
! !IF "$(CFG)" == "testmic - Win32 Release"
!
! # PROP BASE Use_MFC 0
! # PROP BASE Use_Debug_Libraries 0
! # PROP BASE Output_Dir "testmic___Win32_Release"
! # PROP BASE Intermediate_Dir "testmic___Win32_Release"
! # PROP BASE Target_Dir ""
! # PROP Use_MFC 0
! # PROP Use_Debug_Libraries 0
! # PROP Output_Dir "testmic___Win32_Release"
! # PROP Intermediate_Dir "testmic___Win32_Release"
! # PROP Ignore_Export_Lib 0
! # PROP Target_Dir ""
! # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
! # ADD CPP /nologo /G5 /MD /W3 /GX /O2 /I "..\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FR /YX /FD /c
! # ADD BASE RSC /l 0x41d /d "NDEBUG"
! # ADD RSC /l 0x41d /d "NDEBUG"
! BSC32=bscmake.exe
! # ADD BASE BSC32 /nologo
! # ADD BSC32 /nologo
! LINK32=link.exe
! # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
! # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib openalpp.lib openal32.lib alut.lib ccgnu2.lib pastaticdsd.lib dsound.lib winmm.lib /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcd" /out:"../bin\testmic.exe" /libpath:"..\lib"
!
! !ELSEIF "$(CFG)" == "testmic - Win32 Debug"
!
! # PROP BASE Use_MFC 0
! # PROP BASE Use_Debug_Libraries 1
! # PROP BASE Output_Dir "testmic___Win32_Debug"
! # PROP BASE Intermediate_Dir "testmic___Win32_Debug"
! # PROP BASE Target_Dir ""
! # PROP Use_MFC 0
! # PROP Use_Debug_Libraries 1
! # PROP Output_Dir "testmic___Win32_Debug"
! # PROP Intermediate_Dir "testmic___Win32_Debug"
! # PROP Ignore_Export_Lib 0
! # PROP Target_Dir ""
! # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
! # ADD CPP /nologo /G5 /MDd /W3 /Gm /GX /ZI /Od /I "../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
! # ADD BASE RSC /l 0x41d /d "_DEBUG"
! # ADD RSC /l 0x41d /d "_DEBUG"
! BSC32=bscmake.exe
! # ADD BASE BSC32 /nologo
! # ADD BSC32 /nologo
! LINK32=link.exe
! # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
! # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib...
[truncated message content] |
|
From: <vr-...@us...> - 2003-12-11 09:32:53
|
Update of /cvsroot/alpp/openalpp/src In directory sc8-pr-cvs1:/tmp/cvs-serv23117/src Modified Files: deviceupdater.cpp inputdevice.cpp Log Message: Updated .dsw and .dsp files for VC6 Added a config.h for various configuration switches. Added ALPP_USE_PORTAUDIO to reflect if PortAudio is available or not. Changed libraryname under windows to open++al.lib/.dll due to clash with wrapper search algorithm for OpenAL Index: deviceupdater.cpp =================================================================== RCS file: /cvsroot/alpp/openalpp/src/deviceupdater.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** deviceupdater.cpp 18 Oct 2002 07:50:13 -0000 1.7 --- deviceupdater.cpp 11 Dec 2003 09:32:49 -0000 1.8 *************** *** 22,25 **** --- 22,26 ---- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ + #ifdef ALPP_USE_PORTAUDIO #include "openalpp/deviceupdater.h" *************** *** 138,139 **** --- 139,141 ---- } + #endif // ifdef ALPP_USE_PORTAUDIO \ No newline at end of file Index: inputdevice.cpp =================================================================== RCS file: /cvsroot/alpp/openalpp/src/inputdevice.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** inputdevice.cpp 7 Mar 2003 20:30:07 -0000 1.8 --- inputdevice.cpp 11 Dec 2003 09:32:49 -0000 1.9 *************** *** 26,29 **** --- 26,32 ---- #include "openalpp/inputdevice.h" #include "openalpp/sample.h" + + #ifdef ALPP_USE_PORTAUDIO + #include <portaudio.h> *************** *** 72,73 **** --- 75,77 ---- } + #endif \ No newline at end of file |
|
From: <vr-...@us...> - 2003-12-11 09:32:53
|
Update of /cvsroot/alpp/openalpp/tests
In directory sc8-pr-cvs1:/tmp/cvs-serv23117/tests
Modified Files:
moving.cpp testmic.cpp
Log Message:
Updated .dsw and .dsp files for VC6
Added a config.h for various configuration switches.
Added ALPP_USE_PORTAUDIO to reflect if PortAudio is available or not.
Changed libraryname under windows to open++al.lib/.dll due to clash with
wrapper search algorithm for OpenAL
Index: moving.cpp
===================================================================
RCS file: /cvsroot/alpp/openalpp/tests/moving.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** moving.cpp 21 Feb 2003 14:48:24 -0000 1.9
--- moving.cpp 11 Dec 2003 09:32:49 -0000 1.10
***************
*** 39,42 ****
--- 39,43 ----
int main() {
try {
+ Source *asd = new Source("bee.wav");
Source beesound("bee.wav");
beesound.SetGain(1);
Index: testmic.cpp
===================================================================
RCS file: /cvsroot/alpp/openalpp/tests/testmic.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** testmic.cpp 28 Feb 2003 08:36:24 -0000 1.10
--- testmic.cpp 11 Dec 2003 09:32:49 -0000 1.11
***************
*** 35,38 ****
--- 35,42 ----
int main() {
+
+ #ifdef ALPP_USE_PORTAUDIO
+
+
try {
InputDevice mic;
***************
*** 84,87 ****
--- 88,95 ----
std::cin.get();
+ #else
+ std::cerr << "Use of portaudio is not compiled to the project" << std::endl;
+ std::cerr << "Look into the config.h and modify that if you inted to use PortAudio" << std::endl;
+ #endif
return 0;
|
|
From: <vr-...@us...> - 2003-12-11 09:32:52
|
Update of /cvsroot/alpp/openalpp/include/openalpp
In directory sc8-pr-cvs1:/tmp/cvs-serv23117/include/openalpp
Modified Files:
Makefile.am deviceupdater.h positionedobject.h
Added Files:
config.h
Log Message:
Updated .dsw and .dsp files for VC6
Added a config.h for various configuration switches.
Added ALPP_USE_PORTAUDIO to reflect if PortAudio is available or not.
Changed libraryname under windows to open++al.lib/.dll due to clash with
wrapper search algorithm for OpenAL
--- NEW FILE: config.h ---
(This appears to be a binary file; contents omitted.)
Index: Makefile.am
===================================================================
RCS file: /cvsroot/alpp/openalpp/include/openalpp/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Makefile.am 16 Apr 2003 11:39:42 -0000 1.3
--- Makefile.am 11 Dec 2003 09:32:49 -0000 1.4
***************
*** 22,24 ****
filestreamupdater.h \
export.h \
! windowsstuff.h
--- 22,25 ----
filestreamupdater.h \
export.h \
! windowsstuff.h \
! config.h
Index: deviceupdater.h
===================================================================
RCS file: /cvsroot/alpp/openalpp/include/openalpp/deviceupdater.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** deviceupdater.h 16 Apr 2003 11:15:01 -0000 1.2
--- deviceupdater.h 11 Dec 2003 09:32:49 -0000 1.3
***************
*** 29,35 ****
#include "openalpp/streamupdater.h"
#include "openalpp/error.h"
- #include <portaudio.h>
#include "openalpp/export.h"
namespace openalpp {
--- 29,37 ----
#include "openalpp/streamupdater.h"
#include "openalpp/error.h"
#include "openalpp/export.h"
+ #ifdef ALPP_USE_PORT_AUDIO
+ #include <portaudio.h>
+
namespace openalpp {
***************
*** 89,92 ****
--- 91,95 ----
}
+ #endif // ifdef ALPP_USE_PORTAUDIO
#endif /* DEVICEUPDATER_H_INCLUDED_C419EA9C */
Index: positionedobject.h
===================================================================
RCS file: /cvsroot/alpp/openalpp/include/openalpp/positionedobject.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** positionedobject.h 16 Apr 2003 11:15:01 -0000 1.3
--- positionedobject.h 11 Dec 2003 09:32:49 -0000 1.4
***************
*** 39,42 ****
--- 39,43 ----
public:
+ PositionedObject() {}
virtual ~PositionedObject() {}
|
|
From: <vr-...@us...> - 2003-12-11 09:32:52
|
Update of /cvsroot/alpp/openalpp In directory sc8-pr-cvs1:/tmp/cvs-serv23117 Modified Files: INSTALL Added Files: AUTHORS NEWS README Removed Files: W32INST.BAT Log Message: Updated .dsw and .dsp files for VC6 Added a config.h for various configuration switches. Added ALPP_USE_PORTAUDIO to reflect if PortAudio is available or not. Changed libraryname under windows to open++al.lib/.dll due to clash with wrapper search algorithm for OpenAL --- NEW FILE: AUTHORS --- (This appears to be a binary file; contents omitted.) --- NEW FILE: NEWS --- NEWS 2003-12-11 Anders Backman: Recently (november 2003) there is a wrapper system for OpenAL. It searches for .dll files called *openal*.dll and loads them, thinking it is an implementation of OpenAL32. This does not work with the previous library name of this project (openalpp.lib/.dll). So for now it is called open++al.dll. Its not a nice name, but I cant find out any better solution to this problem. --- NEW FILE: README --- (This appears to be a binary file; contents omitted.) Index: INSTALL =================================================================== RCS file: /cvsroot/alpp/openalpp/INSTALL,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** INSTALL 18 Feb 2002 14:45:25 -0000 1.2 --- INSTALL 11 Dec 2003 09:32:49 -0000 1.3 *************** *** 23,43 **** Windows ------- ! OpenAL++ has been successfully compiled using Visual C++. It should work using other compilers too. There are three ways to compile and install OpenAl++. Whichever way you choose, you should make sure that the necessary paths (include, lib etc.) are correct. For example (in DOS) by using "set INCLUDE=%INCLUDE%;additional path here". - 1 - ! Open up the workspace (openalpp.dsw) in Visual C++. Make sure openalpp is the active project (Build/Set Active Configuration. Openalpp - Win32 Release). Be sure to set any include paths that might be necessary for PortAudio, CommonC++ and/or OpenAL. This can be done under Project/Settings/C/C++/Additional include directories. Also, if you have installed libraries in "non-standard" places, additional library paths should be set under Project/Settings/Link/Input/Additional library path. Build the library (hit F7) ! Copy openalpp.lib from the lib directory to C:\WINDOWS\SYSTEM (if the library is compiled in debug-mode, it will be called openalppd.lib) ! Create the directory alpp somewhere in your include path. ! Copy all the *.h files from include to the newly created directory. ! - 2 - ! Edit W32INST.BAT to make sure the paths are correct ! Run W32INST.BAT. nmake must be installed for this to work. ! - 3 - ! Use another compiler to compile the library and do the last three steps in 1 to install it. Other platforms --- 23,48 ---- Windows ------- ! DISCLAIMER!! ! ! Recently (november 2003) there is a wrapper system for OpenAL. ! It searches for .dll files called *openal*.dll and loads them, thinking it is an implementation ! of OpenAL32. This does not work with the previous library name of this project (openalpp.lib/.dll). ! So for now it is called open++al.dll. Its not a nice name, but I cant find out any better solution to this ! problem. ! ! ! OpenAL++ has been successfully compiled using Visual C++ 6.0/.NET2000/.NET2003. ! It should work using other compilers too. There are three ways to compile and install OpenAl++. Whichever way you choose, you should make sure that the necessary paths (include, lib etc.) are correct. For example (in DOS) by using "set INCLUDE=%INCLUDE%;additional path here". - 1 - ! Open up the workspace (openalpp.dsw/openalpp.sln) in Visual C++. Make sure openalpp is the active project (Build/Set Active Configuration. Openalpp - Win32 Release). Be sure to set any include paths that might be necessary for PortAudio, CommonC++ and/or OpenAL. This can be done under Project/Settings/C/C++/Additional include directories. Also, if you have installed libraries in "non-standard" places, additional library paths should be set under Project/Settings/Link/Input/Additional library path. Build the library (hit F7) ! The library and dll files are named open++al.lib open++al.dll and resides in the lib and the bin directory ! in the project root. ! Other platforms --- W32INST.BAT DELETED --- |
|
From: <vr-...@us...> - 2003-12-09 14:55:55
|
Update of /cvsroot/alpp/openalpp/VisualStudio In directory sc8-pr-cvs1:/tmp/cvs-serv7819 Modified Files: openalpp.vcproj Log Message: Moved dll files to bin instead of lib Index: openalpp.vcproj =================================================================== RCS file: /cvsroot/alpp/openalpp/VisualStudio/openalpp.vcproj,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** openalpp.vcproj 16 Apr 2003 12:16:42 -0000 1.3 --- openalpp.vcproj 9 Dec 2003 14:55:51 -0000 1.4 *************** *** 45,49 **** AdditionalOptions="/MACHINE:I386" AdditionalDependencies="ccgnu2d.lib alut.lib openal32.lib vorbisfile_d.lib ogg_d.lib pastaticdsd.lib winmm.lib wsock32.lib dsound.lib" ! OutputFile="$(OutDir)/$(ProjectName)d.dll" LinkIncremental="2" SuppressStartupBanner="TRUE" --- 45,49 ---- AdditionalOptions="/MACHINE:I386" AdditionalDependencies="ccgnu2d.lib alut.lib openal32.lib vorbisfile_d.lib ogg_d.lib pastaticdsd.lib winmm.lib wsock32.lib dsound.lib" ! OutputFile="../bin/$(ProjectName)d.dll" LinkIncremental="2" SuppressStartupBanner="TRUE" *************** *** 106,110 **** AdditionalOptions="/MACHINE:I386" AdditionalDependencies="ccgnu2.lib alut.lib openal32.lib vorbisfile.lib ogg.lib pastaticdsd.lib winmm.lib wsock32.lib dsound.lib" ! OutputFile="$(OutDir)/$(ProjectName).dll" LinkIncremental="1" SuppressStartupBanner="TRUE" --- 106,110 ---- AdditionalOptions="/MACHINE:I386" AdditionalDependencies="ccgnu2.lib alut.lib openal32.lib vorbisfile.lib ogg.lib pastaticdsd.lib winmm.lib wsock32.lib dsound.lib" ! OutputFile="../bin/$(ProjectName).dll" LinkIncremental="1" SuppressStartupBanner="TRUE" |
|
From: <vr-...@us...> - 2003-12-03 08:39:12
|
Update of /cvsroot/alpp/openalpp/src
In directory sc8-pr-cvs1:/tmp/cvs-serv13773
Modified Files:
groupsource.cpp
Log Message:
.NET2003 requires casting to float for sqrt
Index: groupsource.cpp
===================================================================
RCS file: /cvsroot/alpp/openalpp/src/groupsource.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** groupsource.cpp 16 Apr 2003 11:15:05 -0000 1.6
--- groupsource.cpp 3 Dec 2003 08:39:09 -0000 1.7
***************
*** 169,173 ****
right[2]=orientation[0]*orientation[4]-orientation[3]*orientation[1];
// The length of the cross-product of two normalized vectors will be sqrt(2)
! float dsqrt2=(float)5.0/sqrt(2);
right[0]*=dsqrt2;
right[1]*=dsqrt2;
--- 169,173 ----
right[2]=orientation[0]*orientation[4]-orientation[3]*orientation[1];
// The length of the cross-product of two normalized vectors will be sqrt(2)
! float dsqrt2=(float)(5.0/sqrt(2.0));
right[0]*=dsqrt2;
right[1]*=dsqrt2;
|
|
From: <tom...@us...> - 2003-07-16 19:20:05
|
Update of /cvsroot/alpp/openalpp/tests
In directory sc8-pr-cvs1:/tmp/cvs-serv31502
Modified Files:
CMakeLists.txt
Log Message:
Updates...
Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/alpp/openalpp/tests/CMakeLists.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CMakeLists.txt 14 Jun 2003 12:45:34 -0000 1.1
--- CMakeLists.txt 16 Jul 2003 19:20:02 -0000 1.2
***************
*** 1,32 ****
LINK_DIRECTORIES(../src)
- ADD_EXECUTABLE(moving moving.cpp)
- ADD_EXECUTABLE(simple simple.cpp)
- ADD_EXECUTABLE(testfstream testfstream.cpp)
- ADD_EXECUTABLE(testmic testmic.cpp)
- ADD_EXECUTABLE(testsend testsend.cpp)
- ADD_EXECUTABLE(teststream teststream.cpp)
FIND_LIBRARY(EXTRALIBS openal ${LIBDIRS})
- FIND_LIBRARY(PALIB portaudio ${LIBDIRS})
- IF(PALIB)
- SET(EXTRALIBS ${EXTRALIBS} ${PALIB})
- ENDIF(PALIB)
- FIND_LIBRARY(CCGNULIB ccgnu2 ${LIBDIRS})
- IF(CCGNULIB)
- FIND_LIBRARY(THREADLIB pthread ${LIBDIRS})
- FIND_LIBRARY(DLLIB dl ${LIBDIRS})
- SET(EXTRALIBS ${EXTRALIBS} ${CCGNULIB} ${DLLIB} ${THREADLIB})
- ENDIF(CCGNULIB)
- FIND_LIBRARY(VORBISFILELIB vorbisfile ${LIBDIRS})
- FIND_LIBRARY(VORBISLIB vorbis ${LIBDIRS})
- FIND_LIBRARY(OGGLIB ogg ${LIBDIRS})
- IF(VORBISLIB)
- SET(EXTRALIBS ${EXTRALIBS} ${VORBISFILELIB} ${VORBISLIB} ${OGGLIB})
- ENDIF(VORBISLIB)
! TARGET_LINK_LIBRARIES(moving openalpp ${EXTRALIBS})
! TARGET_LINK_LIBRARIES(simple openalpp ${EXTRALIBS})
TARGET_LINK_LIBRARIES(testfstream openalpp ${EXTRALIBS})
- TARGET_LINK_LIBRARIES(testmic openalpp ${EXTRALIBS})
- TARGET_LINK_LIBRARIES(testsend openalpp ${EXTRALIBS})
- TARGET_LINK_LIBRARIES(teststream openalpp ${EXTRALIBS})
--- 1,44 ----
LINK_DIRECTORIES(../src)
FIND_LIBRARY(EXTRALIBS openal ${LIBDIRS})
! IF(CCGNU_FOUND)
! FIND_LIBRARY(CCGNULIB ccgnu2 ${LIBDIRS})
! IF(CCGNULIB)
! FIND_LIBRARY(THREADLIB pthread ${LIBDIRS})
! FIND_LIBRARY(DLLIB dl ${LIBDIRS})
! SET(EXTRALIBS ${EXTRALIBS} ${CCGNULIB} ${DLLIB} ${THREADLIB})
! ENDIF(CCGNULIB)
!
! IF(PORTAUDIO_FOUND)
! FIND_LIBRARY(PALIB portaudio ${LIBDIRS})
! IF(PALIB)
! SET(EXTRALIBS ${EXTRALIBS} ${PALIB})
! ENDIF(PALIB)
! ENDIF(PORTAUDIO_FOUND)
!
! IF(VORBIS_FOUND)
! FIND_LIBRARY(VORBISFILELIB vorbisfile ${LIBDIRS})
! FIND_LIBRARY(VORBISLIB vorbis ${LIBDIRS})
! FIND_LIBRARY(OGGLIB ogg ${LIBDIRS})
! IF(VORBISLIB)
! SET(EXTRALIBS ${EXTRALIBS} ${VORBISFILELIB} ${VORBISLIB} ${OGGLIB})
! ENDIF(VORBISLIB)
! ENDIF(VORBIS_FOUND)
! ENDIF(CCGNU_FOUND)
!
! IF(CCGNU_FOUND)
! ADD_EXECUTABLE(moving moving.cpp)
! TARGET_LINK_LIBRARIES(moving openalpp ${EXTRALIBS})
! ADD_EXECUTABLE(simple simple.cpp)
! TARGET_LINK_LIBRARIES(simple openalpp ${EXTRALIBS})
! ADD_EXECUTABLE(testmic testmic.cpp)
! TARGET_LINK_LIBRARIES(testmic openalpp ${EXTRALIBS})
! ADD_EXECUTABLE(testsend testsend.cpp)
! TARGET_LINK_LIBRARIES(testsend openalpp ${EXTRALIBS})
! ADD_EXECUTABLE(teststream teststream.cpp)
! TARGET_LINK_LIBRARIES(teststream openalpp ${EXTRALIBS})
! ENDIF(CCGNU_FOUND)
! ADD_EXECUTABLE(testfstream testfstream.cpp)
!
TARGET_LINK_LIBRARIES(testfstream openalpp ${EXTRALIBS})
|
|
From: <tom...@us...> - 2003-07-16 19:19:54
|
Update of /cvsroot/alpp/openalpp/src
In directory sc8-pr-cvs1:/tmp/cvs-serv31480
Modified Files:
CMakeLists.txt
Log Message:
Updates...
Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/alpp/openalpp/src/CMakeLists.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CMakeLists.txt 14 Jun 2003 12:44:51 -0000 1.1
--- CMakeLists.txt 16 Jul 2003 19:19:51 -0000 1.2
***************
*** 1 ****
! ADD_LIBRARY(openalpp audiobase audioconvert audioenvironment deviceupdater error filestream filestreamupdater groupsource inputdevice listener netstream netupdater sample sounddata source sourcebase stream streamupdater)
--- 1,19 ----
! SET(SOURCEFILES audiobase audioconvert audioenvironment error groupsource listener sample sounddata source sourcebase)
!
! IF(CCGNU_FOUND)
! SET(SOURCEFILES ${SOURCEFILES} stream netstream streamupdater netupdater)
! IF(PORTAUDIO_FOUND)
! SET(SOURCEFILES ${SOURCEFILES} inputdevice deviceupdater)
! ELSE(PORTAUDIO_FOUND)
! SET(SOURCEFILES ${SOURCEFILES} noinputdevice)
! ENDIF(PORTAUDIO_FOUND)
! IF(VORBIS_FOUND)
! SET(SOURCEFILES ${SOURCEFILES} filestream filestreamupdater)
! ELSE(VORBIS_FOUND)
! SET(SOURCEFILES ${SOURCEFILES} nofilestream)
! ENDIF(VORBIS_FOUND)
! ELSE(CCGNU_FOUND)
! SET(SOURCEFILES ${SOURCEFILES} nostreaming noinputdevice nofilestream)
! ENDIF(CCGNU_FOUND)
!
! ADD_LIBRARY(openalpp SOURCEFILES)
|
|
From: <tom...@us...> - 2003-07-16 19:19:44
|
Update of /cvsroot/alpp/openalpp
In directory sc8-pr-cvs1:/tmp/cvs-serv31439a
Modified Files:
CMakeLists.txt
Log Message:
Updates...
Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/alpp/openalpp/CMakeLists.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CMakeLists.txt 14 Jun 2003 12:44:23 -0000 1.1
--- CMakeLists.txt 16 Jul 2003 19:19:41 -0000 1.2
***************
*** 1,18 ****
PROJECT(OPENALPP)
IF(UNIX)
! SET(INCLUDEDIRS /usr/include /usr/local/include)
ELSE(UNIX)
! SET(INCLUDEDIRS C:\)
ENDIF(UNIX)
! FIND_PATH(PORTAUDIO_INCLUDE portaudio.h ${INCLUDEDIRS})
! FIND_PATH(VORBIS_INCLUDE vorbis/vorbisfile.h ${INCLUDEDIRS})
IF(UNIX)
! SET(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} "-I`ccgnu2-config --includes`")
ELSE(UNIX)
! #SET()
ENDIF(UNIX)
! INCLUDE_DIRECTORIES(${PORTAUDIO_INCLUDE} ${VORBIS_INCLUDE} ../include)
IF(UNIX)
--- 1,36 ----
PROJECT(OPENALPP)
IF(UNIX)
! SET(HEADERDIRS /usr/include /usr/local/include)
ELSE(UNIX)
! SET(HEADERDIRS C:\)
ENDIF(UNIX)
! SET(INCLUDEDIRS ../include)
!
IF(UNIX)
! FIND_PROGRAM(CCGNU_CONFIG ccgnu2-config)
! IF(CCGNU_CONFIG)
! SET(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} "-I`${CCGNU_CONFIG} --includes`")
! SET(CCGNU_FOUND 1)
! ENDIF(CCGNU_CONFIG)
ELSE(UNIX)
! SET(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
ENDIF(UNIX)
! IF(CCGNU_FOUND)
! FIND_PATH(PORTAUDIO_INCLUDE portaudio.h ${HEADERDIRS})
! IF(PORTAUDIO_INCLUDE)
! SET(INCLUDEDIRS ${INCLUDEDIRS} ${PORTAUDIO_INCLUDE})
! SET(PORTAUDIO_FOUND 1)
! ENDIF(PORTAUDIO_INCLUDE)
!
! FIND_PATH(VORBIS_INCLUDE vorbis/vorbisfile.h ${HEADERDIRS})
! IF(VORBIS_INCLUDE)
! SET(INCLUDEDIRS ${INCLUDEDIRS} ${VORBIS_INCLUDE})
! SET(VORBIS_FOUND 1)
! ENDIF(VORBIS_INCLUDE)
! ENDIF(CCGNU_FOUND)
!
! INCLUDE_DIRECTORIES(${INCLUDEDIRS})
IF(UNIX)
|
|
From: <tom...@us...> - 2003-06-14 12:45:37
|
Update of /cvsroot/alpp/openalpp/tests
In directory sc8-pr-cvs1:/tmp/cvs-serv26992
Added Files:
CMakeLists.txt
Log Message:
First commit
--- NEW FILE: CMakeLists.txt ---
LINK_DIRECTORIES(../src)
ADD_EXECUTABLE(moving moving.cpp)
ADD_EXECUTABLE(simple simple.cpp)
ADD_EXECUTABLE(testfstream testfstream.cpp)
ADD_EXECUTABLE(testmic testmic.cpp)
ADD_EXECUTABLE(testsend testsend.cpp)
ADD_EXECUTABLE(teststream teststream.cpp)
FIND_LIBRARY(EXTRALIBS openal ${LIBDIRS})
FIND_LIBRARY(PALIB portaudio ${LIBDIRS})
IF(PALIB)
SET(EXTRALIBS ${EXTRALIBS} ${PALIB})
ENDIF(PALIB)
FIND_LIBRARY(CCGNULIB ccgnu2 ${LIBDIRS})
IF(CCGNULIB)
FIND_LIBRARY(THREADLIB pthread ${LIBDIRS})
FIND_LIBRARY(DLLIB dl ${LIBDIRS})
SET(EXTRALIBS ${EXTRALIBS} ${CCGNULIB} ${DLLIB} ${THREADLIB})
ENDIF(CCGNULIB)
FIND_LIBRARY(VORBISFILELIB vorbisfile ${LIBDIRS})
FIND_LIBRARY(VORBISLIB vorbis ${LIBDIRS})
FIND_LIBRARY(OGGLIB ogg ${LIBDIRS})
IF(VORBISLIB)
SET(EXTRALIBS ${EXTRALIBS} ${VORBISFILELIB} ${VORBISLIB} ${OGGLIB})
ENDIF(VORBISLIB)
TARGET_LINK_LIBRARIES(moving openalpp ${EXTRALIBS})
TARGET_LINK_LIBRARIES(simple openalpp ${EXTRALIBS})
TARGET_LINK_LIBRARIES(testfstream openalpp ${EXTRALIBS})
TARGET_LINK_LIBRARIES(testmic openalpp ${EXTRALIBS})
TARGET_LINK_LIBRARIES(testsend openalpp ${EXTRALIBS})
TARGET_LINK_LIBRARIES(teststream openalpp ${EXTRALIBS})
|
|
From: <tom...@us...> - 2003-06-14 12:44:54
|
Update of /cvsroot/alpp/openalpp/src In directory sc8-pr-cvs1:/tmp/cvs-serv26903 Added Files: CMakeLists.txt Log Message: First commit --- NEW FILE: CMakeLists.txt --- ADD_LIBRARY(openalpp audiobase audioconvert audioenvironment deviceupdater error filestream filestreamupdater groupsource inputdevice listener netstream netupdater sample sounddata source sourcebase stream streamupdater) |
