Got rid of the alut dependence and also corrected both visual studio and codeblocks project to realize change.
This commit is contained in:
Raynaldo Rivera
parent
198124c988
commit
c00f6bfc6e
|
|
@ -4,7 +4,6 @@
|
|||
#include <iostream>
|
||||
#include <vector>
|
||||
#include "AL/al.h"
|
||||
#include "AL/alut.h"
|
||||
|
||||
#define BUFFER_SIZE ( 1024 * 32 )
|
||||
#include "../include/IAudio.h"
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
#include <AL/al.h>
|
||||
#include <AL/alc.h>
|
||||
#include <AL/alut.h>
|
||||
|
||||
//!#include <AL/alext.h>
|
||||
//!#include <AL/efx.h>
|
||||
#include <iostream>
|
||||
|
|
@ -25,48 +25,23 @@ namespace cAudio
|
|||
//!Initialize the listener,openal,and mikmod
|
||||
void cAudioManager::init(int argc,char* argv[])
|
||||
{
|
||||
alutInit(&argc,argv);
|
||||
|
||||
/*
|
||||
//Make a Openal context pointer
|
||||
ALCcontext *Context;
|
||||
//Make a openal device pointer
|
||||
ALCdevice *Device;
|
||||
ALint attribs[4] = {0};
|
||||
ALCint iSends = 0;
|
||||
LPALGENEFFECTS alGenEffects;
|
||||
LPALDELETEEFFECTS alDeleteEffects;
|
||||
LPALISEFFECT alIsEffect;
|
||||
|
||||
//Create a new device
|
||||
Device = alcOpenDevice(NULL);
|
||||
//Check if device can be created
|
||||
if (Device == NULL)
|
||||
exit(-1);
|
||||
|
||||
//!Query for effect extention
|
||||
if(alcIsExtensionPresent(Device,"ALC_EXT_EFX") == AL_FALSE){
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
//!Use context creation hint to request 4 axiliary sends per source
|
||||
attribs[0] = ALC_MAX_AUXILIARY_SENDS;
|
||||
attribs[1] = 4;
|
||||
attribs[2] = 0;
|
||||
|
||||
Context = alcCreateContext(Device,attribs);
|
||||
|
||||
if(!Context)
|
||||
return;
|
||||
|
||||
//!activate context
|
||||
|
||||
//Create context
|
||||
Context=alcCreateContext(Device, NULL);
|
||||
//Set active context
|
||||
alcMakeContextCurrent(Context);
|
||||
// Clear Error Code
|
||||
alGetError();
|
||||
|
||||
//!retrive Actual number aux sends avaliable per source
|
||||
alcGetIntegerv(Device,ALC_MAX_AUXILIARY_SENDS,1,&iSends);
|
||||
|
||||
//!Get the effect extention function pointers
|
||||
LOAD_AL_FUNC(alGenEffects);
|
||||
LOAD_AL_FUNC(alDeleteEffects);
|
||||
LOAD_AL_FUNC(alIsEffect);
|
||||
|
||||
*/
|
||||
initCapture.checkCaptureExtension();
|
||||
initCapture.initialize();
|
||||
|
||||
|
|
@ -246,8 +221,24 @@ namespace cAudio
|
|||
//!Shuts down cAudio. Deletes all audio sources in process
|
||||
void cAudioManager::shutDown()
|
||||
{
|
||||
//Create a openal context pointer
|
||||
ALCcontext *Context;
|
||||
//Create a openal device pointer
|
||||
ALCdevice *Device;
|
||||
|
||||
//Shutdown audio capture
|
||||
initCapture.shutdown();
|
||||
alutExit();
|
||||
|
||||
//Grab current openal context
|
||||
Context=alcGetCurrentContext();
|
||||
//Grab current device context
|
||||
Device=alcGetContextsDevice(Context);
|
||||
//Reset context to null
|
||||
alcMakeContextCurrent(NULL);
|
||||
//Delete the context
|
||||
alcDestroyContext(Context);
|
||||
//Close the device
|
||||
alcCloseDevice(Device);
|
||||
}
|
||||
|
||||
//!Sets the listeners position.
|
||||
|
|
|
|||
|
|
@ -18,8 +18,6 @@
|
|||
<Add directory="include" />
|
||||
<Add directory="Headers" />
|
||||
<Add directory="dependencies\Headers" />
|
||||
<Add directory="dependencies\Headers\ALUT" />
|
||||
<Add directory="dependencies\Headers\ALUT\AL" />
|
||||
<Add directory="dependencies\Headers\AL" />
|
||||
</Compiler>
|
||||
<Linker>
|
||||
|
|
@ -28,7 +26,6 @@
|
|||
<Add library="vorbisenc" />
|
||||
<Add library="vorbis" />
|
||||
<Add library="ogg" />
|
||||
<Add library="bin\alut.dll" />
|
||||
<Add library="bin\OpenAL32.dll" />
|
||||
</Linker>
|
||||
</Target>
|
||||
|
|
@ -47,8 +44,6 @@
|
|||
<Add directory="include" />
|
||||
<Add directory="Headers" />
|
||||
<Add directory="dependencies\Headers" />
|
||||
<Add directory="dependencies\Headers\ALUT" />
|
||||
<Add directory="dependencies\Headers\ALUT\AL" />
|
||||
<Add directory="dependencies\Headers\AL" />
|
||||
</Compiler>
|
||||
<Linker>
|
||||
|
|
@ -57,7 +52,6 @@
|
|||
<Add library="vorbisenc_static" />
|
||||
<Add library="vorbis_static" />
|
||||
<Add library="ogg_static" />
|
||||
<Add library="alut" />
|
||||
<Add library="OpenAL32" />
|
||||
</Linker>
|
||||
</Target>
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@
|
|||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories=".\dependencies\Headers;.\dependencies\Headers\alut;.\dependencies\Headers\al"
|
||||
AdditionalIncludeDirectories=".\dependencies\Headers;.\dependencies\Headers\al"
|
||||
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;CAUDIO_EXPORTS"
|
||||
MinimalRebuild="true"
|
||||
BasicRuntimeChecks="3"
|
||||
|
|
@ -61,7 +61,7 @@
|
|||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="OpenAL32.lib alut.lib ogg_static.lib vorbis_static.lib vorbisenc_static.lib vorbisfile_static.lib"
|
||||
AdditionalDependencies="OpenAL32.lib ogg_static.lib vorbis_static.lib vorbisenc_static.lib vorbisfile_static.lib"
|
||||
LinkIncremental="2"
|
||||
AdditionalLibraryDirectories=".\dependencies\Libs\windows"
|
||||
GenerateManifest="false"
|
||||
|
|
|
|||
|
|
@ -1,126 +0,0 @@
|
|||
#if !defined(AL_ALUT_H)
|
||||
#define AL_ALUT_H
|
||||
|
||||
#if defined(_MSC_VER)
|
||||
#include <alc.h>
|
||||
#include <al.h>
|
||||
#elif defined(__APPLE__)
|
||||
#include <OpenAL/alc.h>
|
||||
#include <OpenAL/al.h>
|
||||
#else
|
||||
#include <AL/al.h>
|
||||
#include <AL/alc.h>
|
||||
#endif
|
||||
|
||||
#if defined(__cplusplus)
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
#if defined(_WIN32) && !defined(_XBOX)
|
||||
#if defined (ALUT_BUILD_LIBRARY)
|
||||
#define ALUT_API __declspec(dllexport)
|
||||
#else
|
||||
#define ALUT_API __declspec(dllimport)
|
||||
#endif
|
||||
#else
|
||||
#if defined(ALUT_BUILD_LIBRARY) && defined(HAVE_GCC_VISIBILITY)
|
||||
#define ALUT_API __attribute__((visibility("default")))
|
||||
#else
|
||||
#define ALUT_API extern
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#if defined(_WIN32)
|
||||
#define ALUT_APIENTRY __cdecl
|
||||
#else
|
||||
#define ALUT_APIENTRY
|
||||
#endif
|
||||
|
||||
#if defined(__MWERKS_)
|
||||
#pragma export on
|
||||
#endif
|
||||
|
||||
/* Flag deprecated functions if possible (VisualC++ .NET and GCC >= 3.1.1). */
|
||||
#if defined(_MSC_VER) && _MSC_VER >= 1300 && !defined(MIDL_PASS)
|
||||
#define ALUT_ATTRIBUTE_DEPRECATED __declspec(deprecated)
|
||||
#elif defined(__GNUC__) && (__GNUC__ > 3 || (__GNUC__ == 3 && (__GNUC_MINOR__ > 1 || (__GNUC_MINOR__ == 1 && __GNUC_PATCHLEVEL__ >= 1))))
|
||||
#define ALUT_ATTRIBUTE_DEPRECATED __attribute__((deprecated))
|
||||
#else
|
||||
#define ALUT_ATTRIBUTE_DEPRECATED
|
||||
#endif
|
||||
|
||||
#define ALUT_API_MAJOR_VERSION 1
|
||||
#define ALUT_API_MINOR_VERSION 1
|
||||
|
||||
#define ALUT_ERROR_NO_ERROR 0
|
||||
#define ALUT_ERROR_OUT_OF_MEMORY 0x200
|
||||
#define ALUT_ERROR_INVALID_ENUM 0x201
|
||||
#define ALUT_ERROR_INVALID_VALUE 0x202
|
||||
#define ALUT_ERROR_INVALID_OPERATION 0x203
|
||||
#define ALUT_ERROR_NO_CURRENT_CONTEXT 0x204
|
||||
#define ALUT_ERROR_AL_ERROR_ON_ENTRY 0x205
|
||||
#define ALUT_ERROR_ALC_ERROR_ON_ENTRY 0x206
|
||||
#define ALUT_ERROR_OPEN_DEVICE 0x207
|
||||
#define ALUT_ERROR_CLOSE_DEVICE 0x208
|
||||
#define ALUT_ERROR_CREATE_CONTEXT 0x209
|
||||
#define ALUT_ERROR_MAKE_CONTEXT_CURRENT 0x20A
|
||||
#define ALUT_ERROR_DESTROY_CONTEXT 0x20B
|
||||
#define ALUT_ERROR_GEN_BUFFERS 0x20C
|
||||
#define ALUT_ERROR_BUFFER_DATA 0x20D
|
||||
#define ALUT_ERROR_IO_ERROR 0x20E
|
||||
#define ALUT_ERROR_UNSUPPORTED_FILE_TYPE 0x20F
|
||||
#define ALUT_ERROR_UNSUPPORTED_FILE_SUBTYPE 0x210
|
||||
#define ALUT_ERROR_CORRUPT_OR_TRUNCATED_DATA 0x211
|
||||
|
||||
#define ALUT_WAVEFORM_SINE 0x100
|
||||
#define ALUT_WAVEFORM_SQUARE 0x101
|
||||
#define ALUT_WAVEFORM_SAWTOOTH 0x102
|
||||
#define ALUT_WAVEFORM_WHITENOISE 0x103
|
||||
#define ALUT_WAVEFORM_IMPULSE 0x104
|
||||
|
||||
#define ALUT_LOADER_BUFFER 0x300
|
||||
#define ALUT_LOADER_MEMORY 0x301
|
||||
|
||||
ALUT_API ALboolean ALUT_APIENTRY alutInit (int *argcp, char **argv);
|
||||
ALUT_API ALboolean ALUT_APIENTRY alutInitWithoutContext (int *argcp, char **argv);
|
||||
ALUT_API ALboolean ALUT_APIENTRY alutExit (void);
|
||||
|
||||
ALUT_API ALenum ALUT_APIENTRY alutGetError (void);
|
||||
ALUT_API const char *ALUT_APIENTRY alutGetErrorString (ALenum error);
|
||||
|
||||
ALUT_API ALuint ALUT_APIENTRY alutCreateBufferFromFile (const char *fileName);
|
||||
ALUT_API ALuint ALUT_APIENTRY alutCreateBufferFromFileImage (const ALvoid *data, ALsizei length);
|
||||
ALUT_API ALuint ALUT_APIENTRY alutCreateBufferHelloWorld (void);
|
||||
ALUT_API ALuint ALUT_APIENTRY alutCreateBufferWaveform (ALenum waveshape, ALfloat frequency, ALfloat phase, ALfloat duration);
|
||||
|
||||
ALUT_API ALvoid *ALUT_APIENTRY alutLoadMemoryFromFile (const char *fileName, ALenum *format, ALsizei *size, ALfloat *frequency);
|
||||
ALUT_API ALvoid *ALUT_APIENTRY alutLoadMemoryFromFileImage (const ALvoid *data, ALsizei length, ALenum *format, ALsizei *size, ALfloat *frequency);
|
||||
ALUT_API ALvoid *ALUT_APIENTRY alutLoadMemoryHelloWorld (ALenum *format, ALsizei *size, ALfloat *frequency);
|
||||
ALUT_API ALvoid *ALUT_APIENTRY alutLoadMemoryWaveform (ALenum waveshape, ALfloat frequency, ALfloat phase, ALfloat duration, ALenum *format, ALsizei *size, ALfloat *freq);
|
||||
|
||||
ALUT_API const char *ALUT_APIENTRY alutGetMIMETypes (ALenum loader);
|
||||
|
||||
ALUT_API ALint ALUT_APIENTRY alutGetMajorVersion (void);
|
||||
ALUT_API ALint ALUT_APIENTRY alutGetMinorVersion (void);
|
||||
|
||||
ALUT_API ALboolean ALUT_APIENTRY alutSleep (ALfloat duration);
|
||||
|
||||
/* Nasty Compatibility stuff, WARNING: THESE FUNCTIONS ARE STRONGLY DEPRECATED */
|
||||
#if defined(__APPLE__)
|
||||
ALUT_API ALUT_ATTRIBUTE_DEPRECATED void ALUT_APIENTRY alutLoadWAVFile (ALbyte *fileName, ALenum *format, void **data, ALsizei *size, ALsizei *frequency);
|
||||
ALUT_API ALUT_ATTRIBUTE_DEPRECATED void ALUT_APIENTRY alutLoadWAVMemory (ALbyte *buffer, ALenum *format, void **data, ALsizei *size, ALsizei *frequency);
|
||||
#else
|
||||
ALUT_API ALUT_ATTRIBUTE_DEPRECATED void ALUT_APIENTRY alutLoadWAVFile (ALbyte *fileName, ALenum *format, void **data, ALsizei *size, ALsizei *frequency, ALboolean *loop);
|
||||
ALUT_API ALUT_ATTRIBUTE_DEPRECATED void ALUT_APIENTRY alutLoadWAVMemory (ALbyte *buffer, ALenum *format, void **data, ALsizei *size, ALsizei *frequency, ALboolean *loop);
|
||||
#endif
|
||||
ALUT_API ALUT_ATTRIBUTE_DEPRECATED void ALUT_APIENTRY alutUnloadWAV (ALenum format, ALvoid *data, ALsizei size, ALsizei frequency);
|
||||
|
||||
#if defined(__MWERKS_)
|
||||
#pragma export off
|
||||
#endif
|
||||
|
||||
#if defined(__cplusplus)
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif
|
||||
Binary file not shown.
Binary file not shown.
Loading…
Reference in New Issue