whitespace and style cleanup, no functional changes

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@28358 a95241bf-73f2-0310-859d-f6bbb57e9c96

src/kits/game/FileGameSound.cpp

@@ -1,9 +1,9 @@
-/* 
+/*
  * Copyright 2001-2007, Haiku Inc.
  * Authors:
  *		Christopher ML Zumwalt May ([email protected])
  *		Jérôme Duval
- * 
+ *
  * Distributed under the terms of the MIT License.
  */
 
@@ -32,34 +32,34 @@ struct _gs_media_tracker
 bool FillBuffer(_gs_ramp * ramp, uint8 * data, uint8 * buffer, size_t * bytes)
 {
 	int32 samples = *bytes / sizeof(int16);
-	
+
 	for (int32 byte = 0; byte < samples; byte++) {
 		float gain = *ramp->value;
 		data[byte] = uint8(float(buffer[byte]) * gain);
-				
+
 		if (ChangeRamp(ramp)) {
 			*bytes = byte * sizeof(int16);
 			return true;
 		}
 	}
-	
+
 	return false;
 }
 
 bool FillBuffer(_gs_ramp * ramp, int16 * data, int16 * buffer, size_t * bytes)
 {
 	int32 samples = *bytes / sizeof(int16);
-	
+
 	for (int32 byte = 0; byte < samples; byte++) {
 		float gain = *ramp->value;
 		data[byte] = int16(float(buffer[byte]) * gain);
-				
+
 		if (ChangeRamp(ramp)) {
 			*bytes = byte * sizeof(int16);
 			return true;
 		}
 	}
-	
+
 	return false;
 }
 
@@ -71,16 +71,16 @@ bool FillBuffer(_gs_ramp * ramp, int32 * data, int32 * buffer, size_t * bytes)
 	while (bytesAreReady) {
 		float gain = *ramp->value;
 		data[byte] = int32(float(buffer[byte]) * gain);
-		
+
 		if (ChangeRamp(ramp)) {
 			*bytes = byte;
 			return true;
 		}
-		
+
 		byte++;
 		bytesAreReady = (byte >= *bytes);
 	}
-	
+
 	return false;
 }
 
@@ -92,57 +92,57 @@ bool FillBuffer(_gs_ramp * ramp, float * data, float * buffer, size_t * bytes)
 	while (bytesAreReady) {
 		float gain = *ramp->value;
 		data[byte] = buffer[byte] * gain;
-		
+
 		if (ChangeRamp(ramp)) {
 			*bytes = byte;
 			return true;
 		}
-		
+
 		byte++;
 		bytesAreReady = (byte >= *bytes);
 	}
-	
+
 	return false;
 }
-	 
+
 // BFileGameSound -------------------------------------------------------
 BFileGameSound::BFileGameSound(const entry_ref *file,
 							   bool looping,
 							   BGameSoundDevice *device)
- 	:	BStreamingGameSound(device),
+	:	BStreamingGameSound(device),
 		fAudioStream(NULL),
- 		fStopping(false),
+		fStopping(false),
- 		fLooping(looping),
+		fLooping(looping),
- 		fBuffer(NULL),
+		fBuffer(NULL),
- 		fPlayPosition(0),
+		fPlayPosition(0),
- 		fPausing(NULL),
+		fPausing(NULL),
- 		fPaused(false),
+		fPaused(false),
- 		fPauseGain(1.0)
+		fPauseGain(1.0)
 {
-	if (InitCheck() == B_OK) 
+	if (InitCheck() == B_OK)
-		SetInitError(Init(file));							
+		SetInitError(Init(file));
 }
 
 
 BFileGameSound::BFileGameSound(const char *file,
 							   bool looping,
 							   BGameSoundDevice *device)
- 	:	BStreamingGameSound(device),
+	:	BStreamingGameSound(device),
 		fAudioStream(NULL),
- 		fStopping(false),
+		fStopping(false),
- 		fLooping(looping), 
+		fLooping(looping),
 		fBuffer(NULL),
- 		fPlayPosition(0),
+		fPlayPosition(0),
- 		fPausing(NULL),
+		fPausing(NULL),
- 		fPaused(false),
+		fPaused(false),
- 		fPauseGain(1.0)
+		fPauseGain(1.0)
 {
 	if (InitCheck() == B_OK) {
 		entry_ref node;
-	
+
 		if (get_ref_for_path(file, &node) != B_OK)
 			SetInitError(B_ENTRY_NOT_FOUND);
-		else	
+		else
 			SetInitError(Init(&node));
 	}
 }
