Browse Source

Open Network Stream: fix streaming opening with new menu

Felix Paul Kühne 12 years ago
parent
commit
975f3d65ab

+ 0 - 2
AspenProject/VLCMenuViewController.m

@@ -134,8 +134,6 @@
     [self _presentViewController:self.settingsController.viewController];
 }
 
-
-
 - (void)updateHTTPServerAddress
 {
     HTTPServer *server = self.uploadController.httpServer;

+ 7 - 4
AspenProject/VLCOpenNetworkStreamViewController.m

@@ -12,6 +12,7 @@
 #import "VLCAppDelegate.h"
 #import "VLCPlaylistViewController.h"
 #import "UIBarButtonItem+Theme.h"
+#import "UINavigationController+Theme.h"
 
 @interface VLCOpenNetworkStreamViewController ()
 {
@@ -159,12 +160,14 @@
 - (void)_openURLStringAndDismiss:(NSString *)url
 {
     VLCAppDelegate* appDelegate = [UIApplication sharedApplication].delegate;
-    [appDelegate.playlistViewController openMovieFromURL:[NSURL URLWithString:url]];
 
-    [self dismissModalViewControllerAnimated:YES];
+    UINavigationController *navController = [[UINavigationController alloc] initWithRootViewController:appDelegate.playlistViewController];
+    [navController loadTheme];
 
-    if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad)
-        [appDelegate.playlistViewController.addMediaPopoverController dismissPopoverAnimated:YES];
+    appDelegate.revealController.contentViewController = navController;
+    [appDelegate.revealController toggleSidebar:NO duration:kGHRevealSidebarDefaultAnimationDuration];
+
+    [appDelegate.playlistViewController performSelector:@selector(openMovieFromURL:) withObject:[NSURL URLWithString:url] afterDelay:kGHRevealSidebarDefaultAnimationDuration];
 }
 
 @end