Commit a409624b authored by Felix Paul Kühne's avatar Felix Paul Kühne

app delegate: don't push movie view controller when playback starts

parent 02bc1f54
......@@ -33,6 +33,7 @@
- (void)cleanCache;
- (void)presentMovieViewController;
- (void)openMediaFromManagedObject:(NSManagedObject *)file;
- (void)openMovieFromURL:(NSURL *)url;
- (void)openMediaList:(VLCMediaList*)list atIndex:(int)index;
......
......@@ -208,7 +208,6 @@
- (void)pathMigrationToGroupsIfNeeded:(NSError **)migrationError
{
/*
* We can't and don't need to migrate to groups on pre-iOS 7
*/
......@@ -363,9 +362,13 @@
_isComingFromHandoff = NO;
}
if ([VLCPlaybackController sharedInstance].isPlaying && !self.movieViewController.presentingViewController) {
[self presentMovieViewController];
}
VLCPlaybackController *vpc = [VLCPlaybackController sharedInstance];
if (!vpc.audioOnlyPlaybackSession) {
if (vpc.isPlaying && !self.movieViewController.presentingViewController)
[self presentMovieViewController];
} else
[self.playlistViewController displayMiniPlaybackViewIfNeeded];
}
- (void)applicationWillTerminate:(UIApplication *)application
......@@ -606,8 +609,6 @@
vpc.fileFromMediaLibrary = [(MLShowEpisode*)mediaObject files].anyObject;
[(MLFile *)vpc.fileFromMediaLibrary setUnread:@(NO)];
[self presentMovieViewController];
[vpc startPlayback];
}
......@@ -622,8 +623,6 @@
vpc.successCallback = successCallback;
vpc.errorCallback = errorCallback;
[self presentMovieViewController];
[vpc startPlayback];
}
......@@ -640,8 +639,6 @@
vpc.itemInMediaListToBePlayedFirst = index;
vpc.pathToExternalSubtitlesFile = nil;
[self presentMovieViewController];
[vpc startPlayback];
}
......@@ -652,8 +649,6 @@
vpc.url = url;
vpc.pathToExternalSubtitlesFile = SubtitlePath;
[self presentMovieViewController];
[vpc startPlayback];
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment