- Lots of cleanups and coding style issues

- Added support for fullscreen windows in two modes, one with cropping
  (XINE_FULLSCREEN_CROP) and one with adding overscans
  (XINE_FULLSCREEEN_OVERSCAN)
- New class methods to make the window resize to it's original dimensions
  (setNormalSize) to make it half-sized (setHalfSize), double-sized
  (setDoubleSize) or as large as possible (setFitToScreen)
- Support for keeping aspect ration when the user reshapes the window
  manually (setKeepsAspectRatio, keepsAspectRatio)

CVS patchset: 6665
CVS date: 2004/06/10 11:54:54

1 files changed, 28 insertions, 17 deletions

diff --git a/src/video_out/macosx/video_window.h b/src/video_out/macosx/video_window.h
index d37859d93..3089a4d2a 100644
--- a/src/video_out/macosx/video_window.h
+++ b/src/video_out/macosx/video_window.h
@@ -17,29 +17,33 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: 
- *
  */
 
 #include <Cocoa/Cocoa.h>
 
+typedef enum {
+    XINE_FULLSCREEN_OVERSCAN,
+    XINE_FULLSCREEN_CROP
+} XineVideoWindowFullScreenMode;
+
+
 @interface XineOpenGLView : NSOpenGLView {
-        int               width, height;
-        char             *texture_buffer;
-        unsigned long     i_texture;
-        float             f_x;
-        float             f_y;
-        int               initDone;
-        int               isFullScreen;
-	NSOpenGLContext * opengl_context;
-        NSOpenGLContext * fullScreenContext;
-        NSOpenGLContext * currentContext;
+    int                        width, height;
+    char                      *texture_buffer;
+    unsigned long              i_texture;
+    int                        initDone;
+    int                        isFullScreen;
+    XineVideoWindowFullScreenMode fullscreen_mode;
+    NSOpenGLContext           *opengl_context;
+    NSOpenGLContext           *fullScreenContext;
+    NSOpenGLContext  *currentContext;
 }
 
 - (void) drawQuad;
 - (void) drawRect: (NSRect) rect;
-- (void) goFullScreen;
+- (void) goFullScreen: (XineVideoWindowFullScreenMode) mode;
 - (void) exitFullScreen;
+- (int) isFullScreen;
 - (void) reshape;
 - (void) initTextures;
 - (void) reloadTexture;
@@ -51,14 +55,21 @@
 
 
 @interface XineVideoWindow : NSWindow {
-	int               width, height;
-	XineOpenGLView   *openGLView;
+    int               width, height;
+    int               keepAspectRatio;
+    XineOpenGLView   *openGLView;
 }
 
 - (void) setContentSize: (NSSize) size;
 - (void) displayTexture;
 - (XineOpenGLView *) getGLView;
-- (void) goFullScreen;
+- (void) goFullScreen: (XineVideoWindowFullScreenMode) mode;
 - (void) exitFullScreen;
-
+- (void) setNormalSize;
+- (void) setHalfSize;
+- (void) setDoubleSize;
+- (void) fitToScreen;
+- (void) setKeepsAspectRatio: (int) i;
+- (int) keepsAspectRatio;
 @end
+