[Epfl-cvs] tgengine-0.1 soundmanager.cc,1.13,1.14

[Seb <whi...@us...>]

Update of /cvsroot/epfl/tgengine-0.1
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12772

Modified Files:
	soundmanager.cc 
Log Message:
Modif du formatage des log et err:
OpenAL:: -> [OpenAL]


Index: soundmanager.cc
===================================================================
RCS file: /cvsroot/epfl/tgengine-0.1/soundmanager.cc,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** soundmanager.cc	22 Oct 2004 20:31:08 -0000	1.13
--- soundmanager.cc	30 Oct 2004 08:38:27 -0000	1.14
***************
*** 19,23 ****
  {
  	#ifdef SOUND_DEBUG
! 	cout << "OpenAL:: Starting SoundManager" << endl;
  	#endif
  		
--- 19,23 ----
  {
  	#ifdef SOUND_DEBUG
! 	cout << "[OpenAL] Starting SoundManager" << endl;
  	#endif
  		
***************
*** 31,35 ****
  {	
  	#ifdef SOUND_DEBUG
! 	cout << "OpenAL:: Ending SoundManager" << endl;
  	#endif
  	
--- 31,35 ----
  {	
  	#ifdef SOUND_DEBUG
! 	cout << "[OpenAL] Ending SoundManager" << endl;
  	#endif
  	
***************
*** 42,46 ****
  {
  	#ifdef SOUND_DEBUG
! 	cout << "OpenAL:: Initializing SoundManager" << endl;
  	#endif
  	
--- 42,46 ----
  {
  	#ifdef SOUND_DEBUG
! 	cout << "[OpenAL] Initializing SoundManager" << endl;
  	#endif
  	
***************
*** 48,52 ****
  	{
  		#ifdef SOUND_DEBUG
! 		cout << "OpenAL:: Little Endian detected..." << endl;
  		#endif
  		
--- 48,52 ----
  	{
  		#ifdef SOUND_DEBUG
! 		cout << "[OpenAL] Little Endian detected..." << endl;
  		#endif
  		
***************
*** 56,60 ****
  	{
  		#ifdef SOUND_DEBUG
! 		cout << "OpenAL:: Big Endian detected..." << endl;
  		#endif
  		
--- 56,60 ----
  	{
  		#ifdef SOUND_DEBUG
! 		cout << "[OpenAL] Big Endian detected..." << endl;
  		#endif
  		
***************
*** 65,69 ****
  	
  	#ifdef SOUND_DEBUG
! 	cout << "OpenAL:: Loading Lib: Version = " << (char*)alGetString(AL_VERSION) << flush;
  	cout << " | Renderer = " << (char*)alGetString(AL_RENDERER) << flush;
  	cout << " | Vendor = " << (char*)alGetString(AL_VENDOR) << endl;
--- 65,69 ----
  	
  	#ifdef SOUND_DEBUG
! 	cout << "[OpenAL] Loading Lib: Version = " << (char*)alGetString(AL_VERSION) << flush;
  	cout << " | Renderer = " << (char*)alGetString(AL_RENDERER) << flush;
  	cout << " | Vendor = " << (char*)alGetString(AL_VENDOR) << endl;
***************
*** 89,94 ****
  		if(!*check)
  			pSoundManager->DisableSoundManager();
! 		else
! 			pSoundManager->EnableSoundManager();
  			
  		SDL_Delay(80);
--- 89,94 ----
  		if(!*check)
  			pSoundManager->DisableSoundManager();
! 		//else
! 			//pSoundManager->EnableSoundManager();
  			
  		SDL_Delay(80);
***************
*** 115,119 ****
  {
  	#ifdef SOUND_DEBUG
! 	//cout << "OpenAL:: SetListenerPosition (" << x << "," << y << "," << z << ")" << endl;
  	#endif
  	
--- 115,119 ----
  {
  	#ifdef SOUND_DEBUG
! 	//cout << "[OpenAL] SetListenerPosition (" << x << "," << y << "," << z << ")" << endl;
  	#endif
  	
***************
*** 126,130 ****
  {
  	#ifdef SOUND_DEBUG
! 	//cout << "OpenAL:: SetListenerOrientation" << endl;
  	#endif
  	
--- 126,130 ----
  {
  	#ifdef SOUND_DEBUG
! 	//cout << "[OpenAL] SetListenerOrientation" << endl;
  	#endif
  	
***************
*** 145,149 ****
  {
  	#ifdef SOUND_DEBUG
! 	//cout << "OpenAL:: UpdateListener" << endl;
  	#endif
  	
--- 145,149 ----
  {
  	#ifdef SOUND_DEBUG
! 	//cout << "[OpenAL] UpdateListener" << endl;
  	#endif
  	
***************
*** 166,170 ****
      {
      	#ifdef SOUND_DEBUG 
!     	cout << "OpenAL:: AddSound: " << name << endl;
      	#endif
      	
--- 166,170 ----
      {
      	#ifdef SOUND_DEBUG 
!     	cout << "[OpenAL] AddSound: " << name << endl;
      	#endif
      	
***************
*** 191,195 ****
      	else
      	{
!     		cerr << "OpenAL:: Cannot find " << name << " for reading..." << endl;
      	}
      	
--- 191,195 ----
      	else
      	{
!     		cerr << "[OpenAL] Cannot find " << name << " for reading..." << endl;
      	}
      	
***************
*** 217,221 ****
      
  	#ifdef SOUND_DEBUG
! 	cout << "OpenAL:: LoadWavALBuffer: " << path << endl;
  	#endif
  
--- 217,221 ----
      
  	#ifdef SOUND_DEBUG
! 	cout << "[OpenAL] LoadWavALBuffer: " << path << endl;
  	#endif
  
***************
*** 267,271 ****
  	
  	#ifdef SOUND_DEBUG
! 	cout << "OpenAL:: GetLoadedWavALBuffer: " << path << endl;
  	#endif
  
--- 267,271 ----
  	
  	#ifdef SOUND_DEBUG
! 	cout << "[OpenAL] GetLoadedWavALBuffer: " << path << endl;
  	#endif
  
***************
*** 303,307 ****
  	
  	#ifdef SOUND_DEBUG
! 	cout << "OpenAL:: LoadWavALSample: " << name << endl;
  	#endif
  
--- 303,307 ----
  	
  	#ifdef SOUND_DEBUG
! 	cout << "[OpenAL] LoadWavALSample: " << name << endl;
  	#endif
  
***************
*** 344,348 ****
      
  	#ifdef SOUND_DEBUG
! 	cout << "OpenAL:: LoadOggALBuffer: " << path << endl;
  	#endif
  
--- 344,348 ----
      
  	#ifdef SOUND_DEBUG
! 	cout << "[OpenAL] LoadOggALBuffer: " << path << endl;
  	#endif
  
***************
*** 377,381 ****
  	
  	#ifdef SOUND_DEBUG
! 	cout << "OpenAL:: GetLoadedOggALBuffer: " << path << endl;
  	#endif
  
--- 377,381 ----
  	
  	#ifdef SOUND_DEBUG
! 	cout << "[OpenAL] GetLoadedOggALBuffer: " << path << endl;
  	#endif
  
***************
*** 413,417 ****
  	
  	#ifdef SOUND_DEBUG
! 	cout << "OpenAL:: LoadOggALSample: " << name << endl;
  	#endif
  
--- 413,417 ----
  	
  	#ifdef SOUND_DEBUG
! 	cout << "[OpenAL] LoadOggALSample: " << name << endl;
  	#endif
  
***************
*** 457,461 ****
      if (ov_open(f, &oggFile, NULL, 0) != 0)
  	{
!         cerr << "OpenAL:: Error opening " << fileName << " for decoding..." << endl;
          exit(-1);
  	}
--- 457,461 ----
      if (ov_open(f, &oggFile, NULL, 0) != 0)
  	{
!         cerr << "[OpenAL] Error opening " << fileName << " for decoding..." << endl;
          exit(-1);
  	}
***************
*** 484,488 ****
          {
              ov_clear(&oggFile);
!             cerr << "OpenAL:: Error decoding " << fileName << "..." << endl;
              exit(-1);
          }
--- 484,488 ----
          {
              ov_clear(&oggFile);
!             cerr << "[OpenAL] Error decoding " << fileName << "..." << endl;
              exit(-1);
          }
***************
*** 506,510 ****
  	{	
  		#ifdef SOUND_DEBUG 
! 		cout << "OpenAL:: SetSoundProperties: " << name << "(" << x << "," << y << "," << z << ")" << endl;
  		#endif
  	
--- 506,510 ----
  	{	
  		#ifdef SOUND_DEBUG 
! 		cout << "[OpenAL] SetSoundProperties: " << name << "(" << x << "," << y << "," << z << ")" << endl;
  		#endif
  	
***************
*** 521,525 ****
  	{
  		#ifdef SOUND_DEBUG 
! 		cout << "OpenAL:: SetSoundVolume: " << name << "(" << x << ")" << endl;
  		#endif
  	
--- 521,525 ----
  	{
  		#ifdef SOUND_DEBUG 
! 		cout << "[OpenAL] SetSoundVolume: " << name << "(" << x << ")" << endl;
  		#endif
  	
***************
*** 534,538 ****
  	{
  		#ifdef SOUND_DEBUG 
! 		cout << "OpenAL:: PlaySound: " << name << endl;
  		#endif
  	
--- 534,538 ----
  	{
  		#ifdef SOUND_DEBUG 
! 		cout << "[OpenAL] PlaySound: " << name << endl;
  		#endif
  	
***************
*** 547,551 ****
  	{
  		#ifdef SOUND_DEBUG 
! 		cout << "OpenAL:: StopSound: " << name << endl;
  		#endif
  		
--- 547,551 ----
  	{
  		#ifdef SOUND_DEBUG 
! 		cout << "[OpenAL] StopSound: " << name << endl;
  		#endif
  		
***************
*** 562,566 ****
  	{
  		#ifdef SOUND_DEBUG 
! 		cout << "OpenAL:: SoundStatus: " << name << endl;
  		#endif
  		
--- 562,566 ----
  	{
  		#ifdef SOUND_DEBUG 
! 		cout << "[OpenAL] SoundStatus: " << name << endl;
  		#endif
  		
***************
*** 596,600 ****
  	else
  	{
! 		cerr << "OpenAL:: Sound " << name << " not loaded..." << endl;
  		return AL_FALSE;
  	}
--- 596,602 ----
  	else
  	{
! 		#ifdef SOUND_DEBUG 
! 		cerr << "[OpenAL] Sound " << name << " not loaded..." << endl;
! 		#endif
  		return AL_FALSE;
  	}
***************
*** 613,617 ****
  
      #ifdef SOUND_DEBUG
!     cout << "OpenAL:: KillALData" << endl;
      #endif
  
--- 615,619 ----
  
      #ifdef SOUND_DEBUG
!     cout << "[OpenAL] KillALData" << endl;
      #endif
  
***************
*** 634,638 ****
  	if (file.fail())
  	{
! 		cerr << "OpenAL:: Cannot parse SoundFile: " << filename << endl;
  		return;
  	}
--- 636,640 ----
  	if (file.fail())
  	{
! 		cerr << "[OpenAL] Cannot parse SoundFile: " << filename << endl;
  		return;
  	}