summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorMatthias Vogelgesang <matthias.vogelgesang@gmail.com>2013-03-13 18:07:21 +0100
committerMatthias Vogelgesang <matthias.vogelgesang@gmail.com>2013-03-13 18:07:21 +0100
commitca1a74cafa8f75a20e42bbdf501f5c8e8f184920 (patch)
treef4e99bbc93abad34e24f7db89d786adb8fbfc834 /tools
parent0c2a3b8d2f35ccc4dc67616e430df7fb72cb5e62 (diff)
downloadlibuca-ca1a74cafa8f75a20e42bbdf501f5c8e8f184920.tar.gz
libuca-ca1a74cafa8f75a20e42bbdf501f5c8e8f184920.tar.bz2
libuca-ca1a74cafa8f75a20e42bbdf501f5c8e8f184920.tar.xz
libuca-ca1a74cafa8f75a20e42bbdf501f5c8e8f184920.zip
Use GInitable to pass properties to plugins
Diffstat (limited to 'tools')
-rw-r--r--tools/benchmark.c3
-rw-r--r--tools/gen-doc.c2
-rw-r--r--tools/grab-async.c2
-rw-r--r--tools/grab.c2
-rw-r--r--tools/gui/control.c2
-rw-r--r--tools/perf-overhead.c2
6 files changed, 6 insertions, 7 deletions
diff --git a/tools/benchmark.c b/tools/benchmark.c
index e062e61..170a96c 100644
--- a/tools/benchmark.c
+++ b/tools/benchmark.c
@@ -140,7 +140,6 @@ grab_frames_async (UcaCamera *camera, gpointer buffer, guint n_frames)
;
uca_camera_stop_recording (camera, &error);
-
}
static void
@@ -255,7 +254,7 @@ main (int argc, char *argv[])
g_log_set_handler (NULL, G_LOG_LEVEL_MASK, log_handler, log_channel);
manager = uca_plugin_manager_new ();
- camera = uca_plugin_manager_get_camera (manager, argv[1], &error);
+ camera = uca_plugin_manager_get_camera (manager, argv[1], &error, NULL);
if (camera == NULL) {
g_error ("Initialization: %s", error->message);
diff --git a/tools/gen-doc.c b/tools/gen-doc.c
index eb61cc9..d27bdd8 100644
--- a/tools/gen-doc.c
+++ b/tools/gen-doc.c
@@ -205,7 +205,7 @@ int main(int argc, char *argv[])
}
else {
name = argv[1];
- camera = uca_plugin_manager_get_camera (manager, name, &error);
+ camera = uca_plugin_manager_get_camera (manager, name, &error, NULL);
}
if (camera == NULL) {
diff --git a/tools/grab-async.c b/tools/grab-async.c
index 2c4bf04..00f2879 100644
--- a/tools/grab-async.c
+++ b/tools/grab-async.c
@@ -94,7 +94,7 @@ main(int argc, char *argv[])
}
manager = uca_plugin_manager_new ();
- camera = uca_plugin_manager_get_camera (manager, argv[1], &error);
+ camera = uca_plugin_manager_get_camera (manager, argv[1], &error, NULL);
if (camera == NULL) {
g_print("Error during initialization: %s\n", error->message);
diff --git a/tools/grab.c b/tools/grab.c
index 1518997..b020279 100644
--- a/tools/grab.c
+++ b/tools/grab.c
@@ -75,7 +75,7 @@ int main(int argc, char *argv[])
}
manager = uca_plugin_manager_new ();
- camera = uca_plugin_manager_get_camera (manager, argv[1], &error);
+ camera = uca_plugin_manager_get_camera (manager, argv[1], &error, NULL);
if (camera == NULL) {
g_print("Error during initialization: %s\n", error->message);
diff --git a/tools/gui/control.c b/tools/gui/control.c
index c2ea59c..192859c 100644
--- a/tools/gui/control.c
+++ b/tools/gui/control.c
@@ -456,7 +456,7 @@ create_main_window (GtkBuilder *builder, const gchar* camera_name)
guint width, height;
GError *error = NULL;
- camera = uca_plugin_manager_get_camera (plugin_manager, camera_name, &error);
+ camera = uca_plugin_manager_get_camera (plugin_manager, camera_name, &error, NULL);
if ((camera == NULL) || (error != NULL)) {
g_error ("%s\n", error->message);
diff --git a/tools/perf-overhead.c b/tools/perf-overhead.c
index 6735e6f..7661dbc 100644
--- a/tools/perf-overhead.c
+++ b/tools/perf-overhead.c
@@ -163,7 +163,7 @@ main (int argc, char *argv[])
}
manager = uca_plugin_manager_new ();
- camera = uca_plugin_manager_get_camera (manager, argv[1], &error);
+ camera = uca_plugin_manager_get_camera (manager, argv[1], &error, NULL);
if (camera == NULL) {
g_print ("Error during initialization: %s\n", error->message);