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

Whitespace cleanup and 80 chars/line fix.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@31273 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stephan Aßmus
2009-06-27 17:13:58 +00:00
parent 7f3664f88e
commit d8b88d0378
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/media/Buffer.cpp
+10 -9
View File
@@ -181,14 +181,14 @@ BBuffer::Size()
*************************************************************/ *************************************************************/
/* explicit */ /* explicit */
BBuffer::BBuffer(const buffer_clone_info & info) : BBuffer::BBuffer(const buffer_clone_info & info) :
fBufferList(0), // must be 0 if not correct initialized fBufferList(0), // must be 0 if not correct initialized
fData(0), // must be 0 if not correct initialized fData(0), // must be 0 if not correct initialized
fSize(0), // should be 0 if not correct initialized fSize(0), // should be 0 if not correct initialized
fBufferID(0) // must be 0 if not registered fBufferID(0) // must be 0 if not registered
{ {
CALLED(); CALLED();
// special case for BSmallBuffer // special case for BSmallBuffer
if (info.area == 0 && info.buffer == 0) if (info.area == 0 && info.buffer == 0)
return; return;
@@ -200,9 +200,9 @@ BBuffer::BBuffer(const buffer_clone_info & info) :
ERROR("BBuffer::BBuffer: SERVER_GET_SHARED_BUFFER_AREA failed\n"); ERROR("BBuffer::BBuffer: SERVER_GET_SHARED_BUFFER_AREA failed\n");
return; return;
} }
ASSERT(area_reply.area > 0); ASSERT(area_reply.area > 0);
fBufferList = _shared_buffer_list::Clone(area_reply.area); fBufferList = _shared_buffer_list::Clone(area_reply.area);
if (fBufferList == NULL) { if (fBufferList == NULL) {
ERROR("BBuffer::BBuffer: _shared_buffer_list::Clone() failed\n"); ERROR("BBuffer::BBuffer: _shared_buffer_list::Clone() failed\n");
@@ -211,11 +211,11 @@ BBuffer::BBuffer(const buffer_clone_info & info) :
server_register_buffer_request request; server_register_buffer_request request;
server_register_buffer_reply reply; server_register_buffer_reply reply;
request.team = team; request.team = team;
request.info = info; request.info = info;
// ask media_server to register this buffer, // ask media_server to register this buffer,
// either identified by "buffer" or by area information. // either identified by "buffer" or by area information.
// media_server either has a copy of the area identified // media_server either has a copy of the area identified
// by "buffer", or creates a new area. // by "buffer", or creates a new area.
@@ -238,8 +238,9 @@ BBuffer::BBuffer(const buffer_clone_info & info) :
fSize = reply.info.size; fSize = reply.info.size;
fFlags = reply.info.flags; fFlags = reply.info.flags;
fOffset = reply.info.offset; fOffset = reply.info.offset;
fArea = clone_area("a cloned BBuffer", &fData, B_ANY_ADDRESS, B_READ_AREA | B_WRITE_AREA, reply.info.area); fArea = clone_area("a cloned BBuffer", &fData, B_ANY_ADDRESS,
B_READ_AREA | B_WRITE_AREA, reply.info.area);
if (fArea <= B_OK) { if (fArea <= B_OK) {
// XXX should unregister buffer here // XXX should unregister buffer here
ERROR("BBuffer::BBuffer: buffer cloning failed\n"); ERROR("BBuffer::BBuffer: buffer cloning failed\n");
@@ -281,7 +282,7 @@ BBuffer::SetHeader(const media_header *header)
{ {
CALLED(); CALLED();
fMediaHeader = *header; fMediaHeader = *header;
// XXX why can't we do this without crash? what's wrong? // XXX why can't we do this without crash? what's wrong?
// fMediaHeader.buffer = fBufferID; // fMediaHeader.buffer = fBufferID;
} }