diff options
author | Stefano Pigozzi <stefano.pigozzi@gmail.com> | 2011-12-11 12:26:00 +0100 |
---|---|---|
committer | Uoti Urpala <uau@mplayer2.org> | 2012-04-26 21:03:10 +0300 |
commit | d12b9b611aa7030047e6556714e859dd2bfd38fc (patch) | |
tree | 6df7a9b89ae07f5235310c5b952189c81c753236 /libvo/vo_corevideo.h | |
parent | 237f44db44b5479c78c90c1a045e0123a2f9c2b8 (diff) | |
download | mpv-d12b9b611aa7030047e6556714e859dd2bfd38fc.tar.bz2 mpv-d12b9b611aa7030047e6556714e859dd2bfd38fc.tar.xz |
vo_corevideo: use cocoa_common to display the window
Change vo_corevideo to use cocoa_common to create and manage the
window. This doesn't affect external OSX GUIs, since they don't use
vo_corevideo window management, but only read the image data from the
shared buffer.
Diffstat (limited to 'libvo/vo_corevideo.h')
-rw-r--r-- | libvo/vo_corevideo.h | 73 |
1 files changed, 0 insertions, 73 deletions
diff --git a/libvo/vo_corevideo.h b/libvo/vo_corevideo.h index 926399053f..28b3807376 100644 --- a/libvo/vo_corevideo.h +++ b/libvo/vo_corevideo.h @@ -39,77 +39,4 @@ - (void) ontop; @end -@interface MPlayerOpenGLView : NSOpenGLView -{ - //Cocoa - NSWindow *window; - - //CoreVideo - CVPixelBufferRef frameBuffers[2]; - CVOpenGLTextureCacheRef textureCache; - CVOpenGLTextureRef texture; - NSRect textureFrame; - - GLfloat lowerLeft[2]; - GLfloat lowerRight[2]; - GLfloat upperRight[2]; - GLfloat upperLeft[2]; - - BOOL mouseHide; - - //menu command id - NSMenuItem *kHalfScreenCmd; - NSMenuItem *kNormalScreenCmd; - NSMenuItem *kDoubleScreenCmd; - NSMenuItem *kFullScreenCmd; - NSMenuItem *kKeepAspectCmd; - NSMenuItem *kAspectOrgCmd; - NSMenuItem *kAspectFullCmd; - NSMenuItem *kAspectWideCmd; - NSMenuItem *kPanScanCmd; - - //timestamps for disabling screensaver and mouse hiding - int lastMouseHide; - int lastScreensaverUpdate; -@public - float winSizeMult; -} - -- (BOOL) acceptsFirstResponder; -- (BOOL) becomeFirstResponder; -- (BOOL) resignFirstResponder; - -//window & rendering -- (void) preinit; -- (void) config; -- (void) prepareOpenGL; -- (void) render; -- (void) reshape; -- (void) setCurrentTexture; -- (void) drawRect: (NSRect *) bounds; - -//vo control -- (void) fullscreen: (BOOL) animate; -- (void) ontop; -- (void) panscan; -- (void) rootwin; - -//menu -- (void) initMenu; -- (void) menuAction:(id)sender; - -//event -- (void) keyDown: (NSEvent *) theEvent; -- (void) mouseMoved: (NSEvent *) theEvent; -- (void) mouseDown: (NSEvent *) theEvent; -- (void) mouseUp: (NSEvent *) theEvent; -- (void) rightMouseDown: (NSEvent *) theEvent; -- (void) rightMouseUp: (NSEvent *) theEvent; -- (void) otherMouseDown: (NSEvent *) theEvent; -- (void) otherMouseUp: (NSEvent *) theEvent; -- (void) scrollWheel: (NSEvent *) theEvent; -- (void) mouseEvent: (NSEvent *) theEvent; -- (void) check_events; -@end - #endif /* MPLAYER_VO_COREVIDEO_H */ |