Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
  • 3 commits
  • 5 files changed
  • 0 commit comments
  • 1 contributor
View
4 Classes/Controllers/ApplicationController.m
@@ -47,7 +47,7 @@ - (void)applicationDidFinishLaunching:(NSNotification *)aNotification
PlaybackController *playbackController = [[PlaybackController alloc] init];
[self setPlaybackController:playbackController];
[self.playbackController setLoopInfiniteCount:31];
- [self.playbackController updateLoopCount:10];
+ [self.playbackController updateLoopCount:31];
// Set the max value of the loop counter.
[[self.windowController loopCountStepper] setMaxValue:(double)[self.playbackController loopInfiniteCount]];
@@ -86,6 +86,8 @@ - (IBAction)openFile:(id)sender
NSLog(@"Could not load track.");
return;
}
+ [[ApplicationController sharedInstance].windowController showPlayerView];
+ [[ApplicationController sharedInstance].playbackController openURL:filePath];
}
};
View
2  Classes/Controllers/PlaybackController.h
@@ -21,6 +21,6 @@
- (void)updateLoopCount:(NSUInteger)count;
- (BOOL)openURL:(NSURL *)filename;
- (void)play;
-- (void)stop;
+- (void)pause;
@end
View
4 Classes/Controllers/PlaybackController.m
@@ -82,9 +82,9 @@ - (void)play
}
-- (void)stop
+- (void)pause
{
- [self.track.asset stop];
+ [self.track.asset pause];
[[NSNotificationCenter defaultCenter] postNotificationName:PlaybackDidStopNotification object:self userInfo:nil];
}
View
1  Classes/Controllers/PlayerViewController.m
@@ -168,6 +168,7 @@ - (void)trackWasLoaded:(NSNotification *)notification
[self layoutInitialInterface:[object track]];
WindowController *windowController = [ApplicationController sharedInstance].windowController;
+ [windowController showPlayerView];
[windowController.play setEnabled:TRUE];
}
}
View
2  Classes/Controllers/WindowController.m
@@ -190,7 +190,7 @@ - (IBAction)handlePlayState:(id)sender
{
PlaybackController *playbackController = [ApplicationController sharedInstance].playbackController;
if (playbackController.track.asset.playing) {
- [playbackController stop];
+ [playbackController pause];
}
else {
[playbackController play];

No commit comments for this range

Something went wrong with that request. Please try again.