FaSTTUBe/GST-Tensordecoder-ov_ep
37
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

directdrawsink: port GstXOverlay bits to new API

Browse Source 
Don't use deprecated API.
This commit is contained in:
Tim-Philipp Müller 2010-10-12 16:13:07 +01:00
parent b50abfe738
commit ad0781a7d4
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sys/directdraw/gstdirectdrawsink.c
View File

@ -134,18 +134,19 @@ gst_directdraw_sink_interface_init (GstImplementsInterfaceClass * klass)
} }
static void static void
gst_directdraw_sink_set_window_id (GstXOverlay * overlay, ULONG window_id) gst_directdraw_sink_set_window_handle (GstXOverlay * overlay,
guintptr window_handle)
{ {
GstDirectDrawSink *ddrawsink = GST_DIRECTDRAW_SINK (overlay); GstDirectDrawSink *ddrawsink = GST_DIRECTDRAW_SINK (overlay);
GST_OBJECT_LOCK (ddrawsink); GST_OBJECT_LOCK (ddrawsink);
/* check if we are already using this window id */ /* check if we are already using this window id */
if (ddrawsink->video_window == (HWND) window_id) { if (ddrawsink->video_window == (HWND) window_handle) {
GST_OBJECT_UNLOCK (ddrawsink); GST_OBJECT_UNLOCK (ddrawsink);
return; return;
} }
if (window_id) { if (window_handle) {
HRESULT hres; HRESULT hres;
/* If we had an internal window, close it first */ /* If we had an internal window, close it first */
@ -156,7 +157,7 @@ gst_directdraw_sink_set_window_id (GstXOverlay * overlay, ULONG window_id)
PostMessage (ddrawsink->video_window, WM_QUIT, 0, 0); PostMessage (ddrawsink->video_window, WM_QUIT, 0, 0);
} }
ddrawsink->video_window = (HWND) window_id; ddrawsink->video_window = (HWND) window_handle;
ddrawsink->our_video_window = FALSE; ddrawsink->our_video_window = FALSE;
if (ddrawsink->setup) { if (ddrawsink->setup) {
/* update the clipper object with the new window */ /* update the clipper object with the new window */
@ -164,7 +165,7 @@ gst_directdraw_sink_set_window_id (GstXOverlay * overlay, ULONG window_id)
ddrawsink->video_window); ddrawsink->video_window);
} }
} }
/* FIXME: Handle the case where window_id is 0 and we want the sink to /* FIXME: Handle the case where window_handle is 0 and we want the sink to
* create a new window when playback was already started (after set_caps) */ * create a new window when playback was already started (after set_caps) */
GST_OBJECT_UNLOCK (ddrawsink); GST_OBJECT_UNLOCK (ddrawsink);
} }
@ -180,7 +181,7 @@ gst_directdraw_sink_expose (GstXOverlay * overlay)
static void static void
gst_directdraw_sink_xoverlay_interface_init (GstXOverlayClass * iface) gst_directdraw_sink_xoverlay_interface_init (GstXOverlayClass * iface)
{ {
iface->set_xwindow_id = gst_directdraw_sink_set_window_id; iface->set_window_handle = gst_directdraw_sink_set_window_handle;
iface->expose = gst_directdraw_sink_expose; iface->expose = gst_directdraw_sink_expose;
} }
@ -1547,8 +1548,8 @@ gst_directdraw_sink_window_thread (GstDirectDrawSink * ddrawsink)
IDirectDrawClipper_SetHWnd (ddrawsink->clipper, 0, ddrawsink->video_window); IDirectDrawClipper_SetHWnd (ddrawsink->clipper, 0, ddrawsink->video_window);
/* signal application we created a window */ /* signal application we created a window */
gst_x_overlay_got_xwindow_id (GST_X_OVERLAY (ddrawsink), gst_x_overlay_got_window_handle (GST_X_OVERLAY (ddrawsink),
(gulong) ddrawsink->video_window); (guintptr) ddrawsink->video_window);
ReleaseSemaphore (ddrawsink->window_created_signal, 1, NULL); ReleaseSemaphore (ddrawsink->window_created_signal, 1, NULL);