Change GstCaps to GstStructure in navigation events. Fix x[v]imagesink to scale navigation events.

Original commit message from CVS:
Change GstCaps to GstStructure in navigation events.  Fix x[v]imagesink
to scale navigation events.

2 files changed, 10 insertions, 10 deletions

diff --git a/gst-libs/gst/navigation/navigation.c b/gst-libs/gst/navigation/navigation.c
index 3462348d6..feb84dfa8 100644
--- a/gst-libs/gst/navigation/navigation.c
+++ b/gst-libs/gst/navigation/navigation.c
@@ -61,31 +61,31 @@ gst_navigation_class_init (GstNavigationInterface *iface)
 }
 
 void
-gst_navigation_send_event (GstNavigation *navigation, GstCaps *caps)
+gst_navigation_send_event (GstNavigation *navigation, GstStructure *structure)
 {
   GstNavigationInterface *iface = GST_NAVIGATION_GET_IFACE (navigation);
 
   if (iface->send_event) {
-    iface->send_event (navigation, caps);
+    iface->send_event (navigation, structure);
   }
 }
 
 void
 gst_navigation_send_key_event (GstNavigation *navigation, const char *key)
 {
-  gst_navigation_send_event (navigation, GST_CAPS_NEW ("key_event",
-	"application/x-gst-navigation",
-	"key", GST_PROPS_STRING (key)));
+  gst_navigation_send_event (navigation, gst_structure_new (
+        "application/x-gst-navigation",
+	"key", G_TYPE_STRING, key, NULL));
 }
 
 void
 gst_navigation_send_mouse_event (GstNavigation *navigation, double x,
         double y)
 {
-  gst_navigation_send_event (navigation, GST_CAPS_NEW ("mouse_event",
+  gst_navigation_send_event (navigation, gst_structure_new (
 	"application/x-gst-navigation",
-	"pointer_x", GST_PROPS_FLOAT (x),
-	"pointer_y", GST_PROPS_FLOAT (y)));
+	"pointer_x", G_TYPE_DOUBLE, x,
+	"pointer_y", G_TYPE_DOUBLE, y, NULL));
 }
 
 
diff --git a/gst-libs/gst/navigation/navigation.h b/gst-libs/gst/navigation/navigation.h
index 5ce3a5c72..22a66632d 100644
--- a/gst-libs/gst/navigation/navigation.h
+++ b/gst-libs/gst/navigation/navigation.h
@@ -42,7 +42,7 @@ typedef struct _GstNavigationInterface {
   GTypeInterface g_iface;
 
   /* virtual functions */
-  void (*send_event) (GstNavigation *navigation, GstCaps *caps);
+  void (*send_event) (GstNavigation *navigation, GstStructure *structure);
   
   GST_CLASS_PADDING
 } GstNavigationInterface;
@@ -50,7 +50,7 @@ typedef struct _GstNavigationInterface {
 GType		gst_navigation_get_type	(void);
 
 /* virtual class function wrappers */
-void gst_navigation_send_event (GstNavigation *navigation, GstCaps *caps);
+void gst_navigation_send_event (GstNavigation *navigation, GstStructure *structure);
 
 void gst_navigation_send_key_event (GstNavigation *navigation, const char *key);
 void gst_navigation_send_mouse_event (GstNavigation *navigation, double x,