From 8f1b7c6d44bb5e5f44b497e3260364407a98361e Mon Sep 17 00:00:00 2001
From: Matthias Vogelgesang <matthias.vogelgesang@gmail.com>
Date: Thu, 14 Mar 2013 12:10:44 +0100
Subject: Provide an vararg-free constructor for bindings

---
 src/uca-plugin-manager.c | 122 +++++++++++++++++++++++++++++++++--------------
 1 file changed, 85 insertions(+), 37 deletions(-)

(limited to 'src/uca-plugin-manager.c')

diff --git a/src/uca-plugin-manager.c b/src/uca-plugin-manager.c
index e1bfb9e..5013981 100644
--- a/src/uca-plugin-manager.c
+++ b/src/uca-plugin-manager.c
@@ -209,44 +209,22 @@ find_camera_module_path (GList *search_paths, const gchar *name)
     return result;
 }
 
-/**
- * uca_plugin_manager_get_camera:
- * @manager: A #UcaPluginManager
- * @name: Name of the camera module, that maps to libuca<name>.so
- * @error: Location for a #GError
- *
- * Create a new camera instance with camera @name.
- *
- * Returns: (transfer full): A new #UcaCamera object.
- * @Since: 1.2: Pass construction properties.
- */
-UcaCamera *
-uca_plugin_manager_get_camera (UcaPluginManager *manager,
-                               const gchar *name,
-                               GError **error,
-                               const gchar *first_prop_name,
-                               ...)
+static GType
+get_camera_type (UcaPluginManagerPrivate *priv,
+                 const gchar *name,
+                 GError **error)
 {
-    UcaPluginManagerPrivate *priv;
-    UcaCamera *camera;
     GModule *module;
     gchar *module_path;
     GetTypeFunc *func;
-    GType type;
-    va_list var_args;
-    GError *tmp_error = NULL;
-
     const gchar *symbol_name = "uca_camera_get_type";
 
-    g_return_val_if_fail (UCA_IS_PLUGIN_MANAGER (manager) && (name != NULL), NULL);
-
-    priv = manager->priv;
     module_path = find_camera_module_path (priv->search_paths, name);
 
     if (module_path == NULL) {
         g_set_error (error, UCA_PLUGIN_MANAGER_ERROR, UCA_PLUGIN_MANAGER_ERROR_MODULE_NOT_FOUND,
-                "Camera module `%s' not found", name);
-        return NULL;
+                     "Camera module `%s' not found", name);
+        return G_TYPE_NONE;
     }
 
     module = g_module_open (module_path, G_MODULE_BIND_LAZY);
@@ -255,7 +233,7 @@ uca_plugin_manager_get_camera (UcaPluginManager *manager,
     if (!module) {
         g_set_error (error, UCA_PLUGIN_MANAGER_ERROR, UCA_PLUGIN_MANAGER_ERROR_MODULE_OPEN,
                      "Camera module `%s' could not be opened: %s", name, g_module_error ());
-        return NULL;
+        return G_TYPE_NONE;
     }
 
     func = g_malloc0 (sizeof (GetTypeFunc));
@@ -268,21 +246,91 @@ uca_plugin_manager_get_camera (UcaPluginManager *manager,
         if (!g_module_close (module))
             g_warning ("%s", g_module_error ());
 
-        return NULL;
+        return G_TYPE_NONE;
     }
 
-    type = (*func) ();
+    return (*func) ();
+}
+
+/**
+ * uca_plugin_manager_get_camerav:
+ * @manager: A #UcaPluginManager
+ * @name: Name of the camera module, that maps to libuca<name>.so
+ * @n_parameters: number of parameters in @parameters
+ * @parameters: (array length=n_parameters): the parameters to use to construct
+ *      the camera
+ * @error: Location for a #GError or %NULL
+ *
+ * Create a new camera instance with camera @name.
+ *
+ * Returns: (transfer full): A new #UcaCamera object.
+ * @Since: 1.2
+ */
+UcaCamera *
+uca_plugin_manager_get_camerav (UcaPluginManager *manager,
+                                const gchar *name,
+                                guint n_parameters,
+                                GParameter *parameters,
+                                GError **error)
+{
+    UcaPluginManagerPrivate *priv;
+    UcaCamera *camera;
+    GType type;
+
+    g_return_val_if_fail (UCA_IS_PLUGIN_MANAGER (manager) && (name != NULL), NULL);
+
+    priv = manager->priv;
+    type = get_camera_type (priv, name, error);
+
+    if (type == G_TYPE_NONE)
+        return NULL;
+
+    camera = (UcaCamera *) g_initable_newv (type, n_parameters, parameters,
+                                            NULL, error);
+
+    return camera;
+}
+
+/**
+ * uca_plugin_manager_get_camera: (skip)
+ * @manager: A #UcaPluginManager
+ * @name: Name of the camera module, that maps to libuca<name>.so
+ * @error: Location for a #GError
+ * @first_prop_name: (allow-none): name of the first property, or %NULL if no
+ *      properties
+ * @...: value of the first property, followed by and other property value
+ *      pairs, and ended by %NULL.
+ *
+ * Create a new camera instance with camera @name.
+ *
+ * Returns: (transfer full): A new #UcaCamera object.
+ * @Since: 1.2: Pass construction properties.
+ */
+UcaCamera *
+uca_plugin_manager_get_camera (UcaPluginManager *manager,
+                               const gchar *name,
+                               GError **error,
+                               const gchar *first_prop_name,
+                               ...)
+{
+    UcaPluginManagerPrivate *priv;
+    UcaCamera *camera;
+    GType type;
+    va_list var_args;
+
+    g_return_val_if_fail (UCA_IS_PLUGIN_MANAGER (manager) && (name != NULL), NULL);
+
+    priv = manager->priv;
+    type = get_camera_type (priv, name, error);
+
+    if (type == G_TYPE_NONE)
+        return NULL;
 
     va_start (var_args, first_prop_name);
-    camera = (UcaCamera *) g_initable_new (type, NULL, &tmp_error,
+    camera = (UcaCamera *) g_initable_new (type, NULL, error,
                                            first_prop_name, var_args);
     va_end (var_args);
 
-    if (tmp_error != NULL) {
-        g_propagate_error (error, tmp_error);
-        return NULL;
-    }
-
     return camera;
 }
 
-- 
cgit v1.2.3