Compare commits

..

No commits in common. "98d898a71571b02e1fd217a41fde5248599ce6a5" and "3f7ec658fe18dac98edec45ba19ae2f4153ce391" have entirely different histories.

2 changed files with 3 additions and 8 deletions

View file

@ -16,7 +16,6 @@
float *visAudio; float *visAudio;
int visAudioCursor, visAudioSize; int visAudioCursor, visAudioSize;
uint64_t visSamplesPosted; uint64_t visSamplesPosted;
BOOL ignoreLatency;
} }
static VisualizationController *_sharedController = nil; static VisualizationController *_sharedController = nil;
@ -36,7 +35,6 @@ static VisualizationController *_sharedController = nil;
visAudio = NULL; visAudio = NULL;
visAudioSize = 0; visAudioSize = 0;
latency = 0; latency = 0;
ignoreLatency = YES;
} }
return self; return self;
} }
@ -50,7 +48,6 @@ static VisualizationController *_sharedController = nil;
latency = 0; latency = 0;
visAudioCursor = 0; visAudioCursor = 0;
visSamplesPosted = 0; visSamplesPosted = 0;
ignoreLatency = YES;
if(visAudio && visAudioSize) { if(visAudio && visAudioSize) {
bzero(visAudio, sizeof(float) * visAudioSize); bzero(visAudio, sizeof(float) * visAudioSize);
} }
@ -102,7 +99,7 @@ static VisualizationController *_sharedController = nil;
- (void)postLatency:(double)latency { - (void)postLatency:(double)latency {
self->latency = latency; self->latency = latency;
ignoreLatency = (latency >= 45.0) || (latency < 0.0); assert(latency < 45.0);
} }
- (double)readSampleRate { - (double)readSampleRate {
@ -118,7 +115,7 @@ static VisualizationController *_sharedController = nil;
- (void)copyVisPCM:(float *_Nullable)outPCM visFFT:(float *_Nullable)outFFT latencyOffset:(double)latency { - (void)copyVisPCM:(float *_Nullable)outPCM visFFT:(float *_Nullable)outFFT latencyOffset:(double)latency {
if(!outPCM && !outFFT) return; if(!outPCM && !outFFT) return;
if(ignoreLatency || !visAudio || !visAudioSize) { if(!visAudio || !visAudioSize) {
if(outPCM) bzero(outPCM, sizeof(float) * 4096); if(outPCM) bzero(outPCM, sizeof(float) * 4096);
if(outFFT) bzero(outFFT, sizeof(float) * 2048); if(outFFT) bzero(outFFT, sizeof(float) * 2048);
return; return;

View file

@ -374,10 +374,8 @@ static void *playlistControllerContext = &playlistControllerContext;
ldiv_t weeksAndDays; ldiv_t weeksAndDays;
for(PlaylistEntry *pe in [self arrangedObjects]) { for(PlaylistEntry *pe in [self arrangedObjects]) {
if(pe && !pe.deLeted && pe.length) {
if(!isnan([pe.length doubleValue])) tt += [pe.length doubleValue]; if(!isnan([pe.length doubleValue])) tt += [pe.length doubleValue];
} }
}
long sec = (long)(tt); long sec = (long)(tt);
hoursAndMinutes = ldiv(sec / 60, 60); hoursAndMinutes = ldiv(sec / 60, 60);