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: Anders B. <vr-...@us...> - 2004-11-23 14:06:10
|
Update of /cvsroot/alpp/openalpp/include/openalpp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22381/include/openalpp Modified Files: sample.h Log Message: Added constructor to class Sample that takes raw data as parameter. Index: sample.h =================================================================== RCS file: /cvsroot/alpp/openalpp/include/openalpp/sample.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** sample.h 11 Nov 2004 07:57:57 -0000 1.5 --- sample.h 23 Nov 2004 14:06:00 -0000 1.6 *************** *** 49,52 **** --- 49,62 ---- /** + * Constructor. + * @param format to use to create sample from data. + * @param data use to create sample. + * @param size of data. + * @param freq of data. + */ + Sample(ALenum format,ALvoid* data,ALsizei size,ALsizei freq) throw (FileError); + + + /** * Get file name of loaded file. * @return file name. |
From: Anders B. <vr-...@us...> - 2004-11-23 14:06:10
|
Update of /cvsroot/alpp/openalpp/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22381/src Modified Files: sample.cpp Log Message: Added constructor to class Sample that takes raw data as parameter. Index: sample.cpp =================================================================== RCS file: /cvsroot/alpp/openalpp/src/sample.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** sample.cpp 11 Nov 2004 07:57:58 -0000 1.8 --- sample.cpp 23 Nov 2004 14:06:00 -0000 1.9 *************** *** 51,54 **** --- 51,63 ---- } + Sample::Sample(ALenum format,ALvoid* data,ALsizei size,ALsizei freq) throw (FileError) + : SoundData() { + ALenum error; + + alBufferData(buffername_,format,data,size,freq); + if((error=alGetError())!=AL_FALSE) + throw FileError("Error buffering sound"); + } + std::string Sample::getFileName() const { return filename_; |
From: Anders B. <vr-...@us...> - 2004-11-23 14:06:08
|
Update of /cvsroot/alpp/openalpp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22381 Modified Files: NEWS Log Message: Added constructor to class Sample that takes raw data as parameter. Index: NEWS =================================================================== RCS file: /cvsroot/alpp/openalpp/NEWS,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** NEWS 11 Nov 2004 07:57:56 -0000 1.5 --- NEWS 23 Nov 2004 14:06:00 -0000 1.6 *************** *** 1,4 **** --- 1,7 ---- NEWS + 2004-11-23 Anders Backman: + Added contructor to Sample taking raw data as parameter directly. + 2004-11-10 Anders Backman: Major revision. Added referenced (smart) pointers to clean up the |
From: Anders B. <vr-...@us...> - 2004-11-19 07:48:05
|
Update of /cvsroot/alpp/openalpp/VisualStudio In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18064/VisualStudio Modified Files: simple.vcproj Log Message: Index: simple.vcproj =================================================================== RCS file: /cvsroot/alpp/openalpp/VisualStudio/simple.vcproj,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** simple.vcproj 11 Nov 2004 07:57:57 -0000 1.6 --- simple.vcproj 19 Nov 2004 07:47:51 -0000 1.7 *************** *** 1,151 **** ! <?xml version="1.0" encoding="Windows-1252"?> ! <VisualStudioProject ! ProjectType="Visual C++" ! Version="7.10" ! Name="simple" ! ProjectGUID="{33F6F3B5-3247-476A-A2D9-19316B88423B}" ! SccProjectName="" ! SccLocalPath=""> ! <Platforms> ! <Platform ! Name="Win32"/> ! </Platforms> ! <Configurations> ! <Configuration ! Name="Release|Win32" ! OutputDirectory="..\bin" ! IntermediateDirectory=".\simple_Release" ! ConfigurationType="1" ! UseOfMFC="0" ! ATLMinimizesCRunTimeLibraryUsage="FALSE" ! CharacterSet="2"> ! <Tool ! Name="VCCLCompilerTool" ! InlineFunctionExpansion="1" ! OptimizeForProcessor="3" ! AdditionalIncludeDirectories="../include" ! PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE" ! StringPooling="TRUE" ! RuntimeLibrary="2" ! EnableFunctionLevelLinking="TRUE" ! UsePrecompiledHeader="2" ! PrecompiledHeaderFile=".\Release/simple.pch" ! AssemblerListingLocation=".\Release/" ! ObjectFile=".\Release/" ! ProgramDataBaseFileName=".\Release/" ! WarningLevel="3" ! SuppressStartupBanner="TRUE" ! CompileAs="0"/> ! <Tool ! Name="VCCustomBuildTool"/> ! <Tool ! Name="VCLinkerTool" ! AdditionalOptions="/MACHINE:I386" ! OutputFile="$(OutDir)/$(ProjectName).exe" ! LinkIncremental="1" ! SuppressStartupBanner="TRUE" ! AdditionalLibraryDirectories="..\lib" ! IgnoreDefaultLibraryNames="" ! ProgramDatabaseFile=".\Release/simple.pdb" ! SubSystem="1"/> ! <Tool ! Name="VCMIDLTool" ! TypeLibraryName=".\Release/simple.tlb"/> ! <Tool ! Name="VCPostBuildEventTool"/> ! <Tool ! Name="VCPreBuildEventTool"/> ! <Tool ! Name="VCPreLinkEventTool"/> ! <Tool ! Name="VCResourceCompilerTool" ! PreprocessorDefinitions="NDEBUG" ! Culture="1053"/> ! <Tool ! Name="VCWebServiceProxyGeneratorTool"/> ! <Tool ! Name="VCXMLDataGeneratorTool"/> ! <Tool ! Name="VCWebDeploymentTool"/> ! <Tool ! Name="VCManagedWrapperGeneratorTool"/> ! <Tool ! Name="VCAuxiliaryManagedWrapperGeneratorTool"/> ! </Configuration> ! <Configuration ! Name="Debug|Win32" ! OutputDirectory="..\bin" ! IntermediateDirectory=".\simple_Debug" ! ConfigurationType="1" ! UseOfMFC="0" ! ATLMinimizesCRunTimeLibraryUsage="FALSE" ! CharacterSet="2"> ! <Tool ! Name="VCCLCompilerTool" ! Optimization="0" ! OptimizeForProcessor="3" ! AdditionalIncludeDirectories="../include" ! PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE" ! BasicRuntimeChecks="3" ! RuntimeLibrary="3" ! UsePrecompiledHeader="2" ! PrecompiledHeaderFile=".\Debug/simple.pch" ! AssemblerListingLocation=".\Debug/" ! ObjectFile=".\Debug/" ! ProgramDataBaseFileName=".\Debug/" ! WarningLevel="3" ! SuppressStartupBanner="TRUE" ! DebugInformationFormat="4" ! CompileAs="0"/> ! <Tool ! Name="VCCustomBuildTool"/> ! <Tool ! Name="VCLinkerTool" ! AdditionalOptions="/MACHINE:I386" ! OutputFile="$(OutDir)/$(ProjectName)d.exe" ! LinkIncremental="2" ! SuppressStartupBanner="TRUE" ! AdditionalLibraryDirectories="..\lib" ! IgnoreDefaultLibraryNames="" ! GenerateDebugInformation="TRUE" ! ProgramDatabaseFile=".\Debug/simple.pdb" ! SubSystem="1"/> ! <Tool ! Name="VCMIDLTool" ! TypeLibraryName=".\Debug/simple.tlb"/> ! <Tool ! Name="VCPostBuildEventTool"/> ! <Tool ! Name="VCPreBuildEventTool"/> ! <Tool ! Name="VCPreLinkEventTool"/> ! <Tool ! Name="VCResourceCompilerTool" ! PreprocessorDefinitions="_DEBUG" ! Culture="1053"/> ! <Tool ! Name="VCWebServiceProxyGeneratorTool"/> ! <Tool ! Name="VCXMLDataGeneratorTool"/> ! <Tool ! Name="VCWebDeploymentTool"/> ! <Tool ! Name="VCManagedWrapperGeneratorTool"/> ! <Tool ! Name="VCAuxiliaryManagedWrapperGeneratorTool"/> ! </Configuration> ! </Configurations> ! <References> ! </References> ! <Files> ! <Filter ! Name="Source Files" ! Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"> ! <File ! RelativePath="..\tests\simple.cpp"> ! </File> ! </Filter> ! </Files> ! <Globals> ! </Globals> ! </VisualStudioProject> --- 1,151 ---- ! <?xml version="1.0" encoding="Windows-1252"?> ! <VisualStudioProject ! ProjectType="Visual C++" ! Version="7.10" ! Name="simple" ! ProjectGUID="{33F6F3B5-3247-476A-A2D9-19316B88423B}" ! SccProjectName="" ! SccLocalPath=""> ! <Platforms> ! <Platform ! Name="Win32"/> ! </Platforms> ! <Configurations> ! <Configuration ! Name="Release|Win32" ! OutputDirectory="..\bin" ! IntermediateDirectory=".\simple_Release" ! ConfigurationType="1" ! UseOfMFC="0" ! ATLMinimizesCRunTimeLibraryUsage="FALSE" ! CharacterSet="2"> ! <Tool ! Name="VCCLCompilerTool" ! InlineFunctionExpansion="1" ! OptimizeForProcessor="3" ! AdditionalIncludeDirectories="../include" ! PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE" ! StringPooling="TRUE" ! RuntimeLibrary="2" ! EnableFunctionLevelLinking="TRUE" ! UsePrecompiledHeader="2" ! PrecompiledHeaderFile=".\Release/simple.pch" ! AssemblerListingLocation=".\Release/" ! ObjectFile=".\Release/" ! ProgramDataBaseFileName=".\Release/" ! WarningLevel="3" ! SuppressStartupBanner="TRUE" ! CompileAs="0"/> ! <Tool ! Name="VCCustomBuildTool"/> ! <Tool ! Name="VCLinkerTool" ! AdditionalOptions="/MACHINE:I386" ! OutputFile="$(OutDir)/$(ProjectName).exe" ! LinkIncremental="1" ! SuppressStartupBanner="TRUE" ! AdditionalLibraryDirectories="..\lib" ! IgnoreDefaultLibraryNames="" ! ProgramDatabaseFile=".\Release/simple.pdb" ! SubSystem="1"/> ! <Tool ! Name="VCMIDLTool" ! TypeLibraryName=".\Release/simple.tlb"/> ! <Tool ! Name="VCPostBuildEventTool"/> ! <Tool ! Name="VCPreBuildEventTool"/> ! <Tool ! Name="VCPreLinkEventTool"/> ! <Tool ! Name="VCResourceCompilerTool" ! PreprocessorDefinitions="NDEBUG" ! Culture="1053"/> ! <Tool ! Name="VCWebServiceProxyGeneratorTool"/> ! <Tool ! Name="VCXMLDataGeneratorTool"/> ! <Tool ! Name="VCWebDeploymentTool"/> ! <Tool ! Name="VCManagedWrapperGeneratorTool"/> ! <Tool ! Name="VCAuxiliaryManagedWrapperGeneratorTool"/> ! </Configuration> ! <Configuration ! Name="Debug|Win32" ! OutputDirectory="..\bin" ! IntermediateDirectory=".\simple_Debug" ! ConfigurationType="1" ! UseOfMFC="0" ! ATLMinimizesCRunTimeLibraryUsage="FALSE" ! CharacterSet="2"> ! <Tool ! Name="VCCLCompilerTool" ! Optimization="0" ! OptimizeForProcessor="3" ! AdditionalIncludeDirectories="../include" ! PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE" ! BasicRuntimeChecks="3" ! RuntimeLibrary="3" ! UsePrecompiledHeader="2" ! PrecompiledHeaderFile=".\Debug/simple.pch" ! AssemblerListingLocation=".\Debug/" ! ObjectFile=".\Debug/" ! ProgramDataBaseFileName=".\Debug/" ! WarningLevel="3" ! SuppressStartupBanner="TRUE" ! DebugInformationFormat="4" ! CompileAs="0"/> ! <Tool ! Name="VCCustomBuildTool"/> ! <Tool ! Name="VCLinkerTool" ! AdditionalOptions="/MACHINE:I386" ! OutputFile="$(OutDir)/$(ProjectName)d.exe" ! LinkIncremental="2" ! SuppressStartupBanner="TRUE" ! AdditionalLibraryDirectories="..\lib" ! IgnoreDefaultLibraryNames="" ! GenerateDebugInformation="TRUE" ! ProgramDatabaseFile=".\Debug/simple.pdb" ! SubSystem="1"/> ! <Tool ! Name="VCMIDLTool" ! TypeLibraryName=".\Debug/simple.tlb"/> ! <Tool ! Name="VCPostBuildEventTool"/> ! <Tool ! Name="VCPreBuildEventTool"/> ! <Tool ! Name="VCPreLinkEventTool"/> ! <Tool ! Name="VCResourceCompilerTool" ! PreprocessorDefinitions="_DEBUG" ! Culture="1053"/> ! <Tool ! Name="VCWebServiceProxyGeneratorTool"/> ! <Tool ! Name="VCXMLDataGeneratorTool"/> ! <Tool ! Name="VCWebDeploymentTool"/> ! <Tool ! Name="VCManagedWrapperGeneratorTool"/> ! <Tool ! Name="VCAuxiliaryManagedWrapperGeneratorTool"/> ! </Configuration> ! </Configurations> ! <References> ! </References> ! <Files> ! <Filter ! Name="Source Files" ! Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"> ! <File ! RelativePath="..\tests\simple.cpp"> ! </File> ! </Filter> ! </Files> ! <Globals> ! </Globals> ! </VisualStudioProject> |
From: Anders B. <vr-...@us...> - 2004-11-19 07:48:05
|
Update of /cvsroot/alpp/openalpp/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18064/tests Modified Files: simple.cpp Log Message: Index: simple.cpp =================================================================== RCS file: /cvsroot/alpp/openalpp/tests/simple.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** simple.cpp 11 Nov 2004 07:57:58 -0000 1.14 --- simple.cpp 19 Nov 2004 07:47:55 -0000 1.15 *************** *** 42,45 **** --- 42,46 ---- try { openalpp::ref_ptr<Source> bgsound = new Source; //(file); // Create source and load sound + bgsound->stop(); openalpp::ref_ptr<Sample> sample = new Sample(file); bgsound->setSound(sample.get()); *************** *** 51,60 **** std::cerr << "Press return to stop: " << std::endl; ! //usleep(3000*1000); // Sleep for a while std::string str; std::getline(std::cin, str); bgsound->stop(); std::cerr << "Done " << std::endl; - usleep(3000*1000); } catch(Error e) { --- 52,60 ---- std::cerr << "Press return to stop: " << std::endl; ! std::string str; std::getline(std::cin, str); bgsound->stop(); std::cerr << "Done " << std::endl; } catch(Error e) { |
From: Anders B. <vr-...@us...> - 2004-11-12 09:10:27
|
Update of /cvsroot/alpp/openalpp/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2331/src Modified Files: sourcebase.cpp Log Message: Index: sourcebase.cpp =================================================================== RCS file: /cvsroot/alpp/openalpp/src/sourcebase.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** sourcebase.cpp 11 Nov 2004 07:57:58 -0000 1.11 --- sourcebase.cpp 12 Nov 2004 09:10:18 -0000 1.12 *************** *** 355,359 **** } ! ALuint SourceBase::link(const SourceBase &source) throw (MemoryError) { if(nlinkedsources_>=alloclinkedsources_) { alloclinkedsources_+=5; --- 355,359 ---- } ! ALuint SourceBase::link(const SourceBase *source) throw (MemoryError) { if(nlinkedsources_>=alloclinkedsources_) { alloclinkedsources_+=5; *************** *** 363,375 **** throw MemoryError("realloc failed"); } ! linkedsources_[nlinkedsources_++]=source.getAlSource(); ! return source.getAlSource(); } ! void SourceBase::unlink(const SourceBase &source) throw (NameError) { ! if(source.sourcename_==sourcename_) throw(NameError("Can't unlink a source from itself!")); for(unsigned int i=0;i<nlinkedsources_;i++) ! if(linkedsources_[i]==source.sourcename_) { linkedsources_[i]=linkedsources_[--nlinkedsources_]; return; --- 363,375 ---- throw MemoryError("realloc failed"); } ! linkedsources_[nlinkedsources_++]=source->getAlSource(); ! return source->getAlSource(); } ! void SourceBase::unlink(const SourceBase *source) throw (NameError) { ! if(source->sourcename_==sourcename_) throw(NameError("Can't unlink a source from itself!")); for(unsigned int i=0;i<nlinkedsources_;i++) ! if(linkedsources_[i]==source->sourcename_) { linkedsources_[i]=linkedsources_[--nlinkedsources_]; return; |
From: Anders B. <vr-...@us...> - 2004-11-12 09:10:27
|
Update of /cvsroot/alpp/openalpp/include/openalpp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2331/include/openalpp Modified Files: sourcebase.h Log Message: Index: sourcebase.h =================================================================== RCS file: /cvsroot/alpp/openalpp/include/openalpp/sourcebase.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** sourcebase.h 11 Nov 2004 07:57:57 -0000 1.5 --- sourcebase.h 12 Nov 2004 09:10:18 -0000 1.6 *************** *** 278,282 **** * it. */ ! ALuint link(const SourceBase &source) throw (MemoryError); /** --- 278,282 ---- * it. */ ! ALuint link(const SourceBase *source) throw (MemoryError); /** *************** *** 284,288 **** * @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); /** |
From: Anders B. <vr-...@us...> - 2004-11-12 09:10:27
|
Update of /cvsroot/alpp/openalpp/doc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2331/doc Modified Files: Doxyfile Log Message: Index: Doxyfile =================================================================== RCS file: /cvsroot/alpp/openalpp/doc/Doxyfile,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Doxyfile 12 Dec 2003 06:55:04 -0000 1.2 --- Doxyfile 12 Nov 2004 09:10:17 -0000 1.3 *************** *** 470,474 **** # or Internet explorer 4.0+). ! GENERATE_TREEVIEW = NO # If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be --- 470,474 ---- # or Internet explorer 4.0+). ! GENERATE_TREEVIEW = YES # If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be *************** *** 485,489 **** # generate Latex output. ! GENERATE_LATEX = YES # The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. --- 485,489 ---- # generate Latex output. ! GENERATE_LATEX = NO # The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. |
From: Anders B. <vr-...@us...> - 2004-11-11 09:08:05
|
Update of /cvsroot/alpp/openalpp/include/openalpp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15136 Modified Files: windowsstuff.h Log Message: Index: windowsstuff.h =================================================================== RCS file: /cvsroot/alpp/openalpp/include/openalpp/windowsstuff.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** windowsstuff.h 11 Nov 2004 07:57:57 -0000 1.4 --- windowsstuff.h 11 Nov 2004 09:07:56 -0000 1.5 *************** *** 24,28 **** #ifndef WINDOWSSTUFF_H_INCLUDED #define WINDOWSSTUFF_H_INCLUDED ! #ifdef WIN32 //C++ exception specification ignored except to indicate a function is not __declspec(nothrow) --- 24,32 ---- #ifndef WINDOWSSTUFF_H_INCLUDED #define WINDOWSSTUFF_H_INCLUDED ! #ifndef WIN32 ! ! #include <unistd.h> ! ! #else // WIN32 //C++ exception specification ignored except to indicate a function is not __declspec(nothrow) *************** *** 52,55 **** #endif #else - #include <unistd.h> #endif --- 56,58 ---- |
Update of /cvsroot/alpp/openalpp/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31707/src Modified Files: CMakeLists.txt Makefile.am audiobase.cpp audioconvert.cpp audioenvironment.cpp deviceupdater.cpp error.cpp filestream.cpp filestreamupdater.cpp groupsource.cpp inputdevice.cpp listener.cpp netstream.cpp netupdater.cpp nofilestream.cpp noinputdevice.cpp nostreaming.cpp openalpp.cpp sample.cpp sounddata.cpp source.cpp sourcebase.cpp stream.cpp streamupdater.cpp Added Files: referenced.cpp Log Message: Adapted smart (reference) pointers from the OpenSceneGraph library. Used with permission of Robert Osfield. Cleans up the new/delete responsibility. All objects must be created on the heap from now on. Fixed small bugin in Streaming classes. Index: nofilestream.cpp =================================================================== RCS file: /cvsroot/alpp/openalpp/src/nofilestream.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** nofilestream.cpp 2 Mar 2004 11:01:14 -0000 1.6 --- nofilestream.cpp 11 Nov 2004 07:57:58 -0000 1.7 *************** *** 1,47 **** ! /** ! * 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. ! */ ! ! #include "openalpp/filestream.h" ! ! namespace openalpp { ! ! FileStream::FileStream(const std::string& ,const int) ! throw (NameError,InitError,FileError) : Stream() { ! throw InitError("No support for streaming from files compiled in."); ! } ! ! FileStream::FileStream(const FileStream &stream) ! : Stream((const Stream &)stream) { ! } ! ! FileStream::~FileStream() { ! } ! ! FileStream &FileStream::operator=(const FileStream &/*stream*/) { ! return *this; ! } ! ! void FileStream::setLooping(bool) { ! } ! ! } --- 1,47 ---- ! /** ! * 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. ! */ ! ! #include "openalpp/filestream.h" ! ! namespace openalpp { ! ! FileStream::FileStream(const std::string& ,const int) ! throw (NameError,InitError,FileError) : Stream() { ! throw InitError("No support for streaming from files compiled in."); ! } ! ! FileStream::FileStream(const FileStream &stream) ! : Stream((const Stream &)stream) { ! } ! ! FileStream::~FileStream() { ! } ! ! FileStream &FileStream::operator=(const FileStream &/*stream*/) { ! return *this; ! } ! ! void FileStream::setLooping(bool) { ! } ! ! } Index: sourcebase.cpp =================================================================== RCS file: /cvsroot/alpp/openalpp/src/sourcebase.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** sourcebase.cpp 28 Sep 2004 08:54:06 -0000 1.10 --- sourcebase.cpp 11 Nov 2004 07:57:58 -0000 1.11 *************** *** 1,440 **** ! /** ! * 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. ! */ ! ! #include "openalpp/sourcebase.h" ! ! /** ! * TODO: Should error checking be optional? ! * (a static bool throwflag in AudioBase)? ! */ ! ! 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; ! reverbdelay_=0.0; ! streaming_=false; ! } ! ! SourceBase::SourceBase() throw (MemoryError,NameError) : PositionedObject() { ! init(); ! } ! ! SourceBase::SourceBase(float x,float y,float z) ! 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); ! switch(state) { ! case(AL_INITIAL): ! return Initial; ! case(AL_PLAYING): ! return Playing; ! case(AL_PAUSED): ! return Paused; ! case(AL_STOPPED): ! return Stopped; ! default: ! throw FatalError("AL_SOURCE_STATE is unknown"); ! } ! } ! ! void SourceBase::setLooping(bool loop) { ! if(loop && !streaming_) ! alSourcei(sourcename_,AL_LOOPING,AL_TRUE); ! else ! alSourcei(sourcename_,AL_LOOPING,AL_FALSE); ! } ! ! bool SourceBase::isLooping() const { ! ALint looping; ! alGetSourceiv(sourcename_,AL_LOOPING,&looping); ! return (looping==AL_TRUE); ! } ! ! 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); ! directionx=direction[0]; ! directiony=direction[1]; ! directionz=direction[2]; ! } ! ! 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); ! alSourcef(sourcename_,AL_CONE_OUTER_GAIN,outergain); ! } ! ! void SourceBase::getSoundCone(float &innerangle, float &outerangle, float &outergain) const { ! alGetSourcefv(sourcename_,AL_CONE_INNER_ANGLE,&innerangle); ! alGetSourcefv(sourcename_,AL_CONE_OUTER_ANGLE,&outerangle); ! alGetSourcefv(sourcename_,AL_CONE_OUTER_GAIN,&outergain); ! } ! ! void SourceBase::setGain(float gain) { ! alSourcef(sourcename_,AL_GAIN,gain); ! ALenum error=alGetError(); ! if(error!=AL_FALSE) ! switch(error) { ! case(AL_INVALID_VALUE): ! throw ValueError("Invalid value for gain"); ! break; ! default: ! throw FatalError("Error trying to set gain!"); ! } ! } ! ! float SourceBase::getGain() const { ! ALfloat gain; ! alGetSourcefv(sourcename_,AL_GAIN,&gain); ! return gain; ! } ! ! void SourceBase::setMinMaxGain(float min, float max) { ! alSourcef(sourcename_,AL_MIN_GAIN,min); ! alSourcef(sourcename_,AL_MAX_GAIN,max); ! ALenum error=alGetError(); ! if(error!=AL_FALSE) ! switch(error) { ! case(AL_INVALID_VALUE): ! throw ValueError("Invalid value for min/max gain"); ! break; ! default: ! throw FatalError("Error trying to set min/max gain!"); ! } ! } ! ! 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); ! alSourcef(sourcename_,AL_ROLLOFF_FACTOR,0.0); ! // 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); ! alSourcef(sourcename_,AL_ROLLOFF_FACTOR,1.0); ! } ! if(alGetError()!=AL_FALSE) ! throw FatalError("Error trying to make/unmake sound ambient!"); ! } ! ! bool SourceBase::isAmbient() const { ! ALint relative; ! alGetSourceiv(sourcename_,AL_SOURCE_RELATIVE,&relative); ! ALfloat rolloff; ! alGetSourcefv(sourcename_,AL_ROLLOFF_FACTOR,&rolloff); ! return (relative==AL_TRUE && rolloff<0.001); ! } ! ! void SourceBase::setRelative(bool relative) { ! if(relative) ! alSourcei(sourcename_,AL_SOURCE_RELATIVE,AL_TRUE); ! else ! alSourcei(sourcename_,AL_SOURCE_RELATIVE,AL_FALSE); ! } ! ! bool SourceBase::isRelative() const { ! ALint relative; ! alGetSourceiv(sourcename_,AL_SOURCE_RELATIVE,&relative); ! return (relative==AL_TRUE); ! } ! ! void SourceBase::setReferenceDistance(float distance) { ! alSourcef(sourcename_,AL_REFERENCE_DISTANCE,distance); ! if(alGetError()!=AL_FALSE) ! throw FatalError("Error trying to set reference distance!"); ! } ! ! float SourceBase::getReferenceDistance() const { ! ALfloat ref; ! alGetSourcefv(sourcename_,AL_REFERENCE_DISTANCE,&ref); ! return ref; ! } ! ! void SourceBase::setMaxDistance(float distance) { ! alSourcef(sourcename_,AL_MAX_DISTANCE,distance); ! if(alGetError()!=AL_FALSE) ! throw FatalError("Error trying to set max distance!"); ! } ! ! float SourceBase::getMaxDistance() const { ! ALfloat maxdistance; ! alGetSourcefv(sourcename_,AL_MAX_DISTANCE,&maxdistance); ! return maxdistance; ! } ! ! void SourceBase::setRolloffFactor(float factor) { ! alSourcef(sourcename_,AL_ROLLOFF_FACTOR,factor); ! if(alGetError()!=AL_FALSE) ! throw FatalError("Error trying to set rolloff factor!"); ! } ! ! float SourceBase::getRolloffFactor() const { ! ALfloat factor; ! alGetSourcefv(sourcename_,AL_ROLLOFF_FACTOR,&factor); ! return factor; ! } ! ! void SourceBase::setPitch(float pitch) { ! alSourcef(sourcename_,AL_PITCH,pitch); ! ALenum error=alGetError(); ! if(error!=AL_FALSE) ! switch(error) { ! case(AL_INVALID_VALUE): ! throw ValueError("Invalid value for pitch"); ! break; ! default: ! throw FatalError("Error trying to set pitch!"); ! } ! } ! ! float SourceBase::getPitch() const { ! ALfloat pitch; ! alGetSourcefv(sourcename_,AL_PITCH,&pitch); ! return pitch; ! } ! ! void SourceBase::setReverbScale(float scale) throw (InitError,ValueError) { ! if(reverbinitiated_) { ! alReverbScale(sourcename_,scale); ! if(alGetError()!=AL_FALSE) ! throw ValueError("Reverb scale must be in range [0.0,1.0]"); ! reverbscale_=scale; ! } else ! throw InitError("Reverb not initialized"); ! } ! ! void SourceBase::setReverbDelay(float delay) throw (InitError,ValueError) { ! if(reverbinitiated_) { ! alReverbDelay(sourcename_,delay); ! if(alGetError()!=AL_FALSE) ! throw ValueError("Reverb delay must be in range [0.0,2.0]"); ! reverbdelay_=delay; ! } else ! throw InitError("Reverb not initialized"); ! } ! ! float SourceBase::getReverbScale() throw (InitError) { ! if(!reverbinitiated_) ! throw InitError("Reverb not initialized"); ! return reverbscale_; ! } ! ! float SourceBase::getReverbDelay() throw (InitError) { ! if(!reverbinitiated_) ! throw InitError("Reverb not initialized"); ! return reverbdelay_; ! } ! ! ALuint SourceBase::link(const SourceBase &source) throw (MemoryError) { ! if(nlinkedsources_>=alloclinkedsources_) { ! alloclinkedsources_+=5; ! linkedsources_=(ALuint *)realloc(linkedsources_, ! sizeof(ALuint)*alloclinkedsources_); ! if(!linkedsources_) ! throw MemoryError("realloc failed"); ! } ! linkedsources_[nlinkedsources_++]=source.getAlSource(); ! return source.getAlSource(); ! } ! ! void SourceBase::unlink(const SourceBase &source) throw (NameError) { ! if(source.sourcename_==sourcename_) ! throw(NameError("Can't unlink a source from itself!")); ! for(unsigned int i=0;i<nlinkedsources_;i++) ! if(linkedsources_[i]==source.sourcename_) { ! linkedsources_[i]=linkedsources_[--nlinkedsources_]; ! return; ! } ! throw NameError("Source not linked"); ! } ! ! void SourceBase::unlink(const ALuint name) throw (NameError) { ! if(name==sourcename_) ! throw(NameError("Can't unlink a source from itself!")); ! for(unsigned int i=0;i<nlinkedsources_;i++) ! if(linkedsources_[i]==name) { ! linkedsources_[i]=linkedsources_[--nlinkedsources_]; ! return; ! } ! throw NameError("Source not linked"); ! } ! ! void SourceBase::unlinkAll() { ! nlinkedsources_=1; ! } ! ! ALuint SourceBase::getAlSource() const { ! return sourcename_; ! } ! ! void SourceBase::setPosition(float x, float y, float z) { ! alSource3f(sourcename_,AL_POSITION,x,y,z); ! ALenum error=alGetError(); ! if(error!=AL_FALSE) ! switch(error) { ! case(AL_INVALID_VALUE): ! throw ValueError("Invalid value for position"); ! break; ! default: ! throw FatalError("Error trying to set position!"); ! } ! } ! ! void SourceBase::getPosition(float &x, float &y, float &z) const { ! ALfloat position[3]; ! alGetSourcefv(sourcename_,AL_POSITION,position); ! x=position[0]; ! y=position[1]; ! z=position[2]; ! } ! ! void SourceBase::setVelocity(float vx, float vy, float vz) { ! alSource3f(sourcename_,AL_VELOCITY,vx,vy,vz); ! ALenum error=alGetError(); ! if(error!=AL_FALSE) ! switch(error) { ! case(AL_INVALID_VALUE): ! throw ValueError("Invalid value for velocity"); ! break; ! default: ! throw FatalError("Error trying to set velocity!"); ! } ! } ! ! void SourceBase::getVelocity(float &vx, float &vy, float &vz) const { ! ALfloat velocity[3]; ! alGetSourcefv(sourcename_,AL_VELOCITY,velocity); ! vx=velocity[0]; ! vy=velocity[1]; ! vz=velocity[2]; ! } ! --- 1,440 ---- ! /** ! * 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. ! */ ! ! #include "openalpp/sourcebase.h" ! ! /** ! * TODO: Should error checking be optional? ! * (a static bool throwflag in AudioBase)? ! */ ! ! 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; ! reverbdelay_=0.0; ! streaming_=false; ! } ! ! SourceBase::SourceBase() throw (MemoryError,NameError) : PositionedObject() { ! init(); ! } ! ! SourceBase::SourceBase(float x,float y,float z) ! 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); ! switch(state) { ! case(AL_INITIAL): ! return Initial; ! case(AL_PLAYING): ! return Playing; ! case(AL_PAUSED): ! return Paused; ! case(AL_STOPPED): ! return Stopped; ! default: ! throw FatalError("AL_SOURCE_STATE is unknown"); ! } ! } ! ! void SourceBase::setLooping(bool loop) { ! if(loop && !streaming_) ! alSourcei(sourcename_,AL_LOOPING,AL_TRUE); ! else ! alSourcei(sourcename_,AL_LOOPING,AL_FALSE); ! } ! ! bool SourceBase::isLooping() const { ! ALint looping; ! alGetSourceiv(sourcename_,AL_LOOPING,&looping); ! return (looping==AL_TRUE); ! } ! ! 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); ! directionx=direction[0]; ! directiony=direction[1]; ! directionz=direction[2]; ! } ! ! 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); ! alSourcef(sourcename_,AL_CONE_OUTER_GAIN,outergain); ! } ! ! void SourceBase::getSoundCone(float &innerangle, float &outerangle, float &outergain) const { ! alGetSourcefv(sourcename_,AL_CONE_INNER_ANGLE,&innerangle); ! alGetSourcefv(sourcename_,AL_CONE_OUTER_ANGLE,&outerangle); ! alGetSourcefv(sourcename_,AL_CONE_OUTER_GAIN,&outergain); ! } ! ! void SourceBase::setGain(float gain) { ! alSourcef(sourcename_,AL_GAIN,gain); ! ALenum error=alGetError(); ! if(error!=AL_FALSE) ! switch(error) { ! case(AL_INVALID_VALUE): ! throw ValueError("Invalid value for gain"); ! break; ! default: ! throw FatalError("Error trying to set gain!"); ! } ! } ! ! float SourceBase::getGain() const { ! ALfloat gain; ! alGetSourcefv(sourcename_,AL_GAIN,&gain); ! return gain; ! } ! ! void SourceBase::setMinMaxGain(float min, float max) { ! alSourcef(sourcename_,AL_MIN_GAIN,min); ! alSourcef(sourcename_,AL_MAX_GAIN,max); ! ALenum error=alGetError(); ! if(error!=AL_FALSE) ! switch(error) { ! case(AL_INVALID_VALUE): ! throw ValueError("Invalid value for min/max gain"); ! break; ! default: ! throw FatalError("Error trying to set min/max gain!"); ! } ! } ! ! 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); ! alSourcef(sourcename_,AL_ROLLOFF_FACTOR,0.0); ! // 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); ! alSourcef(sourcename_,AL_ROLLOFF_FACTOR,1.0); ! } ! if(alGetError()!=AL_FALSE) ! throw FatalError("Error trying to make/unmake sound ambient!"); ! } ! ! bool SourceBase::isAmbient() const { ! ALint relative; ! alGetSourceiv(sourcename_,AL_SOURCE_RELATIVE,&relative); ! ALfloat rolloff; ! alGetSourcefv(sourcename_,AL_ROLLOFF_FACTOR,&rolloff); ! return (relative==AL_TRUE && rolloff<0.001); ! } ! ! void SourceBase::setRelative(bool relative) { ! if(relative) ! alSourcei(sourcename_,AL_SOURCE_RELATIVE,AL_TRUE); ! else ! alSourcei(sourcename_,AL_SOURCE_RELATIVE,AL_FALSE); ! } ! ! bool SourceBase::isRelative() const { ! ALint relative; ! alGetSourceiv(sourcename_,AL_SOURCE_RELATIVE,&relative); ! return (relative==AL_TRUE); ! } ! ! void SourceBase::setReferenceDistance(float distance) { ! alSourcef(sourcename_,AL_REFERENCE_DISTANCE,distance); ! if(alGetError()!=AL_FALSE) ! throw FatalError("Error trying to set reference distance!"); ! } ! ! float SourceBase::getReferenceDistance() const { ! ALfloat ref; ! alGetSourcefv(sourcename_,AL_REFERENCE_DISTANCE,&ref); ! return ref; ! } ! ! void SourceBase::setMaxDistance(float distance) { ! alSourcef(sourcename_,AL_MAX_DISTANCE,distance); ! if(alGetError()!=AL_FALSE) ! throw FatalError("Error trying to set max distance!"); ! } ! ! float SourceBase::getMaxDistance() const { ! ALfloat maxdistance; ! alGetSourcefv(sourcename_,AL_MAX_DISTANCE,&maxdistance); ! return maxdistance; ! } ! ! void SourceBase::setRolloffFactor(float factor) { ! alSourcef(sourcename_,AL_ROLLOFF_FACTOR,factor); ! if(alGetError()!=AL_FALSE) ! throw FatalError("Error trying to set rolloff factor!"); ! } ! ! float SourceBase::getRolloffFactor() const { ! ALfloat factor; ! alGetSourcefv(sourcename_,AL_ROLLOFF_FACTOR,&factor); ! return factor; ! } ! ! void SourceBase::setPitch(float pitch) { ! alSourcef(sourcename_,AL_PITCH,pitch); ! ALenum error=alGetError(); ! if(error!=AL_FALSE) ! switch(error) { ! case(AL_INVALID_VALUE): ! throw ValueError("Invalid value for pitch"); ! break; ! default: ! throw FatalError("Error trying to set pitch!"); ! } ! } ! ! float SourceBase::getPitch() const { ! ALfloat pitch; ! alGetSourcefv(sourcename_,AL_PITCH,&pitch); ! return pitch; ! } ! ! void SourceBase::setReverbScale(float scale) throw (InitError,ValueError) { ! if(reverbinitiated_) { ! alReverbScale(sourcename_,scale); ! if(alGetError()!=AL_FALSE) ! throw ValueError("Reverb scale must be in range [0.0,1.0]"); ! reverbscale_=scale; ! } else ! throw InitError("Reverb not initialized"); ! } ! ! void SourceBase::setReverbDelay(float delay) throw (InitError,ValueError) { ! if(reverbinitiated_) { ! alReverbDelay(sourcename_,delay); ! if(alGetError()!=AL_FALSE) ! throw ValueError("Reverb delay must be in range [0.0,2.0]"); ! reverbdelay_=delay; ! } else ! throw InitError("Reverb not initialized"); ! } ! ! float SourceBase::getReverbScale() throw (InitError) { ! if(!reverbinitiated_) ! throw InitError("Reverb not initialized"); ! return reverbscale_; ! } ! ! float SourceBase::getReverbDelay() throw (InitError) { ! if(!reverbinitiated_) ! throw InitError("Reverb not initialized"); ! return reverbdelay_; ! } ! ! ALuint SourceBase::link(const SourceBase &source) throw (MemoryError) { ! if(nlinkedsources_>=alloclinkedsources_) { ! alloclinkedsources_+=5; ! linkedsources_=(ALuint *)realloc(linkedsources_, ! sizeof(ALuint)*alloclinkedsources_); ! if(!linkedsources_) ! throw MemoryError("realloc failed"); ! } ! linkedsources_[nlinkedsources_++]=source.getAlSource(); ! return source.getAlSource(); ! } ! ! void SourceBase::unlink(const SourceBase &source) throw (NameError) { ! if(source.sourcename_==sourcename_) ! throw(NameError("Can't unlink a source from itself!")); ! for(unsigned int i=0;i<nlinkedsources_;i++) ! if(linkedsources_[i]==source.sourcename_) { ! linkedsources_[i]=linkedsources_[--nlinkedsources_]; ! return; ! } ! throw NameError("Source not linked"); ! } ! ! void SourceBase::unlink(const ALuint name) throw (NameError) { ! if(name==sourcename_) ! throw(NameError("Can't unlink a source from itself!")); ! for(unsigned int i=0;i<nlinkedsources_;i++) ! if(linkedsources_[i]==name) { ! linkedsources_[i]=linkedsources_[--nlinkedsources_]; ! return; ! } ! throw NameError("Source not linked"); ! } ! ! void SourceBase::unlinkAll() { ! nlinkedsources_=1; ! } ! ! ALuint SourceBase::getAlSource() const { ! return sourcename_; ! } ! ! void SourceBase::setPosition(float x, float y, float z) { ! alSource3f(sourcename_,AL_POSITION,x,y,z); ! ALenum error=alGetError(); ! if(error!=AL_FALSE) ! switch(error) { ! case(AL_INVALID_VALUE): ! throw ValueError("Invalid value for position"); ! break; ! default: ! throw FatalError("Error trying to set position!"); ! } ! } ! ! void SourceBase::getPosition(float &x, float &y, float &z) const { ! ALfloat position[3]; ! alGetSourcefv(sourcename_,AL_POSITION,position); ! x=position[0]; ! y=position[1]; ! z=position[2]; ! } ! ! void SourceBase::setVelocity(float vx, float vy, float vz) { ! alSource3f(sourcename_,AL_VELOCITY,vx,vy,vz); ! ALenum error=alGetError(); ! if(error!=AL_FALSE) ! switch(error) { ! case(AL_INVALID_VALUE): ! throw ValueError("Invalid value for velocity"); ! break; ! default: ! throw FatalError("Error trying to set velocity!"); ! } ! } ! ! void SourceBase::getVelocity(float &vx, float &vy, float &vz) const { ! ALfloat velocity[3]; ! alGetSourcefv(sourcename_,AL_VELOCITY,velocity); ! vx=velocity[0]; ! vy=velocity[1]; ! vz=velocity[2]; ! } ! Index: netstream.cpp =================================================================== RCS file: /cvsroot/alpp/openalpp/src/netstream.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** netstream.cpp 7 Mar 2003 20:30:08 -0000 1.7 --- netstream.cpp 11 Nov 2004 07:57:58 -0000 1.8 *************** *** 1,82 **** ! /** ! * 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 ! * CommonC++ (http://cplusplus.sourceforge.net/) ! * ! * 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. ! */ ! ! #include "openalpp/netupdater.h" ! #include "openalpp/netstream.h" ! #include "openalpp/sample.h" ! ! namespace openalpp { ! ! NetStream::NetStream(ost::UDPSocket *socket,ost::TCPStream *controlsocket) ! : Stream() { ! unsigned int frequency=11025,buffersize=2048; ! ALenum format=AL_FORMAT_MONO8; ! if(controlsocket) { ! *controlsocket >> format; ! *controlsocket >> frequency; ! *controlsocket >> buffersize; ! } ! updater_=new NetUpdater(socket,controlsocket, ! buffername_,buffer2_->GetName(), ! format,frequency,buffersize*SampleSize(format)); ! } ! ! NetStream::NetStream(ost::UDPSocket *socket,SampleFormat format, ! unsigned int frequency,unsigned int buffersize) ! : Stream() { ! ALenum alformat=0; ! switch(format) { ! case(Mono8): ! alformat=AL_FORMAT_MONO8; ! break; ! case(Mono16): ! alformat=AL_FORMAT_MONO16; ! break; ! case(Stereo8): ! alformat=AL_FORMAT_STEREO8; ! break; ! case(Stereo16): ! alformat=AL_FORMAT_STEREO16; ! break; ! } ! updater_=new NetUpdater(socket,NULL,buffername_,buffer2_->GetName(), ! alformat,frequency,buffersize*SampleSize(format)); ! } ! ! ! NetStream::NetStream(const NetStream &stream) : Stream((const Stream &)stream){ ! } ! ! NetStream::~NetStream() { ! } ! ! NetStream &NetStream::operator=(const NetStream &stream) { ! if(&stream!=this) { ! Stream::operator=((const Stream &)stream); ! } ! return *this; ! } ! ! } ! --- 1,82 ---- ! /** ! * 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 ! * CommonC++ (http://cplusplus.sourceforge.net/) ! * ! * 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. ! */ ! ! #include "openalpp/netupdater.h" ! #include "openalpp/netstream.h" ! #include "openalpp/sample.h" ! ! namespace openalpp { ! ! NetStream::NetStream(ost::UDPSocket *socket,ost::TCPStream *controlsocket) ! : Stream() { ! unsigned int frequency=11025,buffersize=2048; ! ALenum format=AL_FORMAT_MONO8; ! if(controlsocket) { ! *controlsocket >> format; ! *controlsocket >> frequency; ! *controlsocket >> buffersize; ! } ! updater_=new NetUpdater(socket,controlsocket, ! buffername_,buffer2_->GetName(), ! format,frequency,buffersize*SampleSize(format)); ! } ! ! NetStream::NetStream(ost::UDPSocket *socket,SampleFormat format, ! unsigned int frequency,unsigned int buffersize) ! : Stream() { ! ALenum alformat=0; ! switch(format) { ! case(Mono8): ! alformat=AL_FORMAT_MONO8; ! break; ! case(Mono16): ! alformat=AL_FORMAT_MONO16; ! break; ! case(Stereo8): ! alformat=AL_FORMAT_STEREO8; ! break; ! case(Stereo16): ! alformat=AL_FORMAT_STEREO16; ! break; ! } ! updater_=new NetUpdater(socket,NULL,buffername_,buffer2_->GetName(), ! alformat,frequency,buffersize*SampleSize(format)); ! } ! ! ! NetStream::NetStream(const NetStream &stream) : Stream((const Stream &)stream){ ! } ! ! NetStream::~NetStream() { ! } ! ! NetStream &NetStream::operator=(const NetStream &stream) { ! if(&stream!=this) { ! Stream::operator=((const Stream &)stream); ! } ! return *this; ! } ! ! } ! Index: error.cpp =================================================================== RCS file: /cvsroot/alpp/openalpp/src/error.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** error.cpp 2 Mar 2004 07:50:27 -0000 1.5 --- error.cpp 11 Nov 2004 07:57:58 -0000 1.6 *************** *** 1,36 **** ! /** ! * 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. ! */ ! ! #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); ! } ! --- 1,36 ---- ! /** ! * 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. ! */ ! ! #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: audioenvironment.cpp =================================================================== RCS file: /cvsroot/alpp/openalpp/src/audioenvironment.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** audioenvironment.cpp 2 Mar 2004 07:50:27 -0000 1.7 --- audioenvironment.cpp 11 Nov 2004 07:57:58 -0000 1.8 *************** *** 1,158 **** ! /** ! * 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. ! */ ! ! #include "openalpp/audioenvironment.h" ! ! using namespace openalpp; ! ! AudioEnvironment::AudioEnvironment() throw (InitError): AudioBase() { ! } ! ! AudioEnvironment::AudioEnvironment(int frequency,int refresh,bool synchronous) ! throw (InitError) ! : AudioBase(frequency,refresh,synchronous) { ! } ! ! AudioEnvironment::AudioEnvironment(int frequency,int refresh) throw (InitError) ! : AudioBase(frequency,refresh) { ! } ! ! void AudioEnvironment::setSoundVelocity(float speed) throw(ValueError,FatalError){ ! alDopplerVelocity(speed); ! ALenum error; ! if((error=alGetError())!=AL_FALSE) ! switch(error) { ! case(AL_INVALID_VALUE): ! throw ValueError((const char *)alGetString(error)); ! break; ! default: ! throw FatalError("Unknown error in AudioEnvironment::SetSoundSpeed()"); ! break; ! } ! } ! ! 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); ! ALenum error; ! if((error=alGetError())!=AL_FALSE) ! switch(error) { ! case(AL_INVALID_VALUE): ! throw ValueError((const char *)alGetString(error)); ! break; ! default: ! throw FatalError("Unknown error in AudioEnvironment::SetDopplerFactor()"); ! break; ! } ! } ! ! float AudioEnvironment::getDopplerFactor() throw (FatalError) { ! ALfloat(factor); ! alGetFloatv(AL_DOPPLER_FACTOR,&factor); ! if(alGetError()!=AL_FALSE) // This isn't strictly necessary... ! throw FatalError("Unknown error in AudioEnvironment::GetDopplerFactor()"); ! return factor; ! } ! ! void AudioEnvironment::setGain(float gain) { ! alListenerf(AL_GAIN,gain); ! ALenum error=alGetError(); ! if(error!=AL_FALSE) ! switch(error) { ! case(AL_INVALID_VALUE): ! throw ValueError("Invalid value for gain"); ! break; ! default: ! throw FatalError("Error trying to set gain!"); ! } ! } ! ! float AudioEnvironment::getGain() throw (FatalError) { ! ALfloat gain; ! alGetListenerf(AL_GAIN,&gain); ! if(alGetError()!=AL_FALSE) // This isn't strictly necessary... ! throw FatalError("Unknown error in AudioEnvironment::GetGain()"); ! return gain; ! } ! ! void AudioEnvironment::setDistanceModel(DistanceModel model) ! throw (FatalError){ ! switch(model) { ! case(None): ! alDistanceModel(AL_NONE); ! break; ! case(InverseDistance): ! alDistanceModel(AL_INVERSE_DISTANCE); ! break; ! case(InverseDistanceClamped): ! alDistanceModel(AL_INVERSE_DISTANCE_CLAMPED); ! break; ! default: ! throw FatalError("Unknown model in AudioEnvironment::SetDistanceModel()"); ! } ! if(alGetError()!=AL_FALSE) ! throw FatalError("alDistanceModel failed in AudioEnvironment::SetDistanceModel()"); ! } ! ! DistanceModel AudioEnvironment::getDistanceModel() throw (FatalError) { ! int almodel; ! alGetIntegerv(AL_DISTANCE_MODEL,&almodel); ! switch(almodel) { ! case(AL_NONE): ! return None; ! case(AL_INVERSE_DISTANCE): ! return InverseDistance; ! case(AL_INVERSE_DISTANCE_CLAMPED): ! return InverseDistanceClamped; ! default: ! throw FatalError("Unknown distance model in AudioEnvironment::GetDistanceModel"); ! } ! } ! ! // Static fields in AudioBase ! bool AudioBase::reverbinitiated_; ! void (*AudioBase::alReverbScale)(ALuint sid, ALfloat param); ! void (*AudioBase::alReverbDelay)(ALuint sid, ALfloat param); ! ! void AudioEnvironment::initiateReverb() throw (InitError) { ! if (reverbinitiated_) ! return; ! ! alReverbScale=(void (*)(ALuint sid, ALfloat param)) ! alGetProcAddress((ALubyte *)"alReverbScale_LOKI"); ! alReverbDelay=(void (*)(ALuint sid, ALfloat param)) ! alGetProcAddress((ALubyte *)"alReverbDelay_LOKI"); ! if(!(alReverbScale && alReverbDelay)) { ! throw InitError("Couldn't initiate reverb"); ! } else ! reverbinitiated_=true; ! } ! --- 1,158 ---- ! /** ! * 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. ! */ ! ! #include "openalpp/audioenvironment.h" ! ! using namespace openalpp; ! ! AudioEnvironment::AudioEnvironment() throw (InitError): AudioBase() { ! } ! ! AudioEnvironment::AudioEnvironment(int frequency,int refresh,bool synchronous) ! throw (InitError) ! : AudioBase(frequency,refresh,synchronous) { ! } ! ! AudioEnvironment::AudioEnvironment(int frequency,int refresh) throw (InitError) ! : AudioBase(frequency,refresh) { ! } ! ! void AudioEnvironment::setSoundVelocity(float speed) throw(ValueError,FatalError){ ! alDopplerVelocity(speed); ! ALenum error; ! if((error=alGetError())!=AL_FALSE) ! switch(error) { ! case(AL_INVALID_VALUE): ! throw ValueError((const char *)alGetString(error)); ! break; ! default: ! throw FatalError("Unknown error in AudioEnvironment::SetSoundSpeed()"); ! break; ! } ! } ! ! 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); ! ALenum error; ! if((error=alGetError())!=AL_FALSE) ! switch(error) { ! case(AL_INVALID_VALUE): ! throw ValueError((const char *)alGetString(error)); ! break; ! default: ! throw FatalError("Unknown error in AudioEnvironment::SetDopplerFactor()"); ! break; ! } ! } ! ! float AudioEnvironment::getDopplerFactor() throw (FatalError) { ! ALfloat(factor); ! alGetFloatv(AL_DOPPLER_FACTOR,&factor); ! if(alGetError()!=AL_FALSE) // This isn't strictly necessary... ! throw FatalError("Unknown error in AudioEnvironment::GetDopplerFactor()"); ! return factor; ! } ! ! void AudioEnvironment::setGain(float gain) { ! alListenerf(AL_GAIN,gain); ! ALenum error=alGetError(); ! if(error!=AL_FALSE) ! switch(error) { ! case(AL_INVALID_VALUE): ! throw ValueError("Invalid value for gain"); ! break; ! default: ! throw FatalError("Error trying to set gain!"); ! } ! } ! ! float AudioEnvironment::getGain() throw (FatalError) { ! ALfloat gain; ! alGetListenerf(AL_GAIN,&gain); ! if(alGetError()!=AL_FALSE) // This isn't strictly necessary... ! throw FatalError("Unknown error in AudioEnvironment::GetGain()"); ! return gain; ! } ! ! void AudioEnvironment::setDistanceModel(DistanceModel model) ! throw (FatalError){ ! switch(model) { ! case(None): ! alDistanceModel(AL_NONE); ! break; ! case(InverseDistance): ! alDistanceModel(AL_INVERSE_DISTANCE); ! break; ! case(InverseDistanceClamped): ! alDistanceModel(AL_INVERSE_DISTANCE_CLAMPED); ! break; ! default: ! throw FatalError("Unknown model in AudioEnvironment::SetDistanceModel()"); ! } ! if(alGetError()!=AL_FALSE) ! throw FatalError("alDistanceModel failed in AudioEnvironment::SetDistanceModel()"); ! } ! ! DistanceModel AudioEnvironment::getDistanceModel() throw (FatalError) { ! int almodel; ! alGetIntegerv(AL_DISTANCE_MODEL,&almodel); ! switch(almodel) { ! case(AL_NONE): ! return None; ! case(AL_INVERSE_DISTANCE): ! return InverseDistance; ! case(AL_INVERSE_DISTANCE_CLAMPED): ! return InverseDistanceClamped; ! default: ! throw FatalError("Unknown distance model in AudioEnvironment::GetDistanceModel"); ! } ! } ! ! // Static fields in AudioBase ! bool AudioBase::reverbinitiated_; ! void (*AudioBase::alReverbScale)(ALuint sid, ALfloat param); ! void (*AudioBase::alReverbDelay)(ALuint sid, ALfloat param); ! ! void AudioEnvironment::initiateReverb() throw (InitError) { ! if (reverbinitiated_) ! return; ! ! alReverbScale=(void (*)(ALuint sid, ALfloat param)) ! alGetProcAddress((ALubyte *)"alReverbScale_LOKI"); ! alReverbDelay=(void (*)(ALuint sid, ALfloat param)) ! alGetProcAddress((ALubyte *)"alReverbDelay_LOKI"); ! if(!(alReverbScale && alReverbDelay)) { ! throw InitError("Couldn't initiate reverb"); ! } else ! reverbinitiated_=true; ! } ! Index: CMakeLists.txt =================================================================== RCS file: /cvsroot/alpp/openalpp/src/CMakeLists.txt,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** CMakeLists.txt 16 Jul 2003 19:19:51 -0000 1.2 --- CMakeLists.txt 11 Nov 2004 07:57:58 -0000 1.3 *************** *** 1,3 **** ! SET(SOURCEFILES audiobase audioconvert audioenvironment error groupsource listener sample sounddata source sourcebase) IF(CCGNU_FOUND) --- 1,3 ---- ! SET(SOURCEFILES audiobase audioconvert audioenvironment error groupsource listener sample sounddata source sourcebase referenced) IF(CCGNU_FOUND) Index: listener.cpp =================================================================== RCS file: /cvsroot/alpp/openalpp/src/listener.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** listener.cpp 2 Mar 2004 07:50:27 -0000 1.4 --- listener.cpp 11 Nov 2004 07:57:58 -0000 1.5 *************** *** 1,145 **** ! /** ! * 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. ! */ ! ! #include "openalpp/listener.h" ! ! using namespace openalpp; ! ! Listener *Listener::selectedlistener_=NULL; ! ! /** ! * 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]); ! } ! ! Listener::Listener(float x,float y,float z, ! 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); ! } ! ! Listener::~Listener() { ! if(selectedlistener_==this) ! selectedlistener_=NULL; ! } ! ! void Listener::select() { ! alListenerfv(AL_POSITION,position_); ! alListenerfv(AL_VELOCITY,velocity_); ! alListenerfv(AL_ORIENTATION,orientation_); ! selectedlistener_=this; ! } ! ! bool Listener::isSelected() { ! return (selectedlistener_==this); ! } ! ! void Listener::setOrientation(float directionx,float directiony, ! float directionz, ! float upx, float upy, float upz) { ! orientation_[0]=directionx; ! orientation_[1]=directiony; ! orientation_[2]=directionz; ! orientation_[3]=upx; ! 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 { ! directionx=orientation_[0]; ! directiony=orientation_[1]; ! directionz=orientation_[2]; ! upx=orientation_[3]; ! upy=orientation_[4]; ! upz=orientation_[5]; ! } ! ! 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]); ! } ! return *this; ! } ! ! 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]; ! z=position_[2]; ! } ! ! 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]; ! vz=velocity_[2]; ! } ! --- 1,145 ---- ! /** ! * 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. ! */ ! ! #include "openalpp/listener.h" ! ! using namespace openalpp; ! ! Listener *Listener::selectedlistener_=NULL; ! ! /** ! * 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]); ! } ! ! Listener::Listener(float x,float y,float z, ! 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); ! } ! ! Listener::~Listener() { ! if(selectedlistener_==this) ! selectedlistener_=NULL; ! } ! ! void Listener::select() { ! alListenerfv(AL_POSITION,position_); ! alListenerfv(AL_VELOCITY,velocity_); ! alListenerfv(AL_ORIENTATION,orientation_); ! selectedlistener_=this; ! } ! ! bool Listener::isSelected() { ! return (selectedlistener_==this); ! } ! ! void Listener::setOrientation(float directionx,float directiony, ! float directionz, ! float upx, float upy, float upz) { ! orientation_[0]=directionx; ! orientation_[1]=directiony; ! orientation_[2]=directionz; ! orientation_[3]=upx; ! 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 { ! directionx=orientation_[0]; ! directiony=orientation_[1]; ! directionz=orientation_[2]; ! upx=orientation_[3]; ! upy=orientation_[4]; ! upz=orientation_[5]; ! } ! ! 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]); ! } ! return *this; ! } ! ! 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]; ! z=position_[2]; ! } ! ! 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=velocit... [truncated message content] |
Update of /cvsroot/alpp/openalpp/include/openalpp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31707/include/openalpp Modified Files: Makefile.am alpp.h audiobase.h audioconvert.h audioenvironment.h config.h deviceupdater.h error.h export.h filestream.h filestreamupdater.h groupsource.h inputdevice.h listener.h netstream.h netupdater.h positionedobject.h sample.h sounddata.h source.h sourcebase.h stream.h streamupdater.h windowsstuff.h Added Files: ref_ptr.h referenced.h Log Message: Adapted smart (reference) pointers from the OpenSceneGraph library. Used with permission of Robert Osfield. Cleans up the new/delete responsibility. All objects must be created on the heap from now on. Fixed small bugin in Streaming classes. Index: source.h =================================================================== RCS file: /cvsroot/alpp/openalpp/include/openalpp/source.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** source.h 2 Mar 2004 07:50:27 -0000 1.4 --- source.h 11 Nov 2004 07:57:57 -0000 1.5 *************** *** 1,167 **** ! /** ! * 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 SOURCE_H_INCLUDED_C419B739 ! #define SOURCE_H_INCLUDED_C419B739 ! ! #include "openalpp/export.h" ! #include "openalpp/stream.h" ! #include "openalpp/sourcebase.h" ! #include "openalpp/sample.h" ! ! namespace openalpp { ! ! /** ! * Class for "normal" sources. ! * This is used for standard OpenAL sources, whether streaming or not. ! */ ! class OPENALPP_API Source : public SourceBase { ! public: ! /** ! * Constructor. ! * Creates the source with the specified position. ! * @param x x coordinate. ! * @param y y coordinate. ! * @param z z coordinate. ! */ ! Source(float x = 0.0, float y = 0.0, float z = 0.0); ! ! /** ! * Constructor. ! * Creates the source and a buffer with the specified file. ! * @param filename is the name of the file. ! */ ! Source(const char *filename,float x=0.0,float y=0.0,float z=0.0); ! ! /** ! * Constructor. ! * Creates the source with the specified buffer. ! * @param buffer is the buffer to use. ! */ ! Source(const Sample &buffer,float x=0.0,float y=0.0,float z=0.0); ! ! /** ! * Constructor. ! * Creates the source with the specified stream. ! * @param stream is the stream to use. ! */ ! Source(const Stream &stream,float x=0.0,float y=0.0,float z=0.0); ! ! /** ! * Copy constructor. ! */ ! Source(const Source &source); ! ! /** ! * Destructor. ! */ ! ~Source(); ! ! /** ! * Create a buffer for the source and load a file into it. ! * The source should _not_ be playing when doing this. ! * @param filename is the name of the file. ! */ ! void setSound(const std::string& filename); ! ! /** ! * Sets a new buffer for the source. ! * The source should _not_ be playing when doing this. ! * @param buffer is the new buffer. ! */ ! void setSound(const Sample &buffer); ! ! /** ! * Sets a new (streamed) buffer for the source. ! * The source should _not_ be playing when doing this. ! * @param stream is the new buffer. ! */ ! void setSound(const Stream &stream); ! ! /** ! * Gets the buffer associated with the source. ! * @return the buffer. ! */ ! const SoundData &getSound() const; ! ! /** ! * Play a file on the source. ! * This will change the source's buffer. ! * @param filename is the name of the file to play. ! */ ! void play(const std::string& filename); ! ! /** ! * Play a buffer on the source. ! * This will change the source's buffer. ! * @param buffer is the buffer to play. ! */ ! void play(const Sample &buffer); ! ! /** ! * Play a stream on the source. ! * This will change the source's buffer. ! * @param stream is the stream to play. ! */ ! void play(const Stream &stream); ! ! /** ! * Play this source. ! * This is only here, because the above Play(...) hides SourceBase::Play() ! */ ! void play(); ! ! /** ! * Stop this source. ! * This is needed here for streaming sources... ! */ ! void stop(); ! ! /** ! * Pause this source. ! * This is needed here for streaming sources... ! */ ! void pause(); ! ! ! /** ! * Check if the source is streaming. ! * @return true if the source is streaming, false otherwise. ! */ ! bool isStreaming(); ! ! /** ! * Assignment operator. ! */ ! Source &operator=(const Source &source); ! ! private: ! /** ! * Pointer to the SoundData (buffer) associated with this source. ! */ ! SoundData *sounddata_; ! }; ! ! } ! ! #endif /* SOURCE_H_INCLUDED_C419B739 */ --- 1,169 ---- ! /** ! * 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 SOURCE_H_INCLUDED_C419B739 ! #define SOURCE_H_INCLUDED_C419B739 ! ! #include "openalpp/export.h" ! #include "openalpp/stream.h" ! #include "openalpp/sourcebase.h" ! #include "openalpp/sample.h" ! ! namespace openalpp { ! ! /** ! * Class for "normal" sources. ! * This is used for standard OpenAL sources, whether streaming or not. ! */ ! class OPENALPP_API Source : public SourceBase { ! public: ! /** ! * Constructor. ! * Creates the source with the specified position. ! * @param x x coordinate. ! * @param y y coordinate. ! * @param z z coordinate. ! */ ! Source(float x = 0.0, float y = 0.0, float z = 0.0); ! ! /** ! * Constructor. ! * Creates the source and a buffer with the specified file. ! * @param filename is the name of the file. ! */ ! Source(const std::string& filename,float x=0.0,float y=0.0,float z=0.0); ! ! /** ! * Constructor. ! * Creates the source with the specified buffer. ! * @param buffer is the buffer to use. ! */ ! Source(const Sample &buffer,float x=0.0,float y=0.0,float z=0.0); ! ! /** ! * Constructor. ! * Creates the source with the specified stream. ! * @param stream is the stream to use. ! */ ! Source(const Stream &stream,float x=0.0,float y=0.0,float z=0.0); ! ! /** ! * Copy constructor. ! */ ! Source(const Source &source); ! ! ! /** ! * Create a buffer for the source and load a file into it. ! * The source should _not_ be playing when doing this. ! * @param filename is the name of the file. ! */ ! void setSound(const std::string& filename); ! ! /** ! * Sets a new buffer for the source. ! * The source should _not_ be playing when doing this. ! * @param buffer is the new buffer. ! */ ! void setSound(const Sample *buffer); ! ! /** ! * Sets a new (streamed) buffer for the source. ! * The source should _not_ be playing when doing this. ! * @param stream is the new buffer. ! */ ! void setSound(const Stream *stream); ! ! /** ! * Gets the buffer associated with the source. ! * @return the buffer. ! */ ! const SoundData *getSound() const; ! ! /** ! * Play a file on the source. ! * This will change the source's buffer. ! * @param filename is the name of the file to play. ! */ ! void play(const std::string& filename); ! ! /** ! * Play a buffer on the source. ! * This will change the source's buffer. ! * @param buffer is the buffer to play. ! */ ! void play(const Sample *buffer); ! ! /** ! * Play a stream on the source. ! * This will change the source's buffer. ! * @param stream is the stream to play. ! */ ! void play(const Stream *stream); ! ! /** ! * Play this source. ! * This is only here, because the above Play(...) hides SourceBase::Play() ! */ ! void play(); ! ! /** ! * Stop this source. ! * This is needed here for streaming sources... ! */ ! void stop(); ! ! /** ! * Pause this source. ! * This is needed here for streaming sources... ! */ ! void pause(); ! ! ! /** ! * Check if the source is streaming. ! * @return true if the source is streaming, false otherwise. ! */ ! bool isStreaming(); ! ! /** ! * Assignment operator. ! */ ! Source &operator=(const Source &source); ! ! protected: ! /** ! * Destructor. ! */ ! virtual ~Source(); ! ! private: ! /** ! * Pointer to the SoundData (buffer) associated with this source. ! */ ! openalpp::ref_ptr<SoundData> sounddata_; ! }; ! ! } ! ! #endif /* SOURCE_H_INCLUDED_C419B739 */ Index: audioconvert.h =================================================================== RCS file: /cvsroot/alpp/openalpp/include/openalpp/audioconvert.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** audioconvert.h 2 Mar 2004 07:50:27 -0000 1.3 --- audioconvert.h 11 Nov 2004 07:57:57 -0000 1.4 *************** *** 1,164 **** ! /** ! * Parts of this file are copied from OpenAL source code. ! * Copyright (C) Loki Games, licensed under the LGPL. ! * ! * This code has since been (more or less) modified to be a part of: ! * 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 AUDIOCONVERT_H_INCLUDED ! #define AUDIOCONVERT_H_INCLUDED ! ! #include "openalpp/export.h" ! #include <AL/al.h> ! #include <stdlib.h> ! #include <string.h> ! #include "openalpp/error.h" ! ! namespace openalpp { ! ! /** ! * Class for converting audio. ! */ ! class OPENALPP_API AudioConvert { ! unsigned short channels_,bits_; ! unsigned int frequency_; ! ALenum format_; ! public: ! /** ! * Constructor. ! * @param format is the (OpenAL) format that data will be converted to. ! * @param frequency is the frequency the data will be converted to. ! */ ! AudioConvert(ALenum format,unsigned int frequency); ! ! /** ! * Apply the conversion to data. ! * @param data is the data to convert. ! * @param format is the (OpenAL) format of the data. ! * @param frequency is the frequency of the data. ! * @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); ! }; ! ! typedef struct _acAudioCVT { ! int needed; /* Set to 1 if conversion possible */ ! ALushort src_format; /* Source audio format */ ! ALushort dst_format; /* Target audio format */ ! double rate_incr; /* Rate conversion increment */ ! void *buf; /* Buffer to hold entire audio data */ ! int len; /* Length of original audio buffer */ ! int len_cvt; /* Length of converted audio buffer */ ! int len_mult; /* buffer must be len*len_mult big */ ! double len_ratio; /* Given len, final size is len*len_ratio */ ! void (*filters[10])(struct _acAudioCVT *cvt, ALushort format); ! int filter_index; /* Current audio conversion function */ ! } acAudioCVT; ! ! /* Audio format flags (defaults to LSB byte order) */ ! #define AUDIO_U8 0x0008 /* Unsigned 8-bit samples */ ! #define AUDIO_S8 0x8008 /* Signed 8-bit samples */ ! #define AUDIO_U16LSB 0x0010 /* Unsigned 16-bit samples */ ! #define AUDIO_S16LSB 0x8010 /* Signed 16-bit samples */ ! #define AUDIO_U16MSB 0x1010 /* As above, but big-endian byte order */ ! #define AUDIO_S16MSB 0x9010 /* As above, but big-endian byte order */ ! ! /* Native audio byte ordering */ ! #ifndef WORDS_BIGENDIAN ! #define AUDIO_U16 AUDIO_U16LSB ! #define AUDIO_S16 AUDIO_S16LSB ! #define swap16le(x) (x) ! #define swap32le(x) (x) ! #define swap16be(x) swap16(x) ! #define swap32be(x) swap32(x) ! #else ! #define AUDIO_U16 AUDIO_U16MSB ! #define AUDIO_S16 AUDIO_S16MSB ! #define swap16le(x) swap16(x) ! #define swap32le(x) swap32(x) ! #define swap16be(x) (x) ! #define swap32be(x) (x) ! #endif ! ! #define _al_ALCHANNELS(fmt) ((fmt==AL_FORMAT_MONO16||fmt==AL_FORMAT_MONO8)?1:2) ! ! #define DATA 0x61746164 /* "data" */ ! #define FACT 0x74636166 /* "fact" */ ! #define LIST 0x5453494c /* "LIST" */ ! #define RIFF 0x46464952 ! #define WAVE 0x45564157 ! #define FMT 0x20746D66 ! ! #define AL_FORMAT_IMA_ADPCM_MONO16_EXT 0x10000 ! #define AL_FORMAT_IMA_ADPCM_STEREO16_EXT 0x10001 ! #define AL_FORMAT_WAVE_EXT 0x10002 ! ! #define NELEMS(x) ((sizeof x) / (sizeof *x)) ! ! #define PCM_CODE 0x0001 ! #define MS_ADPCM_CODE 0x0002 ! #define IMA_ADPCM_CODE 0x0011 ! ! #define MS_ADPCM_max ((1<<(16-1))-1) ! #define MS_ADPCM_min -(1<<(16-1)) ! ! typedef struct Chunk { ! ALuint magic; ! ALuint length; ! void *data; ! } Chunk; ! ! struct MS_ADPCM_decodestate_FULL { ! ALubyte hPredictor; ! ALushort iDelta; ! ALshort iSamp1; ! ALshort iSamp2; ! }; ! ! typedef struct WaveFMT { ! ALushort encoding; ! ALushort channels; /* 1 = mono, 2 = stereo */ ! ALuint frequency; /* One of 11025, 22050, or 44100 Hz */ ! ALuint byterate; /* Average bytes per second */ ! ALushort blockalign; /* Bytes per sample block */ ! ALushort bitspersample; ! } alWaveFMT_LOKI; ! ! typedef struct IMA_ADPCM_decodestate_s { ! ALint valprev; /* Previous output value */ ! ALbyte index; /* Index into stepsize table */ ! } alIMAADPCM_decodestate_LOKI; ! ! typedef struct IMA_ADPCM_decoder { ! alWaveFMT_LOKI wavefmt; ! ALushort wSamplesPerBlock; ! alIMAADPCM_decodestate_LOKI state[2]; ! } alIMAADPCM_state_LOKI; ! /* ! void *AudioConvert(ALvoid *data, ! ALenum f_format, ALuint f_size, ALuint f_freq, ! ALenum t_format, ALuint t_freq, ALuint *retsize); ! */ ! } ! ! #endif --- 1,164 ---- ! /** ! * Parts of this file are copied from OpenAL source code. ! * Copyright (C) Loki Games, licensed under the LGPL. ! * ! * This code has since been (more or less) modified to be a part of: ! * 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 AUDIOCONVERT_H_INCLUDED ! #define AUDIOCONVERT_H_INCLUDED ! ! #include "openalpp/export.h" ! #include <AL/al.h> ! #include <stdlib.h> ! #include <string.h> ! #include "openalpp/error.h" ! ! namespace openalpp { ! ! /** ! * Class for converting audio. ! */ ! class OPENALPP_API AudioConvert { ! unsigned short channels_,bits_; ! unsigned int frequency_; ! ALenum format_; ! public: ! /** ! * Constructor. ! * @param format is the (OpenAL) format that data will be converted to. ! * @param frequency is the frequency the data will be converted to. ! */ ! AudioConvert(ALenum format,unsigned int frequency); ! ! /** ! * Apply the conversion to data. ! * @param data is the data to convert. ! * @param format is the (OpenAL) format of the data. ! * @param frequency is the frequency of the data. ! * @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); ! }; ! ! typedef struct _acAudioCVT { ! int needed; /* Set to 1 if conversion possible */ ! ALushort src_format; /* Source audio format */ ! ALushort dst_format; /* Target audio format */ ! double rate_incr; /* Rate conversion increment */ ! void *buf; /* Buffer to hold entire audio data */ ! int len; /* Length of original audio buffer */ ! int len_cvt; /* Length of converted audio buffer */ ! int len_mult; /* buffer must be len*len_mult big */ ! double len_ratio; /* Given len, final size is len*len_ratio */ ! void (*filters[10])(struct _acAudioCVT *cvt, ALushort format); ! int filter_index; /* Current audio conversion function */ ! } acAudioCVT; ! ! /* Audio format flags (defaults to LSB byte order) */ ! #define AUDIO_U8 0x0008 /* Unsigned 8-bit samples */ ! #define AUDIO_S8 0x8008 /* Signed 8-bit samples */ ! #define AUDIO_U16LSB 0x0010 /* Unsigned 16-bit samples */ ! #define AUDIO_S16LSB 0x8010 /* Signed 16-bit samples */ ! #define AUDIO_U16MSB 0x1010 /* As above, but big-endian byte order */ ! #define AUDIO_S16MSB 0x9010 /* As above, but big-endian byte order */ ! ! /* Native audio byte ordering */ ! #ifndef WORDS_BIGENDIAN ! #define AUDIO_U16 AUDIO_U16LSB ! #define AUDIO_S16 AUDIO_S16LSB ! #define swap16le(x) (x) ! #define swap32le(x) (x) ! #define swap16be(x) swap16(x) ! #define swap32be(x) swap32(x) ! #else ! #define AUDIO_U16 AUDIO_U16MSB ! #define AUDIO_S16 AUDIO_S16MSB ! #define swap16le(x) swap16(x) ! #define swap32le(x) swap32(x) ! #define swap16be(x) (x) ! #define swap32be(x) (x) ! #endif ! ! #define _al_ALCHANNELS(fmt) ((fmt==AL_FORMAT_MONO16||fmt==AL_FORMAT_MONO8)?1:2) ! ! #define DATA 0x61746164 /* "data" */ ! #define FACT 0x74636166 /* "fact" */ ! #define LIST 0x5453494c /* "LIST" */ ! #define RIFF 0x46464952 ! #define WAVE 0x45564157 ! #define FMT 0x20746D66 ! ! #define AL_FORMAT_IMA_ADPCM_MONO16_EXT 0x10000 ! #define AL_FORMAT_IMA_ADPCM_STEREO16_EXT 0x10001 ! #define AL_FORMAT_WAVE_EXT 0x10002 ! ! #define NELEMS(x) ((sizeof x) / (sizeof *x)) ! ! #define PCM_CODE 0x0001 ! #define MS_ADPCM_CODE 0x0002 ! #define IMA_ADPCM_CODE 0x0011 ! ! #define MS_ADPCM_max ((1<<(16-1))-1) ! #define MS_ADPCM_min -(1<<(16-1)) ! ! typedef struct Chunk { ! ALuint magic; ! ALuint length; ! void *data; ! } Chunk; ! ! struct MS_ADPCM_decodestate_FULL { ! ALubyte hPredictor; ! ALushort iDelta; ! ALshort iSamp1; ! ALshort iSamp2; ! }; ! ! typedef struct WaveFMT { ! ALushort encoding; ! ALushort channels; /* 1 = mono, 2 = stereo */ ! ALuint frequency; /* One of 11025, 22050, or 44100 Hz */ ! ALuint byterate; /* Average bytes per second */ ! ALushort blockalign; /* Bytes per sample block */ ! ALushort bitspersample; ! } alWaveFMT_LOKI; ! ! typedef struct IMA_ADPCM_decodestate_s { ! ALint valprev; /* Previous output value */ ! ALbyte index; /* Index into stepsize table */ ! } alIMAADPCM_decodestate_LOKI; ! ! typedef struct IMA_ADPCM_decoder { ! alWaveFMT_LOKI wavefmt; ! ALushort wSamplesPerBlock; ! alIMAADPCM_decodestate_LOKI state[2]; ! } alIMAADPCM_state_LOKI; ! /* ! void *AudioConvert(ALvoid *data, ! ALenum f_format, ALuint f_size, ALuint f_freq, ! ALenum t_format, ALuint t_freq, ALuint *retsize); ! */ ! } ! ! #endif Index: netstream.h =================================================================== RCS file: /cvsroot/alpp/openalpp/include/openalpp/netstream.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** netstream.h 2 Mar 2004 07:50:27 -0000 1.7 --- netstream.h 11 Nov 2004 07:57:57 -0000 1.8 *************** *** 1,87 **** ! /** ! * 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 NETSTREAM_H_INCLUDED_C419F72E ! #define NETSTREAM_H_INCLUDED_C419F72E ! ! #include "openalpp/stream.h" ! #include "openalpp/export.h" ! ! namespace ost { ! class UDPSocket; ! class TCPStream; ! } ! ! namespace openalpp { ! ! /** ! * Class for handling streams through sockets. ! * Preliminary tests indicate that packets smaller than ca 1 kb should not ! * be used (tests were done with Mono8, 11025 Hz). ! */ ! class OPENALPP_API NetStream : public Stream { ! public: ! /** ! * Constructor. ! * @param socket is the socket to stream data through. ! * @param controlsocket is an (optional) TCPStream that can be used to send ! * information about the stream. The constructor will begin with trying to ! * read SampleFormat, frequency, and buffer size. The sender can also use the ! * control socket to send "EXIT" when it's run out of data to send. If ! * this parameter is not given, defaults will be used (format=Mono8, ! * frequency=11025, buffersize=4096). ! */ ! NetStream(ost::UDPSocket *socket,ost::TCPStream *controlsocket=NULL); ! ! /** ! * Constructor. ! * @param socket is the socket to stream data through. ! * @param format is the format the data will be in. ! * @param frequency is the frequency of the sound. ! * @param buffersize is the size of the sound buffer. Note that the actual ! * packets sent over the network can be smaller (or bigger!); this is just ! * the size of the buffer OpenAL++ will use to receive the data. ! */ ! NetStream(ost::UDPSocket *socket,SampleFormat format,unsigned int frequency, ! unsigned int buffersize); ! ! /** ! * Copy constructor. ! */ ! NetStream(const NetStream &stream); ! ! /** ! * Destructor. ! */ ! ~NetStream(); ! ! /** ! * Assignment operator. ! */ ! NetStream &operator=(const NetStream &stream); ! }; ! ! } ! ! #endif /* NETSTREAM_H_INCLUDED_C419F72E */ ! --- 1,87 ---- ! /** ! * 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 NETSTREAM_H_INCLUDED_C419F72E ! #define NETSTREAM_H_INCLUDED_C419F72E ! ! #include "openalpp/stream.h" ! #include "openalpp/export.h" ! ! namespace ost { ! class UDPSocket; ! class TCPStream; ! } ! ! namespace openalpp { ! ! /** ! * Class for handling streams through sockets. ! * Preliminary tests indicate that packets smaller than ca 1 kb should not ! * be used (tests were done with Mono8, 11025 Hz). ! */ ! class OPENALPP_API NetStream : public Stream { ! public: ! /** ! * Constructor. ! * @param socket is the socket to stream data through. ! * @param controlsocket is an (optional) TCPStream that can be used to send ! * information about the stream. The constructor will begin with trying to ! * read SampleFormat, frequency, and buffer size. The sender can also use the ! * control socket to send "EXIT" when it's run out of data to send. If ! * this parameter is not given, defaults will be used (format=Mono8, ! * frequency=11025, buffersize=4096). ! */ ! NetStream(ost::UDPSocket *socket,ost::TCPStream *controlsocket=NULL); ! ! /** ! * Constructor. ! * @param socket is the socket to stream data through. ! * @param format is the format the data will be in. ! * @param frequency is the frequency of the sound. ! * @param buffersize is the size of the sound buffer. Note that the actual ! * packets sent over the network can be smaller (or bigger!); this is just ! * the size of the buffer OpenAL++ will use to receive the data. ! */ ! NetStream(ost::UDPSocket *socket,SampleFormat format,unsigned int frequency, ! unsigned int buffersize); ! ! /** ! * Copy constructor. ! */ ! NetStream(const NetStream &stream); ! ! /** ! * Destructor. ! */ ! ~NetStream(); ! ! /** ! * Assignment operator. ! */ ! NetStream &operator=(const NetStream &stream); ! }; ! ! } ! ! #endif /* NETSTREAM_H_INCLUDED_C419F72E */ ! Index: error.h =================================================================== RCS file: /cvsroot/alpp/openalpp/include/openalpp/error.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** error.h 2 Mar 2004 07:50:27 -0000 1.5 --- error.h 11 Nov 2004 07:57:57 -0000 1.6 *************** *** 1,160 **** ! /** ! * 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 ERROR_H_INCLUDED_C416C52E ! #define ERROR_H_INCLUDED_C416C52E ! ! #include <iostream> ! #include <string> ! #include <stdexcept> ! #include "openalpp/export.h" ! namespace openalpp { ! ! /** ! * Error class for throwing. ! * The descendants of this class are different error types, and the exact ! * error can be displayed by using "cout << error;" where error is an instance ! * of Error (or one of its descendants) ! */ ! class Error : public std::runtime_error { ! public: ! /** ! * Constructor. ! * Will use a default error message. ! */ ! Error() : runtime_error("No error description") {} ! ! /** ! * Constructor. ! * @param description is error message to use. ! */ ! Error(const char *description) : runtime_error(description) {} ! ! /** ! * Copy constructor. ! */ ! Error(const Error &error) : runtime_error(error.what()) {} ! ! /** ! * Function used for printing. ! * @param stream is stream to print to ! * @return the stream with the error message appended. ! */ ! std::ostream &put(std::ostream &stream) const; ! ! protected: ! /** ! * A description of the error ! */ ! }; ! ! /** ! * Fatal error. ! * Caused by error in implementation, corrupted memory etc. ! */ ! class FatalError : public Error { ! public: ! /** ! * Constructor. ! * @param description is error message to use. ! */ ! FatalError(const char *description) : Error(description) {} ! }; ! ! /** ! * File error. ! * Caused by wrong file permissions, missing files etc. ! */ ! class FileError : public Error { ! public: ! /** ! * Constructor. ! * @param description is error message to use. ! */ ! FileError(const char *description) : Error(description) {} ! }; ! ! /** ! * Memory error. ! * Caused by insufficient memory etc. ! */ ! class MemoryError : public Error { ! public: ! /** ! * Constructor. ! * @param description is error message to use. ! */ ! MemoryError(const char *description) : Error(description) {} ! }; ! ! /** ! * Name error. ! * Caused by invalid (OpenAL) names. ! */ ! class NameError : public Error { ! public: ! /** ! * Constructor. ! * @param description is error message to use. ! */ ! NameError(const char *description) : Error(description) {} ! }; ! ! /** ! * Value error. ! * Caused by values out of range etc. ! */ ! class ValueError : public Error { ! public: ! /** ! * Constructor. ! * @param description is error message to use. ! */ ! ValueError(const char *description) : Error(description) {} ! }; ! ! /** ! * Init error. ! * Caused by trying to do actions without proper initialization. ! */ ! class InitError : public Error { ! public: ! /** ! * Constructor. ! * @param description is error message to use. ! */ ! InitError(const char *description) : Error(description) {} ! }; ! ! /** ! * Out stream operator. ! * Used to print error messages to a stream (i.e. "cerr << error;"). ! * @param stream is the stream to print to. ! * @param error is the error to print. ! * @return the stream. ! */ ! OPENALPP_API std::ostream &operator<<(std::ostream &stream,const Error &error); ! ! } ! ! #endif /* ERROR_H_INCLUDED_C416C52E */ --- 1,160 ---- ! /** ! * 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 ERROR_H_INCLUDED_C416C52E ! #define ERROR_H_INCLUDED_C416C52E ! ! #include <iostream> ! #include <string> ! #include <stdexcept> ! #include "openalpp/export.h" ! namespace openalpp { ! ! /** ! * Error class for throwing. ! * The descendants of this class are different error types, and the exact ! * error can be displayed by using "cout << error;" where error is an instance ! * of Error (or one of its descendants) ! */ ! class Error : public std::runtime_error { ! public: ! /** ! * Constructor. ! * Will use a default error message. ! */ ! Error() : runtime_error("No error description") {} ! ! /** ! * Constructor. ! * @param description is error message to use. ! */ ! Error(const char *description) : runtime_error(description) {} ! ! /** ! * Copy constructor. ! */ ! Error(const Error &error) : runtime_error(error.what()) {} ! ! /** ! * Function used for printing. ! * @param stream is stream to print to ! * @return the stream with the error message appended. ! */ ! std::ostream &put(std::ostream &stream) const; ! ! protected: ! /** ! * A description of the error ! */ ! }; ! ! /** ! * Fatal error. ! * Caused by error in implementation, corrupted memory etc. ! */ ! class FatalError : public Error { ! public: ! /** ! * Constructor. ! * @param description is error message to use. ! */ ! FatalError(const char *description) : Error(description) {} ! }; ! ! /** ! * File error. ! * Caused by wrong file permissions, missing files etc. ! */ ! class FileError : public Error { ! public: ! /** ! * Constructor. ! * @param description is error message to use. ! */ ! FileError(const char *description) : Error(description) {} ! }; ! ! /** ! * Memory error. ! * Caused by insufficient memory etc. ! */ ! class MemoryError : public Error { ! public: ! /** ! * Constructor. ! * @param description is error message to use. ! */ ! MemoryError(const char *description) : Error(description) {} ! }; ! ! /** ! * Name error. ! * Caused by invalid (OpenAL) names. ! */ ! class NameError : public Error { ! public: ! /** ! * Constructor. ! * @param description is error message to use. ! */ ! NameError(const char *description) : Error(description) {} ! }; ! ! /** ! * Value error. ! * Caused by values out of range etc. ! */ ! class ValueError : public Error { ! public: ! /** ! * Constructor. ! * @param description is error message to use. ! */ ! ValueError(const char *description) : Error(description) {} ! }; ! ! /** ! * Init error. ! * Caused by trying to do actions without proper initialization. ! */ ! class InitError : public Error { ! public: ! /** ! * Constructor. ! * @param description is error message to use. ! */ ! InitError(const char *description) : Error(description) {} ! }; ! ! /** ! * Out stream operator. ! * Used to print error messages to a stream (i.e. "cerr << error;"). ! * @param stream is the stream to print to. ! * @param error is the error to print. ! * @return the stream. ! */ ! OPENALPP_API std::ostream &operator<<(std::ostream &stream,const Error &error); ! ! } ! ! #endif /* ERROR_H_INCLUDED_C416C52E */ Index: audiobase.h =================================================================== RCS file: /cvsroot/alpp/openalpp/include/openalpp/audiobase.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** audiobase.h 2 Mar 2004 07:50:27 -0000 1.6 --- audiobase.h 11 Nov 2004 07:57:57 -0000 1.7 *************** *** 1,126 **** ! /** ! * 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 AUDIOBASE_H_INCLUDED_C41996D8 ! #define AUDIOBASE_H_INCLUDED_C41996D8 ! ! #include "openalpp/export.h" ! #include <cstdlib> ! extern "C" { ! #include <AL/al.h> ! #include <AL/alut.h> ! #include <AL/alc.h> ! } ! #include "openalpp/windowsstuff.h" ! #include "openalpp/error.h" ! ! /** ! * \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. ! * ! * Every class in OpenAL++ that is available to the user is a descendant of the ! * virtual base class AudioBase. This class takes care of initialization and ! * shutdown, so there is no need to do it explicitly. ! */ ! ! /** ! * Namespace for OpenAL++. ! */ ! namespace openalpp { ! ! /** ! * Format for sound data. Mono/Stereo, 8 or 16 bits. ! */ ! typedef enum SampleFormat {Mono8,Stereo8,Mono16,Stereo16}; ! ! /** ! * Base class for enviroment, listener and source classes. ! * Takes care of initialisation/shutdown of anything necessary (e.g. ALut) ! */ ! class OPENALPP_API AudioBase { ! /** ! * Counter for #instances for enviroment, listener and source classes. ! * Used to determine when init and shutdown functions should be called ! */ ! static int instances_; ! ! /** ! * Pointer to device. ! */ ! static ALCdevice *device_; ! ! /** ! * Pointer to context. ! */ ! #ifndef WIN32 ! static void *context_; ! #else ! static struct ALCcontext_struct *context_; ! #endif ! protected: ! /** ! * Constructor. ! * @param frequency is the output frequency, in Hz. ! * @param refresh is the refresh rate, in Hz. ! * @param is a flag for syncronous context. Values <0 indicates that the ! * default should be used. ! */ ! AudioBase(int frequency=-1,int refresh=-1,int synchronous=-1) ! throw (InitError); ! ! /** ! * Destructor. ! */ ! virtual ~AudioBase(); ! ! /** ! * Flag for whether reverb has been initiated. ! * Reverb can be initiated with AudioEnviroment::InitiateReverb() ! */ ! static bool reverbinitiated_; ! ! /** ! * Set reverb scale. ! * This pointer will be set by AudioEnviroment::InitiateReverb() ! * @param sid is the OpenAL name for the source ! * @param param is the reverb scale. Range [0.0,1.0]. ! */ ! static void (*alReverbScale)(ALuint sid, ALfloat param); ! ! /** ! * Set reverb delay. ! * This pointer will be set by AudioEnviroment::InitiateReverb() ! * @param sid is the OpenAL name for the source ! * @param param is the reverb delay. Range [0.0,2.0]. ! */ ! static void (*alReverbDelay)(ALuint sid, ALfloat param); ! }; ! ! } ! ! #endif /* AUDIOBASE_H_INCLUDED_C41996D8 */ --- 1,128 ---- ! /** ! * 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 AUDIOBASE_H_INCLUDED_C41996D8 ! #define AUDIOBASE_H_INCLUDED_C41996D8 ! ! #include "openalpp/export.h" ! #include <cstdlib> ! extern "C" { ! #include <AL/al.h> ! #include <AL/alut.h> ! #include <AL/alc.h> ! } ! #include "openalpp/windowsstuff.h" ! #include "openalpp/error.h" ! #include "openalpp/referenced.h" ! #include "openalpp/ref_ptr.h" ! /** ! * \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. ! * ! * Every class in OpenAL++ that is available to the user is a descendant of the ! * virtual base class AudioBase. This class takes care of initialization and ! * shutdown, so there is no need to do it explicitly. ! */ ! ! /** ! * Namespace for OpenAL++. ! */ ! ! namespace openalpp { ! ! /** ! * Format for sound data. Mono/Stereo, 8 or 16 bits. ! */ ! typedef enum SampleFormat {Mono8,Stereo8,Mono16,Stereo16}; ! ! /** ! * Base class for enviroment, listener and source classes. ! * Takes care of initialisation/shutdown of anything necessary (e.g. ALut) ! */ ! class OPENALPP_API AudioBase : public Referenced{ ! /** ! * Counter for #instances for enviroment, listener and source classes. ! * Used to determine when init and shutdown functions should be called ! */ ! static int instances_; ! ! /** ! * Pointer to device. ! */ ! static ALCdevice *device_; ! ! /** ! * Pointer to context. ! */ ! #ifndef WIN32 ! static void *context_; ! #else ! static struct ALCcontext_struct *context_; ! #endif ! protected: ! /** ! * Constructor. ! * @param frequency is the output frequency, in Hz. ! * @param refresh is the refresh rate, in Hz. ! * @param is a flag for syncronous context. Values <0 indicates that the ! * default should be used. ! */ ! AudioBase(int frequency=-1,int refresh=-1,int synchronous=-1) ! throw (InitError); ! ! /** ! * Destructor. ! */ ! virtual ~AudioBase(); ! ! /** ! * Flag for whether reverb has been initiated. ! * Reverb can be initiated with AudioEnviroment::InitiateReverb() ! */ ! static bool reverbinitiated_; ! ! /** ! * Set reverb scale. ! * This pointer will be set by AudioEnviroment::InitiateReverb() ! * @param sid is the OpenAL name for the source ! * @param param is the reverb scale. Range [0.0,1.0]. ! */ ! static void (*alReverbScale)(ALuint sid, ALfloat param); ! ! /** ! * Set reverb delay. ! * This pointer will be set by AudioEnviroment::InitiateReverb() ! * @param sid is the OpenAL name for the source ! * @param param is the reverb delay. Range [0.0,2.0]. ! */ ! static void (*alReverbDelay)(ALuint sid, ALfloat param); ! }; ! ! } ! ! #endif /* AUDIOBASE_H_INCLUDED_C41996D8 */ Index: audioenvironment.h =================================================================== RCS file: /cvsroot/alpp/openalpp/include/openalpp/audioenvironment.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** audioenvironment.h 2 Mar 2004 07:50:27 -0000 1.4 --- audioenvironment.h 11 Nov 2004 07:57:57 -0000 1.5 *************** *** 1,160 **** ! /** ! * 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 AUDIOENVIROMENT_H_INCLUDED_C4211030 ! #define AUDIOENVIROMENT_H_INCLUDED_C4211030 ! ! #include "openalpp/audiobase.h" ! ! namespace openalpp { ! ! /** ! * Enum for setting/getting the current distance model. ! * None means no model is in use, i.e. no attenuation.\n ! * InverseDistance:\n ! * - \f$G=GAIN-20*log_{10}*(1+ROLLOFF*\frac{dist-REFERENCE\_DISTANCE}{REFERENCE\_DISTANCE})\f$ ! * - \f$G=min (G,MAX\_GAIN)\f$ ! * - \f$G=max (G,MIN\_GAIN)\f$ ! * ! * InverseDistanceClamped:\n ! * - \f$dist=max (dist,REFERENCE\_DISTANCE)\f$ ! * - \f$dist=min (dist,MAX\_DISTANCE)\f$ ! * - And then the calculations in InverseDistance... This is equivalent to the ! * <a href="http://www.iasig.org>IASIG</a> I3DL2 distance model.\n ! * ! * In the above calculations, the variables have the following meanings:\n ! * - dist is the distance from the listener to the source.\n ! * - REFERENCE_DISTANCE are the distance at which the listener will experience ! * GAIN. Both are set per source.\n ! * - ROLLOFF is a source specific factor of attenuation. If it's set to one, ! * the InverseDistance model will describe a "physically correct" inverse ! * square behaviour.\n ! * - MIN_GAIN, MAX_GAIN and MAX_DISTANCE are values used for clamping gain ! * and distance, respectively. ! */ ! ! #include "openalpp/export.h" ! ! #ifdef None ! #undef None // Defined in X-headers ! #endif ! typedef enum DistanceModel {None,InverseDistance,InverseDistanceClamped}; ! ! /** ! * Class for setting global parameters. ! * This doesn't have to be instantiated if one does not need to set global ! * parameters. ! */ ! class OPENALPP_API AudioEnvironment : public AudioBase { ! public: ! /** ! * Constructor. ! */ ! AudioEnvironment() throw (InitError); ! ! /** ! * Constructor. ! * The parameters are ignored if this isn't the first object to be ! * instatiated of the AudioBase descendants. ! * @param frequency is the playing frequency of the enviroment (in Hz) ! * @param refresh is the refresh rate of the enviroment (in Hz) ! * @param synchronous is true if the enviroment is synchronous ! */ ! AudioEnvironment(int frequency,int refresh,bool synchronous) ! throw (InitError); ! ! ! /** ! * Constructor. ! * The parameters are ignored if this isn't the first object to be ! * instatiated of the AudioBase descendants. ! * @param frequency is the playing frequency of the enviroment (in Hz) ! * @param refresh is the refresh rate of the enviroment (in Hz) ! */ ! AudioEnvironment(int frequency,int refresh=-1) ! throw (InitError); ! ! /** ! * Sets the speed of sound in the enviroment. ! * This is used in doppler calculations. ! * @param speed is the speed of sound in length units per second. ! */ ! void setSoundVelocity(float speed) throw (ValueError,FatalError); ! ! /** ! * Get the speed of sound in the enviroment. ! * @return speed of sound in length units per second. ! */ ! float getSoundVelocity() throw (FatalError); ! ! /** ! * Sets the doppler factor. ! * This can be used to exaggerate, deemphasize or completely turn off the ! * doppler effect. ! * @param factor has a default value of one. ! */ ! void setDopplerFactor(float factor) throw (ValueError,FatalError); ! ! /** ! * Gets the doppler factor. ! * @return doppler factor. ! */ ! float getDopplerFactor() throw (FatalError); ! ! /** ! * Sets global gain (volume). ! * The volume a source will be played at will be multiplied by this _after_ ! * the attenuation calculations. ! * Note: In todays's implementation on Linux, gain is clamped to [0.0,1.0]. ! * This will be changed in future releases of OpenAL. ! * @param gain is the gain [0.0,... ! */ ! void setGain(float gain); ! ! /** ! * Gets the global gain ! * @return global gain ! */ ! float getGain() throw (FatalError); ! ! /** ! * Sets the distance model used in attenuation calculations. ! * @param model is one of: None, InverseDistance, InverseDistanceClamped. ! */ ! void setDistanceModel(DistanceModel model) throw (FatalError); ! ! /** ! * Gets the distance model used in attenuation calculations. ! * @return the model. ! */ ! DistanceModel getDistanceModel() throw (FatalError); ! ! /** ! * Initiates Loki's reverb implementation. ! */ ! void initiateReverb() throw (InitError); ! }; ! ! } ! ! #endif /* AUDIOENVIROMENT_H_INCLUDED_C4211030 */ --- 1,160 ---- ! /** ! * 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 AUDIOENVIROMENT_H_INCLUDED_C4211030 ! #define AUDIOENVIROMENT_H_INCLUDED_C4211030 ! ! #include "openalpp/audiobase.h" ! ! namespace openalpp { ! ! /** ! * Enum for setting/getting the current distance model. ! * None means no model is in use, i.e. no attenuation.\n ! * InverseDistance:\n ! * - \f$G=GAIN-20*log_{10}*(1+ROLLOFF*\frac{dist-REFERENCE\_DISTANCE}{REFERENCE\_DISTANCE})\f$ ! * - \f$G=min (G,MAX\_GAIN)\f$ ! * - \f$G=max (G,MIN\_GAIN)\f$ ! * ! * InverseDistanceClamped:\n ! * - \f$dist=max (dist,REFERENCE\_DISTANCE)\f$ ! * - \f$dist=min (dist,MAX\_DISTANCE)\f$ ! * - And then the calculations in InverseDistance... This is equivalent to the ! * <a href="http://www.iasig.org>IASIG</a> I3DL2 distance model.\n ! * ! * In the above calculations, the variables have the following meanings:\n ! * - dist is the distance from the listener to the source.\n ! * - REFERENCE_DISTANCE are the distance at which the listener will experience ! * GAIN. Both are set per source.\n ! * - ROLLOFF is a source specific factor of attenuation. If it's set to one, ! * the InverseDistance model will describe a "physically correct" inverse ! * square behaviour.\n ! * - MIN_GAIN, MAX_GAIN and MAX_DISTANCE are values used for clamping gain ! * and distance, respectively. ! */ ! ! #include "openalpp/export.h" ! ! #ifdef None ! #undef None // Defined in X-headers ! #endif ! typedef enum DistanceModel {None,InverseDistance,InverseDistanceClamped}; ! ! /** ! * Class for setting global parameters. ! * This doesn't have to be instantiated if one does not need to set global ! * parameters. ! */ ! class OPENALPP_API AudioEnvironment : public AudioBase { ! public: ! /** ! * Constructor. ! */ ! AudioEnvironment() throw (InitError); ! ! /** ! * Constructor. ! * The parameters are ignored if this isn't the first object to be ! * instatiated of the AudioBase descendants. ! * @param frequency is the playing frequency of the enviroment (in Hz) ! * @param refresh is the refresh rate of the enviroment (in Hz) ! * @param synchronous is true if the enviroment is synchronous ! */ ! AudioEnvironment(int frequency,int refresh,bool synchronous) ! throw (InitError); ! ! ! /** ! * Constructor. ! * The parameters are ignored if this isn't the first object to be ! * instatiated of the AudioBase descendants. ! * @param frequency is the playing frequency of the enviroment (in Hz) ! * @param refresh is the refresh rate of the enviroment (in Hz) ! */ ! AudioEnvironment(int frequency,int refresh=-1) ! throw (InitError); ! ! /** ! * Sets the speed of sound in the enviroment. ! * This is used in doppler calculations. ! * @param speed is the speed of sound in length units per second. ! */ ! void setSoundVelocity(float speed) throw (ValueError,FatalError); ! ! /** ! * Get the speed of sound in the enviroment. ! * @return speed of sound in length units per second. ! */ ! float getSoundVelocity() throw (FatalError); ! ! /** ! * Sets the doppler factor. ! * This can be used to exaggerate, deemphasize or completely turn off the ! * doppler effect. ! * @param factor has a default value of one. ! */ ! void setDopplerFactor(float factor) throw (ValueError,FatalError); ! ! /** ! * Gets the doppler factor. ! * @return doppler factor. ! */ ! float getDopplerFactor() throw (FatalError); ! ! /** ! * Sets global gain (volume). ! * The volume a source will be played at will be multiplied by this _after_ ! * the attenuation calculations. ! * Note: In todays's implementation on Linux, gain is clamped to [0.0,1.0]. ! * This will be changed in future releases of OpenAL. ! * @param gain is the gain [0.0,... ! */ ! void setGain(float gain); ! ! /** ! * Gets the global gain ! * @return global gain ! */ ! float getGain() throw (FatalError); ! ! /** ! * Sets the distance model used in attenuation calculations. ! * @param model is one of: None, InverseDistance, InverseDistanceClamped. ! */ ! void setDistanceModel(DistanceModel model) throw (FatalError); ! ! /** ! * Gets the distance model used in attenuation calculations. ! * @return the model. ! */ ! DistanceModel getDistanceModel() throw (FatalError); ! ! /** ! * Initiates Loki's reverb implementation. ! */ ! void initiateReverb() throw (InitError); ! }; ! ! } ! ! #endif /* AUDIOENVIROMENT_H_INCLUDED_C4211030 */ Index: listener.h =================================================================== RCS file: /cvsroot/alpp/openalpp/include/openalpp/listener.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** listener.h 2 Mar 2004 07:50:27 -0000 1.3 --- listener.h 11 Nov 2004 07:57:57 -0000 1.4 *************** *** 1,152 **** ! /** ! * 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 LISTENER_H_INCLUDED_C419EF1E ! #define LISTENER_H_INCLUDED_C419EF1E ! ! ! #include "openalpp/export.h" ! #include "openalpp/positionedobject.h" ! ! namespace openalpp { ! ! /** ! * Class for listeners. ! */ ! class OPENALPP_API Listener : public PositionedObject { ! float position_[3]; ! float orientation_[6]; ! 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, ! float upx, float upy, float upz); ! public: ! /** ! * Constructor. ! * Creates the listener at the default position. ! */ ! Listener(); ! ! /** ! * Destructor. ! */ ! ~Listener(); ! ! /** ! * Copy constructor. ! */ ! Listener(const Listener &listener); ! ! /** ! * Constructor. ! * Creates the listener at the specified position and orientation. ! * @param x x coordinate ! * @param y y coordinate ! * @param z z coordinate ! * @param directionx x value of the direction vector ! * @param directiony y value of the direction vector ! * @param directionz z value of the direction vector ! * @param upx x value of the up vector ! * @param upy y value of the up vector ! * @param upz z value of the up vector ! */ ! Listener(float x,float y,float z, ! float directionx,float directiony,float directionz, ! float ... [truncated message content] |
From: Anders B. <vr-...@us...> - 2004-11-11 07:58:09
|
Update of /cvsroot/alpp/openalpp/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31707/tests Modified Files: Makefile.am README moving.cpp simple.cpp testfstream.cpp testmic.cpp testsend.cpp teststream.cpp Added Files: a.wav high-e.wav low-e.wav multiple.cpp Removed Files: moving.dsp simple.dsp testmic.dsp testsend.dsp teststream.dsp Log Message: Adapted smart (reference) pointers from the OpenSceneGraph library. Used with permission of Robert Osfield. Cleans up the new/delete responsibility. All objects must be created on the heap from now on. Fixed small bugin in Streaming classes. --- NEW FILE: a.wav --- (This appears to be a binary file; contents omitted.) --- teststream.dsp DELETED --- Index: teststream.cpp =================================================================== RCS file: /cvsroot/alpp/openalpp/tests/teststream.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** teststream.cpp 7 Mar 2003 20:26:24 -0000 1.9 --- teststream.cpp 11 Nov 2004 07:57:58 -0000 1.10 *************** *** 1,63 **** ! /** ! * 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 ! * CommonC++ (http://cplusplus.sourceforge.net/) ! * ! * 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. ! * ! * Example where a soundfile is loaded using alutLoadWav and streamed over a UDP socket ! * to a receiver that will read the datastream and play it. ! * A sound Source is created and connected to the UDP stream of data ! */ ! #include <cc++/socket.h> ! #include <cc++/thread.h> ! #include <openalpp/alpp.h> ! ! using namespace openalpp; ! ! int main(int argc,char **argv) { ! // Buffersize in #samples. <-- This has changed from earlier releases! ! unsigned int buffersize=4096; ! if(argc>1) ! buffersize=atoi(argv[1]); ! ! try { ! // Create a socket and listen for streamed data ! ost::UDPSocket socket(ost::InetAddress("127.0.0.1"),33333); ! ! // Create a soundstream that will read its data from the socket ! // Unless you want to send lots of data, it's a good idea to go for a ! // low rate and/or small sample format. ! NetStream stream(&socket,Mono16,44100,buffersize); ! ! // Create a soundsource that uses the net-streamed soundstream. ! Source source(stream); ! ! source.SetAmbient(); ! source.Play(); ! std::cout << "Press return to continue\n"; ! std::cin.get(); ! source.Stop(); ! } catch(openalpp::Error e) { ! std::cerr << e << "\n"; ! } catch(...) { ! std::cerr << "Unknown error!\n"; ! } ! return 0; ! } --- 1,63 ---- ! /** ! * 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 ! * CommonC++ (http://cplusplus.sourceforge.net/) ! * ! * 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. ! * ! * Example where a soundfile is loaded using alutLoadWav and streamed over a UDP socket ! * to a receiver that will read the datastream and play it. ! * A sound Source is created and connected to the UDP stream of data ! */ ! #include <cc++/socket.h> ! #include <cc++/thread.h> ! #include <openalpp/alpp.h> ! ! using namespace openalpp; ! ! int main(int argc,char **argv) { ! // Buffersize in #samples. <-- This has changed from earlier releases! ! unsigned int buffersize=4096; ! if(argc>1) ! buffersize=atoi(argv[1]); ! ! try { ! // Create a socket and listen for streamed data ! ost::UDPSocket socket(ost::InetAddress("127.0.0.1"),33333); ! ! // Create a soundstream that will read its data from the socket ! // Unless you want to send lots of data, it's a good idea to go for a ! // low rate and/or small sample format. ! NetStream stream(&socket,Mono16,44100,buffersize); ! ! // Create a soundsource that uses the net-streamed soundstream. ! Source source(stream); ! ! source.SetAmbient(); ! source.Play(); ! std::cout << "Press return to continue\n"; ! std::cin.get(); ! source.Stop(); ! } catch(openalpp::Error e) { ! std::cerr << e << "\n"; ! } catch(...) { ! std::cerr << "Unknown error!\n"; ! } ! return 0; ! } --- NEW FILE: low-e.wav --- (This appears to be a binary file; contents omitted.) --- NEW FILE: multiple.cpp --- (This appears to be a binary file; contents omitted.) Index: testmic.cpp =================================================================== RCS file: /cvsroot/alpp/openalpp/tests/testmic.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** testmic.cpp 2 Mar 2004 07:50:27 -0000 1.12 --- testmic.cpp 11 Nov 2004 07:57:58 -0000 1.13 *************** *** 1,96 **** ! /** ! * 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. ! * ! * Example where sound is streamed from a microphone. ! */ ! #include "openalpp/alpp.h" ! #include <iostream> ! ! using namespace openalpp; ! ! #ifndef M_PI ! #define M_PI 3.14159265358979323846 ! #endif ! ! int main() { ! ! #ifdef ALPP_USE_PORTAUDIO ! ! ! try { ! InputDevice mic; ! ! Source source(mic); ! source.setGain(2); ! //source.SetLooping(); ! source.play(); ! usleep(3000*1000); ! ! float limits[2] = {0.5,-0.5}; ! //float delay=10; ! //float time=0,angle=0; ! ! source.setPosition(limits[0],0.0,0.0); ! source.play(); ! ! //const int no_laps=5; ! ! std::cerr << "Moving sound 5 times..." << std::endl; ! ! // Do a cheat time loop. ! #if 0 ! while(angle<(M_PI*no_laps)) { ! usleep(delay*1000); // Wait for delay milliseconds ! ! time +=delay/1000; // Calculate the time in the loop ! angle=M_PI *time; // What is the resulting angle ! ! // 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) { ! std::cerr << e << "\n"; ! return -1; ! } ! ! ! std::cerr << "Press return to continue\n"; ! ! 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; ! ! } ! --- 1,96 ---- ! /** ! * 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. ! * ! * Example where sound is streamed from a microphone. ! */ ! #include "openalpp/alpp.h" ! #include <iostream> ! ! using namespace openalpp; ! ! #ifndef M_PI ! #define M_PI 3.14159265358979323846 ! #endif ! ! int main() { ! ! #ifdef ALPP_USE_PORTAUDIO ! ! ! try { ! InputDevice mic; ! ! Source source(mic); ! source.setGain(2); ! //source.SetLooping(); ! source.play(); ! usleep(3000*1000); ! ! float limits[2] = {0.5,-0.5}; ! //float delay=10; ! //float time=0,angle=0; ! ! source.setPosition(limits[0],0.0,0.0); ! source.play(); ! ! //const int no_laps=5; ! ! std::cerr << "Moving sound 5 times..." << std::endl; ! ! // Do a cheat time loop. ! #if 0 ! while(angle<(M_PI*no_laps)) { ! usleep(delay*1000); // Wait for delay milliseconds ! ! time +=delay/1000; // Calculate the time in the loop ! angle=M_PI *time; // What is the resulting angle ! ! // 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) { ! std::cerr << e << "\n"; ! return -1; ! } ! ! ! std::cerr << "Press return to continue\n"; ! ! 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; ! ! } ! Index: moving.cpp =================================================================== RCS file: /cvsroot/alpp/openalpp/tests/moving.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** moving.cpp 23 Sep 2004 06:37:57 -0000 1.13 --- moving.cpp 11 Nov 2004 07:57:58 -0000 1.14 *************** *** 1,71 **** ! /** ! * 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. ! * ! * ! * Simple example for using OpenAL++. ! * Plays a file bee.wav and moves it left right. ! */ ! #include <openalpp/alpp.h> ! #include <iostream> ! ! ! using namespace openalpp; ! ! #ifndef M_PI ! #define M_PI 3.14159265358979323846 ! #endif ! ! ! int main() { ! try { ! Source beesound("bee.wav"); ! beesound.setGain(1); ! beesound.setLooping(); ! ! float limits[2] = {5,-15}; ! float delay=10; ! 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 ! angle=M_PI *time; // What is the resulting angle ! ! // Calculate a new position ! beesound.setPosition(limits[0]*cos(angle),0.0,limits[1]*sin(angle)); ! } ! } catch(Error e) { ! std::cerr << e << "\n"; ! return -1; ! } ! return 0; ! } ! --- 1,71 ---- ! /** ! * 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. ! * ! * ! * Simple example for using OpenAL++. ! * Plays a file bee.wav and moves it left right. ! */ ! #include <openalpp/alpp.h> ! #include <iostream> ! ! ! using namespace openalpp; ! ! #ifndef M_PI ! #define M_PI 3.14159265358979323846 ! #endif ! ! ! int main() { ! try { ! openalpp::ref_ptr<Source> beesound = new Source("bee.wav"); ! beesound->setGain(1); ! beesound->setLooping(); ! ! float limits[2] = {5,-15}; ! float delay=10; ! 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 ! angle=M_PI *time; // What is the resulting angle ! ! // Calculate a new position ! beesound->setPosition(limits[0]*cos(angle),0.0,limits[1]*sin(angle)); ! } ! } catch(Error e) { ! std::cerr << e << "\n"; ! return -1; ! } ! return 0; ! } ! --- testsend.dsp DELETED --- Index: testsend.cpp =================================================================== RCS file: /cvsroot/alpp/openalpp/tests/testsend.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** testsend.cpp 7 Mar 2003 20:26:24 -0000 1.8 --- testsend.cpp 11 Nov 2004 07:57:58 -0000 1.9 *************** *** 1,99 **** ! /** ! * 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 ! * CommonC++ (http://cplusplus.sourceforge.net/) ! * ! * 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. ! * ! * Example where a soundfile is loaded using alutLoadWav and streamed over a ! * UDP socket to a receiver that will read the datastream and play it. ! * ! * Note about selecting rate, format and sending rate: ! * Rate is given in samples per second, and format gives the size of one ! * sample. This means that, for example: ! * If the format is Mono16, we have one channel with 16 bit per channel, i.e. ! * 16 bit or 2 bytes per sample. ! * Say we have a frequency of 44100 samples per second. 2 byte samples will ! * mean that we need to stream 88200 bytes per second. ! * If we can send (and receive) ten packets per second, each packet should be ! * at least 8820 bytes. ! * If we instead had a frequency of 11025, then it would be enough with 2205 ! * bytes per packet. ! * Of course it's a good idea to add a few hundred bytes to those numbers ;) ! */ ! ! #include <cc++/thread.h> ! #include <cc++/socket.h> ! #include <iostream> ! #include <stdlib.h> ! #include <AL/al.h> ! #include <AL/alut.h> ! #include "openalpp/windowsstuff.h" ! ! using namespace ost; ! ! int main(int argc,char **argv) { ! ALvoid *data; ! ALsizei bits,freq,size; ! ALenum format; ! ALboolean success; ! // Default packet size (in bytes) ! // Note that this doesn't necessarily have to have anything to do with the ! // buffer size of the receiver. Just set it to something appropriate ! // (depending on the connection), and the receiver will take care of the ! // playing the sound correctly... ! unsigned int packetsize=10000; ! const char defaultfile[]="bee.wav"; ! const char *filename; ! ! if(argc>1) ! filename=argv[1]; ! else ! filename=defaultfile; ! if(argc>2) ! packetsize=atoi(argv[2]); ! ! try { ! success=alutLoadWAV(filename,&data,&format,&size,&bits,&freq); ! std::cerr << "Bits: " << bits << " Freq: " << freq << std::endl; ! ! if(success==AL_FALSE) { ! std::cerr << "Error loading " << filename << "\n"; ! exit(1); ! } ! ! UDPSocket socket; ! socket.setPeer(InetHostAddress("127.0.0.1"),33333); ! ! int totalsent=0; ! while(totalsent<size) { ! // Send data in packets with a 60 ms delay between packets ! if((totalsent+packetsize)>size) ! packetsize=size-totalsent; ! totalsent+=socket.send((char *)data+totalsent,packetsize); ! ost::Thread::sleep(60); ! } ! ! free(data); ! } catch(...) { ! std::cerr << "Error caught!\n"; ! } ! ! return 0; ! } --- 1,99 ---- ! /** ! * 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 ! * CommonC++ (http://cplusplus.sourceforge.net/) ! * ! * 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. ! * ! * Example where a soundfile is loaded using alutLoadWav and streamed over a ! * UDP socket to a receiver that will read the datastream and play it. ! * ! * Note about selecting rate, format and sending rate: ! * Rate is given in samples per second, and format gives the size of one ! * sample. This means that, for example: ! * If the format is Mono16, we have one channel with 16 bit per channel, i.e. ! * 16 bit or 2 bytes per sample. ! * Say we have a frequency of 44100 samples per second. 2 byte samples will ! * mean that we need to stream 88200 bytes per second. ! * If we can send (and receive) ten packets per second, each packet should be ! * at least 8820 bytes. ! * If we instead had a frequency of 11025, then it would be enough with 2205 ! * bytes per packet. ! * Of course it's a good idea to add a few hundred bytes to those numbers ;) ! */ ! ! #include <cc++/thread.h> ! #include <cc++/socket.h> ! #include <iostream> ! #include <stdlib.h> ! #include <AL/al.h> ! #include <AL/alut.h> ! #include "openalpp/windowsstuff.h" ! ! using namespace ost; ! ! int main(int argc,char **argv) { ! ALvoid *data; ! ALsizei bits,freq,size; ! ALenum format; ! ALboolean success; ! // Default packet size (in bytes) ! // Note that this doesn't necessarily have to have anything to do with the ! // buffer size of the receiver. Just set it to something appropriate ! // (depending on the connection), and the receiver will take care of the ! // playing the sound correctly... ! unsigned int packetsize=10000; ! const char defaultfile[]="bee.wav"; ! const char *filename; ! ! if(argc>1) ! filename=argv[1]; ! else ! filename=defaultfile; ! if(argc>2) ! packetsize=atoi(argv[2]); ! ! try { ! success=alutLoadWAV(filename,&data,&format,&size,&bits,&freq); ! std::cerr << "Bits: " << bits << " Freq: " << freq << std::endl; ! ! if(success==AL_FALSE) { ! std::cerr << "Error loading " << filename << "\n"; ! exit(1); ! } ! ! UDPSocket socket; ! socket.setPeer(InetHostAddress("127.0.0.1"),33333); ! ! int totalsent=0; ! while(totalsent<size) { ! // Send data in packets with a 60 ms delay between packets ! if((totalsent+packetsize)>size) ! packetsize=size-totalsent; ! totalsent+=socket.send((char *)data+totalsent,packetsize); ! ost::Thread::sleep(60); ! } ! ! free(data); ! } catch(...) { ! std::cerr << "Error caught!\n"; ! } ! ! return 0; ! } Index: simple.cpp =================================================================== RCS file: /cvsroot/alpp/openalpp/tests/simple.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** simple.cpp 23 Sep 2004 06:37:57 -0000 1.13 --- simple.cpp 11 Nov 2004 07:57:58 -0000 1.14 *************** *** 1,60 **** ! /** ! * 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. ! * ! * Simple example for using OpenAL++. ! * Plays a file bee.wav in the background. ! */ ! #include <openalpp/alpp.h> ! #include <iostream> ! ! 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) { ! std::cerr << e << "\n"; ! return -1; ! } ! return 0; ! } --- 1,65 ---- ! /** ! * 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. ! * ! * Simple example for using OpenAL++. ! * Plays a file bee.wav in the background. ! */ ! #include <openalpp/alpp.h> ! #include <iostream> ! ! 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 { ! openalpp::ref_ptr<Source> bgsound = new Source; //(file); // Create source and load sound ! openalpp::ref_ptr<Sample> sample = new Sample(file); ! bgsound->setSound(sample.get()); ! bgsound->setGain(0.6f); // Lower gain (volume) ! bgsound->setLooping(); ! bgsound->setAmbient(); // Make sound ambient (i.e. not attenuated) ! bgsound->play(); // Start playing ! ! ! std::cerr << "Press return to stop: " << std::endl; ! //usleep(3000*1000); // Sleep for a while ! std::string str; ! std::getline(std::cin, str); ! bgsound->stop(); ! std::cerr << "Done " << std::endl; ! usleep(3000*1000); ! ! } catch(Error e) { ! std::cerr << e << "\n"; ! return -1; ! } ! return 0; ! } Index: Makefile.am =================================================================== RCS file: /cvsroot/alpp/openalpp/tests/Makefile.am,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Makefile.am 2 Mar 2004 07:50:27 -0000 1.6 --- Makefile.am 11 Nov 2004 07:57:58 -0000 1.7 *************** *** 15,19 **** LDADD = ../src/libopenalpp.la $(ccgnulibs) -lopenal $(portaudiolibs) $(ogglibs) -lOpenThreads ! bin_PROGRAMS = testfstream testmic simple moving #testsend teststream #teststream_SOURCES = teststream.cpp --- 15,19 ---- LDADD = ../src/libopenalpp.la $(ccgnulibs) -lopenal $(portaudiolibs) $(ogglibs) -lOpenThreads ! bin_PROGRAMS = testfstream multiple testmic simple moving #testsend teststream #teststream_SOURCES = teststream.cpp *************** *** 27,30 **** --- 27,32 ---- moving_SOURCES = moving.cpp + testfstream_SOURCES = testfstream.cpp + multiple_SOURCES = multiple.cpp --- NEW FILE: high-e.wav --- (This appears to be a binary file; contents omitted.) --- testmic.dsp DELETED --- Index: README =================================================================== RCS file: /cvsroot/alpp/openalpp/tests/README,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** README 19 Feb 2002 09:44:46 -0000 1.3 --- README 11 Nov 2004 07:57:58 -0000 1.4 *************** *** 9,17 **** testsend - Load a file (gamebeginning.wav - not included) and send it through a socket, in packets of 1024 bytes. To be used in conjunction with teststream. teststream - Connect a socket to a source and play it. Run testsend directly after running this. More tests might be added in the future. The stranger tests that I used while developing have been removed as they would ! probably not be very interesting. For more examples, check the tutorials on the homepage. ! /Tomas Hämälä, VRlab, 2002 --- 9,21 ---- testsend - Load a file (gamebeginning.wav - not included) and send it through a socket, in packets of 1024 bytes. To be used in conjunction with teststream. + multiple - Loads and plays and deletes several wav files. Tests the reference pointer deallocation + teststream - Connect a socket to a source and play it. Run testsend directly after running this. + More tests might be added in the future. The stranger tests that I used while developing have been removed as they would ! probably not be very interesting. ! /Anders Backman, VRlab, 2004 ! Tomas Hämälä, VRlab, 2002 --- simple.dsp DELETED --- Index: testfstream.cpp =================================================================== RCS file: /cvsroot/alpp/openalpp/tests/testfstream.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** testfstream.cpp 2 Mar 2004 07:50:27 -0000 1.6 --- testfstream.cpp 11 Nov 2004 07:57:58 -0000 1.7 *************** *** 1,58 **** ! /** ! * 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. ! * ! * Example of streaming from a file. Only ogg files are supported at the ! * moment (2003-02-15). The program takes one argument; the name of the file ! * to stream data from. ! */ ! ! #include <openalpp/alpp.h> ! #include <iostream> ! ! using namespace openalpp; ! ! int main(int argc,char **argv) { ! if(argc<=1) { ! std::cerr << "Syntax:\n " << argv[0] << " <audiofile>\n"; ! return 1; ! } ! ! std::cout << argv[1] << "\n"; ! ! 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"; ! //} catch(...) { ! // std::cerr << "Unknown error!\n"; ! } ! return 0; ! } --- 1,72 ---- ! /** ! * 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. ! * ! * Example of streaming from a file. Only ogg files are supported at the ! * moment (2003-02-15). The program takes one argument; the name of the file ! * to stream data from. ! */ ! ! #include <openalpp/alpp.h> ! #include <iostream> ! ! using namespace openalpp; ! ! int main(int argc,char **argv) { ! if(argc<=1) { ! std::cerr << "Syntax:\n " << argv[0] << " <audiofile>\n"; ! return 1; ! } ! ! std::cout << argv[1] << "\n"; ! ! try { ! ! std::vector<openalpp::ref_ptr<Source> > vec; ! std::vector<openalpp::ref_ptr<FileStream> > fstream_vec; ! ! for(int i=0; i < 1; i++) { ! ! openalpp::ref_ptr<FileStream> stream = new FileStream(argv[1]); ! fstream_vec.push_back(stream); ! stream->setLooping(); // Remove this to play file once only. ! ! ! Source *source = new Source(*stream.get()); ! vec.push_back(source); ! source->setAmbient(); ! source->play(); ! ! } ! std::cerr << "Press return to stop " << std::endl; ! std::cin.get(); ! ! for(unsigned int i=0; i < vec.size(); i++) ! vec[i]->stop(); ! usleep(1000*1000); ! ! } catch(openalpp::Error e) { ! std::cerr << e << "\n"; ! } catch(...) { ! std::cerr << "Unknown error!\n"; ! } ! return 0; ! } --- moving.dsp DELETED --- |
From: Anders B. <vr-...@us...> - 2004-11-11 07:58:07
|
Update of /cvsroot/alpp/openalpp/VisualStudio In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31707/VisualStudio Modified Files: moving.vcproj openalpp.dsp openalpp.dsw openalpp.sln openalpp.vcproj simple.vcproj testfstream.vcproj testmic.vcproj testsend.dsp testsend.vcproj teststream.dsp teststream.vcproj Added Files: multiple.dsp multiple.vcproj Log Message: Adapted smart (reference) pointers from the OpenSceneGraph library. Used with permission of Robert Osfield. Cleans up the new/delete responsibility. All objects must be created on the heap from now on. Fixed small bugin in Streaming classes. Index: openalpp.dsp =================================================================== RCS file: /cvsroot/alpp/openalpp/VisualStudio/openalpp.dsp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** openalpp.dsp 2 Mar 2004 11:01:14 -0000 1.5 --- openalpp.dsp 11 Nov 2004 07:57:57 -0000 1.6 *************** *** 127,130 **** --- 127,134 ---- # Begin Source File + SOURCE=..\src\referenced.cpp + # End Source File + # Begin Source File + SOURCE=..\src\sample.cpp # End Source File Index: teststream.dsp =================================================================== RCS file: /cvsroot/alpp/openalpp/VisualStudio/teststream.dsp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** teststream.dsp 12 Dec 2003 06:55:04 -0000 1.4 --- teststream.dsp 11 Nov 2004 07:57:57 -0000 1.5 *************** *** 1,98 **** ! # Microsoft Developer Studio Project File - Name="teststream" - Package Owner=<4> ! # Microsoft Developer Studio Generated Build File, Format Version 6.00 ! # ** DO NOT EDIT ** ! ! # TARGTYPE "Win32 (x86) Console Application" 0x0103 ! ! CFG=teststream - 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 "teststream.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 "teststream.mak" CFG="teststream - Win32 Debug" ! !MESSAGE ! !MESSAGE Possible choices for configuration are: ! !MESSAGE ! !MESSAGE "teststream - Win32 Debug" (based on "Win32 (x86) Console Application") ! !MESSAGE "teststream - 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)" == "teststream - Win32 Debug" ! ! # PROP BASE Use_MFC 0 ! # PROP BASE Use_Debug_Libraries 1 ! # PROP BASE Output_Dir "..\bin" ! # PROP BASE Intermediate_Dir ".\teststream___Win32_Debug" ! # PROP BASE Target_Dir "" ! # PROP Use_MFC 0 ! # PROP Use_Debug_Libraries 1 ! # PROP Output_Dir "..\bin" ! # PROP Intermediate_Dir ".\teststream___Win32_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".\teststream___Win32_Debug/teststream.pch" /Fo".\teststream___Win32_Debug/" /Fd".\teststream___Win32_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".\teststream___Win32_Debug/teststream.pch" /Fo".\teststream___Win32_Debug/" /Fd".\teststream___Win32_Debug/" /GZ /c /GX ! # ADD BASE MTL /nologo /tlb".\teststream___Win32_Debug\teststream.tlb" /win32 ! # ADD MTL /nologo /tlb".\teststream___Win32_Debug\teststream.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" /debug /pdb:".\teststream___Win32_Debug\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 ccgnu2d.lib /nologo /out:"..\bin\$(ProjectName)d.exe" /incremental:yes /libpath:"..\lib" /nodefaultlib:"libcd" /debug /pdb:".\teststream___Win32_Debug\teststream.pdb" /pdbtype:sept /subsystem:console /MACHINE:I386 ! ! !ELSEIF "$(CFG)" == "teststream - Win32 Release" ! ! # 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 "" ! # 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".\teststream___Win32_Release/teststream.pch" /Fo".\teststream___Win32_Release/" /Fd".\teststream___Win32_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".\teststream___Win32_Release/teststream.pch" /Fo".\teststream___Win32_Release/" /Fd".\teststream___Win32_Release/" /c /GX ! # ADD BASE MTL /nologo /tlb".\teststream___Win32_Release\teststream.tlb" /win32 ! # ADD MTL /nologo /tlb".\teststream___Win32_Release\teststream.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 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 ! ! # Begin Target ! ! # Name "teststream - Win32 Debug" ! # Name "teststream - Win32 Release" ! # Begin Group "Source Files" ! ! # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" ! # Begin Source File ! ! SOURCE=..\tests\teststream.cpp ! # End Source File ! # End Group ! # End Target ! # End Project ! --- 1,98 ---- ! # Microsoft Developer Studio Project File - Name="teststream" - Package Owner=<4> ! # Microsoft Developer Studio Generated Build File, Format Version 6.00 ! # ** DO NOT EDIT ** ! ! # TARGTYPE "Win32 (x86) Console Application" 0x0103 ! ! CFG=teststream - 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 "teststream.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 "teststream.mak" CFG="teststream - Win32 Debug" ! !MESSAGE ! !MESSAGE Possible choices for configuration are: ! !MESSAGE ! !MESSAGE "teststream - Win32 Debug" (based on "Win32 (x86) Console Application") ! !MESSAGE "teststream - 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)" == "teststream - Win32 Debug" ! ! # PROP BASE Use_MFC 0 ! # PROP BASE Use_Debug_Libraries 1 ! # PROP BASE Output_Dir "..\bin" ! # PROP BASE Intermediate_Dir ".\teststream___Win32_Debug" ! # PROP BASE Target_Dir "" ! # PROP Use_MFC 0 ! # PROP Use_Debug_Libraries 1 ! # PROP Output_Dir "..\bin" ! # PROP Intermediate_Dir ".\teststream___Win32_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".\teststream___Win32_Debug/teststream.pch" /Fo".\teststream___Win32_Debug/" /Fd".\teststream___Win32_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".\teststream___Win32_Debug/teststream.pch" /Fo".\teststream___Win32_Debug/" /Fd".\teststream___Win32_Debug/" /GZ /c /GX ! # ADD BASE MTL /nologo /tlb".\teststream___Win32_Debug\teststream.tlb" /win32 ! # ADD MTL /nologo /tlb".\teststream___Win32_Debug\teststream.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" /debug /pdb:".\teststream___Win32_Debug\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 ccgnu2d.lib /nologo /out:"..\bin\$(ProjectName)d.exe" /incremental:yes /libpath:"..\lib" /nodefaultlib:"libcd" /debug /pdb:".\teststream___Win32_Debug\teststream.pdb" /pdbtype:sept /subsystem:console /MACHINE:I386 ! ! !ELSEIF "$(CFG)" == "teststream - Win32 Release" ! ! # 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 "" ! # 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".\teststream___Win32_Release/teststream.pch" /Fo".\teststream___Win32_Release/" /Fd".\teststream___Win32_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".\teststream___Win32_Release/teststream.pch" /Fo".\teststream___Win32_Release/" /Fd".\teststream___Win32_Release/" /c /GX ! # ADD BASE MTL /nologo /tlb".\teststream___Win32_Release\teststream.tlb" /win32 ! # ADD MTL /nologo /tlb".\teststream___Win32_Release\teststream.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 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 ! ! # Begin Target ! ! # Name "teststream - Win32 Debug" ! # Name "teststream - Win32 Release" ! # Begin Group "Source Files" ! ! # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" ! # Begin Source File ! ! SOURCE=..\tests\teststream.cpp ! # End Source File ! # End Group ! # End Target ! # End Project ! Index: testmic.vcproj =================================================================== RCS file: /cvsroot/alpp/openalpp/VisualStudio/testmic.vcproj,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** testmic.vcproj 2 Mar 2004 11:01:14 -0000 1.5 --- testmic.vcproj 11 Nov 2004 07:57:57 -0000 1.6 *************** *** 1,151 **** ! <?xml version="1.0" encoding="Windows-1252"?> ! <VisualStudioProject ! ProjectType="Visual C++" ! Version="7.10" ! Name="testmic" ! ProjectGUID="{F98212F5-A462-4F75-9AF6-4ED4E79A4B1F}" ! SccProjectName="" ! SccLocalPath=""> ! <Platforms> ! <Platform ! Name="Win32"/> ! </Platforms> ! <Configurations> ! <Configuration ! Name="Release|Win32" ! OutputDirectory="..\bin" ! IntermediateDirectory=".\testmic_Release" ! ConfigurationType="1" ! UseOfMFC="0" ! ATLMinimizesCRunTimeLibraryUsage="FALSE" ! CharacterSet="2"> ! <Tool ! Name="VCCLCompilerTool" ! InlineFunctionExpansion="1" ! OptimizeForProcessor="3" ! AdditionalIncludeDirectories="../include" ! PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE" ! StringPooling="TRUE" ! RuntimeLibrary="2" ! EnableFunctionLevelLinking="TRUE" ! UsePrecompiledHeader="2" ! PrecompiledHeaderFile=".\testmic___Win32_Release/testmic.pch" ! AssemblerListingLocation=".\testmic___Win32_Release/" ! ObjectFile=".\testmic___Win32_Release/" ! ProgramDataBaseFileName=".\testmic___Win32_Release/" ! BrowseInformation="1" ! WarningLevel="3" ! SuppressStartupBanner="TRUE" ! CompileAs="0"/> ! <Tool ! Name="VCCustomBuildTool"/> ! <Tool ! Name="VCLinkerTool" ! AdditionalOptions="/MACHINE:I386" ! OutputFile="$(OutDir)/$(ProjectName).exe" ! LinkIncremental="1" ! SuppressStartupBanner="TRUE" ! AdditionalLibraryDirectories="..\lib" ! IgnoreDefaultLibraryNames="" ! ProgramDatabaseFile=".\testmic___Win32_Release/testmic.pdb" ! SubSystem="1"/> ! <Tool ! Name="VCMIDLTool" ! TypeLibraryName=".\testmic___Win32_Release/testmic.tlb"/> ! <Tool ! Name="VCPostBuildEventTool"/> ! <Tool ! Name="VCPreBuildEventTool"/> ! <Tool ! Name="VCPreLinkEventTool"/> ! <Tool ! Name="VCResourceCompilerTool" ! PreprocessorDefinitions="NDEBUG" ! Culture="1053"/> ! <Tool ! Name="VCWebServiceProxyGeneratorTool"/> ! <Tool ! Name="VCXMLDataGeneratorTool"/> ! <Tool ! Name="VCWebDeploymentTool"/> ! <Tool ! Name="VCManagedWrapperGeneratorTool"/> ! <Tool ! Name="VCAuxiliaryManagedWrapperGeneratorTool"/> ! </Configuration> ! <Configuration ! Name="Debug|Win32" ! OutputDirectory="..\bin" ! IntermediateDirectory=".\testmic_Debug" ! ConfigurationType="1" ! UseOfMFC="0" ! ATLMinimizesCRunTimeLibraryUsage="FALSE" ! CharacterSet="2"> ! <Tool ! Name="VCCLCompilerTool" ! Optimization="0" ! OptimizeForProcessor="3" ! AdditionalIncludeDirectories="../include" ! PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE" ! BasicRuntimeChecks="3" ! RuntimeLibrary="3" ! UsePrecompiledHeader="0" ! PrecompiledHeaderFile=".\testmic___Win32_Debug/testmic.pch" ! AssemblerListingLocation=".\testmic___Win32_Debug/" ! ObjectFile=".\testmic___Win32_Debug/" ! ProgramDataBaseFileName=".\testmic___Win32_Debug/" ! WarningLevel="3" ! SuppressStartupBanner="TRUE" ! DebugInformationFormat="4"/> ! <Tool ! Name="VCCustomBuildTool"/> ! <Tool ! Name="VCLinkerTool" ! AdditionalOptions="/MACHINE:I386" ! OutputFile="$(OutDir)/$(ProjectName)d.exe" ! LinkIncremental="2" ! SuppressStartupBanner="TRUE" ! AdditionalLibraryDirectories="..\lib" ! IgnoreDefaultLibraryNames="" ! GenerateDebugInformation="TRUE" ! ProgramDatabaseFile=".\testmic___Win32_Debug/testmic.pdb" ! SubSystem="1"/> ! <Tool ! Name="VCMIDLTool" ! TypeLibraryName=".\testmic___Win32_Debug/testmic.tlb"/> ! <Tool ! Name="VCPostBuildEventTool"/> ! <Tool ! Name="VCPreBuildEventTool"/> ! <Tool ! Name="VCPreLinkEventTool"/> ! <Tool ! Name="VCResourceCompilerTool" ! PreprocessorDefinitions="_DEBUG" ! Culture="1053"/> ! <Tool ! Name="VCWebServiceProxyGeneratorTool"/> ! <Tool ! Name="VCXMLDataGeneratorTool"/> ! <Tool ! Name="VCWebDeploymentTool"/> ! <Tool ! Name="VCManagedWrapperGeneratorTool"/> ! <Tool ! Name="VCAuxiliaryManagedWrapperGeneratorTool"/> ! </Configuration> ! </Configurations> ! <References> ! </References> ! <Files> ! <Filter ! Name="Source Files" ! Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"> ! <File ! RelativePath="..\tests\testmic.cpp"> ! </File> ! </Filter> ! </Files> ! <Globals> ! </Globals> ! </VisualStudioProject> --- 1,151 ---- ! <?xml version="1.0" encoding="Windows-1252"?> ! <VisualStudioProject ! ProjectType="Visual C++" ! Version="7.10" ! Name="testmic" ! ProjectGUID="{F98212F5-A462-4F75-9AF6-4ED4E79A4B1F}" ! SccProjectName="" ! SccLocalPath=""> ! <Platforms> ! <Platform ! Name="Win32"/> ! </Platforms> ! <Configurations> ! <Configuration ! Name="Release|Win32" ! OutputDirectory="..\bin" ! IntermediateDirectory=".\testmic_Release" ! ConfigurationType="1" ! UseOfMFC="0" ! ATLMinimizesCRunTimeLibraryUsage="FALSE" ! CharacterSet="2"> ! <Tool ! Name="VCCLCompilerTool" ! InlineFunctionExpansion="1" ! OptimizeForProcessor="3" ! AdditionalIncludeDirectories="../include" ! PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE" ! StringPooling="TRUE" ! RuntimeLibrary="2" ! EnableFunctionLevelLinking="TRUE" ! UsePrecompiledHeader="2" ! PrecompiledHeaderFile=".\testmic___Win32_Release/testmic.pch" ! AssemblerListingLocation=".\testmic___Win32_Release/" ! ObjectFile=".\testmic___Win32_Release/" ! ProgramDataBaseFileName=".\testmic___Win32_Release/" ! BrowseInformation="1" ! WarningLevel="3" ! SuppressStartupBanner="TRUE" ! CompileAs="0"/> ! <Tool ! Name="VCCustomBuildTool"/> ! <Tool ! Name="VCLinkerTool" ! AdditionalOptions="/MACHINE:I386" ! OutputFile="$(OutDir)/$(ProjectName).exe" ! LinkIncremental="1" ! SuppressStartupBanner="TRUE" ! AdditionalLibraryDirectories="..\lib" ! IgnoreDefaultLibraryNames="" ! ProgramDatabaseFile=".\testmic___Win32_Release/testmic.pdb" ! SubSystem="1"/> ! <Tool ! Name="VCMIDLTool" ! TypeLibraryName=".\testmic___Win32_Release/testmic.tlb"/> ! <Tool ! Name="VCPostBuildEventTool"/> ! <Tool ! Name="VCPreBuildEventTool"/> ! <Tool ! Name="VCPreLinkEventTool"/> ! <Tool ! Name="VCResourceCompilerTool" ! PreprocessorDefinitions="NDEBUG" ! Culture="1053"/> ! <Tool ! Name="VCWebServiceProxyGeneratorTool"/> ! <Tool ! Name="VCXMLDataGeneratorTool"/> ! <Tool ! Name="VCWebDeploymentTool"/> ! <Tool ! Name="VCManagedWrapperGeneratorTool"/> ! <Tool ! Name="VCAuxiliaryManagedWrapperGeneratorTool"/> ! </Configuration> ! <Configuration ! Name="Debug|Win32" ! OutputDirectory="..\bin" ! IntermediateDirectory=".\testmic_Debug" ! ConfigurationType="1" ! UseOfMFC="0" ! ATLMinimizesCRunTimeLibraryUsage="FALSE" ! CharacterSet="2"> ! <Tool ! Name="VCCLCompilerTool" ! Optimization="0" ! OptimizeForProcessor="3" ! AdditionalIncludeDirectories="../include" ! PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE" ! BasicRuntimeChecks="3" ! RuntimeLibrary="3" ! UsePrecompiledHeader="0" ! PrecompiledHeaderFile=".\testmic___Win32_Debug/testmic.pch" ! AssemblerListingLocation=".\testmic___Win32_Debug/" ! ObjectFile=".\testmic___Win32_Debug/" ! ProgramDataBaseFileName=".\testmic___Win32_Debug/" ! WarningLevel="3" ! SuppressStartupBanner="TRUE" ! DebugInformationFormat="4"/> ! <Tool ! Name="VCCustomBuildTool"/> ! <Tool ! Name="VCLinkerTool" ! AdditionalOptions="/MACHINE:I386" ! OutputFile="$(OutDir)/$(ProjectName)d.exe" ! LinkIncremental="2" ! SuppressStartupBanner="TRUE" ! AdditionalLibraryDirectories="..\lib" ! IgnoreDefaultLibraryNames="" ! GenerateDebugInformation="TRUE" ! ProgramDatabaseFile=".\testmic___Win32_Debug/testmic.pdb" ! SubSystem="1"/> ! <Tool ! Name="VCMIDLTool" ! TypeLibraryName=".\testmic___Win32_Debug/testmic.tlb"/> ! <Tool ! Name="VCPostBuildEventTool"/> ! <Tool ! Name="VCPreBuildEventTool"/> ! <Tool ! Name="VCPreLinkEventTool"/> ! <Tool ! Name="VCResourceCompilerTool" ! PreprocessorDefinitions="_DEBUG" ! Culture="1053"/> ! <Tool ! Name="VCWebServiceProxyGeneratorTool"/> ! <Tool ! Name="VCXMLDataGeneratorTool"/> ! <Tool ! Name="VCWebDeploymentTool"/> ! <Tool ! Name="VCManagedWrapperGeneratorTool"/> ! <Tool ! Name="VCAuxiliaryManagedWrapperGeneratorTool"/> ! </Configuration> ! </Configurations> ! <References> ! </References> ! <Files> ! <Filter ! Name="Source Files" ! Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"> ! <File ! RelativePath="..\tests\testmic.cpp"> ! </File> ! </Filter> ! </Files> ! <Globals> ! </Globals> ! </VisualStudioProject> Index: openalpp.vcproj =================================================================== RCS file: /cvsroot/alpp/openalpp/VisualStudio/openalpp.vcproj,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** openalpp.vcproj 2 Mar 2004 11:01:14 -0000 1.8 --- openalpp.vcproj 11 Nov 2004 07:57:57 -0000 1.9 *************** *** 183,186 **** --- 183,189 ---- </File> <File + RelativePath="..\src\referenced.cpp"> + </File> + <File RelativePath="..\src\sample.cpp"> </File> Index: teststream.vcproj =================================================================== RCS file: /cvsroot/alpp/openalpp/VisualStudio/teststream.vcproj,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** teststream.vcproj 12 Dec 2003 06:55:04 -0000 1.4 --- teststream.vcproj 11 Nov 2004 07:57:57 -0000 1.5 *************** *** 1,152 **** ! <?xml version="1.0" encoding="Windows-1252"?> ! <VisualStudioProject ! ProjectType="Visual C++" ! Version="7.10" ! Name="teststream" ! ProjectGUID="{3B36C471-B270-4A97-8A7E-0681ACAFB492}" ! SccProjectName="" ! SccLocalPath=""> ! <Platforms> ! <Platform ! Name="Win32"/> ! </Platforms> ! <Configurations> ! <Configuration ! Name="Debug|Win32" ! OutputDirectory="..\bin" ! IntermediateDirectory=".\teststream___Win32_Debug" ! ConfigurationType="1" ! UseOfMFC="0" ! ATLMinimizesCRunTimeLibraryUsage="FALSE" ! CharacterSet="2"> ! <Tool ! Name="VCCLCompilerTool" ! Optimization="0" ! OptimizeForProcessor="2" ! AdditionalIncludeDirectories="../include,../../portaudio/pa_common" ! PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE" ! BasicRuntimeChecks="3" ! RuntimeLibrary="3" ! UsePrecompiledHeader="2" ! PrecompiledHeaderFile=".\teststream___Win32_Debug/teststream.pch" ! AssemblerListingLocation=".\teststream___Win32_Debug/" ! ObjectFile=".\teststream___Win32_Debug/" ! ProgramDataBaseFileName=".\teststream___Win32_Debug/" ! WarningLevel="3" ! SuppressStartupBanner="TRUE" ! DebugInformationFormat="4" ! CompileAs="0"/> ! <Tool ! Name="VCCustomBuildTool"/> ! <Tool ! Name="VCLinkerTool" ! AdditionalOptions="/MACHINE:I386" ! AdditionalDependencies=" ccgnu2d.lib" ! OutputFile="$(OutDir)/$(ProjectName)d.exe" ! LinkIncremental="2" ! SuppressStartupBanner="TRUE" ! AdditionalLibraryDirectories="..\lib" ! IgnoreDefaultLibraryNames="libcd" ! GenerateDebugInformation="TRUE" ! ProgramDatabaseFile=".\teststream___Win32_Debug/teststream.pdb" ! SubSystem="1"/> ! <Tool ! Name="VCMIDLTool" ! TypeLibraryName=".\teststream___Win32_Debug/teststream.tlb"/> ! <Tool ! Name="VCPostBuildEventTool"/> ! <Tool ! Name="VCPreBuildEventTool"/> ! <Tool ! Name="VCPreLinkEventTool"/> ! <Tool ! Name="VCResourceCompilerTool" ! PreprocessorDefinitions="_DEBUG" ! Culture="1053"/> ! <Tool ! Name="VCWebServiceProxyGeneratorTool"/> ! <Tool ! Name="VCXMLDataGeneratorTool"/> ! <Tool ! Name="VCWebDeploymentTool"/> ! <Tool ! Name="VCManagedWrapperGeneratorTool"/> ! <Tool ! Name="VCAuxiliaryManagedWrapperGeneratorTool"/> ! </Configuration> ! <Configuration ! Name="Release|Win32" ! OutputDirectory="..\bin" ! IntermediateDirectory=".\teststream___Win32_Release" ! ConfigurationType="1" ! UseOfMFC="0" ! ATLMinimizesCRunTimeLibraryUsage="FALSE" ! CharacterSet="2"> ! <Tool ! Name="VCCLCompilerTool" ! InlineFunctionExpansion="1" ! OptimizeForProcessor="3" ! AdditionalIncludeDirectories="../include,../../portaudio/pa_common" ! PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE" ! StringPooling="TRUE" ! RuntimeLibrary="2" ! EnableFunctionLevelLinking="TRUE" ! UsePrecompiledHeader="2" ! PrecompiledHeaderFile=".\teststream___Win32_Release/teststream.pch" ! AssemblerListingLocation=".\teststream___Win32_Release/" ! ObjectFile=".\teststream___Win32_Release/" ! ProgramDataBaseFileName=".\teststream___Win32_Release/" ! WarningLevel="3" ! SuppressStartupBanner="TRUE" ! CompileAs="0"/> ! <Tool ! Name="VCCustomBuildTool"/> ! <Tool ! Name="VCLinkerTool" ! AdditionalOptions="/MACHINE:I386" ! AdditionalDependencies="ccgnu2.lib wsock32.lib" ! OutputFile="$(OutDir)/$(ProjectName).exe" ! LinkIncremental="1" ! SuppressStartupBanner="TRUE" ! AdditionalLibraryDirectories="..\lib" ! ProgramDatabaseFile=".\teststream___Win32_Release/teststream.pdb" ! SubSystem="1"/> ! <Tool ! Name="VCMIDLTool" ! TypeLibraryName=".\teststream___Win32_Release/teststream.tlb"/> ! <Tool ! Name="VCPostBuildEventTool"/> ! <Tool ! Name="VCPreBuildEventTool"/> ! <Tool ! Name="VCPreLinkEventTool"/> ! <Tool ! Name="VCResourceCompilerTool" ! PreprocessorDefinitions="NDEBUG" ! Culture="1053"/> ! <Tool ! Name="VCWebServiceProxyGeneratorTool"/> ! <Tool ! Name="VCXMLDataGeneratorTool"/> ! <Tool ! Name="VCWebDeploymentTool"/> ! <Tool ! Name="VCManagedWrapperGeneratorTool"/> ! <Tool ! Name="VCAuxiliaryManagedWrapperGeneratorTool"/> ! </Configuration> ! </Configurations> ! <References> ! </References> ! <Files> ! <Filter ! Name="Source Files" ! Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"> ! <File ! RelativePath="..\tests\teststream.cpp"> ! </File> ! </Filter> ! </Files> ! <Globals> ! </Globals> ! </VisualStudioProject> --- 1,152 ---- ! <?xml version="1.0" encoding="Windows-1252"?> ! <VisualStudioProject ! ProjectType="Visual C++" ! Version="7.10" ! Name="teststream" ! ProjectGUID="{3B36C471-B270-4A97-8A7E-0681ACAFB492}" ! SccProjectName="" ! SccLocalPath=""> ! <Platforms> ! <Platform ! Name="Win32"/> ! </Platforms> ! <Configurations> ! <Configuration ! Name="Debug|Win32" ! OutputDirectory="..\bin" ! IntermediateDirectory=".\teststream___Win32_Debug" ! ConfigurationType="1" ! UseOfMFC="0" ! ATLMinimizesCRunTimeLibraryUsage="FALSE" ! CharacterSet="2"> ! <Tool ! Name="VCCLCompilerTool" ! Optimization="0" ! OptimizeForProcessor="2" ! AdditionalIncludeDirectories="../include,../../portaudio/pa_common" ! PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE" ! BasicRuntimeChecks="3" ! RuntimeLibrary="3" ! UsePrecompiledHeader="2" ! PrecompiledHeaderFile=".\teststream___Win32_Debug/teststream.pch" ! AssemblerListingLocation=".\teststream___Win32_Debug/" ! ObjectFile=".\teststream___Win32_Debug/" ! ProgramDataBaseFileName=".\teststream___Win32_Debug/" ! WarningLevel="3" ! SuppressStartupBanner="TRUE" ! DebugInformationFormat="4" ! CompileAs="0"/> ! <Tool ! Name="VCCustomBuildTool"/> ! <Tool ! Name="VCLinkerTool" ! AdditionalOptions="/MACHINE:I386" ! AdditionalDependencies=" ccgnu2d.lib" ! OutputFile="$(OutDir)/$(ProjectName)d.exe" ! LinkIncremental="2" ! SuppressStartupBanner="TRUE" ! AdditionalLibraryDirectories="..\lib" ! IgnoreDefaultLibraryNames="libcd" ! GenerateDebugInformation="TRUE" ! ProgramDatabaseFile=".\teststream___Win32_Debug/teststream.pdb" ! SubSystem="1"/> ! <Tool ! Name="VCMIDLTool" ! TypeLibraryName=".\teststream___Win32_Debug/teststream.tlb"/> ! <Tool ! Name="VCPostBuildEventTool"/> ! <Tool ! Name="VCPreBuildEventTool"/> ! <Tool ! Name="VCPreLinkEventTool"/> ! <Tool ! Name="VCResourceCompilerTool" ! PreprocessorDefinitions="_DEBUG" ! Culture="1053"/> ! <Tool ! Name="VCWebServiceProxyGeneratorTool"/> ! <Tool ! Name="VCXMLDataGeneratorTool"/> ! <Tool ! Name="VCWebDeploymentTool"/> ! <Tool ! Name="VCManagedWrapperGeneratorTool"/> ! <Tool ! Name="VCAuxiliaryManagedWrapperGeneratorTool"/> ! </Configuration> ! <Configuration ! Name="Release|Win32" ! OutputDirectory="..\bin" ! IntermediateDirectory=".\teststream___Win32_Release" ! ConfigurationType="1" ! UseOfMFC="0" ! ATLMinimizesCRunTimeLibraryUsage="FALSE" ! CharacterSet="2"> ! <Tool ! Name="VCCLCompilerTool" ! InlineFunctionExpansion="1" ! OptimizeForProcessor="3" ! AdditionalIncludeDirectories="../include,../../portaudio/pa_common" ! PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE" ! StringPooling="TRUE" ! RuntimeLibrary="2" ! EnableFunctionLevelLinking="TRUE" ! UsePrecompiledHeader="2" ! PrecompiledHeaderFile=".\teststream___Win32_Release/teststream.pch" ! AssemblerListingLocation=".\teststream___Win32_Release/" ! ObjectFile=".\teststream___Win32_Release/" ! ProgramDataBaseFileName=".\teststream___Win32_Release/" ! WarningLevel="3" ! SuppressStartupBanner="TRUE" ! CompileAs="0"/> ! <Tool ! Name="VCCustomBuildTool"/> ! <Tool ! Name="VCLinkerTool" ! AdditionalOptions="/MACHINE:I386" ! AdditionalDependencies="ccgnu2.lib wsock32.lib" ! OutputFile="$(OutDir)/$(ProjectName).exe" ! LinkIncremental="1" ! SuppressStartupBanner="TRUE" ! AdditionalLibraryDirectories="..\lib" ! ProgramDatabaseFile=".\teststream___Win32_Release/teststream.pdb" ! SubSystem="1"/> ! <Tool ! Name="VCMIDLTool" ! TypeLibraryName=".\teststream___Win32_Release/teststream.tlb"/> ! <Tool ! Name="VCPostBuildEventTool"/> ! <Tool ! Name="VCPreBuildEventTool"/> ! <Tool ! Name="VCPreLinkEventTool"/> ! <Tool ! Name="VCResourceCompilerTool" ! PreprocessorDefinitions="NDEBUG" ! Culture="1053"/> ! <Tool ! Name="VCWebServiceProxyGeneratorTool"/> ! <Tool ! Name="VCXMLDataGeneratorTool"/> ! <Tool ! Name="VCWebDeploymentTool"/> ! <Tool ! Name="VCManagedWrapperGeneratorTool"/> ! <Tool ! Name="VCAuxiliaryManagedWrapperGeneratorTool"/> ! </Configuration> ! </Configurations> ! <References> ! </References> ! <Files> ! <Filter ! Name="Source Files" ! Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"> ! <File ! RelativePath="..\tests\teststream.cpp"> ! </File> ! </Filter> ! </Files> ! <Globals> ! </Globals> ! </VisualStudioProject> Index: testsend.vcproj =================================================================== RCS file: /cvsroot/alpp/openalpp/VisualStudio/testsend.vcproj,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** testsend.vcproj 12 Dec 2003 06:55:04 -0000 1.4 --- testsend.vcproj 11 Nov 2004 07:57:57 -0000 1.5 *************** *** 1,151 **** ! <?xml version="1.0" encoding="Windows-1252"?> ! <VisualStudioProject ! ProjectType="Visual C++" ! Version="7.10" ! Name="testsend" ! ProjectGUID="{9740C9CE-674E-4083-80FE-9ADE598B0000}" ! SccProjectName="" ! SccLocalPath=""> ! <Platforms> ! <Platform ! Name="Win32"/> ! </Platforms> ! <Configurations> ! <Configuration ! Name="Debug|Win32" ! OutputDirectory="..\bin" ! IntermediateDirectory=".\testsend___Win32_Debug" ! ConfigurationType="1" ! UseOfMFC="0" ! ATLMinimizesCRunTimeLibraryUsage="FALSE" ! CharacterSet="2"> ! <Tool ! Name="VCCLCompilerTool" ! Optimization="0" ! OptimizeForProcessor="2" ! AdditionalIncludeDirectories="../include,../../portaudio/pa_common" ! PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE" ! BasicRuntimeChecks="3" ! RuntimeLibrary="3" ! UsePrecompiledHeader="2" ! PrecompiledHeaderFile=".\testsend___Win32_Debug/testsend.pch" ! AssemblerListingLocation=".\testsend___Win32_Debug/" ! ObjectFile=".\testsend___Win32_Debug/" ! ProgramDataBaseFileName=".\testsend___Win32_Debug/" ! WarningLevel="3" ! SuppressStartupBanner="TRUE" ! DebugInformationFormat="4"/> ! <Tool ! Name="VCCustomBuildTool"/> ! <Tool ! Name="VCLinkerTool" ! AdditionalOptions="/MACHINE:I386" ! AdditionalDependencies=" ccgnu2d.lib wsock32.lib" ! OutputFile="$(OutDir)/$(ProjectName)d.exe" ! LinkIncremental="2" ! SuppressStartupBanner="TRUE" ! IgnoreDefaultLibraryNames="libcd" ! GenerateDebugInformation="TRUE" ! ProgramDatabaseFile=".\testsend___Win32_Debug/testsend.pdb" ! SubSystem="1"/> ! <Tool ! Name="VCMIDLTool" ! TypeLibraryName=".\testsend___Win32_Debug/testsend.tlb"/> ! <Tool ! Name="VCPostBuildEventTool"/> ! <Tool ! Name="VCPreBuildEventTool"/> ! <Tool ! Name="VCPreLinkEventTool"/> ! <Tool ! Name="VCResourceCompilerTool" ! PreprocessorDefinitions="_DEBUG" ! Culture="1053"/> ! <Tool ! Name="VCWebServiceProxyGeneratorTool"/> ! <Tool ! Name="VCXMLDataGeneratorTool"/> ! <Tool ! Name="VCWebDeploymentTool"/> ! <Tool ! Name="VCManagedWrapperGeneratorTool"/> ! <Tool ! Name="VCAuxiliaryManagedWrapperGeneratorTool"/> ! </Configuration> ! <Configuration ! Name="Release|Win32" ! OutputDirectory="..\bin" ! IntermediateDirectory=".\testsend___Win32_Release" ! ConfigurationType="1" ! UseOfMFC="0" ! ATLMinimizesCRunTimeLibraryUsage="FALSE" ! CharacterSet="2"> ! <Tool ! Name="VCCLCompilerTool" ! InlineFunctionExpansion="1" ! OptimizeForProcessor="3" ! AdditionalIncludeDirectories="../include,../../portaudio/pa_common" ! PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE" ! StringPooling="TRUE" ! RuntimeLibrary="2" ! EnableFunctionLevelLinking="TRUE" ! UsePrecompiledHeader="2" ! PrecompiledHeaderFile=".\testsend___Win32_Release/testsend.pch" ! AssemblerListingLocation=".\testsend___Win32_Release/" ! ObjectFile=".\testsend___Win32_Release/" ! ProgramDataBaseFileName=".\testsend___Win32_Release/" ! WarningLevel="3" ! SuppressStartupBanner="TRUE" ! CompileAs="0"/> ! <Tool ! Name="VCCustomBuildTool"/> ! <Tool ! Name="VCLinkerTool" ! AdditionalOptions="/MACHINE:I386" ! AdditionalDependencies="ccgnu2.lib wsock32.lib" ! OutputFile="$(OutDir)/$(ProjectName).exe" ! LinkIncremental="1" ! SuppressStartupBanner="TRUE" ! AdditionalLibraryDirectories="..\lib" ! IgnoreDefaultLibraryNames="libcd" ! ProgramDatabaseFile=".\testsend___Win32_Release/testsend.pdb" ! SubSystem="1"/> ! <Tool ! Name="VCMIDLTool" ! TypeLibraryName=".\testsend___Win32_Release/testsend.tlb"/> ! <Tool ! Name="VCPostBuildEventTool"/> ! <Tool ! Name="VCPreBuildEventTool"/> ! <Tool ! Name="VCPreLinkEventTool"/> ! <Tool ! Name="VCResourceCompilerTool" ! PreprocessorDefinitions="NDEBUG" ! Culture="1053"/> ! <Tool ! Name="VCWebServiceProxyGeneratorTool"/> ! <Tool ! Name="VCXMLDataGeneratorTool"/> ! <Tool ! Name="VCWebDeploymentTool"/> ! <Tool ! Name="VCManagedWrapperGeneratorTool"/> ! <Tool ! Name="VCAuxiliaryManagedWrapperGeneratorTool"/> ! </Configuration> ! </Configurations> ! <References> ! </References> ! <Files> ! <Filter ! Name="Source Files" ! Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"> ! <File ! RelativePath="..\tests\testsend.cpp"> ! </File> ! </Filter> ! </Files> ! <Globals> ! </Globals> ! </VisualStudioProject> --- 1,151 ---- ! <?xml version="1.0" encoding="Windows-1252"?> ! <VisualStudioProject ! ProjectType="Visual C++" ! Version="7.10" ! Name="testsend" ! ProjectGUID="{9740C9CE-674E-4083-80FE-9ADE598B0000}" ! SccProjectName="" ! SccLocalPath=""> ! <Platforms> ! <Platform ! Name="Win32"/> ! </Platforms> ! <Configurations> ! <Configuration ! Name="Debug|Win32" ! OutputDirectory="..\bin" ! IntermediateDirectory=".\testsend___Win32_Debug" ! ConfigurationType="1" ! UseOfMFC="0" ! ATLMinimizesCRunTimeLibraryUsage="FALSE" ! CharacterSet="2"> ! <Tool ! Name="VCCLCompilerTool" ! Optimization="0" ! OptimizeForProcessor="2" ! AdditionalIncludeDirectories="../include,../../portaudio/pa_common" ! PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE" ! BasicRuntimeChecks="3" ! RuntimeLibrary="3" ! UsePrecompiledHeader="2" ! PrecompiledHeaderFile=".\testsend___Win32_Debug/testsend.pch" ! AssemblerListingLocation=".\testsend___Win32_Debug/" ! ObjectFile=".\testsend___Win32_Debug/" ! ProgramDataBaseFileName=".\testsend___Win32_Debug/" ! WarningLevel="3" ! SuppressStartupBanner="TRUE" ! DebugInformationFormat="4"/> ! <Tool ! Name="VCCustomBuildTool"/> ! <Tool ! Name="VCLinkerTool" ! AdditionalOptions="/MACHINE:I386" ! AdditionalDependencies=" ccgnu2d.lib wsock32.lib" ! OutputFile="$(OutDir)/$(ProjectName)d.exe" ! LinkIncremental="2" ! SuppressStartupBanner="TRUE" ! IgnoreDefaultLibraryNames="libcd" ! GenerateDebugInformation="TRUE" ! ProgramDatabaseFile=".\testsend___Win32_Debug/testsend.pdb" ! SubSystem="1"/> ! <Tool ! Name="VCMIDLTool" ! TypeLibraryName=".\testsend___Win32_Debug/testsend.tlb"/> ! <Tool ! Name="VCPostBuildEventTool"/> ! <Tool ! Name="VCPreBuildEventTool"/> ! <Tool ! Name="VCPreLinkEventTool"/> ! <Tool ! Name="VCResourceCompilerTool" ! PreprocessorDefinitions="_DEBUG" ! Culture="1053"/> ! <Tool ! Name="VCWebServiceProxyGeneratorTool"/> ! <Tool ! Name="VCXMLDataGeneratorTool"/> ! <Tool ! Name="VCWebDeploymentTool"/> ! <Tool ! Name="VCManagedWrapperGeneratorTool"/> ! <Tool ! Name="VCAuxiliaryManagedWrapperGeneratorTool"/> ! </Configuration> ! <Configuration ! Name="Release|Win32" ! OutputDirectory="..\bin" ! IntermediateDirectory=".\testsend___Win32_Release" ! ConfigurationType="1" ! UseOfMFC="0" ! ATLMinimizesCRunTimeLibraryUsage="FALSE" ! CharacterSet="2"> ! <Tool ! Name="VCCLCompilerTool" ! InlineFunctionExpansion="1" ! OptimizeForProcessor="3" ! AdditionalIncludeDirectories="../include,../../portaudio/pa_common" ! PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE" ! StringPooling="TRUE" ! RuntimeLibrary="2" ! EnableFunctionLevelLinking="TRUE" ! UsePrecompiledHeader="2" ! PrecompiledHeaderFile=".\testsend___Win32_Release/testsend.pch" ! AssemblerListingLocation=".\testsend___Win32_Release/" ! ObjectFile=".\testsend___Win32_Release/" ! ProgramDataBaseFileName=".\testsend___Win32_Release/" ! WarningLevel="3" ! SuppressStartupBanner="TRUE" ! CompileAs="0"/> ! <Tool ! Name="VCCustomBuildTool"/> ! <Tool ! Name="VCLinkerTool" ! AdditionalOptions="/MACHINE:I386" ! AdditionalDependencies="ccgnu2.lib wsock32.lib" ! OutputFile="$(OutDir)/$(ProjectName).exe" ! LinkIncremental="1" ! SuppressStartupBanner="TRUE" ! AdditionalLibraryDirectories="..\lib" ! IgnoreDefaultLibraryNames="libcd" ! ProgramDatabaseFile=".\testsend___Win32_Release/testsend.pdb" ! SubSystem="1"/> ! <Tool ! Name="VCMIDLTool" ! TypeLibraryName=".\testsend___Win32_Release/testsend.tlb"/> ! <Tool ! Name="VCPostBuildEventTool"/> ! <Tool ! Name="VCPreBuildEventTool"/> ! <Tool ! Name="VCPreLinkEventTool"/> ! <Tool ! Name="VCResourceCompilerTool" ! PreprocessorDefinitions="NDEBUG" ! Culture="1053"/> ! <Tool ! Name="VCWebServiceProxyGeneratorTool"/> ! <Tool ! Name="VCXMLDataGeneratorTool"/> ! <Tool ! Name="VCWebDeploymentTool"/> ! <Tool ! Name="VCManagedWrapperGeneratorTool"/> ! <Tool ! Name="VCAuxiliaryManagedWrapperGeneratorTool"/> ! </Configuration> ! </Configurations> ! <References> ! </References> ! <Files> ! <Filter ! Name="Source Files" ! Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"> ! <File ! RelativePath="..\tests\testsend.cpp"> ! </File> ! </Filter> ! </Files> ! <Globals> ! </Globals> ! </VisualStudioProject> Index: testsend.dsp =================================================================== RCS file: /cvsroot/alpp/openalpp/VisualStudio/testsend.dsp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** testsend.dsp 12 Dec 2003 06:55:04 -0000 1.4 --- testsend.dsp 11 Nov 2004 07:57:57 -0000 1.5 *************** *** 1,98 **** ! # Microsoft Developer Studio Project File - Name="testsend" - Package Owner=<4> ! # Microsoft Developer Studio Generated Build File, Format Version 6.00 ! # ** DO NOT EDIT ** ! ! # TARGTYPE "Win32 (x86) Console Application" 0x0103 ! ! CFG=testsend - 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 "testsend.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 "testsend.mak" CFG="testsend - Win32 Debug" ! !MESSAGE ! !MESSAGE Possible choices for configuration are: ! !MESSAGE ! !MESSAGE "testsend - Win32 Debug" (based on "Win32 (x86) Console Application") ! !MESSAGE "testsend - 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)" == "testsend - Win32 Debug" ! ! # PROP BASE Use_MFC 0 ! # PROP BASE Use_Debug_Libraries 1 ! # PROP BASE Output_Dir "..\bin" ! # PROP BASE Intermediate_Dir ".\testsend___Win32_Debug" ! # PROP BASE Target_Dir "" ! # PROP Use_MFC 0 ! # PROP Use_Debug_Libraries 1 ! # PROP Output_Dir "..\bin" ! # PROP Intermediate_Dir ".\testsend___Win32_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".\testsend___Win32_Debug/testsend.pch" /Fo".\testsend___Win32_Debug/" /Fd".\testsend___Win32_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".\testsend___Win32_Debug/testsend.pch" /Fo".\testsend___Win32_Debug/" /Fd".\testsend___Win32_Debug/" /GZ /c /GX ! # ADD BASE MTL /nologo /tlb".\testsend___Win32_Debug\testsend.tlb" /win32 ! # ADD MTL /nologo /tlb".\testsend___Win32_Debug\testsend.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 wsock32.lib /nologo /out:"..\bin\$(ProjectName)d.exe" /incremental:yes /nodefaultlib:"libcd" /debug /pdb:".\testsend___Win32_Debug\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 ccgnu2d.lib wsock32.lib /nologo /out:"..\bin\$(ProjectName)d.exe" /incremental:yes /nodefaultlib:"libcd" /debug /pdb:".\testsend___Win32_Debug\testsend.pdb" /pdbtype:sept /subsystem:console /MACHINE:I386 ! ! !ELSEIF "$(CFG)" == "testsend - Win32 Release" ! ! # 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 "" ! # 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".\testsend___Win32_Release/testsend.pch" /Fo".\testsend___Win32_Release/" /Fd".\testsend___Win32_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".\testsend___Win32_Release/testsend.pch" /Fo".\testsend___Win32_Release/" /Fd".\testsend___Win32_Release/" /c /GX ! # ADD BASE MTL /nologo /tlb".\testsend___Win32_Release\testsend.tlb" /win32 ! # ADD MTL /nologo /tlb".\testsend___Win32_Release\testsend.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 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 ! ! # Begin Target ! ! # Name "testsend - Win32 Debug" ! # Name "testsend - Win32 Release" ! # Begin Group "Source Files" ! ! # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" ! # Begin Source File ! ! SOURCE=..\tests\testsend.cpp ! # End Source File ! # End Group ! # End Target ! # End Project ! --- 1,98 ---- ! # Microsoft Developer Studio Project File - Name="testsend" - Package Owner=<4> ! # Microsoft Developer Studio Generated Build File, Format Version 6.00 ! # ** DO NOT EDIT ** ! ! # TARGTYPE "Win32 (x86) Console Application" 0x0103 ! ! CFG=testsend - 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 "testsend.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 "testsend.mak" CFG="testsend - Win32 Debug" ! !MESSAGE ! !MESSAGE Possible choices for configuration are: ! !MESSAGE ! !MESSAGE "testsend - Win32 Debug" (based on "Win32 (x86) Console Application") ! !MESSAGE "testsend - 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)" == "testsend - Win32 Debug" ! ! # PROP BASE Use_MFC 0 ! # PROP BASE Use_Debug_Libraries 1 ! # PROP BASE Output_Dir "..\bin" ! # PROP BASE Intermediate_Dir ".\testsend___Win32_Debug" ! # PROP BASE Target_Dir "" ! # PROP Use_MFC 0 ! # PROP Use_Debug_Libraries 1 ! # PROP Output_Dir "..\bin" ! # PROP Intermediate_Dir ".\testsend___Win32_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".\testsend___Win32_Debug/testsend.pch" /Fo".\testsend___Win32_Debug/" /Fd".\testsend___Win32_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".\testsend___Win32_Debug/testsend.pch" /Fo".\testsend___Win32_Debug/" /Fd".\testsend___Win32_Debug/" /GZ /c /GX ! # ADD BASE MTL /nologo /tlb".\testsend___Win32_Debug\testsend.tlb" /win32 ! # ADD MTL /nologo /tlb".\testsend___Win32_Debug\testsend.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 wsock32.lib /nologo /out:"..\bin\$(ProjectName)d.exe" /incremental:yes /nodefaultlib:"libcd" /debug /pdb:".\testsend___Win32_Debug\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 ccgnu2d.lib wsock32.lib /nologo /out:"..\bin\$(ProjectName)d.exe" /incremental:yes /nodefaultlib:"libcd" /debug /pdb:".\testsend___Win32_Debug\testsend.pdb" /pdbtype:sept /subsystem:console /MACHINE:I386 ! ! !ELSEIF "$(CFG)" == "testsend - Win32 Release" ! ! # 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 "" ! # 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".\testsend___Win32_Release/testsend.pch" /Fo".\testsend___Win32_Release/" /Fd".\testsend___Win32_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".\testsend___Win32_Release/testsend.pch" /Fo".\testsend___Win32_Release/" /Fd".\testsend___Win32_Release/" /c /GX ! # ADD BASE MTL /nologo /tlb".\testsend___Win32_Release\testsend.tlb" /win32 ! # ADD MTL /nologo /tlb".\testsend___Win32_Release\testsend.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 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 ! ! # Begin Target ! ! # Name "testsend - Win32 Debug" ! # Name "testsend - Win32 Release" ! # Begin Group "Source Files" ! ! # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" ! # Begin Source File ! ! SOURCE=..\tests\testsend.cpp ! # End Source File ! # End Group ! # End Target ! # End Project ! --- NEW FILE: multiple.vcproj --- <?xml version="1.0" encoding="Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" Version="7.10" Name="multiple" ProjectGUID="{B9EDEBD3-BCA0-4FDB-A2BE-CAA2FB2D5271}" SccProjectName="" SccLocalPath=""> <Platforms> <Platform Name="Win32"/> </Platforms> <Configurations> <Configuration Name="Debug|Win32" OutputDirectory="..\bin" IntermediateDirectory=".\multiple_Debug" ConfigurationType="1" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="FALSE" CharacterSet="2"> <Tool Name="VCCLCompilerTool" Optimization="0" OptimizeForProcessor="3" AdditionalIncludeDirectories="../include" PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE" BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="2" PrecompiledHeaderFile=".\Debug/multiple.pch" AssemblerListingLocation=".\Debug/" ObjectFile=".\Debug/" ProgramDataBaseFileName=".\Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="4" CompileAs="0"/> <Tool Name="VCCustomBuildTool"/> <Tool Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386" OutputFile="$(OutDir)/$(ProjectName)d.exe" LinkIncremental="2" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="..\lib" IgnoreDefaultLibraryNames="" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\Debug/multiple.pdb" SubSystem="1"/> <Tool Name="VCMIDLTool" TypeLibraryName=".\Debug/multiple.tlb"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPreLinkEventTool"/> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1053"/> <Tool Name="VCWebServiceProxyGeneratorTool"/> <Tool Name="VCXMLDataGeneratorTool"/> <Tool Name="VCWebDeploymentTool"/> <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> </Configuration> <Configuration Name="Release|Win32" OutputDirectory="..\bin" IntermediateDirectory=".\multiple_Release" ConfigurationType="1" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="FALSE" CharacterSet="2"> <Tool Name="VCCLCompilerTool" InlineFunctionExpansion="1" OptimizeForProcessor="3" AdditionalIncludeDirectories="../include" PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="2" PrecompiledHeaderFile=".\Release/multiple.pch" AssemblerListingLocation=".\Release/" ObjectFile=".\Release/" ProgramDataBaseFileName=".\Release/" WarningLevel="3" SuppressStartupBanner="TRUE" CompileAs="0"/> <Tool Name="VCCustomBuildTool"/> <Tool Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386" OutputFile="$(OutDir)/$(ProjectName).exe" LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="..\lib" ProgramDatabaseFile=".\Release/multiple.pdb" SubSystem="1"/> <Tool Name="VCMIDLTool" TypeLibraryName=".\Release/multiple.tlb"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPreLinkEventTool"/> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1053"/> <Tool Name="VCWebServiceProxyGeneratorTool"/> <Tool Name="VCXMLDataGeneratorTool"/> <Tool Name="VCWebDeploymentTool"/> <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> </Configuration> </Configurations> <References> </References> <Files> <Filter Name="Source Files" Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"> <File RelativePath="..\tests\multiple.cpp"> </File> </Filter> </Files> <Globals> </Globals> </VisualStudioProject> --- NEW FILE: multiple.dsp --- # Microsoft Developer Studio Project File - Name="multiple" - Package Owner=<4> # Microsoft Developer Studio Generated Build File, Format Version 6.00 # ** DO NOT EDIT ** # TARGTYPE "Win32 (x86) Console Application" 0x0103 CFG=multiple - 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 "multiple.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 "multiple.mak" CFG="multiple - Win32 Debug" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE !MESSAGE "multiple - Win32 Debug" (based on "Win32 (x86) Console Application") !MESSAGE "multiple - 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)" == "multiple - Win32 Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "..\bin" # PROP BASE Intermediate_Dir ".\multiple_Debug" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "..\bin" # PROP Intermediate_Dir ".\multiple_Debug" # PROP Target_Dir "" # ADD BASE CPP /nologo /MDd /I "../include" /ZI /W3 /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /Fp".\Debug/multiple.pch" /Fo".\Debug/" /Fd".\Debug/" /GZ /c /GX # ADD CPP /nologo /MDd /I "../include" /ZI /W3 /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /Fp".\Debug/multiple.pch" /Fo".\Debug/" /Fd".\Debug/" /GZ /c /GX # ADD BASE MTL /nologo /tlb".\Debug\multiple.tlb" /win32 # ADD MTL /nologo /tlb".\Debug\multiple.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 /nologo /out:"..\bin\$(ProjectName)d.exe" /incremental:yes /libpath:"..\lib" /debug /pdb:".\Debug\multiple.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 /nologo /out:"..\bin\$(ProjectName)d.exe" /incremental:yes /libpath:"..\lib" /debug /pdb:".\Debug\multiple.pdb" /pdbtype:sept /subsystem:console /MACHINE:I386 !ELSEIF "$(CFG)" == "multiple - Win32 Release" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\bin" # PROP BASE Intermediate_Dir ".\multiple_Release" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\bin" # PROP Intermediate_Dir ".\multiple_Release" # PROP Target_Dir "" # ADD BASE CPP /nologo /MD /I "../include" /W3 /Ob1 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /GF /Gy /YX /Fp".\Release/multiple.pch" /Fo".\Release/" /Fd".\Release/" /c /GX # ADD CPP /nologo /MD /I "../include" /W3 /Ob1 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /GF /Gy /YX /Fp".\Release/multiple.pch" /Fo".\Release/" /Fd".\Release/" /c /GX # ADD BASE MTL /nologo /tlb".\Release\multiple.tlb" /win32 # ADD MTL /nologo /tlb".\Release\multiple.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 w... [truncated message content] |
From: Anders B. <vr-...@us...> - 2004-11-11 07:58:06
|
Update of /cvsroot/alpp/openalpp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31707 Modified Files: NEWS README Added Files: LICENSE.txt Log Message: Adapted smart (reference) pointers from the OpenSceneGraph library. Used with permission of Robert Osfield. Cleans up the new/delete responsibility. All objects must be created on the heap from now on. Fixed small bugin in Streaming classes. Index: README =================================================================== RCS file: /cvsroot/alpp/openalpp/README,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** README 2 Mar 2004 11:01:14 -0000 1.3 --- README 11 Nov 2004 07:57:56 -0000 1.4 *************** *** 5,9 **** * 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 --- 5,9 ---- * OpenAL++ was created using the libraries: * OpenAL (http://www.openal.org), ! * PortAudio (http://www.portaudio.com/) * * This library is free software; you can redistribute it and/or *************** *** 21,24 **** --- 21,27 ---- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ + + See also License.txt containing the OpenSceneGraph License information under which the + Reference and ref_ptr classes is used. OpenAL++ is an Object Oriented version of OpenAL. Index: NEWS =================================================================== RCS file: /cvsroot/alpp/openalpp/NEWS,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** NEWS 23 Sep 2004 06:42:49 -0000 1.4 --- NEWS 11 Nov 2004 07:57:56 -0000 1.5 *************** *** 1,4 **** --- 1,22 ---- NEWS + 2004-11-10 Anders Backman: + Major revision. Added referenced (smart) pointers to clean up the + responsibility of new/delete policy. This means that it is now not possible to create any instances of + Source, Streams, Sample, FileStreams at the stack. THey have to be created on the heap (using new). + This is to avoid memory polution. Whenever possible a openalpp::ref_ptr<> should be used to + store the allocated objects. + This ensures a clean and stable memory handling. See the examples for the changes. + Several methods now have pointer to a class instead of a reference to a class as arguments. + + For example: pSource->setSound(pSample) + + A bug in the FileStream class is fixed, playing ogg files using certain sound cards under windows was known to cause crashes. This should now work. Linux is still an issue, as openal is not thread safe under linux. + Whenever OpenAL have stable ogg support, it will be working in OpenAL++ + rewind, pause, is still unstable for streaming sounds. start() and stop() method should work just fine. + This in total, makes openal++ more stable and more useful than ever. + + + 2004-09-23 Anders Backman: Small fixes for the filestreaming class. --- NEW FILE: LICENSE.txt --- OpenSceneGraph Public License, Version 0.0 ========================================== Copyright (C) 2002 Robert Osfield. Everyone is permitted to copy and distribute verbatim copies of this licence document, but changing it is not allowed. OPENSCENEGRAPH PUBLIC LICENCE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION This library is free software; you can redistribute it and/or modify it under the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or later. Notes: the OSGPL is based on the LGPL, with the 4 exceptions laid in in the wxWindows section below. The LGPL in the final section of this license. ------------------------------------------------------------------------------- wxWindows Library Licence, Version 3 ==================================== Copyright (C) 1998 Julian Smart, Robert Roebling [, ...] Everyone is permitted to copy and distribute verbatim copies of this licence document, but changing it is not allowed. WXWINDOWS LIBRARY LICENCE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public Licence as published by the Free Software Foundation; either version 2 of the Licence, 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 Library General Public Licence for more details. You should have received a copy of the GNU Library General Public Licence along with this software, usually in a file named COPYING.LIB. If not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. EXCEPTION NOTICE 1. As a special exception, the copyright holders of this library give permission for additional uses of the text contained in this release of the library as licenced under the wxWindows Library Licence, applying either version 3 of the Licence, or (at your option) any later version of the Licence as published by the copyright holders of version 3 of the Licence document. 2. The exception is that you may use, copy, link, modify and distribute under the user's own terms, binary object code versions of works based on the Library. 3. If you copy code from files distributed under the terms of the GNU General Public Licence or the GNU Library General Public Licence into a copy of this library, as this licence permits, the exception does not apply to the code that you add in this way. To avoid misleading anyone as to the status of such modified files, you must delete this exception notice from such code and/or adjust the licensing conditions notice accordingly. 4. If you write modifications of your own for this library, it is your choice whether to permit this exception to apply to your modifications. If you do not wish that, you must delete the exception notice from such code and/or adjust the licensing conditions notice accordingly. ------------------------------------------------------------------------------ |
From: Anders B. <vr-...@us...> - 2004-09-28 08:54:19
|
Update of /cvsroot/alpp/openalpp/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17952 Modified Files: sourcebase.cpp Log Message: Last modification to ::play method was a catastroph, reverted to old version. Index: sourcebase.cpp =================================================================== RCS file: /cvsroot/alpp/openalpp/src/sourcebase.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** sourcebase.cpp 23 Sep 2004 06:36:22 -0000 1.9 --- sourcebase.cpp 28 Sep 2004 08:54:06 -0000 1.10 *************** *** 121,126 **** void SourceBase::play() { ! //alSourcePlayv(nlinkedsources_,linkedsources_); ! alSourcePlay(nlinkedsources_); } --- 121,125 ---- void SourceBase::play() { ! alSourcePlayv(nlinkedsources_,linkedsources_); } |
From: Anders B. <vr-...@us...> - 2004-09-23 06:42:58
|
Update of /cvsroot/alpp/openalpp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13787 Modified Files: NEWS Log Message: Index: NEWS =================================================================== RCS file: /cvsroot/alpp/openalpp/NEWS,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** NEWS 2 Mar 2004 11:01:14 -0000 1.3 --- NEWS 23 Sep 2004 06:42:49 -0000 1.4 *************** *** 1,4 **** --- 1,8 ---- NEWS + 2004-09-23 Anders Backman: + Small fixes for the filestreaming class. + Changed the play method in sourcebase to not use array of linked sources. + 2004-02-11 Anders Backman: |
From: Anders B. <vr-...@us...> - 2004-09-23 06:39:08
|
Update of /cvsroot/alpp/openalpp/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13059 Modified Files: simple.dsp testmic.dsp testsend.dsp teststream.dsp Log Message: Index: teststream.dsp =================================================================== RCS file: /cvsroot/alpp/openalpp/tests/teststream.dsp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** teststream.dsp 18 Oct 2002 07:50:16 -0000 1.4 --- teststream.dsp 23 Sep 2004 06:38:57 -0000 1.5 *************** *** 1,102 **** ! # Microsoft Developer Studio Project File - Name="teststream" - Package Owner=<4> ! # Microsoft Developer Studio Generated Build File, Format Version 6.00 ! # ** DO NOT EDIT ** ! ! # TARGTYPE "Win32 (x86) Console Application" 0x0103 ! ! CFG=teststream - 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 "teststream.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 "teststream.mak" CFG="teststream - Win32 Debug" ! !MESSAGE ! !MESSAGE Possible choices for configuration are: ! !MESSAGE ! !MESSAGE "teststream - Win32 Release" (based on "Win32 (x86) Console Application") ! !MESSAGE "teststream - 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)" == "teststream - Win32 Release" ! ! # 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 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 wsock32.lib /nologo /subsystem:console /machine:I386 /out:"bin\teststream.exe" /libpath:"..\lib" ! ! !ELSEIF "$(CFG)" == "teststream - Win32 Debug" ! ! # PROP BASE Use_MFC 0 ! # PROP BASE Use_Debug_Libraries 1 ! # PROP BASE Output_Dir "teststream___Win32_Debug" ! # PROP BASE Intermediate_Dir "teststream___Win32_Debug" ! # PROP BASE Target_Dir "" ! # PROP Use_MFC 0 ! # PROP Use_Debug_Libraries 1 ! # PROP Output_Dir "teststream___Win32_Debug" ! # PROP Intermediate_Dir "teststream___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 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" /out:"bin\teststream.exe" /pdbtype:sept /libpath:"..\lib" ! ! !ENDIF ! ! # Begin Target ! ! # Name "teststream - Win32 Release" ! # Name "teststream - Win32 Debug" ! # Begin Group "Source Files" ! ! # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" ! # Begin Source File ! ! SOURCE=.\teststream.cpp ! # End Source File ! # End Group ! # Begin Group "Header Files" ! ! # PROP Default_Filter "h;hpp;hxx;hm;inl" ! # End Group ! # Begin Group "Resource Files" ! ! # PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" ! # End Group ! # End Target ! # End Project --- 1,102 ---- ! # Microsoft Developer Studio Project File - Name="teststream" - Package Owner=<4> ! # Microsoft Developer Studio Generated Build File, Format Version 6.00 ! # ** DO NOT EDIT ** ! ! # TARGTYPE "Win32 (x86) Console Application" 0x0103 ! ! CFG=teststream - 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 "teststream.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 "teststream.mak" CFG="teststream - Win32 Debug" ! !MESSAGE ! !MESSAGE Possible choices for configuration are: ! !MESSAGE ! !MESSAGE "teststream - Win32 Release" (based on "Win32 (x86) Console Application") ! !MESSAGE "teststream - 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)" == "teststream - Win32 Release" ! ! # 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 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 wsock32.lib /nologo /subsystem:console /machine:I386 /out:"bin\teststream.exe" /libpath:"..\lib" ! ! !ELSEIF "$(CFG)" == "teststream - Win32 Debug" ! ! # PROP BASE Use_MFC 0 ! # PROP BASE Use_Debug_Libraries 1 ! # PROP BASE Output_Dir "teststream___Win32_Debug" ! # PROP BASE Intermediate_Dir "teststream___Win32_Debug" ! # PROP BASE Target_Dir "" ! # PROP Use_MFC 0 ! # PROP Use_Debug_Libraries 1 ! # PROP Output_Dir "teststream___Win32_Debug" ! # PROP Intermediate_Dir "teststream___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 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" /out:"bin\teststream.exe" /pdbtype:sept /libpath:"..\lib" ! ! !ENDIF ! ! # Begin Target ! ! # Name "teststream - Win32 Release" ! # Name "teststream - Win32 Debug" ! # Begin Group "Source Files" ! ! # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" ! # Begin Source File ! ! SOURCE=.\teststream.cpp ! # End Source File ! # End Group ! # Begin Group "Header Files" ! ! # PROP Default_Filter "h;hpp;hxx;hm;inl" ! # End Group ! # Begin Group "Resource Files" ! ! # PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" ! # End Group ! # End Target ! # End Project Index: testmic.dsp =================================================================== RCS file: /cvsroot/alpp/openalpp/tests/testmic.dsp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** testmic.dsp 18 Oct 2002 07:50:15 -0000 1.5 --- testmic.dsp 23 Sep 2004 06:38:57 -0000 1.6 *************** *** 1,102 **** ! # 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 /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 pastaticdsd.lib dsound.lib winmm.lib /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libcd.lib" /out:"bin\testmic.exe" /pdbtype:sept /libpath:"..\lib" ! ! !ENDIF ! ! # Begin Target ! ! # Name "testmic - Win32 Release" ! # Name "testmic - Win32 Debug" ! # Begin Group "Source Files" ! ! # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" ! # Begin Source File ! ! SOURCE=.\testmic.cpp ! # End Source File ! # End Group ! # Begin Group "Header Files" ! ! # PROP Default_Filter "h;hpp;hxx;hm;inl" ! # End Group ! # Begin Group "Resource Files" ! ! # PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" ! # End Group ! # End Target ! # End Project --- 1,102 ---- ! # 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 /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 pastaticdsd.lib dsound.lib winmm.lib /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libcd.lib" /out:"bin\testmic.exe" /pdbtype:sept /libpath:"..\lib" ! ! !ENDIF ! ! # Begin Target ! ! # Name "testmic - Win32 Release" ! # Name "testmic - Win32 Debug" ! # Begin Group "Source Files" ! ! # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" ! # Begin Source File ! ! SOURCE=.\testmic.cpp ! # End Source File ! # End Group ! # Begin Group "Header Files" ! ! # PROP Default_Filter "h;hpp;hxx;hm;inl" ! # End Group ! # Begin Group "Resource Files" ! ! # PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" ! # End Group ! # End Target ! # End Project Index: simple.dsp =================================================================== RCS file: /cvsroot/alpp/openalpp/tests/simple.dsp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** simple.dsp 18 Oct 2002 07:50:15 -0000 1.6 --- simple.dsp 23 Sep 2004 06:38:57 -0000 1.7 *************** *** 1,102 **** ! # 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=.\simple.cpp ! # End Source File ! # End Group ! # Begin Group "Header Files" ! ! # PROP Default_Filter "h;hpp;hxx;hm;inl" ! # End Group ! # Begin Group "Resource Files" ! ! # PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" ! # End Group ! # End Target ! # End Project --- 1,102 ---- ! # 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=.\simple.cpp ! # End Source File ! # End Group ! # Begin Group "Header Files" ! ! # PROP Default_Filter "h;hpp;hxx;hm;inl" ! # End Group ! # Begin Group "Resource Files" ! ! # PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" ! # End Group ! # End Target ! # End Project Index: testsend.dsp =================================================================== RCS file: /cvsroot/alpp/openalpp/tests/testsend.dsp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** testsend.dsp 18 Oct 2002 07:50:15 -0000 1.4 --- testsend.dsp 23 Sep 2004 06:38:57 -0000 1.5 *************** *** 1,102 **** ! # Microsoft Developer Studio Project File - Name="testsend" - Package Owner=<4> ! # Microsoft Developer Studio Generated Build File, Format Version 6.00 ! # ** DO NOT EDIT ** ! ! # TARGTYPE "Win32 (x86) Console Application" 0x0103 ! ! CFG=testsend - 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 "testsend.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 "testsend.mak" CFG="testsend - Win32 Debug" ! !MESSAGE ! !MESSAGE Possible choices for configuration are: ! !MESSAGE ! !MESSAGE "testsend - Win32 Release" (based on "Win32 (x86) Console Application") ! !MESSAGE "testsend - 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)" == "testsend - Win32 Release" ! ! # 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 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 wsock32.lib /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcd" /out:"bin\testsend.exe" /libpath:"..\lib" ! ! !ELSEIF "$(CFG)" == "testsend - Win32 Debug" ! ! # PROP BASE Use_MFC 0 ! # PROP BASE Use_Debug_Libraries 1 ! # PROP BASE Output_Dir "testsend___Win32_Debug" ! # PROP BASE Intermediate_Dir "testsend___Win32_Debug" ! # PROP BASE Target_Dir "" ! # PROP Use_MFC 0 ! # PROP Use_Debug_Libraries 1 ! # PROP Output_Dir "testsend___Win32_Debug" ! # PROP Intermediate_Dir "testsend___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 /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 openal32.lib alut.lib ccgnu2.lib /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libcd" /out:"bin\testsend.exe" /pdbtype:sept ! ! !ENDIF ! ! # Begin Target ! ! # Name "testsend - Win32 Release" ! # Name "testsend - Win32 Debug" ! # Begin Group "Source Files" ! ! # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" ! # Begin Source File ! ! SOURCE=.\testsend.cpp ! # End Source File ! # End Group ! # Begin Group "Header Files" ! ! # PROP Default_Filter "h;hpp;hxx;hm;inl" ! # End Group ! # Begin Group "Resource Files" ! ! # PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" ! # End Group ! # End Target ! # End Project --- 1,102 ---- ! # Microsoft Developer Studio Project File - Name="testsend" - Package Owner=<4> ! # Microsoft Developer Studio Generated Build File, Format Version 6.00 ! # ** DO NOT EDIT ** ! ! # TARGTYPE "Win32 (x86) Console Application" 0x0103 ! ! CFG=testsend - 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 "testsend.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 "testsend.mak" CFG="testsend - Win32 Debug" ! !MESSAGE ! !MESSAGE Possible choices for configuration are: ! !MESSAGE ! !MESSAGE "testsend - Win32 Release" (based on "Win32 (x86) Console Application") ! !MESSAGE "testsend - 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)" == "testsend - Win32 Release" ! ! # 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 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 wsock32.lib /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcd" /out:"bin\testsend.exe" /libpath:"..\lib" ! ! !ELSEIF "$(CFG)" == "testsend - Win32 Debug" ! ! # PROP BASE Use_MFC 0 ! # PROP BASE Use_Debug_Libraries 1 ! # PROP BASE Output_Dir "testsend___Win32_Debug" ! # PROP BASE Intermediate_Dir "testsend___Win32_Debug" ! # PROP BASE Target_Dir "" ! # PROP Use_MFC 0 ! # PROP Use_Debug_Libraries 1 ! # PROP Output_Dir "testsend___Win32_Debug" ! # PROP Intermediate_Dir "testsend___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 /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 openal32.lib alut.lib ccgnu2.lib /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libcd" /out:"bin\testsend.exe" /pdbtype:sept ! ! !ENDIF ! ! # Begin Target ! ! # Name "testsend - Win32 Release" ! # Name "testsend - Win32 Debug" ! # Begin Group "Source Files" ! ! # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" ! # Begin Source File ! ! SOURCE=.\testsend.cpp ! # End Source File ! # End Group ! # Begin Group "Header Files" ! ! # PROP Default_Filter "h;hpp;hxx;hm;inl" ! # End Group ! # Begin Group "Resource Files" ! ! # PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" ! # End Group ! # End Target ! # End Project |
From: Anders B. <vr-...@us...> - 2004-09-23 06:38:05
|
Update of /cvsroot/alpp/openalpp/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12845 Modified Files: moving.cpp simple.cpp Log Message: Uses usleep on all platforms (defined in windowstuff.h) Index: moving.cpp =================================================================== RCS file: /cvsroot/alpp/openalpp/tests/moving.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** moving.cpp 5 Mar 2004 10:14:03 -0000 1.12 --- moving.cpp 23 Sep 2004 06:37:57 -0000 1.13 *************** *** 27,31 **** #include <openalpp/alpp.h> #include <iostream> ! #include <unistd.h> using namespace openalpp; --- 27,31 ---- #include <openalpp/alpp.h> #include <iostream> ! using namespace openalpp; *************** *** 36,45 **** ! int main(int argc, char **argv) { ! std::string file = "bee.wav"; ! if (argc > 1) ! file = argv[1]; try { ! Source beesound(file); beesound.setGain(1); beesound.setLooping(); --- 36,42 ---- ! int main() { try { ! Source beesound("bee.wav"); beesound.setGain(1); beesound.setLooping(); *************** *** 54,62 **** const int no_laps=5; ! std::cerr << "Moving " << file << " 5 laps..." << std::endl; // Do a cheat time loop. while(angle<(M_PI*2.0*no_laps)) { ! usleep(int(delay*1000)); // Wait for delay milliseconds time +=delay/1000; // Calculate the time in the loop --- 51,59 ---- 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 Index: simple.cpp =================================================================== RCS file: /cvsroot/alpp/openalpp/tests/simple.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** simple.cpp 5 Mar 2004 10:14:03 -0000 1.12 --- simple.cpp 23 Sep 2004 06:37:57 -0000 1.13 *************** *** 26,30 **** #include <openalpp/alpp.h> #include <iostream> - #include <unistd.h> using namespace openalpp; --- 26,29 ---- *************** *** 49,53 **** ! std::cerr << "playing " << file << " for 3 seconds: " << std::endl; usleep(3000*1000); // Sleep for a while std::cerr << "Done " << std::endl; --- 48,52 ---- ! std::cerr << "playing bee.wav for 3 seconds: " << std::endl; usleep(3000*1000); // Sleep for a while std::cerr << "Done " << std::endl; |
From: Anders B. <vr-...@us...> - 2004-09-23 06:37:19
|
Update of /cvsroot/alpp/openalpp/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12681 Modified Files: filestream.cpp Log Message: Changed the opening style of the ogg files to binary instead of modifying it afterwards. Index: filestream.cpp =================================================================== RCS file: /cvsroot/alpp/openalpp/src/filestream.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** filestream.cpp 2 Mar 2004 11:01:14 -0000 1.7 --- filestream.cpp 23 Sep 2004 06:37:09 -0000 1.8 *************** *** 36,50 **** 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. */ - /* Beware the evil ifdef. We avoid these where we can, but this one we - cannot. Don't add any more, you'll probably go to hell if you do. */ - _setmode( _fileno( filehandle ), _O_BINARY ); - _setmode( _fileno( filehandle ), _O_BINARY ); - #endif - // Check for file type, create a FileStreamUpdater if a known type is // detected, otherwise throw an error. --- 36,43 ---- throw (NameError,InitError,FileError) : Stream() { ! FILE *filehandle=fopen(filename.c_str(),"rb"); if(!filehandle) throw FileError("FileStream: Couldn't open file: "); // Check for file type, create a FileStreamUpdater if a known type is // detected, otherwise throw an error. |
From: Anders B. <vr-...@us...> - 2004-09-23 06:36:32
|
Update of /cvsroot/alpp/openalpp/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12448 Modified Files: sourcebase.cpp Log Message: Fixed a bug when playing ogg streamed files through the filestream class. Removing the alPlaySourcev to alPlaySource fixes the problem. Index: sourcebase.cpp =================================================================== RCS file: /cvsroot/alpp/openalpp/src/sourcebase.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** sourcebase.cpp 2 Mar 2004 07:50:27 -0000 1.8 --- sourcebase.cpp 23 Sep 2004 06:36:22 -0000 1.9 *************** *** 121,125 **** void SourceBase::play() { ! alSourcePlayv(nlinkedsources_,linkedsources_); } --- 121,126 ---- void SourceBase::play() { ! //alSourcePlayv(nlinkedsources_,linkedsources_); ! alSourcePlay(nlinkedsources_); } |
From: <vr-...@us...> - 2004-03-05 10:28:05
|
Update of /cvsroot/alpp/openalpp/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26857/tests Modified Files: moving.cpp simple.cpp Removed Files: Makefile.in Log Message: Removed all Makefile.in files, should not reside in a CVS repository Index: moving.cpp =================================================================== RCS file: /cvsroot/alpp/openalpp/tests/moving.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** moving.cpp 2 Mar 2004 07:50:27 -0000 1.11 --- moving.cpp 5 Mar 2004 10:14:03 -0000 1.12 *************** *** 36,42 **** ! int main() { try { ! Source beesound("bee.wav"); beesound.setGain(1); beesound.setLooping(); --- 36,45 ---- ! int main(int argc, char **argv) { ! std::string file = "bee.wav"; ! if (argc > 1) ! file = argv[1]; try { ! Source beesound(file); beesound.setGain(1); beesound.setLooping(); *************** *** 51,59 **** 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 --- 54,62 ---- const int no_laps=5; ! std::cerr << "Moving " << file << " 5 laps..." << std::endl; // Do a cheat time loop. while(angle<(M_PI*2.0*no_laps)) { ! usleep(int(delay*1000)); // Wait for delay milliseconds time +=delay/1000; // Calculate the time in the loop Index: simple.cpp =================================================================== RCS file: /cvsroot/alpp/openalpp/tests/simple.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** simple.cpp 2 Mar 2004 07:50:27 -0000 1.11 --- simple.cpp 5 Mar 2004 10:14:03 -0000 1.12 *************** *** 49,53 **** ! std::cerr << "playing bee.wav for 3 seconds: " << std::endl; usleep(3000*1000); // Sleep for a while std::cerr << "Done " << std::endl; --- 49,53 ---- ! std::cerr << "playing " << file << " for 3 seconds: " << std::endl; usleep(3000*1000); // Sleep for a while std::cerr << "Done " << std::endl; --- Makefile.in DELETED --- |
From: <vr-...@us...> - 2004-03-05 10:28:04
|
Update of /cvsroot/alpp/openalpp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26857 Modified Files: INSTALL Removed Files: Makefile.in Log Message: Removed all Makefile.in files, should not reside in a CVS repository Index: INSTALL =================================================================== RCS file: /cvsroot/alpp/openalpp/INSTALL,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** INSTALL 2 Mar 2004 11:01:13 -0000 1.6 --- INSTALL 5 Mar 2004 10:14:02 -0000 1.7 *************** *** 4,16 **** 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 --- 4,31 ---- + Dependencies + ----------- + + OpenAL - http://www.openal.org + Portable low level sound library. Similar to OpenGL. + OpenAL also depends on ogg-vorbis. + + OggVorbis - http://www.vorbis.com/ + Portable library for reading/writing ogg/vorbis files. Which is similar to MP3 in quality and compression, but FREE. + + OpenThreads - http://openthreads.sourceforge.net/ + Portable thread library + + Portaudio - + Portable library for handling input/output devices in a platform independent way. + Download --------- ! To build OpenAL++ you first need to download and install OggVorbis, OpenAL, OpenThreads. + The use of Portaudio is not well tested and should be considered unstable! ! Building OpenAL++ under Linux/Unix ! ----------------------------------- Start by running configure ($ is the prompt): $ ./autogen.sh *************** *** 50,62 **** 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 oalpp.lib oalpp.dll and resides in the lib and the bin directory ! in the project root. --- 65,85 ---- It should work using other compilers too. ! 1. Make sure that the necessary paths (include, lib etc.) are correct. ! For example (in DOS) by using: ! ! DOS> set INCLUDE=%INCLUDE%;path to openal,oggvorbis, openthreads header files ! DOS> set LIB=%LIB%;path to openal, oggvorbis, openthreads libraries ! DOS> set PATH=%PATH%;path to openal, oggvorbis, openthreads dll files ! ! ! 2. Now open up the workspace/projects in your prefered build environment with the /useenv flag (for .NET) ! ! DOS> devenv /useenv visualstudio/openalpp.sln ! ! 3. Build the projec with the sample projects ! ! The library and dll files are named oalpp.lib oalpp.dll and resides in the lib and the bin directory in the project root. ! ! To use OpenAL++ in your own project, add the include, lib and bin directory to the INCLUDE, LIB and PATH environment variables and restart your build environment, dont forget to use the /useenv flag. --- Makefile.in DELETED --- |
From: <vr-...@us...> - 2004-03-05 10:28:04
|
Update of /cvsroot/alpp/openalpp/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26857/src Removed Files: Makefile.in Log Message: Removed all Makefile.in files, should not reside in a CVS repository --- Makefile.in DELETED --- |
From: <vr-...@us...> - 2004-03-05 09:58:38
|
Update of /cvsroot/alpp/openalpp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22159 Modified Files: configure configure.in openalpp.pc.in Log Message: Minor changes. Cleaning up after CommonC++ use. Index: configure =================================================================== RCS file: /cvsroot/alpp/openalpp/configure,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** configure 2 Mar 2004 07:50:10 -0000 1.8 --- configure 5 Mar 2004 09:44:39 -0000 1.9 *************** *** 8292,8296 **** ! # Check whether --enable-shared or --disable-shared was given. --- 8292,8296 ---- ! #AC_CANONICAL_HOST # Check whether --enable-shared or --disable-shared was given. Index: configure.in =================================================================== RCS file: /cvsroot/alpp/openalpp/configure.in,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** configure.in 2 Mar 2004 07:50:10 -0000 1.9 --- configure.in 5 Mar 2004 09:44:39 -0000 1.10 *************** *** 30,34 **** dnl Check system type ! AC_CANONICAL_HOST dnl create only shared libtool-libraries --- 30,34 ---- dnl Check system type ! #AC_CANONICAL_HOST dnl create only shared libtool-libraries Index: openalpp.pc.in =================================================================== RCS file: /cvsroot/alpp/openalpp/openalpp.pc.in,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** openalpp.pc.in 17 Dec 2002 16:42:51 -0000 1.1 --- openalpp.pc.in 5 Mar 2004 09:44:39 -0000 1.2 *************** *** 7,10 **** Description: OpenAL C++ Abstraction Layer Version: @VERSION@ ! Libs: -L${libdir} -lopenalpp -lopenal @CCGNULIBS@ ! Cflags: -I${includedir} @CCGNUCFLAGS@ --- 7,10 ---- Description: OpenAL C++ Abstraction Layer Version: @VERSION@ ! Libs: -L${libdir} -lopenalpp -lopenal -lOpenThreads ! Cflags: -I${includedir} |
Update of /cvsroot/alpp/openalpp/VisualStudio In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29181/VisualStudio Modified Files: moving.dsp moving.vcproj openalpp.dsp openalpp.dsw openalpp.vcproj simple.dsp simple.vcproj testfstream.vcproj testmic.dsp testmic.vcproj Log Message: Minor bugfixes. Cleaned up project files under windows. Index: moving.dsp =================================================================== RCS file: /cvsroot/alpp/openalpp/VisualStudio/moving.dsp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** moving.dsp 12 Dec 2003 06:55:04 -0000 1.6 --- moving.dsp 2 Mar 2004 11:01:14 -0000 1.7 *************** *** 35,47 **** # 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 --- 35,47 ---- # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "..\bin" ! # PROP BASE Intermediate_Dir ".\moving_Debug" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "..\bin" ! # PROP Intermediate_Dir ".\moving_Debug" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /MDd /I "../include" /ZI /W3 /Od /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" /ZI /W3 /Od /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 *************** *** 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 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" --- 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 /nologo /out:"..\bin\$(ProjectName)d.exe" /incremental:yes /libpath:"..\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 /nologo /out:"..\bin\$(ProjectName)d.exe" /incremental:yes /libpath:"..\lib" /debug /pdb:".\Debug\moving.pdb" /pdbtype:sept /subsystem:console /MACHINE:I386 !ELSEIF "$(CFG)" == "moving - Win32 Release" *************** *** 60,72 **** # 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 "" ! # 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 --- 60,72 ---- # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\bin" ! # PROP BASE Intermediate_Dir ".\moving_Release" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\bin" ! # PROP Intermediate_Dir ".\moving_Release" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /MD /I "../include" /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" /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 *************** *** 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 --- 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 /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 /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.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** moving.vcproj 12 Dec 2003 06:55:04 -0000 1.4 --- moving.vcproj 2 Mar 2004 11:01:14 -0000 1.5 *************** *** 15,19 **** Name="Debug|Win32" OutputDirectory="..\bin" ! IntermediateDirectory=".\Debug" ConfigurationType="1" UseOfMFC="0" --- 15,19 ---- Name="Debug|Win32" OutputDirectory="..\bin" ! IntermediateDirectory=".\moving_Debug" ConfigurationType="1" UseOfMFC="0" *************** *** 23,28 **** Name="VCCLCompilerTool" Optimization="0" ! OptimizeForProcessor="1" ! AdditionalIncludeDirectories="../include,../../portaudio/pa_common" PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE" BasicRuntimeChecks="3" --- 23,28 ---- Name="VCCLCompilerTool" Optimization="0" ! OptimizeForProcessor="3" ! AdditionalIncludeDirectories="../include" PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE" BasicRuntimeChecks="3" *************** *** 42,51 **** Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386" - AdditionalDependencies="ccgnu2d.lib" OutputFile="$(OutDir)/$(ProjectName)d.exe" LinkIncremental="2" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="..\lib" ! IgnoreDefaultLibraryNames="libcd.lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\Debug/moving.pdb" --- 42,50 ---- Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386" OutputFile="$(OutDir)/$(ProjectName)d.exe" LinkIncremental="2" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="..\lib" ! IgnoreDefaultLibraryNames="" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\Debug/moving.pdb" *************** *** 78,82 **** Name="Release|Win32" OutputDirectory="..\bin" ! IntermediateDirectory=".\Release" ConfigurationType="1" UseOfMFC="0" --- 77,81 ---- Name="Release|Win32" OutputDirectory="..\bin" ! IntermediateDirectory=".\moving_Release" ConfigurationType="1" UseOfMFC="0" *************** *** 87,91 **** InlineFunctionExpansion="1" OptimizeForProcessor="3" ! AdditionalIncludeDirectories="../include,../../portaudio/pa_common" PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE" StringPooling="TRUE" --- 86,90 ---- InlineFunctionExpansion="1" OptimizeForProcessor="3" ! AdditionalIncludeDirectories="../include" PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE" StringPooling="TRUE" *************** *** 105,109 **** Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386" - AdditionalDependencies=" ccgnu2.lib" OutputFile="$(OutDir)/$(ProjectName).exe" LinkIncremental="1" --- 104,107 ---- Index: openalpp.dsp =================================================================== RCS file: /cvsroot/alpp/openalpp/VisualStudio/openalpp.dsp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** openalpp.dsp 12 Dec 2003 06:55:04 -0000 1.4 --- openalpp.dsp 2 Mar 2004 11:01:14 -0000 1.5 *************** *** 42,47 **** # 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 --- 42,47 ---- # PROP Intermediate_Dir ".\Debug" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /MDd /I "../include" /ZI /W3 /Od /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" /ZI /W3 /Od /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 *************** *** 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 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)" == "oalpp - Win32 Release" --- 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 openthreadswin32d.lib alut.lib openal32.lib winmm.lib dsound.lib vorbisfile_d.lib ogg_d.lib /nologo /dll /out:"..\bin\$(ProjectName)d.dll" /incremental:yes /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 openthreadswin32d.lib alut.lib openal32.lib winmm.lib dsound.lib vorbisfile_d.lib ogg_d.lib /nologo /dll /out:"..\bin\$(ProjectName)d.dll" /incremental:yes /debug /pdb:".\..\lib\openalppd.pdb" /pdbtype:sept /subsystem:windows /implib:"../lib/$(ProjectName)d.lib" /MACHINE:I386 !ELSEIF "$(CFG)" == "oalpp - Win32 Release" *************** *** 67,72 **** # 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 --- 67,72 ---- # PROP Intermediate_Dir ".\Release" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /MD /I "../include" /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" /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 *************** *** 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 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 --- 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 openthreadswin32.lib alut.lib openal32.lib vorbisfile.lib ogg.lib winmm.lib wsock32.lib dsound.lib /nologo /dll /out:"..\bin\$(ProjectName).dll" /incremental:no /nodefaultlib:"LIBC" /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 openthreadswin32.lib alut.lib openal32.lib vorbisfile.lib ogg.lib winmm.lib wsock32.lib dsound.lib /nologo /dll /out:"..\bin\$(ProjectName).dll" /incremental:no /nodefaultlib:"LIBC" /pdb:".\..\lib\openalpp.pdb" /pdbtype:sept /subsystem:windows /implib:"../lib/$(ProjectName).lib" /MACHINE:I386 !ENDIF *************** *** 103,110 **** # Begin Source File - SOURCE=..\src\deviceupdater.cpp - # End Source File - # Begin Source File - SOURCE=..\src\error.cpp # End Source File --- 103,106 ---- *************** *** 123,142 **** # 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 --- 119,126 ---- *************** *** 187,191 **** # Begin Source File ! SOURCE=..\include\openalpp\deviceupdater.h # End Source File # Begin Source File --- 171,175 ---- # Begin Source File ! SOURCE=..\include\openalpp\config.h # End Source File # Begin Source File *************** *** 219,230 **** # 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 --- 203,206 ---- Index: openalpp.dsw =================================================================== RCS file: /cvsroot/alpp/openalpp/VisualStudio/openalpp.dsw,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** openalpp.dsw 11 Dec 2003 09:32:49 -0000 1.3 --- openalpp.dsw 2 Mar 2004 11:01:14 -0000 1.4 *************** *** 40,67 **** ############################################################################### - 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> --- 40,43 ---- *************** *** 76,80 **** ############################################################################### ! Project: "openalpp"=openalpp.dsp - Package Owner=<4> Package=<5> --- 52,56 ---- ############################################################################### ! Project: "oalpp"=openalpp.dsp - Package Owner=<4> Package=<5> Index: openalpp.vcproj =================================================================== RCS file: /cvsroot/alpp/openalpp/VisualStudio/openalpp.vcproj,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** openalpp.vcproj 2 Mar 2004 07:50:27 -0000 1.7 --- openalpp.vcproj 2 Mar 2004 11:01:14 -0000 1.8 *************** *** 23,28 **** Name="VCCLCompilerTool" Optimization="0" ! OptimizeForProcessor="2" ! AdditionalIncludeDirectories="../include,../../portaudio/pa_common" PreprocessorDefinitions="_DEBUG;_WINDOWS;_USRDLL;OPENALPP_EXPORTS;WIN32" BasicRuntimeChecks="3" --- 23,28 ---- Name="VCCLCompilerTool" Optimization="0" ! OptimizeForProcessor="3" ! AdditionalIncludeDirectories="../include" PreprocessorDefinitions="_DEBUG;_WINDOWS;_USRDLL;OPENALPP_EXPORTS;WIN32" BasicRuntimeChecks="3" *************** *** 44,52 **** 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" SuppressStartupBanner="TRUE" ! AdditionalLibraryDirectories="../../portaudio/lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\../lib/openalppd.pdb" --- 44,53 ---- Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386" ! AdditionalDependencies="openthreadswin32d.lib alut.lib openal32.lib winmm.lib dsound.lib vorbisfile_d.lib ogg_d.lib" OutputFile="../bin/$(ProjectName)d.dll" LinkIncremental="2" SuppressStartupBanner="TRUE" ! AdditionalLibraryDirectories="" ! IgnoreDefaultLibraryNames="" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\../lib/openalppd.pdb" *************** *** 92,96 **** InlineFunctionExpansion="1" OptimizeForProcessor="3" ! AdditionalIncludeDirectories="../include,../../portaudio/pa_common" PreprocessorDefinitions="NDEBUG;_WINDOWS;_USRDLL;OPENALPP_EXPORTS;WIN32" StringPooling="TRUE" --- 93,97 ---- InlineFunctionExpansion="1" OptimizeForProcessor="3" ! AdditionalIncludeDirectories="../include" PreprocessorDefinitions="NDEBUG;_WINDOWS;_USRDLL;OPENALPP_EXPORTS;WIN32" StringPooling="TRUE" *************** *** 111,120 **** 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" SuppressStartupBanner="TRUE" ! AdditionalLibraryDirectories="../../portaudio/lib" ! IgnoreDefaultLibraryNames="LIBCD,MSVCRTD" ProgramDatabaseFile=".\../lib/openalpp.pdb" ImportLibrary="../lib/$(ProjectName).lib"/> --- 112,121 ---- Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386" ! AdditionalDependencies="openthreadswin32.lib alut.lib openal32.lib vorbisfile.lib ogg.lib winmm.lib wsock32.lib dsound.lib" OutputFile="../bin/$(ProjectName).dll" LinkIncremental="1" SuppressStartupBanner="TRUE" ! AdditionalLibraryDirectories="" ! IgnoreDefaultLibraryNames="LIBC" ProgramDatabaseFile=".\../lib/openalpp.pdb" ImportLibrary="../lib/$(ProjectName).lib"/> *************** *** 216,219 **** --- 217,223 ---- </File> <File + RelativePath="..\include\openalpp\config.h"> + </File> + <File RelativePath="..\include\openalpp\error.h"> </File> Index: simple.dsp =================================================================== RCS file: /cvsroot/alpp/openalpp/VisualStudio/simple.dsp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** simple.dsp 12 Dec 2003 06:55:04 -0000 1.4 --- simple.dsp 2 Mar 2004 11:01:14 -0000 1.5 *************** *** 35,47 **** # 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 "" ! # 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 --- 35,47 ---- # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\bin" ! # PROP BASE Intermediate_Dir ".\simple_Release" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\bin" ! # PROP Intermediate_Dir ".\simple_Release" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /MD /I "../include" /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" /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 *************** *** 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" --- 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 /nologo /out:"..\bin\$(ProjectName).exe" /incremental:no /libpath:"..\lib" /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 /nologo /out:"..\bin\$(ProjectName).exe" /incremental:no /libpath:"..\lib" /pdb:".\Release\simple.pdb" /pdbtype:sept /subsystem:console /MACHINE:I386 !ELSEIF "$(CFG)" == "simple - Win32 Debug" *************** *** 60,72 **** # 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 --- 60,72 ---- # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "..\bin" ! # PROP BASE Intermediate_Dir ".\simple_Debug" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "..\bin" ! # PROP Intermediate_Dir ".\simple_Debug" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /MDd /I "../include" /ZI /W3 /Od /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" /ZI /W3 /Od /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 *************** *** 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 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 --- 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 /nologo /out:"..\bin\$(ProjectName)d.exe" /incremental:yes /libpath:"..\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 /nologo /out:"..\bin\$(ProjectName)d.exe" /incremental:yes /libpath:"..\lib" /debug /pdb:".\Debug\simple.pdb" /pdbtype:sept /subsystem:console /MACHINE:I386 !ENDIF Index: simple.vcproj =================================================================== RCS file: /cvsroot/alpp/openalpp/VisualStudio/simple.vcproj,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** simple.vcproj 12 Dec 2003 06:55:04 -0000 1.4 --- simple.vcproj 2 Mar 2004 11:01:14 -0000 1.5 *************** *** 15,19 **** Name="Release|Win32" OutputDirectory="..\bin" ! IntermediateDirectory=".\Release" ConfigurationType="1" UseOfMFC="0" --- 15,19 ---- Name="Release|Win32" OutputDirectory="..\bin" ! IntermediateDirectory=".\simple_Release" ConfigurationType="1" UseOfMFC="0" *************** *** 24,28 **** InlineFunctionExpansion="1" OptimizeForProcessor="3" ! AdditionalIncludeDirectories="../include,../../portaudio/pa_common" PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE" StringPooling="TRUE" --- 24,28 ---- InlineFunctionExpansion="1" OptimizeForProcessor="3" ! AdditionalIncludeDirectories="../include" PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE" StringPooling="TRUE" *************** *** 42,51 **** Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386" - AdditionalDependencies="ccgnu2.lib" OutputFile="$(OutDir)/$(ProjectName).exe" LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="..\lib" ! IgnoreDefaultLibraryNames="MSVCRTD,libcd" ProgramDatabaseFile=".\Release/simple.pdb" SubSystem="1"/> --- 42,50 ---- Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386" OutputFile="$(OutDir)/$(ProjectName).exe" LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="..\lib" ! IgnoreDefaultLibraryNames="" ProgramDatabaseFile=".\Release/simple.pdb" SubSystem="1"/> *************** *** 77,81 **** Name="Debug|Win32" OutputDirectory="..\bin" ! IntermediateDirectory=".\Debug" ConfigurationType="1" UseOfMFC="0" --- 76,80 ---- Name="Debug|Win32" OutputDirectory="..\bin" ! IntermediateDirectory=".\simple_Debug" ConfigurationType="1" UseOfMFC="0" *************** *** 85,90 **** Name="VCCLCompilerTool" Optimization="0" ! OptimizeForProcessor="2" ! AdditionalIncludeDirectories="../include,../../portaudio/pa_common" PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE" BasicRuntimeChecks="3" --- 84,89 ---- Name="VCCLCompilerTool" Optimization="0" ! OptimizeForProcessor="3" ! AdditionalIncludeDirectories="../include" PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE" BasicRuntimeChecks="3" *************** *** 104,113 **** Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386" - AdditionalDependencies="ccgnu2d.lib" OutputFile="$(OutDir)/$(ProjectName)d.exe" LinkIncremental="2" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="..\lib" ! IgnoreDefaultLibraryNames="libcd.lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\Debug/simple.pdb" --- 103,111 ---- Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386" OutputFile="$(OutDir)/$(ProjectName)d.exe" LinkIncremental="2" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="..\lib" ! IgnoreDefaultLibraryNames="" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\Debug/simple.pdb" Index: testfstream.vcproj =================================================================== RCS file: /cvsroot/alpp/openalpp/VisualStudio/testfstream.vcproj,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** testfstream.vcproj 12 Dec 2003 06:55:04 -0000 1.3 --- testfstream.vcproj 2 Mar 2004 11:01:14 -0000 1.4 *************** *** 15,19 **** Name="Debug|Win32" OutputDirectory="..\bin" ! IntermediateDirectory=".\testfstream___Win32_Debug" ConfigurationType="1" UseOfMFC="0" --- 15,19 ---- Name="Debug|Win32" OutputDirectory="..\bin" ! IntermediateDirectory=".\testfstream_Debug" ConfigurationType="1" UseOfMFC="0" *************** *** 23,28 **** Name="VCCLCompilerTool" Optimization="0" ! OptimizeForProcessor="2" ! AdditionalIncludeDirectories="../include,../../portaudio/pa_common" PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE" BasicRuntimeChecks="3" --- 23,28 ---- Name="VCCLCompilerTool" Optimization="0" ! OptimizeForProcessor="3" ! AdditionalIncludeDirectories="../include" PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE" BasicRuntimeChecks="3" *************** *** 42,51 **** Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386" - AdditionalDependencies="ccgnu2d.lib" OutputFile="$(OutDir)/$(ProjectName)d.exe" LinkIncremental="2" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="..\lib" ! IgnoreDefaultLibraryNames="libcd" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\testfstream___Win32_Debug/testfstream.pdb" --- 42,50 ---- Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386" OutputFile="$(OutDir)/$(ProjectName)d.exe" LinkIncremental="2" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="..\lib" ! IgnoreDefaultLibraryNames="" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\testfstream___Win32_Debug/testfstream.pdb" *************** *** 78,82 **** Name="Release|Win32" OutputDirectory="..\bin" ! IntermediateDirectory=".\testfstream___Win32_Release" ConfigurationType="1" UseOfMFC="0" --- 77,81 ---- Name="Release|Win32" OutputDirectory="..\bin" ! IntermediateDirectory=".\testfstream_Release" ConfigurationType="1" UseOfMFC="0" *************** *** 87,91 **** InlineFunctionExpansion="1" OptimizeForProcessor="3" ! AdditionalIncludeDirectories="../include,../../portaudio/pa_common" PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE" StringPooling="TRUE" --- 86,90 ---- InlineFunctionExpansion="1" OptimizeForProcessor="3" ! AdditionalIncludeDirectories="../include" PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE" StringPooling="TRUE" *************** *** 105,109 **** Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386" - AdditionalDependencies="ccgnu2.lib" OutputFile="$(OutDir)/$(ProjectName).exe" LinkIncremental="1" --- 104,107 ---- Index: testmic.dsp =================================================================== RCS file: /cvsroot/alpp/openalpp/VisualStudio/testmic.dsp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** testmic.dsp 12 Dec 2003 06:55:04 -0000 1.4 --- testmic.dsp 2 Mar 2004 11:01:14 -0000 1.5 *************** *** 35,47 **** # 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 "" ! # 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".\testmic___Win32_Release/testmic.pch" /Fo".\testmic___Win32_Release/" /Fd".\testmic___Win32_Release/" /FR /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".\testmic___Win32_Release/testmic.pch" /Fo".\testmic___Win32_Release/" /Fd".\testmic___Win32_Release/" /FR /c /GX # ADD BASE MTL /nologo /tlb".\testmic___Win32_Release\testmic.tlb" /win32 # ADD MTL /nologo /tlb".\testmic___Win32_Release\testmic.tlb" /win32 --- 35,47 ---- # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\bin" ! # PROP BASE Intermediate_Dir ".\testmic_Release" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\bin" ! # PROP Intermediate_Dir ".\testmic_Release" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /MD /I "../include" /W3 /Ob1 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /GF /Gy /YX /Fp".\testmic___Win32_Release/testmic.pch" /Fo".\testmic___Win32_Release/" /Fd".\testmic___Win32_Release/" /FR /c /GX ! # ADD CPP /nologo /MD /I "../include" /W3 /Ob1 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /GF /Gy /YX /Fp".\testmic___Win32_Release/testmic.pch" /Fo".\testmic___Win32_Release/" /Fd".\testmic___Win32_Release/" /FR /c /GX # ADD BASE MTL /nologo /tlb".\testmic___Win32_Release\testmic.tlb" /win32 # ADD MTL /nologo /tlb".\testmic___Win32_Release\testmic.tlb" /win32 *************** *** 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" --- 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 /nologo /out:"..\bin\$(ProjectName).exe" /incremental:no /libpath:"..\lib" /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 /nologo /out:"..\bin\$(ProjectName).exe" /incremental:no /libpath:"..\lib" /pdb:".\testmic___Win32_Release\testmic.pdb" /pdbtype:sept /subsystem:console /MACHINE:I386 !ELSEIF "$(CFG)" == "testmic - Win32 Debug" *************** *** 60,72 **** # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "..\bin" ! # PROP BASE Intermediate_Dir ".\testmic___Win32_Debug" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "..\bin" ! # PROP Intermediate_Dir ".\testmic___Win32_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" PRECOMP_VC7_TOBEREMOVED /Fp".\testmic___Win32_Debug/testmic.pch" /Fo".\testmic___Win32_Debug/" /Fd".\testmic___Win32_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" PRECOMP_VC7_TOBEREMOVED /Fp".\testmic___Win32_Debug/testmic.pch" /Fo".\testmic___Win32_Debug/" /Fd".\testmic___Win32_Debug/" /GZ /c /GX # ADD BASE MTL /nologo /tlb".\testmic___Win32_Debug\testmic.tlb" /win32 # ADD MTL /nologo /tlb".\testmic___Win32_Debug\testmic.tlb" /win32 --- 60,72 ---- # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "..\bin" ! # PROP BASE Intermediate_Dir ".\testmic_Debug" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "..\bin" ! # PROP Intermediate_Dir ".\testmic_Debug" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /MDd /I "../include" /ZI /W3 /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" PRECOMP_VC7_TOBEREMOVED /Fp".\testmic___Win32_Debug/testmic.pch" /Fo".\testmic___Win32_Debug/" /Fd".\testmic___Win32_Debug/" /GZ /c /GX ! # ADD CPP /nologo /MDd /I "../include" /ZI /W3 /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" PRECOMP_VC7_TOBEREMOVED /Fp".\testmic___Win32_Debug/testmic.pch" /Fo".\testmic___Win32_Debug/" /Fd".\testmic___Win32_Debug/" /GZ /c /GX # ADD BASE MTL /nologo /tlb".\testmic___Win32_Debug\testmic.tlb" /win32 # ADD MTL /nologo /tlb".\testmic___Win32_Debug\testmic.tlb" /win32 *************** *** 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 ccgnu2d.lib /nologo /out:"..\bin\$(ProjectName)d.exe" /incremental:yes /libpath:"..\lib" /libpath:"..\..\portaudio\lib" /nodefaultlib:"libcd.lib" /debug /pdb:".\testmic___Win32_Debug\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 ccgnu2d.lib /nologo /out:"..\bin\$(ProjectName)d.exe" /incremental:yes /libpath:"..\lib" /libpath:"..\..\portaudio\lib" /nodefaultlib:"libcd.lib" /debug /pdb:".\testmic___Win32_Debug\testmic.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 /nologo /out:"..\bin\$(ProjectName)d.exe" /incremental:yes /libpath:"..\lib" /debug /pdb:".\testmic___Win32_Debug\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 /nologo /out:"..\bin\$(ProjectName)d.exe" /incremental:yes /libpath:"..\lib" /debug /pdb:".\testmic___Win32_Debug\testmic.pdb" /pdbtype:sept /subsystem:console /MACHINE:I386 !ENDIF Index: testmic.vcproj =================================================================== RCS file: /cvsroot/alpp/openalpp/VisualStudio/testmic.vcproj,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** testmic.vcproj 12 Dec 2003 06:55:04 -0000 1.4 --- testmic.vcproj 2 Mar 2004 11:01:14 -0000 1.5 *************** *** 15,19 **** Name="Release|Win32" OutputDirectory="..\bin" ! IntermediateDirectory=".\testmic___Win32_Release" ConfigurationType="1" UseOfMFC="0" --- 15,19 ---- Name="Release|Win32" OutputDirectory="..\bin" ! IntermediateDirectory=".\testmic_Release" ConfigurationType="1" UseOfMFC="0" *************** *** 24,28 **** InlineFunctionExpansion="1" OptimizeForProcessor="3" ! AdditionalIncludeDirectories="../include,../../portaudio/pa_common" PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE" StringPooling="TRUE" --- 24,28 ---- InlineFunctionExpansion="1" OptimizeForProcessor="3" ! AdditionalIncludeDirectories="../include" PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE" StringPooling="TRUE" *************** *** 43,52 **** Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386" - AdditionalDependencies="ccgnu2.lib pastaticdsd.lib dsound.lib winmm.lib" OutputFile="$(OutDir)/$(ProjectName).exe" LinkIncremental="1" SuppressStartupBanner="TRUE" ! AdditionalLibraryDirectories="..\lib,..\..\portaudio\lib" ! IgnoreDefaultLibraryNames="libcd" ProgramDatabaseFile=".\testmic___Win32_Release/testmic.pdb" SubSystem="1"/> --- 43,51 ---- Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386" OutputFile="$(OutDir)/$(ProjectName).exe" LinkIncremental="1" SuppressStartupBanner="TRUE" ! AdditionalLibraryDirectories="..\lib" ! IgnoreDefaultLibraryNames="" ProgramDatabaseFile=".\testmic___Win32_Release/testmic.pdb" SubSystem="1"/> *************** *** 78,82 **** Name="Debug|Win32" OutputDirectory="..\bin" ! IntermediateDirectory=".\testmic___Win32_Debug" ConfigurationType="1" UseOfMFC="0" --- 77,81 ---- Name="Debug|Win32" OutputDirectory="..\bin" ! IntermediateDirectory=".\testmic_Debug" ConfigurationType="1" UseOfMFC="0" *************** *** 86,91 **** Name="VCCLCompilerTool" Optimization="0" ! OptimizeForProcessor="2" ! AdditionalIncludeDirectories="../include,../../portaudio/pa_common" PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE" BasicRuntimeChecks="3" --- 85,90 ---- Name="VCCLCompilerTool" Optimization="0" ! OptimizeForProcessor="3" ! AdditionalIncludeDirectories="../include" PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE" BasicRuntimeChecks="3" *************** *** 104,113 **** Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386" - AdditionalDependencies="ccgnu2d.lib" OutputFile="$(OutDir)/$(ProjectName)d.exe" LinkIncremental="2" SuppressStartupBanner="TRUE" ! AdditionalLibraryDirectories="..\lib,..\..\portaudio\lib" ! IgnoreDefaultLibraryNames="libcd.lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\testmic___Win32_Debug/testmic.pdb" --- 103,111 ---- Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386" OutputFile="$(OutDir)/$(ProjectName)d.exe" LinkIncremental="2" SuppressStartupBanner="TRUE" ! AdditionalLibraryDirectories="..\lib" ! IgnoreDefaultLibraryNames="" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\testmic___Win32_Debug/testmic.pdb" |