@@ -150,17 +150,17 @@ BFileGameSound::BFileGameSound(const char *file,
 
 BFileGameSound::~BFileGameSound()
 {
-	if (fReadThread >= 0) 
+	if (fReadThread >= 0)
 		kill_thread(fReadThread);
-	
+
 	if (fAudioStream) {
-		if (fAudioStream->stream) 
+		if (fAudioStream->stream)
 			fAudioStream->file->ReleaseTrack(fAudioStream->stream);
-	
+
 		delete fAudioStream->file;
 	}
-	
+
-	delete [] fBuffer;	
+	delete [] fBuffer;
 	delete fAudioStream;
 }
 
@@ -176,9 +176,9 @@ status_t
 BFileGameSound::StartPlaying()
 {
 	// restart playback if needed
-	if (IsPlaying()) 
+	if (IsPlaying())
 		StopPlaying();
-	
+
 	// start playing the file
 	return BStreamingGameSound::StartPlaying();
 }
@@ -188,18 +188,18 @@ status_t
 BFileGameSound::StopPlaying()
 {
 	status_t error = BStreamingGameSound::StopPlaying();
-	
+
 	if (!fAudioStream || !fAudioStream->stream)
 		return B_OK;
-		 
+
 	// start reading next time from the start of the file
 	int64 frame = 0;
 	fAudioStream->stream->SeekToFrame(&frame);
-	
+
 	fStopping = false;
 	fAudioStream->position = 0;
 	fPlayPosition = 0;
-		
+
 	return error;
 }
 
@@ -209,7 +209,7 @@ BFileGameSound::Preload()
 {
 	if (!IsPlaying())
 		Load();
-	
+
 	return B_OK;
 }
 
@@ -219,70 +219,76 @@ BFileGameSound::FillBuffer(void *inBuffer,
 						   size_t inByteCount)
 {
 	size_t bytes = inByteCount;
-	
+
 	if (!fPaused || fPausing) {
 		if (fPlayPosition == 0 || fPlayPosition + inByteCount >= fBufferSize) {
 			Load();
 		}
-		
+
 		if (fPlayPosition + bytes > fBufferSize)
 			bytes = fBufferSize - fPlayPosition;
-			
+
 		if (bytes == 0)
 			return;
-		
+
 		if (fPausing) {
 			Lock();
-		
+
 			bool rampDone = false;
-			
+
 			// Fill the requested buffer, stopping if the paused flag is set
 			switch(Format().format) {
 				case gs_audio_format::B_GS_U8:
-					rampDone = ::FillBuffer(fPausing, (uint8*)inBuffer, (uint8*)&fBuffer[fPlayPosition], &bytes);
+					rampDone = ::FillBuffer(fPausing, (uint8*)inBuffer,
+										(uint8*)&fBuffer[fPlayPosition], &bytes);
 					break;
-			
+
 				case gs_audio_format::B_GS_S16:
-					rampDone = ::FillBuffer(fPausing, (int16*)inBuffer, (int16*)&fBuffer[fPlayPosition], &bytes);
+					rampDone = ::FillBuffer(fPausing, (int16*)inBuffer,
+										(int16*)&fBuffer[fPlayPosition], &bytes);
 					break;
-			
+
 				case gs_audio_format::B_GS_S32:
-					rampDone = ::FillBuffer(fPausing, (int32*)inBuffer, (int32*)&fBuffer[fPlayPosition], &bytes);
+					rampDone = ::FillBuffer(fPausing, (int32*)inBuffer,
+										(int32*)&fBuffer[fPlayPosition], &bytes);
 					break;
-			
+
 				case gs_audio_format::B_GS_F:
-					rampDone = ::FillBuffer(fPausing, (float*)inBuffer, (float*)&fBuffer[fPlayPosition], &bytes);
+					rampDone = ::FillBuffer(fPausing, (float*)inBuffer,
+										(float*)&fBuffer[fPlayPosition], &bytes);
 					break;
 			}
-			
+
 			// We finished ramping
 			if (rampDone) {
 				if (bytes < inByteCount && !fPausing) {
-					// Since we are resuming play back, we need to copy any remaining samples
+					// Since we are resuming play back,
+					// we need to copy any remaining samples
 					char * buffer = (char*)inBuffer;
-					memcpy(&buffer[bytes], &fBuffer[fPlayPosition + bytes], inByteCount - bytes);
+					memcpy(&buffer[bytes], &fBuffer[fPlayPosition + bytes],
+						   inByteCount - bytes);
 				}
-				
+
 				delete fPausing;
 				fPausing = NULL;
 			}
-							
+
 			Unlock();
 		} else {
 			size_t byte = 0;
 			char * buffer = (char*)inBuffer;
-			
+
 			// We need to be able to stop asap when the pause flag is flipped.
 			while(byte < bytes && (!fPaused || fPausing)) {
-				buffer[byte] = fBuffer[fPlayPosition + byte]; 
+				buffer[byte] = fBuffer[fPlayPosition + byte];
 				byte++;
 			}
-			
+
 			bytes = byte;
 		}
 	}
-	
+
-	fPlayPosition += bytes;				  		
+	fPlayPosition += bytes;
 }
 
 
@@ -300,23 +306,25 @@ BFileGameSound::SetPaused(bool isPaused,
 {
 	if (fPaused != isPaused) {
 		Lock();
-	
+
-		// Clear any old ramping	
+		// Clear any old ramping
 		delete fPausing;
 		fPausing = NULL;
-	
+
 		if (rampTime > 100000) {
 			// Setup for ramping
 			if (isPaused)
-				fPausing = InitRamp(&fPauseGain, 0.0, Format().frame_rate, rampTime);
+				fPausing = InitRamp(&fPauseGain, 0.0,
+									Format().frame_rate, rampTime);
 			else
-				fPausing = InitRamp(&fPauseGain, 1.0, Format().frame_rate, rampTime);
+				fPausing = InitRamp(&fPauseGain, 1.0,
+									Format().frame_rate, rampTime);
 		}
-		
+
 		fPaused = isPaused;
 		Unlock();
 	}
-	
+
 	return B_OK;
 }
 
@@ -326,10 +334,10 @@ BFileGameSound::IsPaused()
 {
 	if (fPausing)
 		return B_PAUSE_IN_PROGRESS;
-	
+
 	if (fPaused)
 		return B_PAUSED;
-	
+
 	return B_NOT_PAUSED;
 }
 
@@ -339,54 +347,54 @@ BFileGameSound::Init(const entry_ref* file)
 {
 	fAudioStream = new _gs_media_tracker;
 	memset(fAudioStream, 0, sizeof(_gs_media_tracker));
-	
+
 	fAudioStream->file = new BMediaFile(file);
 	status_t error = fAudioStream->file->InitCheck();
 	if (error != B_OK)
 		return error;
-	
+
 	fAudioStream->stream = fAudioStream->file->TrackAt(0);
-	
+
-	// is this is an audio file?		
+	// is this is an audio file?
 	media_format playFormat;
 	if ((error = fAudioStream->stream->EncodedFormat(&playFormat)) != B_OK)
 		return error;
-	
+
-	if (!playFormat.IsAudio()) 
+	if (!playFormat.IsAudio())
 		return B_MEDIA_BAD_FORMAT;
-	
+
 	gs_audio_format dformat = Device()->Format();
-	
+
 	// request the format we want the sound
 	memset(&playFormat, 0, sizeof(media_format));
 	playFormat.type = B_MEDIA_RAW_AUDIO;
 	if (fAudioStream->stream->DecodedFormat(&playFormat) != B_OK)
 		return B_MEDIA_BAD_FORMAT;
-	
+
 	// translate the format into a "GameKit" friendly one
 	gs_audio_format gsformat;
-	media_to_gs_format(&gsformat, &playFormat.u.raw_audio);	
+	media_to_gs_format(&gsformat, &playFormat.u.raw_audio);
-	
+
 	// Since the buffer sized read from the file is most likely differnt
 	// then the buffer used by the audio mixer, we must allocate a buffer
 	// large enough to hold the largest request.
 	fBufferSize = gsformat.buffer_size;
 	if (fBufferSize < dformat.buffer_size)
 		fBufferSize = dformat.buffer_size;
-	
+
 	// create the buffer
 	fBuffer = new char[fBufferSize * 2];
 	memset(fBuffer, 0, fBufferSize * 2);
-	
+
 	fFrameSize = gsformat.channel_count * get_sample_size(gsformat.format);
 	fAudioStream->frames = fAudioStream->stream->CountFrames();
-	
+
 	// Ask the device to attach our sound to it
 	gs_id sound;
 	error = Device()->CreateBuffer(&sound, this, &gsformat);
 	if (error != B_OK)
 		return error;
-	
+
 	return BGameSound::Init(sound);
 }
 
@@ -399,13 +407,13 @@ BFileGameSound::Load()
 			memcpy(fBuffer, fBuffer + fPlayPosition, fBufferSize - fPlayPosition);
 		fPlayPosition = fBufferSize - fPlayPosition;
 	}
-	
+
 	// time to read a new buffer
 	int64 frames = 0;
 	fAudioStream->stream->ReadFrames(fBuffer + fPlayPosition, &frames);
 	fBufferSize = fPlayPosition + frames * fFrameSize;
 	fPlayPosition = 0;
-	
+
 	if (fBufferSize == 0) {
 		if (fLooping) {
 			// start reading next time from the start of the file
@@ -415,7 +423,7 @@ BFileGameSound::Load()
 			StopPlaying();
 		}
 	}
-		
+
 	return true;
 }
 
@@ -423,17 +431,17 @@ BFileGameSound::Load()
 bool
 BFileGameSound::Read(void * buffer, size_t bytes)
 {
-	return false;		
+	return false;
 }
 
-	
+
 /* unimplemented for protection of the user:
  *
  * BFileGameSound::BFileGameSound()
  * BFileGameSound::BFileGameSound(const BFileGameSound &)
  * BFileGameSound &BFileGameSound::operator=(const BFileGameSound &)
  */
- 
+
 
 status_t
 BFileGameSound::_Reserved_BFileGameSound_0(int32 arg, ...)