vlc | branch: master | Adrien Maglo <[email protected]> | Fri Nov 8 13:18:34 2013 +0100| [95cfb0e32d4c0a900e88a58392f3bd5d6895cc38] | committer: Adrien Maglo
Vout: add a new vout_window type for android native windows > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=95cfb0e32d4c0a900e88a58392f3bd5d6895cc38 --- include/vlc_vout_window.h | 8 +++++--- src/video_output/window.c | 4 ++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/include/vlc_vout_window.h b/include/vlc_vout_window.h index e3e7ff6..ed7d42c 100644 --- a/include/vlc_vout_window.h +++ b/include/vlc_vout_window.h @@ -45,6 +45,7 @@ enum { VOUT_WINDOW_TYPE_XID, VOUT_WINDOW_TYPE_HWND, VOUT_WINDOW_TYPE_NSOBJECT, + VOUT_WINDOW_TYPE_ANDROID_NATIVE, }; /** @@ -87,9 +88,10 @@ struct vout_window_t { * It must be filled in the open function. */ union { - void *hwnd; /* Win32 window handle */ - uint32_t xid; /* X11 windows ID */ - void *nsobject; /* Mac OSX view object */ + void *hwnd; /* Win32 window handle */ + uint32_t xid; /* X11 windows ID */ + void *nsobject; /* Mac OSX view object */ + void *anativewindow; /* Android native window. */ } handle; /* display server (mandatory) */ diff --git a/src/video_output/window.c b/src/video_output/window.c index ffe779a..bc45bc2 100644 --- a/src/video_output/window.c +++ b/src/video_output/window.c @@ -82,6 +82,10 @@ vout_window_t *vout_window_New(vlc_object_t *obj, window->handle.xid = 0; window->display.x11 = NULL; break; + case VOUT_WINDOW_TYPE_ANDROID_NATIVE: + type = "vout window anative"; + window->handle.anativewindow = NULL; + break; default: assert(0); } _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
