X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fmacosx%2Fvout.h;h=90fa8aef3df1cfb610f7a29ce2fb6fd250cf4b08;hb=6ee1e193fd896ab9a4729fde14f009d9ce629815;hp=418bf73ac042d3199a01f7d85eaf37fb74e0c1e0;hpb=89885149e814b2d287dd7166a92eb69f3221f0af;p=vlc

diff --git a/modules/gui/macosx/vout.h b/modules/gui/macosx/vout.h
index 418bf73ac0..90fa8aef3d 100644
--- a/modules/gui/macosx/vout.h
+++ b/modules/gui/macosx/vout.h
@@ -1,19 +1,20 @@
 /*****************************************************************************
  * vout.h: MacOS X interface module
  *****************************************************************************
- * Copyright (C) 2001-2003 VideoLAN
+ * Copyright (C) 2001-2006 the VideoLAN team
  * $Id$
  *
  * Authors: Colin Delacroix <colin@zoy.org>
  *          Florian G. Pflug <fgp@phlo.org>
  *          Jon Lech Johansen <jon-vl@nanocrew.net>
  *          Eric Petit <titer@m0k.org>
+ *          Benjamin Pracht <bigben at videolan dot org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -21,35 +22,126 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 /*****************************************************************************
- * VLCWindow interface
+ * VLCEmbeddedList interface
  *****************************************************************************/
-@interface VLCWindow : NSWindow
+@interface VLCEmbeddedList : NSObject
 {
-    vout_thread_t * p_vout;
-    vout_thread_t * p_real_vout;
-
-    Ptr             p_fullscreen_state;
-    mtime_t         i_time_mouse_last_moved;
+    NSMutableArray * o_embedded_array;
 }
 
-- (id)initWithVout:(vout_thread_t *)_p_vout
-    frame:(NSRect *)s_frame;
-- (void)close;
-- (void)setOnTop:(bool)b_on_top;
+- (id)getEmbeddedVout;
+- (void)releaseEmbeddedVout: (id)o_vout_view;
+- (void)addEmbeddedVout: (id)o_vout_view;
+- (BOOL)windowContainsEmbedded: (id)o_window;
+- (id)getViewForWindow: (id)o_window;
 
-- (void)hideMouse:(bool)b_hide;
-- (void)manage;
+@end
+
+/*****************************************************************************
+ * VLCVoutView interface
+ *****************************************************************************/
+@protocol VLCVoutViewResetting
++ (void)resetVout: (vout_thread_t *)p_vout;
+@end
+
+@interface VLCVoutView : NSView
+{
+    vout_thread_t * p_vout;
+    NSRect        * s_frame;
+
+    NSView <VLCVoutViewResetting> * o_view;
 
-- (void)scaleWindowWithFactor: (float)factor;
+    vout_thread_t * p_real_vout;
+    id              o_window;
+}
+- (BOOL)setVout: (vout_thread_t *) p_arg_vout subView: (NSView *) view
+                     frame: (NSRect *) s_arg_frame;
+- (void)closeVout;
+- (void)updateTitle;
+- (void)manage;
+- (void)scaleWindowWithFactor: (float)factor animate: (BOOL)animate;
+- (void)setOnTop:(BOOL)b_on_top;
 - (void)toggleFloatOnTop;
 - (void)toggleFullscreen;
 - (BOOL)isFullscreen;
 - (void)snapshot;
-- (void)updateTitle;
+- (id)getWindow;
+
++ (id)getVoutView: (vout_thread_t *)p_vout subView: (NSView *) view
+                            frame: (NSRect *) s_frame;
++ (vout_thread_t *)getRealVout: (vout_thread_t *)p_vout;
+
+- (void)enterFullscreen;
+- (void)leaveFullscreen;
+@end
+
+/*****************************************************************************
+ * VLCVoutDetachedView interface
+ *****************************************************************************/
+
+@interface VLCDetachedVoutView : VLCVoutView
+{
+    mtime_t i_time_mouse_last_moved;
+}
+
+- (void)hideMouse: (BOOL)b_hide;
+
+@end
+
+/*****************************************************************************
+ * VLCEmbeddedView interface
+ *****************************************************************************/
+
+@interface VLCEmbeddedVoutView : VLCVoutView
+{
+    BOOL b_used;
+}
+
+- (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
+{
+    vout_thread_t * p_vout;
+    VLCVoutView   * o_view;
+    NSRect        * s_frame;
+
+    vout_thread_t * p_real_vout;
+    vlc_bool_t      b_init_ok;
+    vlc_bool_t      b_black;
+    vlc_bool_t      b_embedded;
+}
+
+- (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;