diff options
| author | Matthias Vogelgesang <matthias.vogelgesang@kit.edu> | 2017-04-05 12:24:32 +0200 |
|---|---|---|
| committer | Matthias Vogelgesang <matthias.vogelgesang@kit.edu> | 2017-04-05 12:25:17 +0200 |
| commit | 61193820ca1797e673906134ccf7b43c735cef8d (patch) | |
| tree | 0abda9df7660e2cba69e3f31f4d1d6e808f756e1 /bin | |
| parent | 7f818c1e29d66ab335b3c232f60ae4b7899a9913 (diff) | |
| download | uca-61193820ca1797e673906134ccf7b43c735cef8d.tar.gz uca-61193820ca1797e673906134ccf7b43c735cef8d.tar.bz2 uca-61193820ca1797e673906134ccf7b43c735cef8d.tar.xz uca-61193820ca1797e673906134ccf7b43c735cef8d.zip | |
Use prop string array to initialize parameters
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/tools/benchmark.c | 5 | ||||
| -rw-r--r-- | bin/tools/common.c | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/bin/tools/benchmark.c b/bin/tools/benchmark.c index f4c6c52..99050f7 100644 --- a/bin/tools/benchmark.c +++ b/bin/tools/benchmark.c @@ -359,11 +359,6 @@ main (int argc, char *argv[]) goto cleanup_manager; } - if (!uca_camera_parse_arg_props (camera, argv, argc - 1, &error)) { - g_print ("Error setting properties: %s\n", error->message); - goto cleanup_camera; - } - benchmark (camera, &options); g_io_channel_shutdown (log_channel, TRUE, &error); diff --git a/bin/tools/common.c b/bin/tools/common.c index ee3c110..c849727 100644 --- a/bin/tools/common.c +++ b/bin/tools/common.c @@ -102,6 +102,8 @@ cleanup: camera = uca_plugin_manager_get_camerav (manager, name, n_props, params, error); + uca_camera_parse_arg_props (camera, uca_prop_assignment_array, n_props, error); + for (guint i = 0; i < n_props; i++) { /* cast is legit, because we created the string */ g_free ((gchar *) params[i].name); |