macosx: implemented playback controls for the detached video window (bwd/play/fwd...

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

diff --git a/modules/gui/macosx/MainWindow.h b/modules/gui/macosx/MainWindow.h
index a1668e332f68685a9dcdaeaaf88f9a3c26b2c3ac..3b33df0e8cf5a03583536aa43b36f369f3620bda 100644 (file)
--- a/modules/gui/macosx/MainWindow.h
+++ b/modules/gui/macosx/MainWindow.h
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * MainWindow.h: MacOS X interface module
  *****************************************************************************
- * Copyright (C) 2002-2011 VideoLAN
+ * Copyright (C) 2002-2012 VLC authors and VideoLAN
  * $Id$
  *
  * Authors: Felix Paul Kühne <fkuehne -at- videolan -dot- org>
@@ -30,8 +30,9 @@
 #import <vlc_input.h>
 #import "misc.h"
 #import "fspanel.h"
+#import "MainWindowTitle.h"
 
-@interface VLCMainWindow : NSWindow <PXSourceListDataSource, PXSourceListDelegate, NSWindowDelegate, NSAnimationDelegate> {
+@interface VLCMainWindow : NSWindow <PXSourceListDataSource, PXSourceListDelegate, NSWindowDelegate, NSAnimationDelegate, NSSplitViewDelegate> {
     IBOutlet id o_play_btn;
     IBOutlet id o_bwd_btn;
     IBOutlet id o_fwd_btn;
@@ -42,6 +43,7 @@
     IBOutlet id o_effects_btn;
     IBOutlet id o_fullscreen_btn;
     IBOutlet id o_search_fld;
+    IBOutlet id o_topbar_view;
     IBOutlet id o_volume_sld;
     IBOutlet id o_volume_track_view;
     IBOutlet id o_volume_down_btn;
@@ -51,16 +53,14 @@
     IBOutlet id o_time_fld;
     IBOutlet id o_progress_bar;
     IBOutlet id o_bottombar_view;
-    IBOutlet id o_time_sld_left_view;
-    IBOutlet id o_time_sld_middle_view;
-    IBOutlet id o_time_sld_right_view;
-    // TODO Playlist table, additional ui stuff at the top of the window
+    IBOutlet id o_time_sld_background;
     IBOutlet id o_playlist_table;
     IBOutlet id o_video_view;
     IBOutlet id o_split_view;
     IBOutlet id o_left_split_view;
     IBOutlet id o_right_split_view;
     IBOutlet id o_sidebar_view;
+    IBOutlet id o_sidebar_scrollview;
     IBOutlet id o_chosen_category_lbl;
 
     IBOutlet id o_dropzone_view;
@@ -68,12 +68,29 @@
     IBOutlet id o_dropzone_lbl;
 
     IBOutlet VLCFSPanel *o_fspanel;
+    IBOutlet id o_titlebar_view;
+    IBOutlet id o_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;
+    int i_lastSplitViewHeight;
     int i_lastShownVolume;
-    BOOL b_mute;
     input_state_e cachedInputState;
 
     NSImage * o_pause_img;
@@ -97,7 +114,6 @@
     BOOL just_triggered_previous;
     NSMutableArray *o_sidebaritems;
 
-    VLCWindow       * o_nonembedded_window;
     BOOL              b_nonembedded;
 
     VLCWindow       * o_fullscreen_window;
@@ -111,7 +127,11 @@
     NSRecursiveLock * o_animation_lock;
     NSSize nativeVideoSize;
 
+    NSTimer *t_hide_mouse_timer;
+
+    VLCColorView * o_color_backdrop;
     NSInteger i_originalLevel;
+    NSRect previousSavedFrame;
 }
 + (VLCMainWindow *)sharedInstance;
 
@@ -128,8 +148,14 @@
 - (IBAction)fullscreen:(id)sender;
 - (IBAction)dropzoneButtonAction:(id)sender;
 
+- (void)setTitle:(NSString *)title;
+- (void) customZoom: (id)sender;
+- (void)windowResizedOrMoved:(NSNotification *)notification;
+
 - (void)showDropZone;
 - (void)hideDropZone;
+- (void)showSplitView;
+- (void)hideSplitView;
 - (void)updateTimeSlider;
 - (void)updateVolumeSlider;
 - (void)updateWindow;
@@ -144,10 +170,14 @@
 - (void)drawFancyGradientEffectForTimeSlider;
 
 - (id)videoView;
+- (id)setupVideoView;
 - (void)setVideoplayEnabled;
 - (void)resizeWindow;
 - (void)setNativeVideoSize:(NSSize)size;
 
+- (void)hideMouseCursor:(NSTimer *)timer;
+- (void)recreateHideMouseTimer;
+
 /* fullscreen handling */
 - (void)showFullscreenController;
 - (BOOL)isFullscreen;
@@ -166,11 +196,10 @@
 
 @end
 
-@interface VLCProgressBarGradientEffect : NSView {
-    NSImage * o_time_sld_gradient_left_img;
-    NSImage * o_time_sld_gradient_middle_img;
-    NSImage * o_time_sld_gradient_right_img;
+@interface VLCDetachedVideoWindow : NSWindow 
+{
 }
-- (void)loadImagesInDarkStyle:(BOOL)b_value;
-@end
 
+- (BOOL)isFullscreen;
+
+@end