[aravis] Revert "viewer: don't use deprecated gst_x_overlay_set_xwindow_id."



commit 29ee10b562f910c96b22083cb9b3b2641bea8489
Author: Emmanuel Pacaud <emmanuel gnome org>
Date:   Tue May 10 11:38:34 2011 +0200

    Revert "viewer: don't use deprecated gst_x_overlay_set_xwindow_id."
    
    The required gstreamer version is too recent.

 configure.ac       |    2 +-
 viewer/arvviewer.c |    4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 1852e4f..8b2a359 100644
--- a/configure.ac
+++ b/configure.ac
@@ -51,7 +51,7 @@ AC_SUBST(aravis_datadir, '$(datadir)/aravis-$(ARAVIS_API_VERSION)')
 
 build_viewer=no
 if test "x$enable_viewer" = "xyes"; then
-	PKG_CHECK_MODULES([ARAVIS_VIEWER],   [gtk+-2.0 >= 2.12 gstreamer-base-0.10 >= 0.10.31 gstreamer-app-0.10 gstreamer-interfaces-0.10],
+	PKG_CHECK_MODULES([ARAVIS_VIEWER],   [gtk+-2.0 >= 2.12 gstreamer-base-0.10 >= 0.10 gstreamer-app-0.10 gstreamer-interfaces-0.10],
 			  [AC_DEFINE([ARAVIS_BUILD_VIEWER], [1], [Build viewer])
 			  build_viewer=yes],
 			  [echo -n])
diff --git a/viewer/arvviewer.c b/viewer/arvviewer.c
index 0d1ea19..2de6088 100644
--- a/viewer/arvviewer.c
+++ b/viewer/arvviewer.c
@@ -349,6 +349,7 @@ arv_viewer_select_camera_cb (GtkComboBox *combo_box, ArvViewer *viewer)
 	int width;
 	int height;
 	unsigned int i;
+	gulong window_xid;
 	double exposure;
 	double log_exposure;
 	double frame_rate;
@@ -468,7 +469,8 @@ arv_viewer_select_camera_cb (GtkComboBox *combo_box, ArvViewer *viewer)
 	gst_element_set_state (viewer->pipeline, GST_STATE_PLAYING);
 
 	window = gtk_widget_get_window (viewer->drawing_area);
-	gst_x_overlay_set_window_handle (GST_X_OVERLAY (ximagesink), GDK_WINDOW_XID (window));
+	window_xid = GDK_WINDOW_XID (window);
+	gst_x_overlay_set_xwindow_id (GST_X_OVERLAY (ximagesink), window_xid);
 
 	g_signal_connect (viewer->stream, "new-buffer", G_CALLBACK (arv_viewer_new_buffer_cb), viewer);
 }



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]