Skip to content

Commit

Permalink
Style fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@Numerio
Numerio committed Jun 22, 2016
1 parent e1c98ce commit 59ff587
Show file tree
Hide file tree
Showing 2 changed files with 152 additions and 152 deletions.
256 changes: 128 additions & 128 deletions src/kits/media/AdapterIO.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,140 +14,140 @@
class RelativePositionIO : public BPositionIO
{
public:
RelativePositionIO(BPositionIO* buffer)
:
BPositionIO(),
fStartOffset(0),
fTotalSize(0),
fBuffer(buffer)
{}

virtual ~RelativePositionIO()
{
delete fBuffer;
}

void SetTotalSize(size_t size)
{
fTotalSize = size;
}

size_t TotalSize() const
{
return fTotalSize;
}

status_t ResetStartOffset(off_t offset)
{
status_t ret = fBuffer->SetSize(0);
if (ret == B_OK)
fStartOffset = offset;

return ret;
}

status_t EvaluatePosition(off_t position)
{
if (position < 0)
return B_ERROR;

if (position < fStartOffset)
return B_RESOURCE_UNAVAILABLE;

// This is an endless stream, we don't know
// how much data will come and when, we could
// block on that.
if (fTotalSize == 0)
return B_WOULD_BLOCK;

if (position >= fTotalSize)
return B_ERROR;

off_t size = 0;
fBuffer->GetSize(&size);
if (position >= size)
return B_RESOURCE_UNAVAILABLE;

return B_OK;
}

status_t WaitForData(off_t position)
{
off_t bufferSize = 0;
position = _PositionToRelative(position);

status_t ret = fBuffer->GetSize(&bufferSize);
if (ret != B_OK)
return B_ERROR;

while(bufferSize < position) {
snooze(100000);
fBuffer->GetSize(&bufferSize);
}
return B_OK;
}

virtual ssize_t ReadAt(off_t position, void* buffer,
size_t size)
{
return fBuffer->ReadAt(
_PositionToRelative(position), buffer, size);

}

virtual ssize_t WriteAt(off_t position,
const void* buffer, size_t size)
{
return fBuffer->WriteAt(
_PositionToRelative(position), buffer, size);
}

virtual off_t Seek(off_t position, uint32 seekMode)
{
return fBuffer->Seek(_PositionToRelative(position), seekMode);
}

virtual off_t Position() const
{
return _RelativeToPosition(fBuffer->Position());
}

virtual status_t SetSize(off_t size)
{
return fBuffer->SetSize(_PositionToRelative(size));
}

virtual status_t GetSize(off_t* size) const
{
if (fTotalSize > 0) {
*size = fTotalSize;
return B_OK;
}

off_t bufferSize;
status_t ret = fBuffer->GetSize(&bufferSize);
if (ret == B_OK)
*size = _RelativeToPosition(bufferSize);

return ret;
}
RelativePositionIO(BPositionIO* buffer)
:
BPositionIO(),
fStartOffset(0),
fTotalSize(0),
fBuffer(buffer)
{}

virtual ~RelativePositionIO()
{
delete fBuffer;
}

void SetTotalSize(size_t size)
{
fTotalSize = size;
}

size_t TotalSize() const
{
return fTotalSize;
}

status_t ResetStartOffset(off_t offset)
{
status_t ret = fBuffer->SetSize(0);
if (ret == B_OK)
fStartOffset = offset;

return ret;
}

status_t EvaluatePosition(off_t position)
{
if (position < 0)
return B_ERROR;

if (position < fStartOffset)
return B_RESOURCE_UNAVAILABLE;

// This is an endless stream, we don't know
// how much data will come and when, we could
// block on that.
if (fTotalSize == 0)
return B_WOULD_BLOCK;

if (position >= fTotalSize)
return B_ERROR;

off_t size = 0;
fBuffer->GetSize(&size);
if (position >= size)
return B_RESOURCE_UNAVAILABLE;

return B_OK;
}

status_t WaitForData(off_t position)
{
off_t bufferSize = 0;
position = _PositionToRelative(position);

status_t ret = fBuffer->GetSize(&bufferSize);
if (ret != B_OK)
return B_ERROR;

while(bufferSize < position) {
snooze(100000);
fBuffer->GetSize(&bufferSize);
}
return B_OK;
}

virtual ssize_t ReadAt(off_t position, void* buffer,
size_t size)
{
return fBuffer->ReadAt(
_PositionToRelative(position), buffer, size);

}

virtual ssize_t WriteAt(off_t position,
const void* buffer, size_t size)
{
return fBuffer->WriteAt(
_PositionToRelative(position), buffer, size);
}

virtual off_t Seek(off_t position, uint32 seekMode)
{
return fBuffer->Seek(_PositionToRelative(position), seekMode);
}

virtual off_t Position() const
{
return _RelativeToPosition(fBuffer->Position());
}

virtual status_t SetSize(off_t size)
{
return fBuffer->SetSize(_PositionToRelative(size));
}

virtual status_t GetSize(off_t* size) const
{
if (fTotalSize > 0) {
*size = fTotalSize;
return B_OK;
}

off_t bufferSize;
status_t ret = fBuffer->GetSize(&bufferSize);
if (ret == B_OK)
*size = _RelativeToPosition(bufferSize);

return ret;
}

private:

off_t _PositionToRelative(off_t position) const
{
return position - fStartOffset;
}
off_t _PositionToRelative(off_t position) const
{
return position - fStartOffset;
}

off_t _RelativeToPosition(off_t position) const
{
return position + fStartOffset;
}
off_t _RelativeToPosition(off_t position) const
{
return position + fStartOffset;
}

off_t fStartOffset;
off_t fTotalSize;
off_t fStartOffset;
off_t fTotalSize;

BPositionIO* fBuffer;
BPositionIO* fBuffer;
};


