Menu
▾
▴
[Alpp-cvs] openalpp/include/openalpp export.h,NONE,1.1 alpp.h,1.6,1.7 audiobase.h,1.4,1.5 audioconvert.h,1.1,1.2 audioenvironment.h,1.2,1.3 deviceupdater.h,1.1,1.2 error.h,1.3,1.4 filestream.h,1.3,1.4 filestreamupdater.h,1.1,1.2 groupsource.h,1.2,1.3 inputdevice.h,1.5,1.6 listener.h,1.1,1.2 netstream.h,1.5,1.6 netupdater.h,1.2,1.3 positionedobject.h,1.2,1.3 sample.h,1.2,1.3 sounddata.h,1.1,1.2 source.h,1.2,1.3 sourcebase.h,1.2,1.3 stream.h,1.4,1.5 streamupdater.h,1.4,1.5 windowsstuff.h,1.1,1.2
Update of /cvsroot/alpp/openalpp/include/openalpp
In directory sc8-pr-cvs1:/tmp/cvs-serv8710/include/openalpp
Modified Files:
alpp.h audiobase.h audioconvert.h audioenvironment.h
deviceupdater.h error.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:
export.h
Log Message:
Changed windows version to dynamic library style. (Only under .NET)
Fixed filestream.cpp so it works under windows.
--- NEW FILE: export.h ---
// 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__
#ifdef _WIN32
#pragma once
#include <windows.h>
#ifdef OPENALPP_EXPORTS
#define OPENALPP_API __declspec(dllexport)
#else
#define OPENALPP_API __declspec(dllimport)
#endif
#else
#define OPENALPP_API
#endif
// This class is exported from the openalpp.dll
//class OPENALPP_API Copenalpp {
//public:
// Copenalpp(void);
// // TODO: add your methods here.
//};
//extern OPENALPP_API int nopenalpp;
//OPENALPP_API int fnopenalpp(void);
#endif
Index: alpp.h
===================================================================
RCS file: /cvsroot/alpp/openalpp/include/openalpp/alpp.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** alpp.h 21 Feb 2003 14:37:10 -0000 1.6
--- alpp.h 16 Apr 2003 11:15:00 -0000 1.7
***************
*** 32,35 ****
--- 32,36 ----
*/
+ #include "openalpp/export.h"
#include "openalpp/source.h"
#include "openalpp/audioenvironment.h"
Index: audiobase.h
===================================================================
RCS file: /cvsroot/alpp/openalpp/include/openalpp/audiobase.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** audiobase.h 21 Feb 2003 14:37:10 -0000 1.4
--- audiobase.h 16 Apr 2003 11:15:00 -0000 1.5
***************
*** 26,29 ****
--- 26,30 ----
#define AUDIOBASE_H_INCLUDED_C41996D8
+ #include "openalpp/export.h"
#include <cstdlib>
extern "C" {
***************
*** 66,70 ****
* Takes care of initialisation/shutdown of anything necessary (e.g. ALut)
*/
! class AudioBase {
/**
* Counter for #instances for enviroment, listener and source classes.
--- 67,71 ----
* Takes care of initialisation/shutdown of anything necessary (e.g. ALut)
*/
! class OPENALPP_API AudioBase {
/**
* Counter for #instances for enviroment, listener and source classes.
***************
*** 94,98 ****
* default should be used.
*/
! AudioBase(int frequency=-1,int refresh=-1,int synchronous=-1)
throw (InitError);
--- 95,99 ----
* default should be used.
*/
! AudioBase(int frequency=-1,int refresh=-1,int synchronous=-1)
throw (InitError);
***************
*** 100,104 ****
* Destructor.
*/
! virtual ~AudioBase();
/**
--- 101,105 ----
* Destructor.
*/
! virtual ~AudioBase();
/**
Index: audioconvert.h
===================================================================
RCS file: /cvsroot/alpp/openalpp/include/openalpp/audioconvert.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** audioconvert.h 18 Oct 2002 07:50:10 -0000 1.1
--- audioconvert.h 16 Apr 2003 11:15:00 -0000 1.2
***************
*** 30,33 ****
--- 30,34 ----
#define AUDIOCONVERT_H_INCLUDED
+ #include "openalpp/export.h"
#include <AL/al.h>
#include <stdlib.h>
***************
*** 40,44 ****
* Class for converting audio.
*/
! class AudioConvert {
unsigned short channels_,bits_;
unsigned int frequency_;
--- 41,45 ----
* Class for converting audio.
*/
! class OPENALPP_API AudioConvert {
unsigned short channels_,bits_;
unsigned int frequency_;
Index: audioenvironment.h
===================================================================
RCS file: /cvsroot/alpp/openalpp/include/openalpp/audioenvironment.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** audioenvironment.h 2 Apr 2003 14:11:25 -0000 1.2
--- audioenvironment.h 16 Apr 2003 11:15:01 -0000 1.3
***************
*** 54,57 ****
--- 54,60 ----
* and distance, respectively.
*/
+
+ #include "openalpp/export.h"
+
#ifdef None
#undef None // Defined in X-headers
***************
*** 64,68 ****
* parameters.
*/
! class AudioEnvironment : public AudioBase {
public:
/**
--- 67,71 ----
* parameters.
*/
! class OPENALPP_API AudioEnvironment : public AudioBase {
public:
/**
Index: deviceupdater.h
===================================================================
RCS file: /cvsroot/alpp/openalpp/include/openalpp/deviceupdater.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** deviceupdater.h 18 Oct 2002 07:50:10 -0000 1.1
--- deviceupdater.h 16 Apr 2003 11:15:01 -0000 1.2
***************
*** 26,32 ****
--- 26,34 ----
#define DEVICEUPDATER_H_INCLUDED_C419EA9C
+
#include "openalpp/streamupdater.h"
#include "openalpp/error.h"
#include <portaudio.h>
+ #include "openalpp/export.h"
namespace openalpp {
***************
*** 35,39 ****
* Updater for sound input devices (like microphones).
*/
! class DeviceUpdater : public StreamUpdater, public ost::Semaphore {
PortAudioStream *stream_;
ost::Mutex inputmutex;
--- 37,41 ----
* Updater for sound input devices (like microphones).
*/
! class DeviceUpdater : public StreamUpdater, public ost::Semaphore {
PortAudioStream *stream_;
ost::Mutex inputmutex;
***************
*** 52,56 ****
* @param buffer2 are the (OpenAL) buffers to use.
*/
! DeviceUpdater(int device, unsigned int frequency,unsigned int buffersize,
SampleFormat format,
ALuint buffer1,ALuint buffer2);
--- 54,58 ----
* @param buffer2 are the (OpenAL) buffers to use.
*/
! OPENALPP_API DeviceUpdater(int device, unsigned int frequency,unsigned int buffersize,
SampleFormat format,
ALuint buffer1,ALuint buffer2);
***************
*** 59,63 ****
* Destructor.
*/
! ~DeviceUpdater();
/**
--- 61,65 ----
* Destructor.
*/
! OPENALPP_API ~DeviceUpdater();
/**
***************
*** 65,79 ****
* This will be called when the updater is Start():ed..
*/
! void run();
/**
* Enter critical section.
*/
! inline void Enter() {inputmutex.enterMutex();}
/**
* Leave critical section.
*/
! inline void Leave() {inputmutex.leaveMutex();}
/**
--- 67,81 ----
* This will be called when the updater is Start():ed..
*/
! OPENALPP_API void run();
/**
* Enter critical section.
*/
! OPENALPP_API inline void Enter() {inputmutex.enterMutex();}
/**
* Leave critical section.
*/
! OPENALPP_API inline void Leave() {inputmutex.leaveMutex();}
/**
***************
*** 83,87 ****
* @param length is the length - in bytes - of the buffer
*/
! void CopyInput(void *tempbuffer,int length);
};
--- 85,89 ----
* @param length is the length - in bytes - of the buffer
*/
! OPENALPP_API void CopyInput(void *tempbuffer,int length);
};
Index: error.h
===================================================================
RCS file: /cvsroot/alpp/openalpp/include/openalpp/error.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** error.h 13 Dec 2002 13:03:42 -0000 1.3
--- error.h 16 Apr 2003 11:15:01 -0000 1.4
***************
*** 29,32 ****
--- 29,33 ----
#include <string>
#include <stdexcept>
+ #include "openalpp/export.h"
namespace openalpp {
***************
*** 37,41 ****
* of Error (or one of its descendants)
*/
! class Error : public std::runtime_error {
public:
/**
--- 38,42 ----
* of Error (or one of its descendants)
*/
! class Error : public std::runtime_error {
public:
/**
***************
*** 73,77 ****
* Caused by error in implementation, corrupted memory etc.
*/
! class FatalError : public Error {
public:
/**
--- 74,78 ----
* Caused by error in implementation, corrupted memory etc.
*/
! class FatalError : public Error {
public:
/**
***************
*** 86,90 ****
* Caused by wrong file permissions, missing files etc.
*/
! class FileError : public Error {
public:
/**
--- 87,91 ----
* Caused by wrong file permissions, missing files etc.
*/
! class FileError : public Error {
public:
/**
***************
*** 99,103 ****
* Caused by insufficient memory etc.
*/
! class MemoryError : public Error {
public:
/**
--- 100,104 ----
* Caused by insufficient memory etc.
*/
! class MemoryError : public Error {
public:
/**
***************
*** 112,116 ****
* Caused by invalid (OpenAL) names.
*/
! class NameError : public Error {
public:
/**
--- 113,117 ----
* Caused by invalid (OpenAL) names.
*/
! class NameError : public Error {
public:
/**
***************
*** 125,129 ****
* Caused by values out of range etc.
*/
! class ValueError : public Error {
public:
/**
--- 126,130 ----
* Caused by values out of range etc.
*/
! class ValueError : public Error {
public:
/**
***************
*** 138,142 ****
* Caused by trying to do actions without proper initialization.
*/
! class InitError : public Error {
public:
/**
--- 139,143 ----
* Caused by trying to do actions without proper initialization.
*/
! class InitError : public Error {
public:
/**
***************
*** 154,158 ****
* @return the stream.
*/
! std::ostream &operator<<(std::ostream &stream,const Error &error);
}
--- 155,159 ----
* @return the stream.
*/
! OPENALPP_API std::ostream &operator<<(std::ostream &stream,const Error &error);
}
Index: filestream.h
===================================================================
RCS file: /cvsroot/alpp/openalpp/include/openalpp/filestream.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** filestream.h 7 Mar 2003 20:36:27 -0000 1.3
--- filestream.h 16 Apr 2003 11:15:01 -0000 1.4
***************
*** 27,30 ****
--- 27,31 ----
#include "openalpp/stream.h"
+ #include "openalpp/export.h"
namespace openalpp {
***************
*** 34,38 ****
* Vorbis files (http://www.vorbis.com/).
*/
! class FileStream : public Stream {
public:
/**
--- 35,39 ----
* Vorbis files (http://www.vorbis.com/).
*/
! class OPENALPP_API FileStream : public Stream {
public:
/**
Index: filestreamupdater.h
===================================================================
RCS file: /cvsroot/alpp/openalpp/include/openalpp/filestreamupdater.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** filestreamupdater.h 15 Feb 2003 02:30:50 -0000 1.1
--- filestreamupdater.h 16 Apr 2003 11:15:01 -0000 1.2
***************
*** 25,33 ****
#ifndef FILESTREAMUPDATER_H_INCLUDED
#define FILESTREAMUPDATER_H_INCLUDED
-
#include "openalpp/streamupdater.h"
#include "stdlib.h"
#include <vorbis/codec.h>
#include <vorbis/vorbisfile.h>
namespace openalpp {
--- 25,35 ----
#ifndef FILESTREAMUPDATER_H_INCLUDED
#define FILESTREAMUPDATER_H_INCLUDED
#include "openalpp/streamupdater.h"
#include "stdlib.h"
#include <vorbis/codec.h>
#include <vorbis/vorbisfile.h>
+ #include "openalpp/export.h"
+
+
namespace openalpp {
***************
*** 36,40 ****
* Updater for streams from files.
*/
! class FileStreamUpdater : public StreamUpdater {
OggVorbis_File *oggfile_; // The file structure
unsigned int buffersize_; // Size of the buffer in bytes
--- 38,42 ----
* Updater for streams from files.
*/
! class OPENALPP_API FileStreamUpdater : public StreamUpdater {
OggVorbis_File *oggfile_; // The file structure
unsigned int buffersize_; // Size of the buffer in bytes
Index: groupsource.h
===================================================================
RCS file: /cvsroot/alpp/openalpp/include/openalpp/groupsource.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** groupsource.h 19 Feb 2003 18:35:08 -0000 1.2
--- groupsource.h 16 Apr 2003 11:15:01 -0000 1.3
***************
*** 26,29 ****
--- 26,31 ----
#define GROUPSOURCE_H_INCLUDED_C427B440
+ #include "openalpp/export.h"
+
#include "openalpp/source.h"
#include "openalpp/audioconvert.h"
***************
*** 40,44 ****
* problem is that the sources cannot be moved separately.
*/
! class GroupSource : public SourceBase {
/**
* Flag for whether the sources have been mixed yet.
--- 42,46 ----
* problem is that the sources cannot be moved separately.
*/
! class OPENALPP_API GroupSource : public SourceBase {
/**
* Flag for whether the sources have been mixed yet.
Index: inputdevice.h
===================================================================
RCS file: /cvsroot/alpp/openalpp/include/openalpp/inputdevice.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** inputdevice.h 7 Mar 2003 20:36:29 -0000 1.5
--- inputdevice.h 16 Apr 2003 11:15:01 -0000 1.6
***************
*** 26,29 ****
--- 26,30 ----
#define INPUTDEVICE_H_INCLUDED_C41987DC
+ #include "openalpp/export.h"
#include "openalpp/stream.h"
***************
*** 33,37 ****
* Class for handling input devices, like microphones.
*/
! class InputDevice : public Stream {
static int nobjects_;
--- 34,38 ----
* Class for handling input devices, like microphones.
*/
! class OPENALPP_API InputDevice : public Stream {
static int nobjects_;
Index: listener.h
===================================================================
RCS file: /cvsroot/alpp/openalpp/include/openalpp/listener.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** listener.h 18 Oct 2002 07:50:11 -0000 1.1
--- listener.h 16 Apr 2003 11:15:01 -0000 1.2
***************
*** 25,28 ****
--- 25,31 ----
#ifndef LISTENER_H_INCLUDED_C419EF1E
#define LISTENER_H_INCLUDED_C419EF1E
+
+
+ #include "openalpp/export.h"
#include "openalpp/positionedobject.h"
***************
*** 32,36 ****
* Class for listeners.
*/
! class Listener : public PositionedObject {
float position_[3];
float orientation_[6];
--- 35,39 ----
* Class for listeners.
*/
! class OPENALPP_API Listener : public PositionedObject {
float position_[3];
float orientation_[6];
Index: netstream.h
===================================================================
RCS file: /cvsroot/alpp/openalpp/include/openalpp/netstream.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** netstream.h 7 Mar 2003 20:37:21 -0000 1.5
--- netstream.h 16 Apr 2003 11:15:01 -0000 1.6
***************
*** 27,30 ****
--- 27,31 ----
#include "openalpp/stream.h"
+ #include "openalpp/export.h"
namespace ost {
***************
*** 40,44 ****
* be used (tests were done with Mono8, 11025 Hz).
*/
! class NetStream : public Stream {
public:
/**
--- 41,45 ----
* be used (tests were done with Mono8, 11025 Hz).
*/
! class OPENALPP_API NetStream : public Stream {
public:
/**
Index: netupdater.h
===================================================================
RCS file: /cvsroot/alpp/openalpp/include/openalpp/netupdater.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** netupdater.h 7 Mar 2003 20:37:20 -0000 1.2
--- netupdater.h 16 Apr 2003 11:15:01 -0000 1.3
***************
*** 29,32 ****
--- 29,33 ----
#include "openalpp/streamupdater.h"
#include "stdlib.h"
+ #include "openalpp/export.h"
namespace openalpp {
***************
*** 35,39 ****
* Updater for streams through sockets.
*/
! class NetUpdater : public StreamUpdater {
/**
* Socket to receive sound data from.
--- 36,40 ----
* Updater for streams through sockets.
*/
! class OPENALPP_API NetUpdater : public StreamUpdater {
/**
* Socket to receive sound data from.
Index: positionedobject.h
===================================================================
RCS file: /cvsroot/alpp/openalpp/include/openalpp/positionedobject.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** positionedobject.h 4 Dec 2002 07:13:12 -0000 1.2
--- positionedobject.h 16 Apr 2003 11:15:01 -0000 1.3
***************
*** 26,29 ****
--- 26,30 ----
#define POSITIONEDOBJECT_H_INCLUDED_C4278579
+ #include "openalpp/export.h"
#include "openalpp/audiobase.h"
***************
*** 34,38 ****
* (I.e. listeners and sources).
*/
! class PositionedObject : public AudioBase {
public:
--- 35,39 ----
* (I.e. listeners and sources).
*/
! class OPENALPP_API PositionedObject : public AudioBase {
public:
Index: sample.h
===================================================================
RCS file: /cvsroot/alpp/openalpp/include/openalpp/sample.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** sample.h 7 Mar 2003 20:35:10 -0000 1.2
--- sample.h 16 Apr 2003 11:15:01 -0000 1.3
***************
*** 36,40 ****
* Class for loading sampled files.
*/
! class Sample : public SoundData {
public:
/**
--- 36,40 ----
* Class for loading sampled files.
*/
! class OPENALPP_API Sample : public SoundData {
public:
/**
Index: sounddata.h
===================================================================
RCS file: /cvsroot/alpp/openalpp/include/openalpp/sounddata.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** sounddata.h 18 Oct 2002 07:50:11 -0000 1.1
--- sounddata.h 16 Apr 2003 11:15:01 -0000 1.2
***************
*** 26,29 ****
--- 26,30 ----
#define SOUNDDATA_H_INCLUDED_C4199A75
+ #include "openalpp/export.h"
#include "openalpp/error.h"
#include "openalpp/audiobase.h"
***************
*** 34,38 ****
* Base class for sound data.
*/
! class SoundData : public AudioBase {
protected:
/**
--- 35,39 ----
* Base class for sound data.
*/
! class OPENALPP_API SoundData : public AudioBase {
protected:
/**
Index: source.h
===================================================================
RCS file: /cvsroot/alpp/openalpp/include/openalpp/source.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** source.h 19 Feb 2003 18:35:10 -0000 1.2
--- source.h 16 Apr 2003 11:15:01 -0000 1.3
***************
*** 26,29 ****
--- 26,30 ----
#define SOURCE_H_INCLUDED_C419B739
+ #include "openalpp/export.h"
#include "openalpp/stream.h"
#include "openalpp/sourcebase.h"
***************
*** 36,40 ****
* This is used for standard OpenAL sources, whether streaming or not.
*/
! class Source : public SourceBase {
public:
/**
--- 37,41 ----
* This is used for standard OpenAL sources, whether streaming or not.
*/
! class OPENALPP_API Source : public SourceBase {
public:
/**
Index: sourcebase.h
===================================================================
RCS file: /cvsroot/alpp/openalpp/include/openalpp/sourcebase.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** sourcebase.h 18 Dec 2002 07:39:44 -0000 1.2
--- sourcebase.h 16 Apr 2003 11:15:01 -0000 1.3
***************
*** 25,28 ****
--- 25,29 ----
#ifndef SOURCEBASE_H_INCLUDED_C419E330
#define SOURCEBASE_H_INCLUDED_C419E330
+ #include "openalpp/export.h"
#include "openalpp/positionedobject.h"
#include "openalpp/error.h"
***************
*** 44,48 ****
* Source) should be created.
*/
! class SourceBase : public PositionedObject {
public:
/**
--- 45,49 ----
* Source) should be created.
*/
! class OPENALPP_API SourceBase : public PositionedObject {
public:
/**
Index: stream.h
===================================================================
RCS file: /cvsroot/alpp/openalpp/include/openalpp/stream.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** stream.h 21 Feb 2003 14:37:10 -0000 1.4
--- stream.h 16 Apr 2003 11:15:01 -0000 1.5
***************
*** 26,29 ****
--- 26,30 ----
#define STREAM_H_INCLUDED_C41983DF
+ #include "openalpp/export.h"
#include "openalpp/sounddata.h"
***************
*** 36,40 ****
* Used for audio streams.
*/
! class Stream : public SoundData {
protected:
/**
--- 37,41 ----
* Used for audio streams.
*/
! class OPENALPP_API Stream : public SoundData {
protected:
/**
***************
*** 48,67 ****
* Default constructor.
*/
! Stream() throw (NameError);
/**
* Copy constructor.
*/
! Stream(const Stream &stream);
/**
* Assignment operator.
*/
! Stream &operator=(const Stream &stream);
/**
* Destructor.
*/
! ~Stream();
/**
--- 49,68 ----
* Default constructor.
*/
! Stream() throw (NameError);
/**
* Copy constructor.
*/
! Stream(const Stream &stream);
/**
* Assignment operator.
*/
! Stream &operator=(const Stream &stream);
/**
* Destructor.
*/
! ~Stream();
/**
***************
*** 70,74 ****
* @param sourcename is the (OpenAL) name of the source.
*/
! void Record(ALuint sourcename);
/**
--- 71,75 ----
* @param sourcename is the (OpenAL) name of the source.
*/
! void Record(ALuint sourcename);
/**
***************
*** 76,80 ****
* @param sourcename is the (OpenAL) name of the source.
*/
! void Stop(ALuint sourcename);
};
--- 77,81 ----
* @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.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** streamupdater.h 21 Feb 2003 14:37:10 -0000 1.4
--- streamupdater.h 16 Apr 2003 11:15:02 -0000 1.5
***************
*** 26,34 ****
--- 26,40 ----
#define STREAMUPDATER_H_INCLUDED_C419FA12
+
#include <cc++/thread.h>
#include <vector>
+
extern "C" {
#include <AL/al.h>
}
+
+ #include "openalpp/export.h"
+
+
#include "openalpp/audiobase.h"
#include "openalpp/error.h"
***************
*** 54,58 ****
* @param frequency is the frequency of the sound.
*/
! StreamUpdater(ALuint buffer1,ALuint buffer2,
ALenum format,unsigned int frequency);
--- 60,64 ----
* @param frequency is the frequency of the sound.
*/
! OPENALPP_API StreamUpdater(ALuint buffer1,ALuint buffer2,
ALenum format,unsigned int frequency);
***************
*** 60,64 ****
* Destructor.
*/
! ~StreamUpdater();
/**
--- 66,70 ----
* Destructor.
*/
! OPENALPP_API ~StreamUpdater();
/**
***************
*** 66,70 ****
* @param sourcename is the OpenAL name of the source.
*/
! void AddSource(ALuint sourcename);
/**
--- 72,76 ----
* @param sourcename is the OpenAL name of the source.
*/
! OPENALPP_API void AddSource(ALuint sourcename);
/**
***************
*** 72,76 ****
* @param sourcename is the OpenAL name of the source.
*/
! void RemoveSource(ALuint sourcename);
/**
--- 78,82 ----
* @param sourcename is the OpenAL name of the source.
*/
! OPENALPP_API void RemoveSource(ALuint sourcename);
/**
***************
*** 81,85 ****
* @return done flag. I.e. stoprunning_.
*/
! bool Update(void *buffer,unsigned int length);
/**
--- 87,91 ----
* @return done flag. I.e. stoprunning_.
*/
! OPENALPP_API bool Update(void *buffer,unsigned int length);
/**
***************
*** 87,91 ****
* Is called after Run() finishes, and deletes this.
*/
! void final();
/**
--- 93,97 ----
* Is called after Run() finishes, and deletes this.
*/
! OPENALPP_API void final();
/**
***************
*** 93,102 ****
* @return this.
*/
! StreamUpdater *Reference();
/**
* Dereference this updater.
*/
! void DeReference() throw (FatalError);
protected:
/**
--- 99,108 ----
* @return this.
*/
! OPENALPP_API StreamUpdater *Reference();
/**
* Dereference this updater.
*/
! OPENALPP_API void DeReference() throw (FatalError);
protected:
/**
***************
*** 118,123 ****
* Source to update.
*/
- std::vector<ALuint> sources_,newsources_,removesources_;
/**
* Flag for when Run should stop running..
--- 124,129 ----
* Source to update.
*/
+ std::vector<ALuint> sources_,newsources_,removesources_;
/**
* Flag for when Run should stop running..
Index: windowsstuff.h
===================================================================
RCS file: /cvsroot/alpp/openalpp/include/openalpp/windowsstuff.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** windowsstuff.h 18 Oct 2002 07:50:12 -0000 1.1
--- windowsstuff.h 16 Apr 2003 11:15:02 -0000 1.2
***************
*** 29,37 ****
//C++ exception specification ignored except to indicate a function is not __declspec(nothrow)
#pragma warning( disable : 4290 )
#include <AL/alut.h>
#define alGetSourceiv alGetSourcei
! inline ALboolean alutLoadWAV(const char *fname,ALvoid **buffer,ALint *format,
ALsizei *size,ALsizei *bits,ALsizei *freq) {
ALboolean loop;
--- 29,38 ----
//C++ exception specification ignored except to indicate a function is not __declspec(nothrow)
#pragma warning( disable : 4290 )
+ #include "openalpp/export.h"
#include <AL/alut.h>
#define alGetSourceiv alGetSourcei
! inline OPENALPP_API ALboolean alutLoadWAV(const char *fname,ALvoid **buffer,ALint *format,
ALsizei *size,ALsizei *bits,ALsizei *freq) {
ALboolean loop;
|
