macosx/CAS: add MKV to the black list for HTTP streaming

[vlc] / modules / gui / macosx / MainWindow.h

diff --git a/modules/gui/macosx/MainWindow.h b/modules/gui/macosx/MainWindow.h
index c332fec28cc82a47433d07694f6b334e581700ec..a5192c93fdeb8ee422711f7348542229fef51dbb 100644 (file)
--- a/modules/gui/macosx/MainWindow.h
+++ b/modules/gui/macosx/MainWindow.h
@@ -44,7 +44,7 @@
 @interface VLCMainWindow : VLCVideoWindowCommon <PXSourceListDataSource, PXSourceListDelegate, NSWindowDelegate, NSAnimationDelegate, NSSplitViewDelegate> {
 
     IBOutlet id o_search_fld;
-    
+
     IBOutlet id o_playlist_table;
     IBOutlet id o_split_view;
     IBOutlet id o_left_split_view;
@@ -82,34 +82,31 @@
     BOOL b_splitview_removed;
     BOOL b_minimized_view;
 
-    int i_lastSplitViewHeight;
+    NSUInteger i_lastSplitViewHeight;
+    NSUInteger i_lastLeftSplitViewWidth;
 
     NSMutableArray *o_sidebaritems;
 
-    BOOL              b_nonembedded;
-    BOOL              b_podcastView_displayed;
+    /* this is only true, when we have NO video playing inside the main window */
+    BOOL b_nonembedded;
+
+    BOOL b_podcastView_displayed;
 
-    VLCWindow       * o_fullscreen_window;
-    NSViewAnimation * o_fullscreen_anim1;
-    NSViewAnimation * o_fullscreen_anim2;
-    NSViewAnimation * o_makekey_anim;
-    NSView          * o_temp_view;
     /* set to yes if we are fullscreen and all animations are over */
-    BOOL              b_fullscreen;
-    BOOL              b_window_is_invisible;
-    NSRecursiveLock * o_animation_lock;
+    BOOL b_fullscreen;
 
     NSTimer *t_hide_mouse_timer;
 
     VLCColorView * o_color_backdrop;
-    NSInteger i_originalLevel;
-
-    id o_current_video_window;
 
     NSRect frameBeforePlayback;
 }
 + (VLCMainWindow *)sharedInstance;
-@property (readonly) BOOL fullscreen;
+@property (readwrite) BOOL fullscreen;
+@property (readonly) BOOL nativeFullscreenMode;
+@property (readwrite) BOOL nonembedded;
+
+@property (readonly) VLCFSPanel* fsPanel;
 
 - (VLCMainWindowControlsBar *)controlsBar;
 
@@ -124,6 +121,7 @@
 
 - (void)windowResizedOrMoved:(NSNotification *)notification;
 
+- (void)toggleLeftSubSplitView;
 - (void)showDropZone;
 - (void)hideDropZone;
 - (void)showSplitView;
@@ -135,22 +133,13 @@
 - (void)setPlay;
 - (void)updateVolumeSlider;
 
-- (VLCVoutView *)setupVout:(vout_window_t *)p_wnd;
+- (void)showFullscreenController;
+
 - (void)setVideoplayEnabled;
 
 - (void)hideMouseCursor:(NSTimer *)timer;
 - (void)recreateHideMouseTimer;
 
-/* fullscreen handling */
-- (void)showFullscreenController;
-- (void)lockFullscreenAnimation;
-- (void)unlockFullscreenAnimation;
-- (void)enterFullscreen;
-- (void)leaveFullscreen;
-- (void)leaveFullscreenAndFadeOut: (BOOL)fadeout;
-- (void)hasEndedFullscreen;
-- (void)hasBecomeFullscreen;
-
 /* lion's native fullscreen handling */
 - (void)windowWillEnterFullScreen:(NSNotification *)notification;
 - (void)windowDidEnterFullScreen:(NSNotification *)notification;
@@ -163,4 +152,4 @@
     VLCColorView * o_color_backdrop;
 }
 
-@end
\ No newline at end of file
+@end