Merge pull request #44 from ComradeKeys/master
The location of the log file can now be specified
This commit is contained in:
commit
207352a120
|
@ -26,6 +26,9 @@ else()
|
||||||
target_link_libraries(cAudio ${OPENAL_LIBRARIES})
|
target_link_libraries(cAudio ${OPENAL_LIBRARIES})
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
set_property(TARGET ${CMAKE_PROJECT_NAME} PROPERTY VERSION "2.3.0")
|
||||||
|
set_property(TARGET ${CMAKE_PROJECT_NAME} PROPERTY SOVERSION 2 )
|
||||||
|
|
||||||
if (APPLE AND CAUDIO_IOS_BUILD)
|
if (APPLE AND CAUDIO_IOS_BUILD)
|
||||||
set_target_properties(cAudio PROPERTIES XCODE_ATTRIBUTE_GCC_THUMB_SUPPORT "NO")
|
set_target_properties(cAudio PROPERTIES XCODE_ATTRIBUTE_GCC_THUMB_SUPPORT "NO")
|
||||||
set_target_properties(cAudio PROPERTIES XCODE_ATTRIBUTE_GCC_UNROLL_LOOPS "YES")
|
set_target_properties(cAudio PROPERTIES XCODE_ATTRIBUTE_GCC_UNROLL_LOOPS "YES")
|
||||||
|
|
|
@ -14,7 +14,7 @@ namespace cAudio
|
||||||
class cFileLogReceiver : public ILogReceiver
|
class cFileLogReceiver : public ILogReceiver
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
cFileLogReceiver();
|
cFileLogReceiver(const char *lFilePath);
|
||||||
~cFileLogReceiver();
|
~cFileLogReceiver();
|
||||||
|
|
||||||
bool OnLogMessage(const char* sender, const char* message, LogLevel level, float time);
|
bool OnLogMessage(const char* sender, const char* message, LogLevel level, float time);
|
||||||
|
@ -22,7 +22,7 @@ namespace cAudio
|
||||||
private:
|
private:
|
||||||
|
|
||||||
bool firsttime;
|
bool firsttime;
|
||||||
|
const char *logFilePath;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -108,9 +108,10 @@ namespace cAudio {
|
||||||
/** Note: This is the only way to get access to the audio playback capabilities of cAudio.
|
/** Note: This is the only way to get access to the audio playback capabilities of cAudio.
|
||||||
You must delete this interface using destroyAudioManager() once you are done with it.
|
You must delete this interface using destroyAudioManager() once you are done with it.
|
||||||
\param initializeDefault: Whether to return an object initialized with the default settings. If set to false, you must make a call to initialize before you can create audio sources.
|
\param initializeDefault: Whether to return an object initialized with the default settings. If set to false, you must make a call to initialize before you can create audio sources.
|
||||||
|
\param lFilePath Where the log file is going to be placed
|
||||||
\return A pointer to the created object, NULL if the object could not be allocated.
|
\return A pointer to the created object, NULL if the object could not be allocated.
|
||||||
*/
|
*/
|
||||||
CAUDIO_API IAudioManager* createAudioManager(bool initializeDefault = true);
|
CAUDIO_API IAudioManager* createAudioManager(bool initializeDefault = true, const char *lFilePath = "cAudioEngineLog.html");
|
||||||
|
|
||||||
//! Destroys an interface to a previously created Audio Manager and frees the memory allocated for it.
|
//! Destroys an interface to a previously created Audio Manager and frees the memory allocated for it.
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -30,9 +30,37 @@
|
||||||
namespace cAudio
|
namespace cAudio
|
||||||
{
|
{
|
||||||
|
|
||||||
//---------------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------------
|
||||||
// Audio manager section
|
// Logger section
|
||||||
//---------------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
#if CAUDIO_COMPILE_WITH_CONSOLE_LOG_RECEIVER == 1
|
||||||
|
static cConsoleLogReceiver ConsoleLog;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if CAUDIO_COMPILE_WITH_FILE_LOG_RECEIVER == 1
|
||||||
|
static cFileLogReceiver *FileLog;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
CAUDIO_API ILogger* getLogger()
|
||||||
|
{
|
||||||
|
static cLogger* Logger = NULL;
|
||||||
|
if(!Logger)
|
||||||
|
{
|
||||||
|
Logger = new cLogger;
|
||||||
|
#if CAUDIO_COMPILE_WITH_CONSOLE_LOG_RECEIVER == 1
|
||||||
|
Logger->registerLogReceiver(&ConsoleLog, "Console");
|
||||||
|
#endif
|
||||||
|
#if CAUDIO_COMPILE_WITH_FILE_LOG_RECEIVER == 1
|
||||||
|
Logger->registerLogReceiver(FileLog,"File");
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
return Logger;
|
||||||
|
}
|
||||||
|
|
||||||
|
//---------------------------------------------------------------------------------------
|
||||||
|
// Audio manager section
|
||||||
|
//---------------------------------------------------------------------------------------
|
||||||
|
|
||||||
#if CAUDIO_COMPILE_WITH_OGG_DECODER == 1
|
#if CAUDIO_COMPILE_WITH_OGG_DECODER == 1
|
||||||
static cOggAudioDecoderFactory OggDecoderFactory;
|
static cOggAudioDecoderFactory OggDecoderFactory;
|
||||||
|
@ -46,10 +74,14 @@ namespace cAudio
|
||||||
#if CAUDIO_COMPILE_WITH_FILE_SOURCE == 1
|
#if CAUDIO_COMPILE_WITH_FILE_SOURCE == 1
|
||||||
static cFileSourceFactory FileSourceFactory;
|
static cFileSourceFactory FileSourceFactory;
|
||||||
#endif
|
#endif
|
||||||
|
CAUDIO_API IAudioManager* createAudioManager(bool initializeDefault, const char *lFilePath)
|
||||||
CAUDIO_API IAudioManager* createAudioManager(bool initializeDefault)
|
|
||||||
{
|
{
|
||||||
cAudioManager* manager = CAUDIO_NEW cAudioManager;
|
cAudioManager* manager = CAUDIO_NEW cAudioManager;
|
||||||
|
#if CAUDIO_COMPILE_WITH_FILE_LOG_RECEIVER == 1
|
||||||
|
if(FileLog == nullptr)
|
||||||
|
|
||||||
|
FileLog = new cFileLogReceiver(lFilePath);
|
||||||
|
#endif
|
||||||
if(manager)
|
if(manager)
|
||||||
{
|
{
|
||||||
if(initializeDefault)
|
if(initializeDefault)
|
||||||
|
@ -81,6 +113,10 @@ namespace cAudio
|
||||||
|
|
||||||
CAUDIO_API void destroyAudioManager(IAudioManager* manager)
|
CAUDIO_API void destroyAudioManager(IAudioManager* manager)
|
||||||
{
|
{
|
||||||
|
#if CAUDIO_COMPILE_WITH_FILE_LOG_RECEIVER == 1
|
||||||
|
if(FileLog not_eq nullptr)
|
||||||
|
delete FileLog;
|
||||||
|
#endif
|
||||||
if(manager)
|
if(manager)
|
||||||
{
|
{
|
||||||
#ifdef CAUDIO_COMPILE_WITH_PLUGIN_SUPPORT
|
#ifdef CAUDIO_COMPILE_WITH_PLUGIN_SUPPORT
|
||||||
|
@ -137,35 +173,6 @@ namespace cAudio
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
//---------------------------------------------------------------------------------------
|
|
||||||
// Logger section
|
|
||||||
//---------------------------------------------------------------------------------------
|
|
||||||
|
|
||||||
#if CAUDIO_COMPILE_WITH_CONSOLE_LOG_RECEIVER == 1
|
|
||||||
static cConsoleLogReceiver ConsoleLog;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if CAUDIO_COMPILE_WITH_FILE_LOG_RECEIVER == 1
|
|
||||||
static cFileLogReceiver FileLog;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
CAUDIO_API ILogger* getLogger()
|
|
||||||
{
|
|
||||||
static cLogger* Logger = NULL;
|
|
||||||
|
|
||||||
if(!Logger)
|
|
||||||
{
|
|
||||||
Logger = new cLogger;
|
|
||||||
#if CAUDIO_COMPILE_WITH_CONSOLE_LOG_RECEIVER == 1
|
|
||||||
Logger->registerLogReceiver(&ConsoleLog, "Console");
|
|
||||||
#endif
|
|
||||||
#if CAUDIO_COMPILE_WITH_FILE_LOG_RECEIVER == 1
|
|
||||||
Logger->registerLogReceiver(&FileLog,"File");
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
return Logger;
|
|
||||||
}
|
|
||||||
|
|
||||||
//---------------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------------
|
||||||
// IAudioDeviceList section
|
// IAudioDeviceList section
|
||||||
//---------------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------------
|
||||||
|
|
|
@ -10,7 +10,8 @@
|
||||||
|
|
||||||
namespace cAudio
|
namespace cAudio
|
||||||
{
|
{
|
||||||
cFileLogReceiver::cFileLogReceiver()
|
cFileLogReceiver::cFileLogReceiver(const char *lFilePath) :
|
||||||
|
logFilePath(lFilePath)
|
||||||
{
|
{
|
||||||
firsttime = false;
|
firsttime = false;
|
||||||
}
|
}
|
||||||
|
@ -31,7 +32,7 @@ namespace cAudio
|
||||||
// Reset log file
|
// Reset log file
|
||||||
outf.setf( std::ios::fixed );
|
outf.setf( std::ios::fixed );
|
||||||
outf.precision( 3 );
|
outf.precision( 3 );
|
||||||
outf.open( "cAudioEngineLog.html", std::ios::out );
|
outf.open( logFilePath, std::ios::out );
|
||||||
|
|
||||||
if( !outf ){
|
if( !outf ){
|
||||||
return false;
|
return false;
|
||||||
|
@ -108,7 +109,7 @@ namespace cAudio
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
outf.open( "cAudioEngineLog.html", std::ios::out | std::ios::app );
|
outf.open( logFilePath, std::ios::out | std::ios::app );
|
||||||
|
|
||||||
if( !outf ){
|
if( !outf ){
|
||||||
return false;
|
return false;
|
||||||
|
|
Loading…
Reference in New Issue