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

SID Input: Synchronize cross file access 

The same file may be accessed from other threads, thanks to this cache
thing. Synchronize access so that only one thread is reading the file at
a time.

Signed-off-by: Christopher Snowhill <kode54@gmail.com>
CQTexperiment
Christopher Snowhill 2022-02-11 03:56:50 -08:00
parent be6fda4663
commit 4f5e5a9e4e
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Plugins/sidplay/SidDecoder.mm
View File

@ -21,6 +21,8 @@
static const char *extListEmpty[] = { NULL }; static const char *extListEmpty[] = { NULL };
static const char *extListStr[] = { ".str", NULL }; static const char *extListStr[] = { ".str", NULL };
static NSLock *_lock = [[NSLock alloc] init];
@interface sid_file_container : NSObject { @interface sid_file_container : NSObject {
NSLock *lock; NSLock *lock;
NSMutableDictionary *list; NSMutableDictionary *list;
@ -76,6 +78,7 @@ static const char *extListStr[] = { ".str", NULL };
static void sidTuneLoader(const char *fileName, std::vector<uint8_t> &bufferRef) { static void sidTuneLoader(const char *fileName, std::vector<uint8_t> &bufferRef) {
id<CogSource> source; id<CogSource> source;
BOOL usedHint = YES; BOOL usedHint = YES;
[_lock lock];
if(![[sid_file_container instance] try_hint:[NSString stringWithUTF8String:fileName] source:&source]) { if(![[sid_file_container instance] try_hint:[NSString stringWithUTF8String:fileName] source:&source]) {
usedHint = NO; usedHint = NO;
@ -85,11 +88,15 @@ static void sidTuneLoader(const char *fileName, std::vector<uint8_t> &bufferRef)
id audioSourceClass = NSClassFromString(@"AudioSource"); id audioSourceClass = NSClassFromString(@"AudioSource");
source = [audioSourceClass audioSourceForURL:url]; source = [audioSourceClass audioSourceForURL:url];
if(![source open:url]) if(![source open:url]) {
[_lock unlock];
return; return;
}
if(![source seekable]) if(![source seekable]) {
[_lock unlock];
return; return;
}
} }
[source seek:0 whence:SEEK_END]; [source seek:0 whence:SEEK_END];
@ -102,6 +109,8 @@ static void sidTuneLoader(const char *fileName, std::vector<uint8_t> &bufferRef)
if(!usedHint) if(!usedHint)
[source close]; [source close];
[_lock unlock];
} }
@implementation SidDecoder @implementation SidDecoder