mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-17 11:45:25 +00:00
Code Issues 1 Projects Releases Wiki Activity

[743/906] win32: Allow setting window handle before creating the context

Browse source
This commit is contained in:
Sebastian Dröge 2013-07-11 21:30:53 +02:00 committed by Tim-Philipp Müller
parent bd60dd7f22
commit 29874d3be6
2 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
gst-libs/gst/gl/win32/gstglwindow_win32.c
View file

@ -269,8 +269,13 @@ gst_gl_window_win32_set_window_handle (GstGLWindow * window, guintptr id)
window_win32 = GST_GL_WINDOW_WIN32 (window); window_win32 = GST_GL_WINDOW_WIN32 (window);
if (!window_win32->internal_win_id) {
window_win32->parent_win_id = id;
return;
}
/* retrieve parent if previously set */ /* retrieve parent if previously set */
parent_id = GetProp (window_win32->internal_win_id, "gl_window_parent_id"); parent_id = window_win32->parent_win_id;
if (window_win32->visible) { if (window_win32->visible) {
ShowWindow (window_win32->internal_win_id, SW_HIDE); ShowWindow (window_win32->internal_win_id, SW_HIDE);
@ -288,7 +293,6 @@ gst_gl_window_win32_set_window_handle (GstGLWindow * window, guintptr id)
SetParent (window_win32->internal_win_id, NULL); SetParent (window_win32->internal_win_id, NULL);
RemoveProp (parent_id, "gl_window_parent_proc"); RemoveProp (parent_id, "gl_window_parent_proc");
RemoveProp (window_win32->internal_win_id, "gl_window_parent_id");
} }
//not 0 //not 0
if (id) { if (id) {
@ -298,7 +302,6 @@ gst_gl_window_win32_set_window_handle (GstGLWindow * window, guintptr id)
GST_DEBUG ("set parent %" G_GUINTPTR_FORMAT "\n", id); GST_DEBUG ("set parent %" G_GUINTPTR_FORMAT "\n", id);
SetProp (window_win32->internal_win_id, "gl_window_parent_id", (HWND) id);
SetProp ((HWND) id, "gl_window_id", window_win32->internal_win_id); SetProp ((HWND) id, "gl_window_id", window_win32->internal_win_id);
SetProp ((HWND) id, "gl_window_parent_proc", (WNDPROC) window_parent_proc); SetProp ((HWND) id, "gl_window_parent_proc", (WNDPROC) window_parent_proc);
SetWindowLongPtr ((HWND) id, GWLP_WNDPROC, (LONG_PTR) sub_class_proc); SetWindowLongPtr ((HWND) id, GWLP_WNDPROC, (LONG_PTR) sub_class_proc);
@ -320,6 +323,7 @@ gst_gl_window_win32_set_window_handle (GstGLWindow * window, guintptr id)
SetWindowLongPtr (window_win32->internal_win_id, GWL_STYLE, SetWindowLongPtr (window_win32->internal_win_id, GWL_STYLE,
WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_OVERLAPPEDWINDOW); WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_OVERLAPPEDWINDOW);
} }
window_win32->parent_win_id = id;
} }
/* Thread safe */ /* Thread safe */
@ -329,8 +333,9 @@ gst_gl_window_win32_draw (GstGLWindow * window, guint width, guint height)
GstGLWindowWin32 *window_win32 = GST_GL_WINDOW_WIN32 (window); GstGLWindowWin32 *window_win32 = GST_GL_WINDOW_WIN32 (window);
if (!window_win32->visible) { if (!window_win32->visible) {
HWND parent_id = HWND parent_id =;
GetProp (window_win32->internal_win_id, "gl_window_parent_id"); window_win32->parent_win_id;
/* if no parent the real size has to be set now because this has not been done /* if no parent the real size has to be set now because this has not been done
* when at window creation */ * when at window creation */
if (!parent_id) { if (!parent_id) {
@ -528,7 +533,7 @@ window_proc (HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
if (destroy_cb) if (destroy_cb)
destroy_cb ((gpointer) wParam); destroy_cb ((gpointer) wParam);
parent_id = GetProp (hWnd, "gl_window_parent_id"); parent_id = window_win32->parent_win_id;
if (parent_id) { if (parent_id) {
WNDPROC parent_proc = GetProp (parent_id, "gl_window_parent_proc"); WNDPROC parent_proc = GetProp (parent_id, "gl_window_parent_proc");
@ -538,7 +543,6 @@ window_proc (HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
SetParent (hWnd, NULL); SetParent (hWnd, NULL);
RemoveProp (parent_id, "gl_window_parent_proc"); RemoveProp (parent_id, "gl_window_parent_proc");
RemoveProp (hWnd, "gl_window_parent_id");
} }
window_win32->is_closed = TRUE; window_win32->is_closed = TRUE;
@ -591,7 +595,7 @@ window_proc (HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
default: default:
{ {
/* transmit messages to the parrent (ex: mouse/keyboard input) */ /* transmit messages to the parrent (ex: mouse/keyboard input) */
HWND parent_id = GetProp (hWnd, "gl_window_parent_id"); HWND parent_id = window_win32->parent_win_id;
if (parent_id) if (parent_id)
PostMessage (parent_id, uMsg, wParam, lParam); PostMessage (parent_id, uMsg, wParam, lParam);
return DefWindowProc (hWnd, uMsg, wParam, lParam); return DefWindowProc (hWnd, uMsg, wParam, lParam);

1
gst-libs/gst/gl/win32/gstglwindow_win32.h
View file

@ -45,6 +45,7 @@ struct _GstGLWindowWin32 {
GstGLWindow parent; GstGLWindow parent;
HWND internal_win_id; HWND internal_win_id;
HWND parent_win_id;
HDC device; HDC device;
gboolean is_closed; gboolean is_closed;
gboolean visible; gboolean visible;