Expand Down
48 changes: 24 additions & 24 deletions src/kits/media/PluginManager.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@ PluginManager gPluginManager;
class DataIOAdapter : public BAdapterIO
{
public:
DataIOAdapter(BDataIO* dataIO)
:
BAdapterIO(B_MEDIA_SEEK_BACKWARD | B_MEDIA_MUTABLE_SIZE,
B_INFINITE_TIMEOUT),
fDataIO(dataIO)
DataIOAdapter(BDataIO* dataIO)
:
BAdapterIO(B_MEDIA_SEEK_BACKWARD | B_MEDIA_MUTABLE_SIZE,
B_INFINITE_TIMEOUT),
fDataIO(dataIO)
{
fDataInputAdapter = BuildInputAdapter();
}
Expand Down Expand Up @@ -138,52 +138,52 @@ class BMediaIOWrapper : public BMediaIO

// BMediaIO interface

virtual void GetFlags(int32* flags) const
virtual void GetFlags(int32* flags) const
{
*flags = fFlags;
}

// BPositionIO interface

virtual ssize_t ReadAt(off_t position, void* buffer,
size_t size)
virtual ssize_t ReadAt(off_t position, void* buffer,
size_t size)
{
CALLED();

return fPosition->ReadAt(position, buffer, size);
}

virtual ssize_t WriteAt(off_t position, const void* buffer,
size_t size)
virtual ssize_t WriteAt(off_t position, const void* buffer,
size_t size)
{
CALLED();

return fPosition->WriteAt(position, buffer, size);
}

virtual off_t Seek(off_t position, uint32 seekMode)
virtual off_t Seek(off_t position, uint32 seekMode)
{
CALLED();

return fPosition->Seek(position, seekMode);

}

virtual off_t Position() const
virtual off_t Position() const
{
CALLED();

return fPosition->Position();
}

virtual status_t SetSize(off_t size)
virtual status_t SetSize(off_t size)
{
CALLED();

return fPosition->SetSize(size);
}

virtual status_t GetSize(off_t* size) const
virtual status_t GetSize(off_t* size) const
{
CALLED();

Expand All @@ -192,33 +192,33 @@ class BMediaIOWrapper : public BMediaIO

// Utility methods

status_t InitCheck() const
status_t InitCheck() const
{
return fErr;
}

protected:

bool IsMedia() const
bool IsMedia() const
{
return fMedia != NULL;
}

bool IsPosition() const
bool IsPosition() const
{
return fPosition != NULL;
}

private:
BDataIO* fData;
BPositionIO* fPosition;
BMediaIO* fMedia;
BBufferIO* fBufferIO;
DataIOAdapter* fDataIOAdapter;
BDataIO* fData;
BPositionIO* fPosition;
BMediaIO* fMedia;
BBufferIO* fBufferIO;
DataIOAdapter* fDataIOAdapter;

int32 fFlags;
int32 fFlags;

status_t fErr;
status_t fErr;
};


Expand Down

0 comments on commit 59ff587

Please sign in to comment.