macosx gui: use vlc_path2uri.

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

diff --git a/modules/gui/macosx/MainWindow.h b/modules/gui/macosx/MainWindow.h
index 41745f22b94142dd75029a39838eeea24571286a..d379ca11921700b27651f88683d53f70f603347b 100644 (file)
--- a/modules/gui/macosx/MainWindow.h
+++ b/modules/gui/macosx/MainWindow.h
@@ -27,6 +27,7 @@
 #import <Cocoa/Cocoa.h>
 #import "CompatibilityFixes.h"
 #import "PXSourceList.h"
+#import "PXSourceListDataSource.h"
 #import <vlc_input.h>
 #import "misc.h"
 #import "fspanel.h"
@@ -66,18 +67,36 @@
     IBOutlet id o_dropzone_view;
     IBOutlet id o_dropzone_btn;
     IBOutlet id o_dropzone_lbl;
+    IBOutlet id o_dropzone_box;
 
     IBOutlet VLCFSPanel *o_fspanel;
     IBOutlet id o_titlebar_view;
     IBOutlet id o_resize_view;
+    IBOutlet id o_detached_resize_view;
+
+    IBOutlet id o_detached_play_btn;
+    IBOutlet id o_detached_fwd_btn;
+    IBOutlet id o_detached_bwd_btn;
+    IBOutlet id o_detached_fullscreen_btn;
+    IBOutlet id o_detached_time_fld;
+    IBOutlet id o_detached_time_sld;
+    IBOutlet id o_detached_time_sld_background;
+    IBOutlet id o_detached_progress_bar;
+    IBOutlet id o_detached_time_sld_fancygradient_view;
+    IBOutlet id o_detached_bottombar_view;
+    IBOutlet id o_detached_titlebar_view;
+    IBOutlet id o_detached_video_window;
 
     BOOL b_dark_interface;
     BOOL b_nativeFullscreenMode;
     BOOL b_video_playback_enabled;
     BOOL b_dropzone_active;
     BOOL b_splitview_removed;
+    BOOL b_minimized_view;
+    BOOL b_video_deco;
+    BOOL b_show_jump_buttons;
+    BOOL b_show_playmode_buttons;
     int i_lastSplitViewHeight;
-    int i_lastShownVolume;
     input_state_e cachedInputState;
 
     NSImage * o_pause_img;
@@ -99,9 +118,11 @@
     NSTimeInterval last_bwd_event;
     BOOL just_triggered_next;
     BOOL just_triggered_previous;
+    NSButton * o_prev_btn;
+    NSButton * o_next_btn;
+
     NSMutableArray *o_sidebaritems;
 
-    VLCWindow       * o_nonembedded_window;
     BOOL              b_nonembedded;
 
     VLCWindow       * o_fullscreen_window;
@@ -120,6 +141,9 @@
     VLCColorView * o_color_backdrop;
     NSInteger i_originalLevel;
     NSRect previousSavedFrame;
+
+    VLCWindow *o_extra_video_window;
+    id o_current_video_window;
 }
 + (VLCMainWindow *)sharedInstance;
 
@@ -137,11 +161,13 @@
 - (IBAction)dropzoneButtonAction:(id)sender;
 
 - (void)setTitle:(NSString *)title;
-- (void) customZoom: (id)sender;
+- (void) customZoom:(id)sender;
 - (void)windowResizedOrMoved:(NSNotification *)notification;
 
 - (void)showDropZone;
 - (void)hideDropZone;
+- (void)showSplitView;
+- (void)hideSplitView;
 - (void)updateTimeSlider;
 - (void)updateVolumeSlider;
 - (void)updateWindow;
@@ -152,10 +178,13 @@
 - (void)setRepeatAll;
 - (void)setRepeatOff;
 - (void)setShuffle;
+- (void)toggleJumpButtons;
+- (void)togglePlaymodeButtons;
 
 - (void)drawFancyGradientEffectForTimeSlider;
 
 - (id)videoView;
+- (id)setupVideoView;
 - (void)setVideoplayEnabled;
 - (void)resizeWindow;
 - (void)setNativeVideoSize:(NSSize)size;
@@ -173,10 +202,22 @@
 - (void)leaveFullscreenAndFadeOut: (BOOL)fadeout;
 - (void)hasEndedFullscreen;
 - (void)hasBecomeFullscreen;
-- (void)setFrameOnMainThread:(NSData*)packedargs;
 
 /* lion's native fullscreen handling */
 - (void)windowWillEnterFullScreen:(NSNotification *)notification;
+- (void)windowDidEnterFullScreen:(NSNotification *)notification;
 - (void)windowWillExitFullScreen:(NSNotification *)notification;
 
+- (id)detachedTitlebarView;
+@end
+
+@interface VLCDetachedVideoWindow : NSWindow
+{
+    BOOL b_dark_interface;
+    BOOL b_video_deco;
+    NSRect previousSavedFrame;
+}
+
+- (void)customZoom:(id)sender;
+
 @end