ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed #943 - replaced printf with Log - thanks to pkucoin.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12691 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
hikerstk
2013-04-23 11:06:50 +00:00
parent b5c90675d9
commit a6223250db
3 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/audio/music_ogg.cpp
View File

@@ -45,7 +45,7 @@ MusicOggStream::MusicOggStream()
MusicOggStream::~MusicOggStream()
{
if(stopMusic() == false)
fprintf(stderr, "WARNING: problems while stopping music.\n");
Log::warn("MusicOgg", "problems while stopping music.\n");
} // ~MusicOggStream
//-----------------------------------------------------------------------------
@@ -61,7 +61,7 @@ bool MusicOggStream::load(const std::string& filename)
if(!m_oggFile)
{
printf("Loading Music: %s failed (fopen returned NULL)\n", m_fileName.c_str());
Log::error("MusicOgg", "Loading Music: %s failed (fopen returned NULL)\n", m_fileName.c_str());
return false;
}
@@ -98,7 +98,7 @@ bool MusicOggStream::load(const std::string& filename)
errorMessage = "Unknown Error";
}
printf("Loading Music: %s failed : ov_open returned error code %i (%s)\n",
Log::error("MusicOgg", "Loading Music: %s failed : ov_open returned error code %i (%s)\n",
m_fileName.c_str(), result, errorMessage);
return false;
}
@@ -308,14 +308,16 @@ void MusicOggStream::update()
alGetSourcei(m_soundSource, AL_SOURCE_STATE, &state);
if (state != AL_PLAYING)
{
fprintf(stderr,"WARNING: Music not playing when it should be. Source state: %d\n", state);
Log::warn("MusicOgg", "Music not playing when it should be. "
"Source state: %d\n", state);
alGetSourcei(m_soundSource, AL_BUFFERS_PROCESSED, &processed);
alSourcePlay(m_soundSource);
}
}
else
{
fprintf(stderr,"WARNING: Attempt to stream music into buffer failed twice in a row.\n");
Log::warn("MusicOgg", "Attempt to stream music into buffer failed "
"twice in a row.\n");
}
} // update
@@ -358,7 +360,7 @@ bool MusicOggStream::check(const char* what)
if (error != AL_NO_ERROR)
{
fprintf(stderr, "[MusicOggStream] OpenAL error at %s : %s (%i)\n", what, SFXManager::getErrorString(error).c_str(), error);
Log::error("MusicOgg", "[MusicOggStream] OpenAL error at %s : %s (%i)\n", what, SFXManager::getErrorString(error).c_str(), error);
return false;
}

10
src/audio/sfx_buffer.cpp
View File

@@ -91,7 +91,7 @@ bool SFXBuffer::load()
if (!loadVorbisBuffer(m_file, m_buffer))
{
fprintf(stderr, "Could not load sound effect %s\n", m_file.c_str());
Log::error("SFXBuffer", "Could not load sound effect %s\n", m_file.c_str());
// TODO: free al buffer here?
return false;
}
@@ -133,7 +133,7 @@ bool SFXBuffer::loadVorbisBuffer(const std::string &name, ALuint buffer)
if (alIsBuffer(buffer) == AL_FALSE)
{
printf("Error, bad OpenAL buffer");
Log::error("SFXBuffer", "Error, bad OpenAL buffer");
return false;
}
@@ -141,14 +141,14 @@ bool SFXBuffer::loadVorbisBuffer(const std::string &name, ALuint buffer)
if(!file)
{
fprintf(stderr, "[SFXBuffer] LoadVorbisBuffer() - couldn't open file!\n");
Log::error("SFXBuffer", "[SFXBuffer] LoadVorbisBuffer() - couldn't open file!\n");
return false;
}
if (ov_open_callbacks(file, &oggFile, NULL, 0, OV_CALLBACKS_NOCLOSE) != 0)
{
fclose(file);
fprintf(stderr, "[SFXBuffer] LoadVorbisBuffer() - ov_open_callbacks() failed, file isn't vorbis?\n");
Log::error("SFXBuffer", "[SFXBuffer] LoadVorbisBuffer() - ov_open_callbacks() failed, file isn't vorbis?\n");
return false;
}
@@ -160,7 +160,7 @@ bool SFXBuffer::loadVorbisBuffer(const std::string &name, ALuint buffer)
if(!data)
{
ov_clear(&oggFile);
fprintf(stderr, "[SFXBuffer] loadVorbisBuffer() - Error : LoadVorbisBuffer() - couldn't allocate decode buffer\n");
Log::error("SFXBuffer", "[SFXBuffer] loadVorbisBuffer() - Error : LoadVorbisBuffer() - couldn't allocate decode buffer\n");
return false;
}

