Fixed binding for display/length when loading songs
parent
91e16fbd95
commit
42ff4e5ef1
|
@ -28,11 +28,11 @@
|
||||||
<integer>3</integer>
|
<integer>3</integer>
|
||||||
<key>IBOpenObjects</key>
|
<key>IBOpenObjects</key>
|
||||||
<array>
|
<array>
|
||||||
<integer>513</integer>
|
|
||||||
<integer>463</integer>
|
<integer>463</integer>
|
||||||
<integer>823</integer>
|
<integer>823</integer>
|
||||||
<integer>29</integer>
|
<integer>29</integer>
|
||||||
<integer>21</integer>
|
<integer>21</integer>
|
||||||
|
<integer>513</integer>
|
||||||
</array>
|
</array>
|
||||||
<key>IBSystem Version</key>
|
<key>IBSystem Version</key>
|
||||||
<string>8I127</string>
|
<string>8I127</string>
|
||||||
|
|
Binary file not shown.
|
@ -69,8 +69,6 @@
|
||||||
{
|
{
|
||||||
PlaylistEntry *pe = [[playlistController arrangedObjects] objectAtIndex:i];
|
PlaylistEntry *pe = [[playlistController arrangedObjects] objectAtIndex:i];
|
||||||
|
|
||||||
[playlistController setCurrentEntry:pe];
|
|
||||||
|
|
||||||
[self playEntry:pe];
|
[self playEntry:pe];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -88,8 +86,8 @@
|
||||||
if (playbackStatus != kCogStatusStopped)
|
if (playbackStatus != kCogStatusStopped)
|
||||||
[self stop:self];
|
[self stop:self];
|
||||||
|
|
||||||
DBLog(@"LENGTH: %lf", [pe length]);
|
[playlistController setCurrentEntry:pe];
|
||||||
[positionSlider setMaxValue:[pe length]];
|
|
||||||
[positionSlider setDoubleValue:0.0f];
|
[positionSlider setDoubleValue:0.0f];
|
||||||
|
|
||||||
[self updateTimeField:0.0f];
|
[self updateTimeField:0.0f];
|
||||||
|
@ -228,7 +226,6 @@
|
||||||
{
|
{
|
||||||
[playlistController setCurrentEntry:pe];
|
[playlistController setCurrentEntry:pe];
|
||||||
|
|
||||||
[positionSlider setMaxValue:[pe length]];
|
|
||||||
[positionSlider setDoubleValue:0.0f];
|
[positionSlider setDoubleValue:0.0f];
|
||||||
|
|
||||||
[self updateTimeField:0.0f];
|
[self updateTimeField:0.0f];
|
||||||
|
|
|
@ -163,10 +163,14 @@
|
||||||
// [pe performSelectorOnMainThread:@selector(readInfoThread) withObject:nil waitUntilDone:YES];
|
// [pe performSelectorOnMainThread:@selector(readInfoThread) withObject:nil waitUntilDone:YES];
|
||||||
[pe readTagsThread];
|
[pe readTagsThread];
|
||||||
// [pe performSelectorOnMainThread:@selector(readTagsThread) withObject:nil waitUntilDone:YES];
|
// [pe performSelectorOnMainThread:@selector(readTagsThread) withObject:nil waitUntilDone:YES];
|
||||||
|
|
||||||
|
//Hack so the display gets updated
|
||||||
|
if (pe == [self currentEntry])
|
||||||
|
[self performSelectorOnMainThread:@selector(setCurrentEntry:) withObject:[self currentEntry] waitUntilDone:YES];
|
||||||
}
|
}
|
||||||
|
|
||||||
[self performSelectorOnMainThread:@selector(updateTotalTime) withObject:nil waitUntilDone:NO];
|
[self performSelectorOnMainThread:@selector(updateTotalTime) withObject:nil waitUntilDone:NO];
|
||||||
|
|
||||||
[entries release];
|
[entries release];
|
||||||
[pool release];
|
[pool release];
|
||||||
}
|
}
|
||||||
|
|
|
@ -235,11 +235,11 @@
|
||||||
|
|
||||||
- (void)readInfoThreadSetVariables:(SoundFile *)sf
|
- (void)readInfoThreadSetVariables:(SoundFile *)sf
|
||||||
{
|
{
|
||||||
length = [sf length];
|
[self setLength:[sf length]];
|
||||||
bitRate = [sf bitRate];
|
[self setBitRate:[sf bitRate]];
|
||||||
channels = [sf channels];
|
[self setChannels:[sf channels]];
|
||||||
bitsPerSample = [sf bitsPerSample];
|
[self setBitsPerSample:[sf bitsPerSample]];
|
||||||
sampleRate = [sf frequency];
|
[self setSampleRate:(float)[sf frequency]];
|
||||||
|
|
||||||
[self setLengthString:length];
|
[self setLengthString:length];
|
||||||
|
|
||||||
|
@ -267,23 +267,47 @@
|
||||||
lengthString = [[NSString alloc] initWithFormat:@"%i:%02i",sec/60,sec%60];
|
lengthString = [[NSString alloc] initWithFormat:@"%i:%02i",sec/60,sec%60];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
- (void)setLength:(double)l
|
||||||
|
{
|
||||||
|
length = l;
|
||||||
|
}
|
||||||
- (double)length
|
- (double)length
|
||||||
{
|
{
|
||||||
return length;
|
return length;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
- (void)setBitRate:(int) br
|
||||||
|
{
|
||||||
|
bitRate = br;
|
||||||
|
}
|
||||||
- (int)bitRate
|
- (int)bitRate
|
||||||
{
|
{
|
||||||
return bitRate;
|
return bitRate;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
- (void)setChannels:(int)c
|
||||||
|
{
|
||||||
|
channels = c;
|
||||||
|
}
|
||||||
- (int)channels
|
- (int)channels
|
||||||
{
|
{
|
||||||
return channels;
|
return channels;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
- (void)setBitsPerSample:(int)bps
|
||||||
|
{
|
||||||
|
bitsPerSample = bps;
|
||||||
|
}
|
||||||
- (int)bitsPerSample
|
- (int)bitsPerSample
|
||||||
{
|
{
|
||||||
return bitsPerSample;
|
return bitsPerSample;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
- (void)setSampleRate:(float)s
|
||||||
|
{
|
||||||
|
sampleRate = s;
|
||||||
|
}
|
||||||
- (float)sampleRate
|
- (float)sampleRate
|
||||||
{
|
{
|
||||||
return sampleRate;
|
return sampleRate;
|
||||||
|
|
Loading…
Reference in New Issue