summaryrefslogtreecommitdiff
path: root/examples
diff options
context:
space:
mode:
authorMarcus Meissner <marcus@jet.franken.de>2009-07-29 07:32:58 +0000
committerMarcus Meissner <marcus@jet.franken.de>2009-07-29 07:32:58 +0000
commit1d5162aebf7808a861acf0052562e1e780121827 (patch)
treee143cae86137316b47ffb667c4e773223fae5cf6 /examples
parent7ab278bad4f73e732e8a30bd52c21a65ce4b2cfb (diff)
downloadlibgphoto2-1d5162aebf7808a861acf0052562e1e780121827.tar.gz
owner -> ownername
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@12300 67ed7778-7388-44ab-90cf-0a291f65f57c
Diffstat (limited to 'examples')
-rw-r--r--examples/preview.c6
-rw-r--r--examples/sample-owner.c4
2 files changed, 4 insertions, 6 deletions
diff --git a/examples/preview.c b/examples/preview.c
index 8cf954a76..97f1fc6d1 100644
--- a/examples/preview.c
+++ b/examples/preview.c
@@ -96,10 +96,6 @@ capture_to_file(Camera *canon, GPContext *canoncontext, char *fn) {
printf("Capturing.\n");
- /* NOP: This gets overridden in the library to /capt0000.jpg */
- strcpy(camera_file_path.folder, "/");
- strcpy(camera_file_path.name, "foo.jpg");
-
retval = gp_camera_capture(canon, GP_CAPTURE_IMAGE, &camera_file_path, canoncontext);
printf(" Retval: %d\n", retval);
@@ -165,6 +161,8 @@ main(int argc, char **argv) {
exit(1);
}
gp_file_unref(file);
+ sprintf(output_file, "image-%03d.jpg", i);
+ capture_to_file(canon, canoncontext, output_file);
}
gp_camera_exit(canon, canoncontext);
return 0;
diff --git a/examples/sample-owner.c b/examples/sample-owner.c
index d14d07201..bd74fdb92 100644
--- a/examples/sample-owner.c
+++ b/examples/sample-owner.c
@@ -37,14 +37,14 @@ int main(int argc, char **argv) {
return 0;
}
- ret = get_config_value_string (camera, "owner", &owner, context);
+ ret = get_config_value_string (camera, "ownername", &owner, context);
if (ret < GP_OK) {
printf ("Could not query owner.\n");
goto out;
}
printf("Current owner: %s\n", owner);
if (argc > 1) {
- ret = set_config_value_string (camera, "owner", argv[1], context);
+ ret = set_config_value_string (camera, "ownername", argv[1], context);
if (ret < GP_OK) {
fprintf (stderr, "Failed to set camera owner to %s; %d\n", argv[1], ret);
} else