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

This should fix crashes due to bad initialization. Completely untested. Might help with ticket #3241

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@42453 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Marcus Overhagen
2011-07-19 18:14:29 +00:00
parent 78c704eee7
commit c80809a3ab
1 changed files with 26 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/game/FileGameSound.cpp
+26 -6
View File
@@ -353,10 +353,18 @@ BFileGameSound::IsPaused()
status_t status_t
BFileGameSound::Init(const entry_ref* file) BFileGameSound::Init(const entry_ref* file)
{ {
fAudioStream = new _gs_media_tracker; fAudioStream = new(std::nothrow) _gs_media_tracker;
memset(fAudioStream, 0, sizeof(_gs_media_tracker)); if (!fAudioStream)
return B_NO_MEMORY;
fAudioStream->file = new BMediaFile(file); memset(fAudioStream, 0, sizeof(_gs_media_tracker));
fAudioStream->file = new(std::nothrow) BMediaFile(file);
if (!fAudioStream->file) {
delete fAudioStream;
fAudioStream = NULL;
return B_NO_MEMORY;
}
status_t error = fAudioStream->file->InitCheck(); status_t error = fAudioStream->file->InitCheck();
if (error != B_OK) if (error != B_OK)
return error; return error;
@@ -365,19 +373,28 @@ BFileGameSound::Init(const entry_ref* file)
// is this is an audio file? // is this is an audio file?
media_format playFormat; media_format playFormat;
if ((error = fAudioStream->stream->EncodedFormat(&playFormat)) != B_OK) if ((error = fAudioStream->stream->EncodedFormat(&playFormat)) != B_OK) {
fAudioStream->file->ReleaseTrack(fAudioStream->stream);
fAudioStream->stream = NULL;
return error; return error;
}
if (!playFormat.IsAudio()) if (!playFormat.IsAudio()) {
fAudioStream->file->ReleaseTrack(fAudioStream->stream);
fAudioStream->stream = NULL;
return B_MEDIA_BAD_FORMAT; return B_MEDIA_BAD_FORMAT;
}
gs_audio_format dformat = Device()->Format(); gs_audio_format dformat = Device()->Format();
// request the format we want the sound // request the format we want the sound
memset(&playFormat, 0, sizeof(media_format)); memset(&playFormat, 0, sizeof(media_format));
playFormat.type = B_MEDIA_RAW_AUDIO; playFormat.type = B_MEDIA_RAW_AUDIO;
if (fAudioStream->stream->DecodedFormat(&playFormat) != B_OK) if (fAudioStream->stream->DecodedFormat(&playFormat) != B_OK) {
fAudioStream->file->ReleaseTrack(fAudioStream->stream);
fAudioStream->stream = NULL;
return B_MEDIA_BAD_FORMAT; return B_MEDIA_BAD_FORMAT;
}
// translate the format into a "GameKit" friendly one // translate the format into a "GameKit" friendly one
gs_audio_format gsformat; gs_audio_format gsformat;
@@ -410,6 +427,9 @@ BFileGameSound::Init(const entry_ref* file)
bool bool
BFileGameSound::Load() BFileGameSound::Load()
{ {
if (!fAudioStream || !fAudioStream->stream)
return false;
// read a new buffer // read a new buffer
int64 frames = 0; int64 frames = 0;
fAudioStream->stream->ReadFrames(fBuffer, &frames); fAudioStream->stream->ReadFrames(fBuffer, &frames);