dfbvideosink: Fix compile error

Fix some compile errors

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3670>
This commit is contained in:
ekwange 2023-01-02 18:34:59 +09:00 committed by kwange e
parent af315967da
commit beccaf31ef
2 changed files with 15 additions and 8 deletions

View file

@ -606,7 +606,8 @@ gst_dfbvideosink_event_thread (GstDfbVideoSink * dfbvideosink)
GST_DEBUG_OBJECT (dfbvideosink, "key press event %c !", GST_DEBUG_OBJECT (dfbvideosink, "key press event %c !",
event.input.key_symbol); event.input.key_symbol);
gst_dfbvideosink_navigation_send_event gst_dfbvideosink_navigation_send_event
(gst_navigation_event_new_key_press ("prout", (GST_NAVIGATION (dfbvideosink),
gst_navigation_event_new_key_press ("prout",
GST_NAVIGATION_MODIFIER_NONE)); GST_NAVIGATION_MODIFIER_NONE));
} }
} else if (event.input.type == DIET_BUTTONPRESS) { } else if (event.input.type == DIET_BUTTONPRESS) {
@ -618,7 +619,8 @@ gst_dfbvideosink_event_thread (GstDfbVideoSink * dfbvideosink)
event.input.button, x, y); event.input.button, x, y);
gst_dfbvideosink_navigation_send_event gst_dfbvideosink_navigation_send_event
(gst_navigation_event_new_mouse_button_press (event.input.button, (GST_NAVIGATION (dfbvideosink),
gst_navigation_event_new_mouse_button_press (event.input.button,
x, y, GST_NAVIGATION_MODIFIER_NONE)); x, y, GST_NAVIGATION_MODIFIER_NONE));
} else if (event.input.type == DIET_BUTTONRELEASE) { } else if (event.input.type == DIET_BUTTONRELEASE) {
gint x, y; gint x, y;
@ -629,14 +631,16 @@ gst_dfbvideosink_event_thread (GstDfbVideoSink * dfbvideosink)
event.input.button, x, y); event.input.button, x, y);
gst_dfbvideosink_navigation_send_event gst_dfbvideosink_navigation_send_event
(gst_navigation_event_new_mouse_button_release (GST_NAVIGATION (dfbvideosink),
(event.input.button, x, y, GST_NAVIGATION_MODIFIER_NONE)); gst_navigation_event_new_mouse_button_release (event.input.button,
x, y, GST_NAVIGATION_MODIFIER_NONE));
} else if (event.input.type == DIET_AXISMOTION) { } else if (event.input.type == DIET_AXISMOTION) {
gint x, y; gint x, y;
dfbvideosink->layer->GetCursorPosition (dfbvideosink->layer, &x, &y); dfbvideosink->layer->GetCursorPosition (dfbvideosink->layer, &x, &y);
gst_dfbvideosink_navigation_send_event gst_dfbvideosink_navigation_send_event
(gst_navigation_event_new_mouse_move (x, y, (GST_NAVIGATION (dfbvideosink),
gst_navigation_event_new_mouse_move (x, y,
GST_NAVIGATION_MODIFIER_NONE)); GST_NAVIGATION_MODIFIER_NONE));
} else { } else {
GST_WARNING_OBJECT (dfbvideosink, "unhandled event type %d", GST_WARNING_OBJECT (dfbvideosink, "unhandled event type %d",
@ -2007,8 +2011,7 @@ gst_dfbvideosink_navigation_send_event (GstNavigation * navigation,
/* Our coordinates can be wrong here if we centered the video */ /* Our coordinates can be wrong here if we centered the video */
/* Converting pointer coordinates to the non scaled geometry */ /* Converting pointer coordinates to the non scaled geometry */
if gst_navigation_event_get_coordinates if (gst_navigation_event_get_coordinates (event, &old_x, &old_y)) {
(event, &old_x, &old_y) {
x = old_x; x = old_x;
y = old_y; y = old_y;
@ -2032,7 +2035,7 @@ gst_dfbvideosink_navigation_send_event (GstNavigation * navigation,
GST_DEBUG_OBJECT (dfbvideosink, "translated navigation event y " GST_DEBUG_OBJECT (dfbvideosink, "translated navigation event y "
"coordinate from %fd to %fd", old_y, y); "coordinate from %fd to %fd", old_y, y);
gst_navigation_event_set_coordinates (event, x, y); gst_navigation_event_set_coordinates (event, x, y);
} }
pad = gst_pad_get_peer (GST_VIDEO_SINK_PAD (dfbvideosink)); pad = gst_pad_get_peer (GST_VIDEO_SINK_PAD (dfbvideosink));

View file

@ -156,6 +156,10 @@ struct _GstDfbVideoSinkClass {
GType gst_dfbvideosink_get_type (void); GType gst_dfbvideosink_get_type (void);
GType gst_dfb_buffer_pool_get_type (void); GType gst_dfb_buffer_pool_get_type (void);
static void
gst_dfbvideosink_navigation_send_event (GstNavigation * navigation,
GstEvent * event);
GST_ELEMENT_REGISTER_DECLARE (dfbvideosink); GST_ELEMENT_REGISTER_DECLARE (dfbvideosink);
G_END_DECLS G_END_DECLS