summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorLutz Mueller <lutz@users.sourceforge.net>2002-01-12 23:31:45 +0000
committerLutz Mueller <lutz@users.sourceforge.net>2002-01-12 23:31:45 +0000
commitcd437aae95664443dbac48dd6e0f893d808e3c02 (patch)
tree59ad67833c2d2243c665bedb4a33b258c74f77ca /tests
parent6aabebdc005abd6a46cb1a86aabd7d0a2663c5f7 (diff)
downloadlibgphoto2-cd437aae95664443dbac48dd6e0f893d808e3c02.tar.gz
2002-01-13 Lutz M�ller <urc8@rz.uni-karlsruhe.de>
Finished the GPContext stuff - changes all over the place. Basically, gp_[file,camera]_progress has been replaced by gp_context_progress_*. Well, we haven't release a gphoto2-2.0 yet, therefore I hope you don't mind the API change... * libgphoto2/gphoto2-camera.[c,h]: Added a GPContext parameter to any function that can possibly communicate with the camera. That makes every function cancellable (which is good), makes it possible to report multiple errors during execution of a command, offers several (nested) progress reports, and many other goodies. git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@3841 67ed7778-7388-44ab-90cf-0a291f65f57c
Diffstat (limited to 'tests')
-rw-r--r--tests/test-gphoto2.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/test-gphoto2.c b/tests/test-gphoto2.c
index 84f7bf36b..2ea5a5027 100644
--- a/tests/test-gphoto2.c
+++ b/tests/test-gphoto2.c
@@ -54,7 +54,7 @@ main (int argc, char *argv [])
*/
printf ("Setting model...\n");
CHECK (gp_abilities_list_new (&al));
- CHECK (gp_abilities_list_load (al));
+ CHECK (gp_abilities_list_load (al, NULL));
CHECK (m = gp_abilities_list_lookup_model (al, "Directory Browse"));
CHECK (gp_abilities_list_get_abilities (al, m, &abilities));
CHECK (gp_abilities_list_free (al));
@@ -64,14 +64,14 @@ main (int argc, char *argv [])
* Now, initialize the camera (establish a connection).
*/
printf ("Initializing camera...\n");
- CHECK (gp_camera_init (camera));
+ CHECK (gp_camera_init (camera, NULL));
/*
* At this point, you can do whatever you want.
* You could get files, capture images...
*/
printf ("Getting information about the driver...\n");
- CHECK (gp_camera_get_about (camera, &text));
+ CHECK (gp_camera_get_about (camera, &text, NULL));
printf ("%s\n", text.text);
/*