i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Style

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@37973 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stefano Ceccherini
2010-08-08 12:48:19 +00:00
parent 6fa16ae6e5
commit e749444dfb
1 changed files with 22 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/media/Sound.cpp
+22 -21
View File
@@ -17,7 +17,7 @@
#include <string.h> #include <string.h>
BSound::BSound(void *data, size_t size, const media_raw_audio_format &format, BSound::BSound(void* data, size_t size, const media_raw_audio_format& format,
bool freeWhenDone) bool freeWhenDone)
: fData(data), : fData(data),
fDataSize(size), fDataSize(size),
@@ -35,7 +35,7 @@ BSound::BSound(void *data, size_t size, const media_raw_audio_format &format,
} }
BSound::BSound(const entry_ref *soundFile, bool loadIntoMemory) BSound::BSound(const entry_ref* soundFile, bool loadIntoMemory)
: fData(NULL), : fData(NULL),
fDataSize(0), fDataSize(0),
fFile(new(std::nothrow) BFile(soundFile, B_READ_ONLY)), fFile(new(std::nothrow) BFile(soundFile, B_READ_ONLY)),
@@ -69,7 +69,7 @@ BSound::BSound(const entry_ref *soundFile, bool loadIntoMemory)
} }
BSound::BSound(const media_raw_audio_format &format) BSound::BSound(const media_raw_audio_format& format)
: fData(NULL), : fData(NULL),
fDataSize(0), fDataSize(0),
fFile(NULL), fFile(NULL),
@@ -101,13 +101,14 @@ BSound::InitCheck()
} }
BSound * BSound*
BSound::AcquireRef() BSound::AcquireRef()
{ {
atomic_add(&fRefCount, 1); atomic_add(&fRefCount, 1);
return this; return this;
} }
bool bool
BSound::ReleaseRef() BSound::ReleaseRef()
{ {
@@ -136,14 +137,14 @@ BSound::Duration() const
} }
const media_raw_audio_format & const media_raw_audio_format&
BSound::Format() const BSound::Format() const
{ {
return fFormat; return fFormat;
} }
const void * const void*
BSound::Data() const BSound::Data() const
{ {
return fData; return fData;
@@ -164,15 +165,15 @@ BSound::Size() const
bool bool
BSound::GetDataAt(off_t offset, void *intoBuffer, size_t bufferSize, BSound::GetDataAt(off_t offset, void* intoBuffer, size_t bufferSize,
size_t *outUsed) size_t* outUsed)
{ {
if (intoBuffer == NULL) if (intoBuffer == NULL)
return false; return false;
if (fData != NULL) { if (fData != NULL) {
size_t copySize = MIN(bufferSize, fDataSize - offset); size_t copySize = MIN(bufferSize, fDataSize - offset);
memcpy(intoBuffer, (uint8 *)fData + offset, copySize); memcpy(intoBuffer, (uint8*)fData + offset, copySize);
if (outUsed != NULL) if (outUsed != NULL)
*outUsed = copySize; *outUsed = copySize;
return true; return true;
@@ -196,16 +197,16 @@ BSound::GetDataAt(off_t offset, void *intoBuffer, size_t bufferSize,
if (bufferOffset != 0) { if (bufferOffset != 0) {
int64 indirectFrameCount = directStartFrame - startFrame; int64 indirectFrameCount = directStartFrame - startFrame;
size_t indirectSize = indirectFrameCount * frameSize; size_t indirectSize = indirectFrameCount * frameSize;
void *buffer = malloc(indirectSize); void* buffer = malloc(indirectSize);
if (buffer == NULL) if (buffer == NULL)
return false; return false;
if (fTrackReader->ReadFrames(buffer, indirectFrameCount) != B_OK) { if (fTrackReader->ReadFrames(buffer, indirectFrameCount) != B_OK) {
free(buffer); free(buffer);
return false; return false;
} }
memcpy(intoBuffer, (uint8 *)buffer + bufferOffset, memcpy(intoBuffer, (uint8*)buffer + bufferOffset,
indirectSize - bufferOffset); indirectSize - bufferOffset);
if (outUsed != NULL) if (outUsed != NULL)
*outUsed = indirectSize - bufferOffset; *outUsed = indirectSize - bufferOffset;
@@ -214,7 +215,7 @@ BSound::GetDataAt(off_t offset, void *intoBuffer, size_t bufferSize,
} else if (outUsed != NULL) } else if (outUsed != NULL)
*outUsed = 0; *outUsed = 0;
if (fTrackReader->ReadFrames((uint8 *)intoBuffer + bufferOffset, if (fTrackReader->ReadFrames((uint8*)intoBuffer + bufferOffset,
directFrameCount) != B_OK) directFrameCount) != B_OK)
return false; return false;
@@ -229,7 +230,7 @@ BSound::GetDataAt(off_t offset, void *intoBuffer, size_t bufferSize,
status_t status_t
BSound::BindTo(BSoundPlayer *player, const media_raw_audio_format &format) BSound::BindTo(BSoundPlayer* player, const media_raw_audio_format& format)
{ {
UNIMPLEMENTED(); UNIMPLEMENTED();
return B_ERROR; return B_ERROR;
@@ -237,7 +238,7 @@ BSound::BindTo(BSoundPlayer *player, const media_raw_audio_format &format)
status_t status_t
BSound::UnbindFrom(BSoundPlayer *player) BSound::UnbindFrom(BSoundPlayer* player)
{ {
UNIMPLEMENTED(); UNIMPLEMENTED();
return B_ERROR; return B_ERROR;
@@ -252,9 +253,9 @@ BSound::Perform(int32 code, ...)
} }
status_t BSound::_Reserved_Sound_0(void *) { return B_ERROR; } status_t BSound::_Reserved_Sound_0(void*) { return B_ERROR; }
status_t BSound::_Reserved_Sound_1(void *) { return B_ERROR; } status_t BSound::_Reserved_Sound_1(void*) { return B_ERROR; }
status_t BSound::_Reserved_Sound_2(void *) { return B_ERROR; } status_t BSound::_Reserved_Sound_2(void*) { return B_ERROR; }
status_t BSound::_Reserved_Sound_3(void *) { return B_ERROR; } status_t BSound::_Reserved_Sound_3(void*) { return B_ERROR; }
status_t BSound::_Reserved_Sound_4(void *) { return B_ERROR; } status_t BSound::_Reserved_Sound_4(void*) { return B_ERROR; }
status_t BSound::_Reserved_Sound_5(void *) { return B_ERROR; } status_t BSound::_Reserved_Sound_5(void*) { return B_ERROR; }