From 46e1018e41ffd3032721fe0b38c9dc01f7626d4e Mon Sep 17 00:00:00 2001
From: Andy Wingo <wingo@pobox.com>
Date: Wed, 12 Oct 2005 14:31:53 +0000
Subject: [PATCH] gst/gst.defs (gst_registry_scan_paths)
 (gst_element_abort_preroll, gst_plugin_check_file)

Original commit message from CVS:
2005-10-12  Andy Wingo  <wingo@pobox.com>

* gst/gst.defs (gst_registry_scan_paths)
(gst_element_abort_preroll, gst_plugin_check_file)
(gst_element_finish_preroll): Removed undefined symbols.

* gst/gstelement.override (_wrap_gst_element_get_state): Fix for
GstClockTime api change.
---
 ChangeLog               | 13 +++++++++++++
 common                  |  2 +-
 gst/gst.defs            | 30 ------------------------------
 gst/gstelement.override | 10 +++-------
 4 files changed, 17 insertions(+), 38 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6c9f92b8c5..5a1f8d9da9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2005-10-12  Andy Wingo  <wingo@pobox.com>
+
+	* gst/gst.defs (gst_element_abort_preroll): foo
+	(gst_plugin_check_file): 
+
+	* gst/gst.defs (gst_element_finish_preroll): foo
+
+	* gst/gstelement.override (_wrap_gst_element_get_state): Fix for
+	GstClockTime api change.
+
+	* gst/gst.defs (gst_registry_scan_paths): Removed, following
+	removal from GStreamer.
+
 2005-10-12  Julien MOUTTE  <julien@moutte.net>
 
 	* gst/gst-argtypes.c:
diff --git a/common b/common
index 37ed26e33b..2485a65b66 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 37ed26e33bae9a6ab256c62ebbb9d711374a0abb
+Subproject commit 2485a65b662de25fb7b71857e34411426c6f530c
diff --git a/gst/gst.defs b/gst/gst.defs
index c7c9036228..fb84ce17e6 100644
--- a/gst/gst.defs
+++ b/gst/gst.defs
@@ -3929,15 +3929,6 @@
   )
 )
 
-(define-function plugin_check_file
-  (c-name "gst_plugin_check_file")
-  (return-type "gboolean")
-  (parameters
-    '("const-gchar*" "filename")
-    '("GError**" "error")
-  )
-)
-
 (define-function plugin_load_file
   (c-name "gst_plugin_load_file")
   (return-type "GstPlugin*")
@@ -4395,12 +4386,6 @@
   )
 )
 
-(define-method scan_paths
-  (of-object "GstRegistry")
-  (c-name "gst_registry_scan_paths")
-  (return-type "none")
-)
-
 ;; From ../gstreamer/gst/gststructure.h
 
 (define-function gst_structure_get_type
@@ -5816,21 +5801,6 @@
   )
 )
 
-(define-method abort_preroll
-  (of-object "GstElement")
-  (c-name "gst_element_abort_preroll")
-  (return-type "GstFlowReturn")
-)
-
-(define-method finish_preroll
-  (of-object "GstElement")
-  (c-name "gst_element_finish_preroll")
-  (return-type "GstFlowReturn")
-  (parameters
-    '("GstPad*" "pad")
-  )
-)
-
 (define-method create_all_pads
   (of-object "GstElement")
   (c-name "gst_element_create_all_pads")
diff --git a/gst/gstelement.override b/gst/gstelement.override
index 7752bc1976..de0fedca1d 100644
--- a/gst/gstelement.override
+++ b/gst/gstelement.override
@@ -83,8 +83,7 @@ _wrap_gst_element_get_state(PyGObject *self, PyObject *args, PyObject *kwargs)
     GstStateChangeReturn ret;
     PyObject *timeout = NULL;
     gdouble timeoutd;
-    GTimeVal *timevalp = NULL;
-    GTimeVal timeval;
+    GstClockTime timeout64;
     PyObject *tuple;
 
     /*
@@ -112,16 +111,13 @@ _wrap_gst_element_get_state(PyGObject *self, PyObject *args, PyObject *kwargs)
             timeoutd = PyFloat_AsDouble (timeout);
         }
 
-        timeval.tv_sec = (glong) timeoutd;
-        timeval.tv_usec = (glong) ((timeoutd - (gdouble) timeval.tv_sec)
-                                   * 1000.0 * 1000.0);
-	timevalp = &timeval;
+        timeout64 = timeoutd * GST_SECOND;
     }
 	
     pyg_begin_allow_threads;
 
     ret = gst_element_get_state(GST_ELEMENT (self->obj), &state, &pending,
-        timevalp);
+        timeout64);
 
     pyg_end_allow_threads;