TouchInstinct
/
StreamingKit
310
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed deadlock

This commit is contained in:
Thong Nguyen 2013-07-17 15:48:18 +01:00
parent c2d5d4000d
commit ee387dc098
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Audjustable/Classes/AudioPlayer/AudioPlayer.m
View File

@ -213,7 +213,7 @@
double calculatedBitRate = [self calculatedBitRate];
if (calculatedBitRate == 0 || self->dataSource.length == 0)
if (calculatedBitRate == 0 || dataSource.length == 0)
{
return 0;
}
@ -1220,20 +1220,20 @@ static void AudioQueueIsRunningCallbackProc(void* userData, AudioQueueRef audioQ
return 0;
}
pthread_mutex_lock(&playerMutex);
OSSpinLockLock(&currentlyPlayingLock);
QueueEntry* entry = currentlyPlayingEntry;
if (entry == nil)
{
pthread_mutex_unlock(&playerMutex);
OSSpinLockUnlock(&currentlyPlayingLock);
return 0;
}
double retval = [entry duration];
pthread_mutex_unlock(&playerMutex);
OSSpinLockUnlock(&currentlyPlayingLock);
return retval;
}
@ -1250,20 +1250,20 @@ static void AudioQueueIsRunningCallbackProc(void* userData, AudioQueueRef audioQ
return 0;
}
pthread_mutex_lock(&playerMutex);
OSSpinLockLock(&currentlyPlayingLock);
QueueEntry* entry = currentlyPlayingEntry;
if (entry == nil)
{
pthread_mutex_unlock(&playerMutex);
OSSpinLockUnlock(&currentlyPlayingLock);
return 0;
}
double retval = [entry progress];
pthread_mutex_unlock(&playerMutex);
OSSpinLockUnlock(&currentlyPlayingLock);
return retval;
}
@ -2146,20 +2146,20 @@ static void AudioQueueIsRunningCallbackProc(void* userData, AudioQueueRef audioQ
-(NSObject*) currentlyPlayingQueueItemId
{
pthread_mutex_lock(&playerMutex);
OSSpinLockLock(&currentlyPlayingLock);
QueueEntry* entry = currentlyPlayingEntry;
if (entry == nil)
{
pthread_mutex_unlock(&playerMutex);
OSSpinLockUnlock(&currentlyPlayingLock);
return nil;
}
NSObject* retval = entry.queueItemId;
pthread_mutex_unlock(&playerMutex);
OSSpinLockUnlock(&currentlyPlayingLock);
return retval;
}