diff options
| author | Lutz Mueller <lutz@users.sourceforge.net> | 2002-01-12 23:31:45 +0000 |
|---|---|---|
| committer | Lutz Mueller <lutz@users.sourceforge.net> | 2002-01-12 23:31:45 +0000 |
| commit | cd437aae95664443dbac48dd6e0f893d808e3c02 (patch) | |
| tree | 59ad67833c2d2243c665bedb4a33b258c74f77ca /camlibs/digita | |
| parent | 6aabebdc005abd6a46cb1a86aabd7d0a2663c5f7 (diff) | |
| download | libgphoto2-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 'camlibs/digita')
| -rw-r--r-- | camlibs/digita/digita.c | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/camlibs/digita/digita.c b/camlibs/digita/digita.c index 8caa52dc0..f92df76b3 100644 --- a/camlibs/digita/digita.c +++ b/camlibs/digita/digita.c @@ -108,7 +108,7 @@ int camera_id(CameraText *id) return GP_OK; } -static int camera_exit(Camera *camera) +static int camera_exit(Camera *camera, GPContext *context) { if (camera->pl) { free(camera->pl); @@ -379,7 +379,7 @@ static int get_file_func(CameraFilesystem *fs, const char *folder, return GP_OK; } -static int camera_summary(Camera *camera, CameraText *summary) +static int camera_summary(Camera *camera, CameraText *summary, GPContext *context) { int taken; @@ -391,14 +391,7 @@ static int camera_summary(Camera *camera, CameraText *summary) return GP_OK; } -static int camera_manual(Camera *camera, CameraText *manual) -{ - strcpy(manual->text, _("Manual Not Available")); - - return GP_ERROR; -} - -static int camera_about(Camera *camera, CameraText *about) +static int camera_about(Camera *camera, CameraText *about, GPContext *context) { strcpy(about->text, _("Digita\n" \ "Johannes Erdfelt <johannes@erdfelt.com>")); @@ -435,7 +428,7 @@ static int delete_picture(int index) } #endif -int camera_init(Camera *camera) +int camera_init(Camera *camera, GPContext *context) { int ret = 0; @@ -445,7 +438,6 @@ int camera_init(Camera *camera) /* First, set up all the function pointers */ camera->functions->exit = camera_exit; camera->functions->summary = camera_summary; - camera->functions->manual = camera_manual; camera->functions->about = camera_about; /* Set up the CameraFilesystem */ |