Menu
▾
▴
[Alpp-cvs] openalpp/include/openalpp Makefile.am,1.4,1.5 alpp.h,1.7,1.8 audiobase.h,1.5,1.6 audioconvert.h,1.2,1.3 audioenvironment.h,1.3,1.4 config.h,1.2,1.3 error.h,1.4,1.5 export.h,1.1,1.2 filestream.h,1.5,1.6 filestreamupdater.h,1.4,1.5 groupsource.h,1.5,1.6 inputdevice.h,1.6,1.7 listener.h,1.2,1.3 netstream.h,1.6,1.7 positionedobject.h,1.4,1.5 sample.h,1.3,1.4 sounddata.h,1.2,1.3 source.h,1.3,1.4 sourcebase.h,1.3,1.4 stream.h,1.5,1.6 streamupdater.h,1.5,1.6 windowsstuff.h,1.2,1.3
Update of /cvsroot/alpp/openalpp/include/openalpp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26590/include/openalpp Modified Files: Makefile.am alpp.h audiobase.h audioconvert.h audioenvironment.h config.h error.h export.h filestream.h filestreamupdater.h groupsource.h inputdevice.h listener.h netstream.h positionedobject.h sample.h sounddata.h source.h sourcebase.h stream.h streamupdater.h windowsstuff.h Log Message: Changed from initial capital letter for methods. i.e. SetPosition() is now setPosition() to be more C++ compliant. Removed dependency of CommonC++ for threading. CHanged to OpenThreads which is GPL licensed. Removed tests for streaming over the net... (Due to Commonc++ removal) Index: Makefile.am =================================================================== RCS file: /cvsroot/alpp/openalpp/include/openalpp/Makefile.am,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Makefile.am 11 Dec 2003 09:32:49 -0000 1.4 --- Makefile.am 2 Mar 2004 07:50:27 -0000 1.5 *************** *** 10,15 **** inputdevice.h \ listener.h \ - netstream.h \ - netupdater.h \ positionedobject.h \ sample.h \ --- 10,13 ---- *************** *** 24,25 **** --- 22,26 ---- windowsstuff.h \ config.h + + # netstream.h \ + # netupdater.h \ Index: alpp.h =================================================================== RCS file: /cvsroot/alpp/openalpp/include/openalpp/alpp.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** alpp.h 16 Apr 2003 11:15:00 -0000 1.7 --- alpp.h 2 Mar 2004 07:50:27 -0000 1.8 *************** *** 6,10 **** * OpenAL (http://www.openal.org), * PortAudio (http://www.portaudio.com/), and - * CommonC++ (http://cplusplus.sourceforge.net/) * * This library is free software; you can redistribute it and/or --- 6,9 ---- *************** *** 38,43 **** #include "openalpp/groupsource.h" #include "openalpp/sample.h" ! #include "openalpp/inputdevice.h" ! #include "openalpp/netstream.h" #include "openalpp/filestream.h" --- 37,42 ---- #include "openalpp/groupsource.h" #include "openalpp/sample.h" ! //#include "openalpp/inputdevice.h" ! //#include "openalpp/netstream.h" #include "openalpp/filestream.h" Index: audiobase.h =================================================================== RCS file: /cvsroot/alpp/openalpp/include/openalpp/audiobase.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** audiobase.h 16 Apr 2003 11:15:00 -0000 1.5 --- audiobase.h 2 Mar 2004 07:50:27 -0000 1.6 *************** *** 6,10 **** * OpenAL (http://www.openal.org), * PortAudio (http://www.portaudio.com/), and - * CommonC++ (http://cplusplus.sourceforge.net/) * * This library is free software; you can redistribute it and/or --- 6,9 ---- *************** *** 39,48 **** * \mainpage * OpenAL++ is an object oriented API for OpenAL (www.openal.org). It also uses ! * PortAudio (www.portaudio.com) for audio capture and CommonC++ ! * (cplusplus.sourceforge.net) for portable threads and sockets. * In addition to the functionality of OpenAL and ALUT (the OpenAL utility ! * library), OpenAL++ has built-in support for streaming through network ! * sockets and input devices. OpenAL++ also supports "group sources," i.e. ! * sources that consist of several other sources mixed together. * * OpenAL++ has been tested on Windows and Linux. --- 38,44 ---- * \mainpage * OpenAL++ is an object oriented API for OpenAL (www.openal.org). It also uses ! * PortAudio (www.portaudio.com) for audio capture. * In addition to the functionality of OpenAL and ALUT (the OpenAL utility ! * library). * * OpenAL++ has been tested on Windows and Linux. Index: audioconvert.h =================================================================== RCS file: /cvsroot/alpp/openalpp/include/openalpp/audioconvert.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** audioconvert.h 16 Apr 2003 11:15:00 -0000 1.2 --- audioconvert.h 2 Mar 2004 07:50:27 -0000 1.3 *************** *** 10,14 **** * OpenAL (http://www.openal.org), * PortAudio (http://www.portaudio.com/), and - * CommonC++ (http://cplusplus.sourceforge.net/) * * This library is free software; you can redistribute it and/or --- 10,13 ---- *************** *** 60,64 **** * @param size is the size of the data. It will be updated to the new size. */ ! void *Apply(void *data,ALenum format,unsigned int frequency,unsigned int &size); }; --- 59,63 ---- * @param size is the size of the data. It will be updated to the new size. */ ! void *apply(void *data,ALenum format,unsigned int frequency,unsigned int &size); }; Index: audioenvironment.h =================================================================== RCS file: /cvsroot/alpp/openalpp/include/openalpp/audioenvironment.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** audioenvironment.h 16 Apr 2003 11:15:01 -0000 1.3 --- audioenvironment.h 2 Mar 2004 07:50:27 -0000 1.4 *************** *** 6,10 **** * OpenAL (http://www.openal.org), * PortAudio (http://www.portaudio.com/), and - * CommonC++ (http://cplusplus.sourceforge.net/) * * This library is free software; you can redistribute it and/or --- 6,9 ---- *************** *** 101,105 **** * @param speed is the speed of sound in length units per second. */ ! void SetSoundSpeed(float speed) throw (ValueError,FatalError); /** --- 100,104 ---- * @param speed is the speed of sound in length units per second. */ ! void setSoundVelocity(float speed) throw (ValueError,FatalError); /** *************** *** 107,111 **** * @return speed of sound in length units per second. */ ! float GetSoundSpeed() throw (FatalError); /** --- 106,110 ---- * @return speed of sound in length units per second. */ ! float getSoundVelocity() throw (FatalError); /** *************** *** 115,119 **** * @param factor has a default value of one. */ ! void SetDopplerFactor(float factor) throw (ValueError,FatalError); /** --- 114,118 ---- * @param factor has a default value of one. */ ! void setDopplerFactor(float factor) throw (ValueError,FatalError); /** *************** *** 121,125 **** * @return doppler factor. */ ! float GetDopplerFactor() throw (FatalError); /** --- 120,124 ---- * @return doppler factor. */ ! float getDopplerFactor() throw (FatalError); /** *************** *** 131,135 **** * @param gain is the gain [0.0,... */ ! void SetGain(float gain); /** --- 130,134 ---- * @param gain is the gain [0.0,... */ ! void setGain(float gain); /** *************** *** 137,141 **** * @return global gain */ ! float GetGain() throw (FatalError); /** --- 136,140 ---- * @return global gain */ ! float getGain() throw (FatalError); /** *************** *** 143,147 **** * @param model is one of: None, InverseDistance, InverseDistanceClamped. */ ! void SetDistanceModel(DistanceModel model) throw (FatalError); /** --- 142,146 ---- * @param model is one of: None, InverseDistance, InverseDistanceClamped. */ ! void setDistanceModel(DistanceModel model) throw (FatalError); /** *************** *** 149,158 **** * @return the model. */ ! DistanceModel GetDistanceModel() throw (FatalError); /** * Initiates Loki's reverb implementation. */ ! void InitiateReverb() throw (InitError); }; --- 148,157 ---- * @return the model. */ ! DistanceModel getDistanceModel() throw (FatalError); /** * Initiates Loki's reverb implementation. */ ! void initiateReverb() throw (InitError); }; *************** *** 160,166 **** #endif /* AUDIOENVIROMENT_H_INCLUDED_C4211030 */ - - - - - --- 159,160 ---- Index: config.h =================================================================== RCS file: /cvsroot/alpp/openalpp/include/openalpp/config.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** config.h 11 Dec 2003 09:36:37 -0000 1.2 --- config.h 2 Mar 2004 07:50:27 -0000 1.3 *************** *** 6,10 **** * OpenAL (http://www.openal.org), * PortAudio (http://www.portaudio.com/), and - * CommonC++ (http://cplusplus.sourceforge.net/) * * This library is free software; you can redistribute it and/or --- 6,9 ---- Index: error.h =================================================================== RCS file: /cvsroot/alpp/openalpp/include/openalpp/error.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** error.h 16 Apr 2003 11:15:01 -0000 1.4 --- error.h 2 Mar 2004 07:50:27 -0000 1.5 *************** *** 6,10 **** * OpenAL (http://www.openal.org), * PortAudio (http://www.portaudio.com/), and - * CommonC++ (http://cplusplus.sourceforge.net/) * * This library is free software; you can redistribute it and/or --- 6,9 ---- *************** *** 62,66 **** * @return the stream with the error message appended. */ ! std::ostream &Put(std::ostream &stream) const; protected: --- 61,65 ---- * @return the stream with the error message appended. */ ! std::ostream &put(std::ostream &stream) const; protected: Index: export.h =================================================================== RCS file: /cvsroot/alpp/openalpp/include/openalpp/export.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** export.h 16 Apr 2003 11:15:01 -0000 1.1 --- export.h 2 Mar 2004 07:50:27 -0000 1.2 *************** *** 1,8 **** ! // The following ifdef block is the standard way of creating macros which make exporting ! // from a DLL simpler. All files within this DLL are compiled with the OPENALPP_EXPORTS ! // symbol defined on the command line. this symbol should not be defined on any project ! // that uses this DLL. This way any other project whose source files include this file see ! // OPENALPP_API functions as being imported from a DLL, whereas this DLL sees symbols ! // defined with this macro as being exported. #ifndef __openalpp_export_h__ #define __openalpp_export_h__ --- 1,25 ---- ! /** ! * OpenAL++ - an object oriented toolkit for spatial sound ! * Copyright (C) 2002 VRlab, Umeå University ! * ! * OpenAL++ was created using the libraries: ! * OpenAL (http://www.openal.org), ! * PortAudio (http://www.portaudio.com/), and ! * ! * This library is free software; you can redistribute it and/or ! * modify it under the terms of the GNU Lesser General Public ! * License as published by the Free Software Foundation; either ! * version 2.1 of the License, or (at your option) any later version. ! * ! * This library is distributed in the hope that it will be useful, ! * but WITHOUT ANY WARRANTY; without even the implied warranty of ! * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ! * Lesser General Public License for more details. ! * ! * You should have received a copy of the GNU Lesser General Public ! * License along with this library; if not, write to the Free Software ! * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. ! */ ! #ifndef __openalpp_export_h__ #define __openalpp_export_h__ Index: filestream.h =================================================================== RCS file: /cvsroot/alpp/openalpp/include/openalpp/filestream.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** filestream.h 23 May 2003 14:46:43 -0000 1.5 --- filestream.h 2 Mar 2004 07:50:27 -0000 1.6 *************** *** 6,10 **** * OpenAL (http://www.openal.org), * PortAudio (http://www.portaudio.com/), and - * CommonC++ (http://cplusplus.sourceforge.net/) * * This library is free software; you can redistribute it and/or --- 6,9 ---- *************** *** 63,67 **** * @param loop is true if the stream should loop, false otherwise. */ ! void SetLooping(bool loop = true); }; --- 62,66 ---- * @param loop is true if the stream should loop, false otherwise. */ ! void setLooping(bool loop = true); }; Index: filestreamupdater.h =================================================================== RCS file: /cvsroot/alpp/openalpp/include/openalpp/filestreamupdater.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** filestreamupdater.h 23 May 2003 14:46:43 -0000 1.4 --- filestreamupdater.h 2 Mar 2004 07:50:27 -0000 1.5 *************** *** 6,10 **** * OpenAL (http://www.openal.org), * PortAudio (http://www.portaudio.com/), and - * CommonC++ (http://cplusplus.sourceforge.net/) * * This library is free software; you can redistribute it and/or --- 6,9 ---- *************** *** 72,76 **** * @param loop is true if the stream should loop, false otherwise. */ ! void SetLooping(bool loop = true); }; --- 71,75 ---- * @param loop is true if the stream should loop, false otherwise. */ ! void setLooping(bool loop = true); }; Index: groupsource.h =================================================================== RCS file: /cvsroot/alpp/openalpp/include/openalpp/groupsource.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** groupsource.h 16 Apr 2003 11:39:43 -0000 1.5 --- groupsource.h 2 Mar 2004 07:50:27 -0000 1.6 *************** *** 6,10 **** * OpenAL (http://www.openal.org), * PortAudio (http://www.portaudio.com/), and - * CommonC++ (http://cplusplus.sourceforge.net/) * * This library is free software; you can redistribute it and/or --- 6,9 ---- *************** *** 64,68 **** * @return the gain. */ ! OPENALPP_API ALfloat GroupSource::FilterDistance(ALuint source,Speaker speaker); /** --- 63,67 ---- * @return the gain. */ ! OPENALPP_API ALfloat filterDistance(ALuint source,Speaker speaker); /** *************** *** 74,78 **** * @return new pointer to buffer. */ ! OPENALPP_API ALshort *GroupSource::FilterReverb(Source *source,ALshort *buffer, ALsizei &size,unsigned int frequency); --- 73,77 ---- * @return new pointer to buffer. */ ! OPENALPP_API ALshort *filterReverb(Source *source,ALshort *buffer, ALsizei &size,unsigned int frequency); *************** *** 85,89 **** * @return (new) pointer to buffer. */ ! OPENALPP_API ALshort *ApplyFilters(Source *source,ALshort *buffer,ALsizei &size, unsigned int frequency); public: --- 84,88 ---- * @return (new) pointer to buffer. */ ! OPENALPP_API ALshort *applyFilters(Source *source,ALshort *buffer,ALsizei &size, unsigned int frequency); public: *************** *** 101,105 **** * group if it haven't been done yet. */ ! OPENALPP_API void Play() throw (InitError,FileError); /** --- 100,104 ---- * group if it haven't been done yet. */ ! OPENALPP_API void play() throw (InitError,FileError); /** *************** *** 111,115 **** * @param frequency is the frequency that will be used when mixing. */ ! OPENALPP_API void MixSources(unsigned int frequency=22050) throw (InitError,FileError,FatalError,MemoryError,ValueError); --- 110,114 ---- * @param frequency is the frequency that will be used when mixing. */ ! OPENALPP_API void mixSources(unsigned int frequency=22050) throw (InitError,FileError,FatalError,MemoryError,ValueError); *************** *** 121,125 **** * @return identifier for the source. */ ! OPENALPP_API ALuint IncludeSource(Source *source) throw (ValueError); /** --- 120,124 ---- * @return identifier for the source. */ ! OPENALPP_API ALuint includeSource(Source *source) throw (ValueError); /** *************** *** 128,132 **** * @param source is the source to exclude. */ ! OPENALPP_API void ExcludeSource(const Source &source) throw (NameError); /** --- 127,131 ---- * @param source is the source to exclude. */ ! OPENALPP_API void excludeSource(const Source &source) throw (NameError); /** *************** *** 135,139 **** * @param source is the identifier of the source to exclude. */ ! OPENALPP_API void ExcludeSource(ALuint source) throw (NameError); /** --- 134,138 ---- * @param source is the identifier of the source to exclude. */ ! OPENALPP_API void excludeSource(ALuint source) throw (NameError); /** Index: inputdevice.h =================================================================== RCS file: /cvsroot/alpp/openalpp/include/openalpp/inputdevice.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** inputdevice.h 16 Apr 2003 11:15:01 -0000 1.6 --- inputdevice.h 2 Mar 2004 07:50:27 -0000 1.7 *************** *** 6,10 **** * OpenAL (http://www.openal.org), * PortAudio (http://www.portaudio.com/), and - * CommonC++ (http://cplusplus.sourceforge.net/) * * This library is free software; you can redistribute it and/or --- 6,9 ---- *************** *** 40,44 **** * Initialize input. Called by constructor(s). */ ! void Init(); public: /** --- 39,43 ---- * Initialize input. Called by constructor(s). */ ! void init(); public: /** Index: listener.h =================================================================== RCS file: /cvsroot/alpp/openalpp/include/openalpp/listener.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** listener.h 16 Apr 2003 11:15:01 -0000 1.2 --- listener.h 2 Mar 2004 07:50:27 -0000 1.3 *************** *** 6,10 **** * OpenAL (http://www.openal.org), * PortAudio (http://www.portaudio.com/), and - * CommonC++ (http://cplusplus.sourceforge.net/) * * This library is free software; you can redistribute it and/or --- 6,9 ---- *************** *** 40,44 **** float velocity_[3]; static Listener *selectedlistener_; ! void Init(float x,float y,float z, float vx,float vy,float vz, float directionx, float directiony, float directionz, --- 39,43 ---- float velocity_[3]; static Listener *selectedlistener_; ! void init(float x,float y,float z, float vx,float vy,float vz, float directionx, float directiony, float directionz, *************** *** 90,94 **** * Select this listener. */ ! void Select(); /** --- 89,93 ---- * Select this listener. */ ! void select(); /** *************** *** 96,100 **** * @return true if this listener is selected, false otherwise. */ ! bool IsSelected(); /** --- 95,99 ---- * @return true if this listener is selected, false otherwise. */ ! bool isSelected(); /** *************** *** 107,111 **** * @param upz z value of the up vector */ ! void SetOrientation(float directionx,float directiony,float directionz, float upx, float upy, float upz); --- 106,110 ---- * @param upz z value of the up vector */ ! void setOrientation(float directionx,float directiony,float directionz, float upx, float upy, float upz); *************** *** 119,123 **** * @param upz z value of the up vector */ ! void GetOrientation(float &directionx,float &directiony,float &directionz, float &upx, float &upy, float &upz) const; --- 118,122 ---- * @param upz z value of the up vector */ ! void getOrientation(float &directionx,float &directiony,float &directionz, float &upx, float &upy, float &upz) const; *************** *** 131,150 **** * Inherited from PositionedObject. */ ! void SetPosition(float x, float y, float z); /** * Inherited from PositionedObject. */ ! void GetPosition(float &x, float &y, float &z) const; /** * Inherited from PositionedObject. */ ! void SetVelocity(float vx, float vy, float vz); /** * Inherited from PositionedObject. */ ! void GetVelocity(float &vx, float &vy, float &vz) const; }; --- 130,149 ---- * Inherited from PositionedObject. */ ! void setPosition(float x, float y, float z); /** * Inherited from PositionedObject. */ ! void getPosition(float &x, float &y, float &z) const; /** * Inherited from PositionedObject. */ ! void setVelocity(float vx, float vy, float vz); /** * Inherited from PositionedObject. */ ! void getVelocity(float &vx, float &vy, float &vz) const; }; Index: netstream.h =================================================================== RCS file: /cvsroot/alpp/openalpp/include/openalpp/netstream.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** netstream.h 16 Apr 2003 11:15:01 -0000 1.6 --- netstream.h 2 Mar 2004 07:50:27 -0000 1.7 *************** *** 6,10 **** * OpenAL (http://www.openal.org), * PortAudio (http://www.portaudio.com/), and - * CommonC++ (http://cplusplus.sourceforge.net/) * * This library is free software; you can redistribute it and/or --- 6,9 ---- *************** *** 86,87 **** --- 85,87 ---- #endif /* NETSTREAM_H_INCLUDED_C419F72E */ + Index: positionedobject.h =================================================================== RCS file: /cvsroot/alpp/openalpp/include/openalpp/positionedobject.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** positionedobject.h 11 Dec 2003 09:32:49 -0000 1.4 --- positionedobject.h 2 Mar 2004 07:50:27 -0000 1.5 *************** *** 6,10 **** * OpenAL (http://www.openal.org), * PortAudio (http://www.portaudio.com/), and - * CommonC++ (http://cplusplus.sourceforge.net/) * * This library is free software; you can redistribute it and/or --- 6,9 ---- *************** *** 48,52 **** * @param z z coordinate. */ ! virtual void SetPosition(float x, float y, float z)=0; /** --- 47,51 ---- * @param z z coordinate. */ ! virtual void setPosition(float x, float y, float z)=0; /** *************** *** 56,60 **** * @param z z coordinate. */ ! virtual void GetPosition(float &x, float &y, float &z) const =0; /** --- 55,59 ---- * @param z z coordinate. */ ! virtual void getPosition(float &x, float &y, float &z) const =0; /** *************** *** 64,68 **** * @param vz z member of velocity vector. */ ! virtual void SetVelocity(float vx, float vy, float vz)=0; /** --- 63,67 ---- * @param vz z member of velocity vector. */ ! virtual void setVelocity(float vx, float vy, float vz)=0; /** *************** *** 72,76 **** * @param vz z member of velocity vector. */ ! virtual void GetVelocity(float &vx, float &vy, float &vz) const =0; }; --- 71,75 ---- * @param vz z member of velocity vector. */ ! virtual void getVelocity(float &vx, float &vy, float &vz) const =0; }; Index: sample.h =================================================================== RCS file: /cvsroot/alpp/openalpp/include/openalpp/sample.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** sample.h 16 Apr 2003 11:15:01 -0000 1.3 --- sample.h 2 Mar 2004 07:50:27 -0000 1.4 *************** *** 6,10 **** * OpenAL (http://www.openal.org), * PortAudio (http://www.portaudio.com/), and - * CommonC++ (http://cplusplus.sourceforge.net/) * * This library is free software; you can redistribute it and/or --- 6,9 ---- *************** *** 42,46 **** * @param filename is name of file to load. */ ! Sample(const char *filename) throw (FileError); /** --- 41,45 ---- * @param filename is name of file to load. */ ! Sample(const std::string& filename ) throw (FileError); /** *************** *** 53,57 **** * @return file name. */ ! std::string GetFileName() const; /** --- 52,56 ---- * @return file name. */ ! std::string getFileName() const; /** *************** *** 71,76 **** * Check how large a sample is in the given format. */ ! unsigned int SampleSize(SampleFormat format); ! unsigned int SampleSize(ALenum format); } --- 70,75 ---- * Check how large a sample is in the given format. */ ! unsigned int sampleSize(SampleFormat format); ! unsigned int sampleSize(ALenum format); } Index: sounddata.h =================================================================== RCS file: /cvsroot/alpp/openalpp/include/openalpp/sounddata.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** sounddata.h 16 Apr 2003 11:15:01 -0000 1.2 --- sounddata.h 2 Mar 2004 07:50:27 -0000 1.3 *************** *** 6,10 **** * OpenAL (http://www.openal.org), * PortAudio (http://www.portaudio.com/), and - * CommonC++ (http://cplusplus.sourceforge.net/) * * This library is free software; you can redistribute it and/or --- 6,9 ---- *************** *** 46,52 **** SoundBuffer() throw (NameError); ~SoundBuffer(); ! SoundBuffer *Reference(); ! void DeReference() throw (FatalError); ! ALuint GetName() {return buffername_;} }; public: --- 45,51 ---- SoundBuffer() throw (NameError); ~SoundBuffer(); ! SoundBuffer *reference(); ! void deReference() throw (FatalError); ! ALuint getName() {return buffername_;} }; public: *************** *** 55,59 **** * @return the OpenAL name. */ ! ALuint GetAlBuffer() const; /** --- 54,58 ---- * @return the OpenAL name. */ ! ALuint getAlBuffer() const; /** Index: source.h =================================================================== RCS file: /cvsroot/alpp/openalpp/include/openalpp/source.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** source.h 16 Apr 2003 11:15:01 -0000 1.3 --- source.h 2 Mar 2004 07:50:27 -0000 1.4 *************** *** 6,10 **** * OpenAL (http://www.openal.org), * PortAudio (http://www.portaudio.com/), and - * CommonC++ (http://cplusplus.sourceforge.net/) * * This library is free software; you can redistribute it and/or --- 6,9 ---- *************** *** 84,88 **** * @param filename is the name of the file. */ ! void SetSound(const char *filename); /** --- 83,87 ---- * @param filename is the name of the file. */ ! void setSound(const std::string& filename); /** *************** *** 91,95 **** * @param buffer is the new buffer. */ ! void SetSound(const Sample &buffer); /** --- 90,94 ---- * @param buffer is the new buffer. */ ! void setSound(const Sample &buffer); /** *************** *** 98,102 **** * @param stream is the new buffer. */ ! void SetSound(const Stream &stream); /** --- 97,101 ---- * @param stream is the new buffer. */ ! void setSound(const Stream &stream); /** *************** *** 104,108 **** * @return the buffer. */ ! const SoundData &GetSound() const; /** --- 103,107 ---- * @return the buffer. */ ! const SoundData &getSound() const; /** *************** *** 111,115 **** * @param filename is the name of the file to play. */ ! void Play(const char *filename); /** --- 110,114 ---- * @param filename is the name of the file to play. */ ! void play(const std::string& filename); /** *************** *** 118,122 **** * @param buffer is the buffer to play. */ ! void Play(const Sample &buffer); /** --- 117,121 ---- * @param buffer is the buffer to play. */ ! void play(const Sample &buffer); /** *************** *** 125,129 **** * @param stream is the stream to play. */ ! void Play(const Stream &stream); /** --- 124,128 ---- * @param stream is the stream to play. */ ! void play(const Stream &stream); /** *************** *** 131,135 **** * This is only here, because the above Play(...) hides SourceBase::Play() */ ! void Play(); /** --- 130,134 ---- * This is only here, because the above Play(...) hides SourceBase::Play() */ ! void play(); /** *************** *** 137,141 **** * This is needed here for streaming sources... */ ! void Stop(); /** --- 136,140 ---- * This is needed here for streaming sources... */ ! void stop(); /** *************** *** 143,147 **** * This is needed here for streaming sources... */ ! void Pause(); --- 142,146 ---- * This is needed here for streaming sources... */ ! void pause(); *************** *** 150,154 **** * @return true if the source is streaming, false otherwise. */ ! bool IsStreaming(); /** --- 149,153 ---- * @return true if the source is streaming, false otherwise. */ ! bool isStreaming(); /** Index: sourcebase.h =================================================================== RCS file: /cvsroot/alpp/openalpp/include/openalpp/sourcebase.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** sourcebase.h 16 Apr 2003 11:15:01 -0000 1.3 --- sourcebase.h 2 Mar 2004 07:50:27 -0000 1.4 *************** *** 6,10 **** * OpenAL (http://www.openal.org), * PortAudio (http://www.portaudio.com/), and - * CommonC++ (http://cplusplus.sourceforge.net/) * * This library is free software; you can redistribute it and/or --- 6,9 ---- *************** *** 50,69 **** * Play the source. */ ! void Play(); /** * Pause the source. */ ! void Pause(); /** * Stop the source. */ ! void Stop(); /** * Rewind the source. */ ! void Rewind(); /** --- 49,68 ---- * Play the source. */ ! void play(); /** * Pause the source. */ ! void pause(); /** * Stop the source. */ ! void stop(); /** * Rewind the source. */ ! void rewind(); /** *************** *** 71,75 **** * @return one of Initial,Playing,Paused,Stopped */ ! SourceState GetState() const; /** --- 70,74 ---- * @return one of Initial,Playing,Paused,Stopped */ ! SourceState getState() const; /** *************** *** 77,81 **** * @param loop is true if the source should loop, false otherwise. */ ! void SetLooping(bool loop = true); /** --- 76,80 ---- * @param loop is true if the source should loop, false otherwise. */ ! void setLooping(bool loop = true); /** *************** *** 83,87 **** * @return true if it's looping, false otherwise. */ ! bool IsLooping() const; /** --- 82,86 ---- * @return true if it's looping, false otherwise. */ ! bool isLooping() const; /** *************** *** 91,95 **** * @param directionz z value of the direction vector. */ ! void SetDirection(float directionx, float directiony, float directionz); /** --- 90,94 ---- * @param directionz z value of the direction vector. */ ! void setDirection(float directionx, float directiony, float directionz); /** *************** *** 99,103 **** * @param directionz z value of the direction vector. */ ! void GetDirection(float &directionx,float &directiony,float &directionz) const; /** --- 98,102 ---- * @param directionz z value of the direction vector. */ ! void getDirection(float &directionx,float &directiony,float &directionz) const; /** *************** *** 105,109 **** * The same effect can be achieved by calling SetDirection(0,0,0) */ ! void MakeOmniDirectional(); /** --- 104,108 ---- * The same effect can be achieved by calling SetDirection(0,0,0) */ ! void makeOmniDirectional(); /** *************** *** 120,124 **** * @param outergain specifies the gain outside the outer cone. */ ! void SetSoundCone(float innerangle, float outerangle=360.0,float outergain=0.0); --- 119,123 ---- * @param outergain specifies the gain outside the outer cone. */ ! void setSoundCone(float innerangle, float outerangle=360.0,float outergain=0.0); *************** *** 129,133 **** * @param outergain specifies the gain outside the outer cone. */ ! void GetSoundCone(float &innerangle,float &outerangle,float &outergain)const; /** --- 128,132 ---- * @param outergain specifies the gain outside the outer cone. */ ! void getSoundCone(float &innerangle,float &outerangle,float &outergain)const; /** *************** *** 139,143 **** * @param gain is the gain [0.0,... */ ! void SetGain(float gain); /** --- 138,142 ---- * @param gain is the gain [0.0,... */ ! void setGain(float gain); /** *************** *** 145,149 **** * @return gain. */ ! float GetGain() const; /** --- 144,148 ---- * @return gain. */ ! float getGain() const; /** *************** *** 153,157 **** * @param max is maximum gain. */ ! void SetMinMaxGain(float min = 0.0, float max = 1.0); /** --- 152,156 ---- * @param max is maximum gain. */ ! void setMinMaxGain(float min = 0.0, float max = 1.0); /** *************** *** 160,164 **** * @param max is maximum gain. */ ! void GetMinMaxGain(float & min, float &max) const; /** --- 159,163 ---- * @param max is maximum gain. */ ! void getMinMaxGain(float & min, float &max) const; /** *************** *** 168,172 **** * @param ambient is true if the source should be ambient, false otherwise. */ ! void SetAmbient(bool ambient = true); /** --- 167,171 ---- * @param ambient is true if the source should be ambient, false otherwise. */ ! void setAmbient(bool ambient = true); /** *************** *** 174,178 **** * @return true if the source is ambient, false otherwise. */ ! bool IsAmbient() const; /** --- 173,177 ---- * @return true if the source is ambient, false otherwise. */ ! bool isAmbient() const; /** *************** *** 182,186 **** * @param relative is true if the source should be relative, false otherwise. */ ! void SetRelative(bool relative = true); /** --- 181,185 ---- * @param relative is true if the source should be relative, false otherwise. */ ! void setRelative(bool relative = true); /** *************** *** 188,192 **** * @return true if the source is relative, false otherwise. */ ! bool IsRelative() const; /** --- 187,191 ---- * @return true if the source is relative, false otherwise. */ ! bool isRelative() const; /** *************** *** 195,199 **** * @param distance is the reference distance. */ ! void SetReferenceDistance(float distance = 1.0); /** --- 194,198 ---- * @param distance is the reference distance. */ ! void setReferenceDistance(float distance = 1.0); /** *************** *** 201,205 **** * @return reference distance. */ ! float GetReferenceDistance() const; /** --- 200,204 ---- * @return reference distance. */ ! float getReferenceDistance() const; /** *************** *** 209,213 **** * @param distance is the maximum distance. */ ! void SetMaxDistance(float distance); // = MAX_FLOAT); /** --- 208,212 ---- * @param distance is the maximum distance. */ ! void setMaxDistance(float distance); // = MAX_FLOAT); /** *************** *** 215,219 **** * @return maximum distance. */ ! float GetMaxDistance() const; /** --- 214,218 ---- * @return maximum distance. */ ! float getMaxDistance() const; /** *************** *** 222,226 **** * @param factor is the rolloff factor. */ ! void SetRolloffFactor(float factor = 1.0); /** --- 221,225 ---- * @param factor is the rolloff factor. */ ! void setRolloffFactor(float factor = 1.0); /** *************** *** 228,232 **** * @return rolloff factor. */ ! float GetRolloffFactor() const; /** --- 227,231 ---- * @return rolloff factor. */ ! float getRolloffFactor() const; /** *************** *** 235,239 **** * @param pitch is the pitch (0.0,1.0]. */ ! void SetPitch(float pitch = 1.0); /** --- 234,238 ---- * @param pitch is the pitch (0.0,1.0]. */ ! void setPitch(float pitch = 1.0); /** *************** *** 241,245 **** * @return pitch. */ ! float GetPitch() const; /** --- 240,244 ---- * @return pitch. */ ! float getPitch() const; /** *************** *** 249,253 **** * @param scale is the reverb scale [0.0-1.0]. */ ! void SetReverbScale(float scale) throw (InitError,ValueError); /** --- 248,252 ---- * @param scale is the reverb scale [0.0-1.0]. */ ! void setReverbScale(float scale) throw (InitError,ValueError); /** *************** *** 257,261 **** * @param delay is the delay [0.0-2.0] in seconds. */ ! void SetReverbDelay(float delay) throw (InitError,ValueError); /** --- 256,260 ---- * @param delay is the delay [0.0-2.0] in seconds. */ ! void setReverbDelay(float delay) throw (InitError,ValueError); /** *************** *** 263,267 **** * @return the delay. */ ! float GetReverbDelay() throw (InitError); /** --- 262,266 ---- * @return the delay. */ ! float getReverbDelay() throw (InitError); /** *************** *** 269,273 **** * @return the scale. */ ! float GetReverbScale() throw (InitError); /** --- 268,272 ---- * @return the scale. */ ! float getReverbScale() throw (InitError); /** *************** *** 279,283 **** * it. */ ! ALuint Link(const SourceBase &source) throw (MemoryError); /** --- 278,282 ---- * it. */ ! ALuint link(const SourceBase &source) throw (MemoryError); /** *************** *** 285,289 **** * @param source is the source to unlink. */ ! void Unlink(const SourceBase &source) throw (NameError); /** --- 284,288 ---- * @param source is the source to unlink. */ ! void unlink(const SourceBase &source) throw (NameError); /** *************** *** 291,300 **** * @param name is the name of the source to unlink. */ ! void Unlink(const ALuint name) throw (NameError); /** * Unlink all sources from this. */ ! void UnlinkAll(); /** --- 290,299 ---- * @param name is the name of the source to unlink. */ ! void unlink(const ALuint name) throw (NameError); /** * Unlink all sources from this. */ ! void unlinkAll(); /** *************** *** 302,326 **** * Can be used to directly modify the source with OpenAL functions. */ ! ALuint GetAlSource() const; /** * Inherited from PositionedObject. */ ! void SetPosition(float x, float y, float z); /** * Inherited from PositionedObject. */ ! void GetPosition(float &x, float &y, float &z) const; /** * Inherited from PositionedObject. */ ! void SetVelocity(float vx, float vy, float vz); /** * Inherited from PositionedObject. */ ! void GetVelocity(float &vx, float &vy, float &vz) const; /** --- 301,325 ---- * Can be used to directly modify the source with OpenAL functions. */ ! ALuint getAlSource() const; /** * Inherited from PositionedObject. */ ! void setPosition(float x, float y, float z); /** * Inherited from PositionedObject. */ ! void getPosition(float &x, float &y, float &z) const; /** * Inherited from PositionedObject. */ ! void setVelocity(float vx, float vy, float vz); /** * Inherited from PositionedObject. */ ! void getVelocity(float &vx, float &vy, float &vz) const; /** *************** *** 366,370 **** * Used by constructors. */ ! void Init() throw (MemoryError,NameError); /** --- 365,369 ---- * Used by constructors. */ ! void init() throw (MemoryError,NameError); /** Index: stream.h =================================================================== RCS file: /cvsroot/alpp/openalpp/include/openalpp/stream.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** stream.h 16 Apr 2003 11:15:01 -0000 1.5 --- stream.h 2 Mar 2004 07:50:27 -0000 1.6 *************** *** 6,10 **** * OpenAL (http://www.openal.org), * PortAudio (http://www.portaudio.com/), and - * CommonC++ (http://cplusplus.sourceforge.net/) * * This library is free software; you can redistribute it and/or --- 6,9 ---- *************** *** 71,75 **** * @param sourcename is the (OpenAL) name of the source. */ ! void Record(ALuint sourcename); /** --- 70,74 ---- * @param sourcename is the (OpenAL) name of the source. */ ! void record(ALuint sourcename); /** *************** *** 77,81 **** * @param sourcename is the (OpenAL) name of the source. */ ! void Stop(ALuint sourcename); }; --- 76,80 ---- * @param sourcename is the (OpenAL) name of the source. */ ! void stop(ALuint sourcename); }; Index: streamupdater.h =================================================================== RCS file: /cvsroot/alpp/openalpp/include/openalpp/streamupdater.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** streamupdater.h 16 Apr 2003 11:15:02 -0000 1.5 --- streamupdater.h 2 Mar 2004 07:50:27 -0000 1.6 *************** *** 6,10 **** * OpenAL (http://www.openal.org), * PortAudio (http://www.portaudio.com/), and - * CommonC++ (http://cplusplus.sourceforge.net/) * * This library is free software; you can redistribute it and/or --- 6,9 ---- *************** *** 27,31 **** ! #include <cc++/thread.h> #include <vector> --- 26,30 ---- ! //#include <cc++/thread.h> #include <vector> *************** *** 40,43 **** --- 39,44 ---- #include "openalpp/error.h" #include "openalpp/windowsstuff.h" + #include "OpenThreads/Thread" + #include "OpenThreads/Mutex" namespace openalpp { *************** *** 46,50 **** * Base class for (threaded) updating of stream buffers. */ ! class StreamUpdater : public ost::Thread,ost::Mutex { /** * #references to this instance. --- 47,51 ---- * Base class for (threaded) updating of stream buffers. */ ! class StreamUpdater : public OpenThreads::Thread, public OpenThreads::Mutex { //ost::Mutex { /** * #references to this instance. *************** *** 72,76 **** * @param sourcename is the OpenAL name of the source. */ ! OPENALPP_API void AddSource(ALuint sourcename); /** --- 73,77 ---- * @param sourcename is the OpenAL name of the source. */ ! OPENALPP_API void addSource(ALuint sourcename); /** *************** *** 78,82 **** * @param sourcename is the OpenAL name of the source. */ ! OPENALPP_API void RemoveSource(ALuint sourcename); /** --- 79,83 ---- * @param sourcename is the OpenAL name of the source. */ ! OPENALPP_API void removeSource(ALuint sourcename); /** *************** *** 87,97 **** * @return done flag. I.e. stoprunning_. */ ! OPENALPP_API bool Update(void *buffer,unsigned int length); /** * Inherited from Thread. ! * Is called after Run() finishes, and deletes this. */ ! OPENALPP_API void final(); /** --- 88,98 ---- * @return done flag. I.e. stoprunning_. */ ! OPENALPP_API bool update(void *buffer,unsigned int length); /** * Inherited from Thread. ! * Is called after run() finishes, and deletes this. */ ! OPENALPP_API void cancelCleanup(); /** *************** *** 99,108 **** * @return this. */ ! OPENALPP_API StreamUpdater *Reference(); /** * Dereference this updater. */ ! OPENALPP_API void DeReference() throw (FatalError); protected: /** --- 100,109 ---- * @return this. */ ! OPENALPP_API StreamUpdater *reference(); /** * Dereference this updater. */ ! OPENALPP_API void deReference() throw (FatalError); protected: /** *************** *** 134,138 **** * Mutex for stoprunning_. */ ! ost::Mutex runmutex_; }; --- 135,140 ---- * Mutex for stoprunning_. */ ! //ost::Mutex runmutex_; ! OpenThreads::Mutex runmutex_; }; Index: windowsstuff.h =================================================================== RCS file: /cvsroot/alpp/openalpp/include/openalpp/windowsstuff.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** windowsstuff.h 16 Apr 2003 11:15:02 -0000 1.2 --- windowsstuff.h 2 Mar 2004 07:50:27 -0000 1.3 *************** *** 6,10 **** * OpenAL (http://www.openal.org), * PortAudio (http://www.portaudio.com/), and - * CommonC++ (http://cplusplus.sourceforge.net/) * * This library is free software; you can redistribute it and/or --- 6,9 ---- *************** *** 31,34 **** --- 30,36 ---- #include "openalpp/export.h" + #include <windows.h> + #define usleep(x) Sleep((x)/1000) + #include <AL/alut.h> |
