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

AdapterIO: Size could be 0

Browse Source 
* Also avoid seeking completely when we are sure
we have to block.
This commit is contained in:
Dario Casalinuovo
2016-06-23 00:38:33 +02:00
parent 6b697577fe
commit bcab157e9d
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/media/AdapterIO.cpp
+10 -6
View File
@@ -61,6 +61,8 @@ public:
// block on that. // block on that.
if (IsMutable()) if (IsMutable())
return B_WOULD_BLOCK; return B_WOULD_BLOCK;
else if (size == 0)
return B_RESOURCE_UNAVAILABLE;
else else
return B_ERROR; return B_ERROR;
} }
@@ -319,13 +321,15 @@ BAdapterIO::_EvaluateWait(off_t pos)
status_t err = fBuffer->EvaluatePosition(pos); status_t err = fBuffer->EvaluatePosition(pos);
if (err != B_RESOURCE_UNAVAILABLE && err != B_OK) if (err != B_WOULD_BLOCK) {
return B_UNSUPPORTED; if (err != B_RESOURCE_UNAVAILABLE && err != B_OK)
if (err == B_RESOURCE_UNAVAILABLE && fBuffer->IsStreaming()
&& fBuffer->IsSeekable()) {
if (SeekRequested(pos) != B_OK)
return B_UNSUPPORTED; return B_UNSUPPORTED;
if (err == B_RESOURCE_UNAVAILABLE && fBuffer->IsStreaming()
&& fBuffer->IsSeekable()) {
if (SeekRequested(pos) != B_OK)
return B_UNSUPPORTED;
}
} }
return fBuffer->WaitForData(pos); return fBuffer->WaitForData(pos);