Compare commits
2 commits
41780e88d0
...
1601206b57
Author | SHA1 | Date | |
---|---|---|---|
|
1601206b57 | ||
|
6655dd34ec |
1 changed files with 16 additions and 6 deletions
|
@ -196,18 +196,28 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
- (void)seekToTime:(double)time {
|
- (void)seekToTime:(double)time {
|
||||||
|
[output fadeOutBackground];
|
||||||
|
[output setVolume:volume];
|
||||||
|
|
||||||
|
[output seek:time];
|
||||||
|
[bufferChain seek:time];
|
||||||
|
|
||||||
CogStatus status = (CogStatus)currentPlaybackStatus;
|
CogStatus status = (CogStatus)currentPlaybackStatus;
|
||||||
NSURL *url;
|
BOOL paused = status == CogStatusPaused;
|
||||||
id userInfo;
|
id userInfo;
|
||||||
NSDictionary *rgi;
|
|
||||||
|
|
||||||
@synchronized(chainQueue) {
|
@synchronized(chainQueue) {
|
||||||
url = [bufferChain streamURL];
|
|
||||||
userInfo = [bufferChain userInfo];
|
userInfo = [bufferChain userInfo];
|
||||||
rgi = [bufferChain rgInfo];
|
|
||||||
}
|
}
|
||||||
|
|
||||||
[self play:url withUserInfo:userInfo withRGInfo:rgi startPaused:(status == CogStatusPaused) andSeekTo:time andResumeInterval:YES];
|
if(paused) {
|
||||||
|
[self setPlaybackStatus:CogStatusPaused waitUntilDone:YES];
|
||||||
|
if(time > 0.0) {
|
||||||
|
[self updatePosition:userInfo];
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
[output fadeIn];
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
- (void)setVolume:(double)v {
|
- (void)setVolume:(double)v {
|
||||||
|
@ -694,7 +704,7 @@
|
||||||
while(atomic_load_explicit(&refCount, memory_order_relaxed) != 0) {
|
while(atomic_load_explicit(&refCount, memory_order_relaxed) != 0) {
|
||||||
[semaphore signal]; // Gotta poke this periodically
|
[semaphore signal]; // Gotta poke this periodically
|
||||||
if(mainThread)
|
if(mainThread)
|
||||||
[[NSRunLoop currentRunLoop] runUntilDate:[NSDate dateWithTimeIntervalSinceNow:0.001]];
|
[[NSRunLoop currentRunLoop] runUntilDate:[NSDate dateWithTimeIntervalSinceNow:0.01]];
|
||||||
else
|
else
|
||||||
usleep(500);
|
usleep(500);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue