X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fmacosx%2Fvout.h;h=6b57f7a523e0f5303fae5698c55162bc7f1551c6;hb=7214994261f855c83ee4d40d4b068418e04dcc62;hp=cd12b2b33246010a3eae5110b83abed1774980fc;hpb=449fd28aaf007c6411251dae9d0dbfdc65b135d1;p=vlc

diff --git a/modules/gui/macosx/vout.h b/modules/gui/macosx/vout.h
index cd12b2b332..6b57f7a523 100644
--- a/modules/gui/macosx/vout.h
+++ b/modules/gui/macosx/vout.h
@@ -25,6 +25,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
+#import "misc.h"
 /*****************************************************************************
  * VLCEmbeddedList interface
  *****************************************************************************/
@@ -33,11 +34,11 @@
     NSMutableArray * o_embedded_array;
 }
 
-- (id)getEmbeddedVout;
+- (id)embeddedVout;
 - (void)releaseEmbeddedVout: (id)o_vout_view;
 - (void)addEmbeddedVout: (id)o_vout_view;
 - (BOOL)windowContainsEmbedded: (id)o_window;
-- (id)getViewForWindow: (id)o_window;
+- (id)viewForWindow: (id)o_window;
 
 @end
 
@@ -69,11 +70,11 @@
 - (void)toggleFullscreen;
 - (BOOL)isFullscreen;
 - (void)snapshot;
-- (id)getWindow;
+- (id)voutWindow;
 
-+ (id)getVoutView: (vout_thread_t *)p_vout subView: (NSView *) view
-            frame: (NSRect *) s_frame;
-+ (vout_thread_t *)getRealVout: (vout_thread_t *)p_vout;
++ (id)voutView: (vout_thread_t *)p_vout subView: (NSView *) view
+         frame: (NSRect *) s_frame;
++ (vout_thread_t *)realVout: (vout_thread_t *)p_vout;
 
 - (void)enterFullscreen;
 - (void)leaveFullscreen;
@@ -99,50 +100,32 @@
 @interface VLCEmbeddedVoutView : VLCVoutView
 {
     BOOL b_used;
+    id o_embeddedwindow;
 }
 
-- (BOOL)setVout: (vout_thread_t *) p_arg_vout subView: (NSView *) view
-                 frame: (NSRect *)s_arg_frame showWindow: (BOOL)b_show_window;
-
 - (void)setUsed: (BOOL)b_new_used;
 - (BOOL)isUsed;
 
 @end
 
-/*****************************************************************************
- * VLCDetachedEmbeddedView interface
- *****************************************************************************/
-
-@interface VLCDetachedEmbeddedVoutView : VLCEmbeddedVoutView
-{
-    id o_embeddedwindow;
-}
-
-@end
-
 /*****************************************************************************
  * VLCVoutWindow interface
  *****************************************************************************/
-@interface VLCVoutWindow : NSWindow
+@interface VLCVoutWindow : VLCWindow
 {
     vout_thread_t * p_vout;
     VLCVoutView   * o_view;
     NSRect        * s_frame;
 
-    vout_thread_t * p_real_vout;
     bool      b_init_ok;
-    bool      b_black;
-    bool      b_embedded;
+    BOOL      fullscreen;
+    NSRect    initialFrame;
 }
 
 - (id) initWithVout: (vout_thread_t *) p_vout view: (VLCVoutView *) view
                      frame: (NSRect *) s_frame;
-- (id)initReal: (id) sender;
-- (void)close;
-- (void)closeWindow;
-- (id)closeReal: (id) sender;
-- (id)getVoutView;
-
-- (BOOL)windowShouldClose:(id)sender;
-
+- (id)initMainThread: (id) sender;
+- (void)leaveFullscreen;
+- (void)enterFullscreen;
+- (id)voutView;
 @end