diff --git a/Application/AppController.m b/Application/AppController.m
index 19217c14d..8d4c85218 100644
--- a/Application/AppController.m
+++ b/Application/AppController.m
@@ -236,11 +236,10 @@ increase/decrease as long as the user holds the left/right, plus/minus button */
[remote startListening:self];
}
- NSUndoManager *undoManager = [playlistController undoManager];
- [undoManager disableUndoRegistration];
+ [[playlistController undoManager] disableUndoRegistration];
NSString *filename = @"~/Library/Application Support/Cog/Default.m3u";
[playlistLoader addURL:[NSURL fileURLWithPath:[filename stringByExpandingTildeInPath]]];
- [undoManager enableUndoRegistration];
+ [[playlistController undoManager] enableUndoRegistration];
}
- (void)applicationWillTerminate:(NSNotification *)aNotification
diff --git a/Application/PlaybackController.h b/Application/PlaybackController.h
index a3bba54b2..7cbd25b71 100644
--- a/Application/PlaybackController.h
+++ b/Application/PlaybackController.h
@@ -66,4 +66,6 @@
- (void)playEntryAtIndex:(int)i;
- (void)playEntry:(PlaylistEntry *)pe;
+- (int)status;
+
@end
diff --git a/Application/PlaybackController.m b/Application/PlaybackController.m
index 9ab7ecf9a..eaa39a345 100644
--- a/Application/PlaybackController.m
+++ b/Application/PlaybackController.m
@@ -8,6 +8,8 @@
@implementation PlaybackController
+#define DEFAULT_SEEK 10
+
- (id)init
{
self = [super init];
@@ -196,38 +198,38 @@
- (IBAction)seekForward:(id)sender
{
- double time;
- time = [audioPlayer amountPlayed];
-
- if ((time + 10) > (int)[positionSlider maxValue])
+ double seekTo = [audioPlayer amountPlayed] + DEFAULT_SEEK;
+
+ if (seekTo > (int)[positionSlider maxValue])
{
[self next:self];
}
else
{
- [audioPlayer seekToTime:time + 10];
- [self updateTimeField:time + 10];
+ [audioPlayer seekToTime:seekTo];
+ [self updateTimeField:seekTo];
+ [positionSlider setDoubleValue:seekTo];
}
}
- (IBAction)seekBackward:(id)sender
{
- double time;
- time = [audioPlayer amountPlayed];
-
- if ((time - 10) < 0)
+ double seekTo = [audioPlayer amountPlayed] - DEFAULT_SEEK;
+
+ if (seekTo < 0)
{
[audioPlayer seekToTime:0];
[self updateTimeField:0];
+ [positionSlider setDoubleValue:0.0];
}
else
{
- [audioPlayer seekToTime:time - 10];
- [self updateTimeField:time - 10];
+ [audioPlayer seekToTime:seekTo];
+ [self updateTimeField:seekTo];
+ [positionSlider setDoubleValue:seekTo];
}
}
-
- (void)changePlayButtonImage:(NSString *)name
{
NSImage *img = [NSImage imageNamed:name];
@@ -360,6 +362,10 @@
}
+- (int)status
+{
+ return playbackStatus;
+}
- (void)audioPlayer:(AudioPlayer *)player statusChanged:(id)s
{
@@ -400,4 +406,22 @@
playbackStatus = status;
}
+-(BOOL)validateMenuItem:(NSMenuItem*)menuItem
+{
+ SEL action = [menuItem action];
+
+ if (action == @selector(seekBackward:) && (playbackStatus == kCogStatusStopped))
+ return NO;
+
+ if (action == @selector(seekForward:) && (playbackStatus == kCogStatusStopped))
+ return NO;
+
+ if (action == @selector(stop:) && (playbackStatus == kCogStatusStopped))
+ return NO;
+
+ return YES;
+}
+
+
+
@end
diff --git a/English.lproj/MainMenu.nib/designable.nib b/English.lproj/MainMenu.nib/designable.nib
index 2b9016103..bc9c63c5d 100644
--- a/English.lproj/MainMenu.nib/designable.nib
+++ b/English.lproj/MainMenu.nib/designable.nib
@@ -8,12 +8,12 @@
343.00
1682
+
+
@@ -5661,13 +5697,13 @@ ELIAAAAAAAgACAAIAAgAAQABAAEAAQ
218
- PlaylistController
+ PlaylistController
+
+
@@ -7349,35 +7399,14 @@ ELIAAAAAAAgACAAIAAgAAQABAAEAAQ
- 1682
+ 1686
-
-
-
-
-
-
-
-
-
-
-
-
@@ -8061,194 +8312,6 @@ ELIAAAAAAAgACAAIAAgAAQABAAEAAQ
-
-
-
-
-
-
-
-