diff --git a/English.lproj/MainMenu.nib/info.nib b/English.lproj/MainMenu.nib/info.nib
index f68d4dc31..793587e98 100644
--- a/English.lproj/MainMenu.nib/info.nib
+++ b/English.lproj/MainMenu.nib/info.nib
@@ -28,11 +28,11 @@
3
IBOpenObjects
- 513
463
823
29
21
+ 513
IBSystem Version
8I127
diff --git a/English.lproj/MainMenu.nib/keyedobjects.nib b/English.lproj/MainMenu.nib/keyedobjects.nib
index b6defd838..8ec89cdaa 100644
Binary files a/English.lproj/MainMenu.nib/keyedobjects.nib and b/English.lproj/MainMenu.nib/keyedobjects.nib differ
diff --git a/PlaybackController.m b/PlaybackController.m
index b1e56fdc4..6e061b576 100644
--- a/PlaybackController.m
+++ b/PlaybackController.m
@@ -69,8 +69,6 @@
{
PlaylistEntry *pe = [[playlistController arrangedObjects] objectAtIndex:i];
- [playlistController setCurrentEntry:pe];
-
[self playEntry:pe];
}
@@ -88,8 +86,8 @@
if (playbackStatus != kCogStatusStopped)
[self stop:self];
- DBLog(@"LENGTH: %lf", [pe length]);
- [positionSlider setMaxValue:[pe length]];
+ [playlistController setCurrentEntry:pe];
+
[positionSlider setDoubleValue:0.0f];
[self updateTimeField:0.0f];
@@ -228,7 +226,6 @@
{
[playlistController setCurrentEntry:pe];
- [positionSlider setMaxValue:[pe length]];
[positionSlider setDoubleValue:0.0f];
[self updateTimeField:0.0f];
diff --git a/Playlist/PlaylistController.m b/Playlist/PlaylistController.m
index 0f437436a..b2b67a121 100644
--- a/Playlist/PlaylistController.m
+++ b/Playlist/PlaylistController.m
@@ -163,10 +163,14 @@
// [pe performSelectorOnMainThread:@selector(readInfoThread) withObject:nil waitUntilDone:YES];
[pe readTagsThread];
// [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];
-
+
[entries release];
[pool release];
}
diff --git a/Playlist/PlaylistEntry.m b/Playlist/PlaylistEntry.m
index ce94e99cc..5048fbc6f 100644
--- a/Playlist/PlaylistEntry.m
+++ b/Playlist/PlaylistEntry.m
@@ -235,11 +235,11 @@
- (void)readInfoThreadSetVariables:(SoundFile *)sf
{
- length = [sf length];
- bitRate = [sf bitRate];
- channels = [sf channels];
- bitsPerSample = [sf bitsPerSample];
- sampleRate = [sf frequency];
+ [self setLength:[sf length]];
+ [self setBitRate:[sf bitRate]];
+ [self setChannels:[sf channels]];
+ [self setBitsPerSample:[sf bitsPerSample]];
+ [self setSampleRate:(float)[sf frequency]];
[self setLengthString:length];
@@ -267,23 +267,47 @@
lengthString = [[NSString alloc] initWithFormat:@"%i:%02i",sec/60,sec%60];
}
+
+- (void)setLength:(double)l
+{
+ length = l;
+}
- (double)length
{
return length;
}
+
+- (void)setBitRate:(int) br
+{
+ bitRate = br;
+}
- (int)bitRate
{
return bitRate;
}
+- (void)setChannels:(int)c
+{
+ channels = c;
+}
- (int)channels
{
return channels;
}
+
+- (void)setBitsPerSample:(int)bps
+{
+ bitsPerSample = bps;
+}
- (int)bitsPerSample
{
return bitsPerSample;
}
+
+- (void)setSampleRate:(float)s
+{
+ sampleRate = s;
+}
- (float)sampleRate
{
return sampleRate;