16
src/audio/sfx_manager.cpp
View File

@@ -203,7 +203,7 @@ SFXBuffer* SFXManager::addSingleSfx(const std::string &sfx_name,
}
if (UserConfigParams::logMisc())
printf("Loading SFX %s\n", sfx_file.c_str());
Log::debug("SFXManager", "Loading SFX %s\n", sfx_file.c_str());
if (buffer->load()) return buffer;
@@ -221,7 +221,7 @@ SFXBuffer* SFXManager::loadSingleSfx(const XMLNode* node,
if (node->get("filename", &filename) == 0)
{
fprintf(stderr,
Log::error("SFXManager",
"/!\\ The 'filename' attribute is mandatory in the SFX XML file!\n");
return NULL;
}
@@ -237,7 +237,7 @@ SFXBuffer* SFXManager::loadSingleSfx(const XMLNode* node,
*/
if(m_all_sfx_types.find(sfx_name)!=m_all_sfx_types.end())
{
fprintf(stderr,
Log::error("SFXManager",
"There is already a sfx named '%s' installed - new one is ignored.\n",
sfx_name.c_str());
return NULL;
@@ -301,7 +301,7 @@ void SFXManager::dump()
{
for(int n=0; n<(int)m_all_sfx.size(); n++)
{
printf("Sound %i : %s \n", n, m_all_sfx[n]->getBuffer()->getFileName().c_str());
Log::debug("SFXManager", "Sound %i : %s \n", n, m_all_sfx[n]->getBuffer()->getFileName().c_str());
}
}
@@ -312,7 +312,7 @@ SFXBase* SFXManager::createSoundSource(const std::string &name,
std::map<std::string, SFXBuffer*>::iterator i = m_all_sfx_types.find(name);
if ( i == m_all_sfx_types.end() )
{
fprintf( stderr, "SFXManager::createSoundSource could not find the requested sound effect : '%s'\n", name.c_str());
Log::error("SFXManager", "SFXManager::createSoundSource could not find the requested sound effect : '%s'\n", name.c_str());
return NULL;
}
@@ -340,7 +340,7 @@ void SFXManager::deleteSFXMapping(const std::string &name)
if (i == m_all_sfx_types.end())
{
fprintf(stderr, "SFXManager::deleteSFXMapping : Warning: sfx not found in list.\n");
Log::warn("SFXManager", "SFXManager::deleteSFXMapping : Warning: sfx not found in list.\n");
return;
}
(*i).second->unload();
@@ -363,7 +363,7 @@ void SFXManager::deleteSFX(SFXBase *sfx)
if(i==m_all_sfx.end())
{
fprintf(stderr, "SFXManager::deleteSFX : Warning: sfx not found in list.\n");
Log::warn("SFXManager", "SFXManager::deleteSFX : Warning: sfx not found in list.\n");
return;
}
@@ -418,7 +418,7 @@ bool SFXManager::checkError(const std::string &context)
if(error != AL_NO_ERROR)
{
fprintf(stdout, "SFXOpenAL OpenAL error while %s: %s\n",
Log::error("SFXManager", "SFXOpenAL OpenAL error while %s: %s\n",
context.c_str(), SFXManager::getErrorString(error).c_str());
return false;
}