kode54
/
cog
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

CoreAudio: Don't try closing resources that aren't opened

CQTexperiment
Christopher Snowhill 2021-05-07 15:33:20 -07:00
parent 7365174b11
commit 79d12e9fc7
2 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Plugins/CoreAudio/CoreAudioDecoder.h
View File

@ -33,6 +33,9 @@
AudioFileID _audioFile;
ExtAudioFileRef _in;
BOOL _audioFile_opened;
BOOL _in_opened;
int bitrate;
int bitsPerSample;
BOOL floatingPoint;

29
Plugins/CoreAudio/CoreAudioDecoder.m
View File

@ -77,15 +77,21 @@ static SInt64 getSizeProc(void* clientData) {
- (void) close
{
OSStatus err;
err = ExtAudioFileDispose(_in);
if(noErr != err) {
DLog(@"Error closing ExtAudioFile");
}
if (_in_opened) {
err = ExtAudioFileDispose(_in);
if(noErr != err) {
DLog(@"Error closing ExtAudioFile");
}
_in_opened = NO;
}
err = AudioFileClose(_audioFile);
if(noErr != err) {
DLog(@"Error closing AudioFile");
if (_audioFile_opened) {
err = AudioFileClose(_audioFile);
if(noErr != err) {
DLog(@"Error closing AudioFile");
}
_audioFile_opened = NO;
}
_audioSource = nil;
@ -100,6 +106,9 @@ static SInt64 getSizeProc(void* clientData) {
{
OSStatus err;
_audioFile_opened = NO;
_in_opened = NO;
if (![source seekable])
return NO;
@ -112,11 +121,15 @@ static SInt64 getSizeProc(void* clientData) {
return NO;
}
_audioFile_opened = YES;
err = ExtAudioFileWrapAudioFileID(_audioFile, false, &_in);
if(noErr != err) {
ALog(@"Error opening file: %d", err);
return NO;
}
_in_opened = YES;
return [self readInfoFromExtAudioFileRef];
}