x11: Fix unused variable warnings

These are emitted when XInput 2 is not available.

```
../subprojects/gst-plugins-base/sys/ximage/ximagesink.c: In function ‘gst_x_image_sink_handle_xevents’:
../subprojects/gst-plugins-base/sys/ximage/ximagesink.c:696:29: warning: unused variable ‘state’ [-Wunused-variable]
  696 |   GstNavigationModifierType state = GST_NAVIGATION_MODIFIER_NONE;
      |                             ^~~~~
../subprojects/gst-plugins-base/sys/ximage/ximagesink.c:694:35: warning: unused variable ‘touch_frame_open’ [-Wunused-variable]
  694 |   gboolean pointer_moved = FALSE, touch_frame_open = FALSE;
      |                                   ^~~~~~~~~~~~~~~~
../subprojects/gst-plugins-base/sys/xvimage/xvimagesink.c: In function ‘gst_xv_image_sink_handle_xevents’:
../subprojects/gst-plugins-base/sys/xvimage/xvimagesink.c:427:35: warning: unused variable ‘touch_frame_open’ [-Wunused-variable]
  427 |   gboolean pointer_moved = FALSE, touch_frame_open = FALSE;
      |                                   ^~~~~~~~~~~~~~~~
../subprojects/gst-plugins-base/sys/xvimage/xvimagesink.c:426:29: warning: unused variable ‘state’ [-Wunused-variable]
  426 |   GstNavigationModifierType state = GST_NAVIGATION_MODIFIER_NONE;
      |                             ^~~~~
```

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2093>

diff --git a/subprojects/gst-plugins-base/sys/ximage/ximagesink.c b/subprojects/gst-plugins-base/sys/ximage/ximagesink.c
index a72e307..e885b72 100644 (file)
--- a/subprojects/gst-plugins-base/sys/ximage/ximagesink.c
+++ b/subprojects/gst-plugins-base/sys/ximage/ximagesink.c
@@ -691,9 +691,12 @@ gst_x_image_sink_handle_xevents (GstXImageSink * ximagesink)
 {
   XEvent e;
   gint pointer_x = 0, pointer_y = 0;
-  gboolean pointer_moved = FALSE, touch_frame_open = FALSE;
+  gboolean pointer_moved = FALSE;
   gboolean exposed = FALSE, configured = FALSE;
+#ifdef HAVE_XI2
+  gboolean touch_frame_open = FALSE;
   GstNavigationModifierType state = GST_NAVIGATION_MODIFIER_NONE;
+#endif
 
   g_return_if_fail (GST_IS_X_IMAGE_SINK (ximagesink));
 

diff --git a/subprojects/gst-plugins-base/sys/xvimage/xvimagesink.c b/subprojects/gst-plugins-base/sys/xvimage/xvimagesink.c
index 68b8fb7..7f98f0a 100644 (file)
--- a/subprojects/gst-plugins-base/sys/xvimage/xvimagesink.c
+++ b/subprojects/gst-plugins-base/sys/xvimage/xvimagesink.c
@@ -423,9 +423,12 @@ gst_xv_image_sink_handle_xevents (GstXvImageSink * xvimagesink)
 {
   XEvent e;
   gint pointer_x = 0, pointer_y = 0;
-  GstNavigationModifierType state = GST_NAVIGATION_MODIFIER_NONE;
-  gboolean pointer_moved = FALSE, touch_frame_open = FALSE;
+  gboolean pointer_moved = FALSE;
   gboolean exposed = FALSE, configured = FALSE;
+#ifdef HAVE_XI2
+  gboolean touch_frame_open = FALSE;
+  GstNavigationModifierType state = GST_NAVIGATION_MODIFIER_NONE;
+#endif
 
   g_return_if_fail (GST_IS_XV_IMAGE_SINK (xvimagesink));