Do smarter method lookup

mwunsch · Apr 27, 2017 · 928148c · 928148c
1 parent 7eeeb3b
commit 928148c
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 7 deletions.
diff --git a/ffi/unsafe/introspection.rkt b/ffi/unsafe/introspection.rkt
@@ -344,6 +344,10 @@
 (define-gir gi-callable-method? (_fun _gi-base-info -> _bool)
   #:c-id g_callable_info_is_method)
 
+(define-gir gi-callable-caller-owns (_fun _gi-base-info ->
+                                          (_enum '(nothing container everything)))
+  #:c-id g_callable_info_get_caller_owns)
+
 (define (gi-callable-arity fn)
   (let ([args (gi-callable-args fn)])
     (if (gi-callable-method? fn)
@@ -570,7 +574,7 @@
 (define-gir gi-struct-find-method (_fun (structure : _gi-base-info) (method : _symbol)
                                         -> (res : _gi-base-info)
                                         -> (or res
-                                               (raise-argument-error 'gi-object-find-method
+                                               (raise-argument-error 'gi-struct-find-method
                                                                      (format "~.v" (gi-struct-known-method? structure))
                                                                      method)))
   #:c-id g_struct_info_find_method)
@@ -645,11 +649,19 @@
 (struct gi-object gi-registered-type ()
   #:property prop:procedure
   (lambda (object method-name . arguments)
-    (let ([method (gi-object-find-method object method-name)])
+    (let ([method (gi-object-method-lookup object method-name)])
       (apply method arguments))))
 
 (struct gobject gtype-instance ())
 
+(define (gi-object-method-lookup obj method-name)
+  (let ([method (gi-object-find-method obj method-name)]
+        [parent (gi-object-parent obj)])
+    (or method
+        (if parent
+            (gi-object-method-lookup parent method-name)
+            (error "method not found")))))
+
 (define (gobject-has-field? obj field-name)
   (let* ([base (gtype-instance-type obj)]
          [fields (map gi-base-sym (gi-object-fields base))])
@@ -787,11 +799,7 @@
   (apply symbols (map (compose1 string->symbol gi-base-name) (gi-object-methods obj))))
 
 (define-gir gi-object-find-method (_fun (obj : _gi-base-info) (method : _symbol)
-                                        -> (res : _gi-base-info)
-                                        -> (or res
-                                               (raise-argument-error 'gi-object-find-method
-                                                                     (format "~.v" (gi-object-method/c obj))
-                                                                     method)))
+                                        -> _gi-base-info)
   #:c-id g_object_info_find_method)
 
 (define-gir gi-object-n-properties (_fun _gi-base-info -> _int)

diff --git a/gstreamer/main.rkt b/gstreamer/main.rkt
@@ -12,3 +12,16 @@
     (error "Could not load Gstreamer"))
 
 (define element-factory (gst 'ElementFactory))
+
+(define pipeline (gst 'Pipeline))
+
+(define bin (gst 'Bin))
+
+(define my-pipeline (pipeline 'new "my-pipeline"))
+(define source (element-factory 'make "fakesrc" "source"))
+(define filter (element-factory 'make "identity" "filter"))
+(define sink (element-factory 'make "fakesink" "sink"))
+
+(define (pipeline-add-many pipeline . elements)
+  (for/and ([element elements])
+    (bin 'add pipeline element)))