mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 06:54:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

d3d11videosink: Early terminate mouse/keyboard event handling

Browse source 
... and add missing null check (plus coding style fix)

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2824>
This commit is contained in:
Seungha Yang 2022-08-02 04:16:31 +09:00 committed by GStreamer Marge Bot
parent f7e75a0208
commit 7d4a1a5beb
1 changed files with 32 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

63
subprojects/gst-plugins-bad/sys/d3d11/gstd3d11videosink.cpp
View file

@ -678,49 +678,50 @@ static void
gst_d3d11_video_sink_key_event (GstD3D11Window * window, const gchar * event, gst_d3d11_video_sink_key_event (GstD3D11Window * window, const gchar * event,
const gchar * key, GstD3D11VideoSink * self) const gchar * key, GstD3D11VideoSink * self)
{ {
GstEvent *key_event = NULL; GstEvent *key_event;
if (self->enable_navigation_events) { if (!self->enable_navigation_events || !event || !key)
GST_LOG_OBJECT (self, "send key event %s, key %s", event, key); return;
if (0 == g_strcmp0 ("key-press", event))
key_event =
gst_navigation_event_new_key_press (key,
GST_NAVIGATION_MODIFIER_NONE);
else if (0 == g_strcmp0 ("key-release", event))
key_event =
gst_navigation_event_new_key_release (key,
GST_NAVIGATION_MODIFIER_NONE);
if (event) GST_LOG_OBJECT (self, "send key event %s, key %s", event, key);
gst_navigation_send_event_simple (GST_NAVIGATION (self), key_event); if (g_strcmp0 ("key-press", event) == 0) {
key_event = gst_navigation_event_new_key_press (key,
GST_NAVIGATION_MODIFIER_NONE);
} else if (g_strcmp0 ("key-release", event) == 0) {
key_event = gst_navigation_event_new_key_release (key,
GST_NAVIGATION_MODIFIER_NONE);
} else {
return;
} }
gst_navigation_send_event_simple (GST_NAVIGATION (self), key_event);
} }
static void static void
gst_d3d11_video_mouse_key_event (GstD3D11Window * window, const gchar * event, gst_d3d11_video_mouse_key_event (GstD3D11Window * window, const gchar * event,
gint button, gdouble x, gdouble y, GstD3D11VideoSink * self) gint button, gdouble x, gdouble y, GstD3D11VideoSink * self)
{ {
GstEvent *mouse_event = NULL; GstEvent *mouse_event;
if (self->enable_navigation_events) { if (!self->enable_navigation_events || !event)
GST_LOG_OBJECT (self, return;
"send mouse event %s, button %d (%.1f, %.1f)", event, button, x, y);
if (0 == g_strcmp0 ("mouse-button-press", event))
mouse_event =
gst_navigation_event_new_mouse_button_press (button, x, y,
GST_NAVIGATION_MODIFIER_NONE);
else if (0 == g_strcmp0 ("mouse-button-release", event))
mouse_event =
gst_navigation_event_new_mouse_button_release (button, x, y,
GST_NAVIGATION_MODIFIER_NONE);
else if (0 == g_strcmp0 ("mouse-move", event))
mouse_event =
gst_navigation_event_new_mouse_move (x, y,
GST_NAVIGATION_MODIFIER_NONE);
if (event) GST_LOG_OBJECT (self,
gst_navigation_send_event_simple (GST_NAVIGATION (self), mouse_event); "send mouse event %s, button %d (%.1f, %.1f)", event, button, x, y);
if (g_strcmp0 ("mouse-button-press", event) == 0) {
mouse_event = gst_navigation_event_new_mouse_button_press (button, x, y,
GST_NAVIGATION_MODIFIER_NONE);
} else if (g_strcmp0 ("mouse-button-release", event) == 0) {
mouse_event = gst_navigation_event_new_mouse_button_release (button, x, y,
GST_NAVIGATION_MODIFIER_NONE);
} else if (g_strcmp0 ("mouse-move", event) == 0) {
mouse_event = gst_navigation_event_new_mouse_move (x, y,
GST_NAVIGATION_MODIFIER_NONE);
} else {
return;
} }
gst_navigation_send_event_simple (GST_NAVIGATION (self), mouse_event);
} }
static gboolean static gboolean