Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

I think this change fixed some trouble I had with MediaPlayer on a system

Browse Source 
with an unsupported sound card or the like, the fSoundOutput initialization
is checked in more places.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@23764 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stephan Aßmus 2008-01-27 13:08:14 +00:00
parent 133f20b00b
commit a29a9e05fb
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/apps/mediaplayer/Controller.cpp
View File

@ -886,7 +886,7 @@ printf("audio format changed, new buffer duration %Ld\n", bufferDuration);
// TODO: fix performance time update (in case no audio)
if (fTimeSourceLock.Lock()) {
audioLatency = fSoundOutput->Latency();
audioLatency = fSoundOutput ? fSoundOutput->Latency() : 0;
fTimeSourceSysTime = system_time() + audioLatency - bufferDuration;
fTimeSourcePerfTime = buffer->startTime;
fTimeSourceLock.Unlock();
@ -895,7 +895,8 @@ printf("audio format changed, new buffer duration %Ld\n", bufferDuration);
// fTimeSourcePerfTime);
if (fSoundOutput) {
fSoundOutput->Play(buffer->buffer, buffer->sizeUsed);
if (fSoundOutput->InitCheck() >= B_OK)
fSoundOutput->Play(buffer->buffer, buffer->sizeUsed);
_UpdatePosition(buffer->startTime);
}
@ -1048,6 +1049,7 @@ printf("video decode start\n");
fTimeSourceLock.Unlock();
} else {
// puhh...
return;
}
#if 0
@ -1220,7 +1222,8 @@ Controller::_UpdatePosition(bigtime_t position, bool isVideoPosition, bool force
return;
// prefer audio position over video position
if (isVideoPosition && fAudioSupplier)
if (isVideoPosition && (fAudioSupplier && fSoundOutput
&& fSoundOutput->InitCheck() >= B_OK))
return;
// BAutolock _(fTimeSourceLock);