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/sonydscf1 | |
| 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/sonydscf1')
| -rw-r--r-- | camlibs/sonydscf1/sonydscf1.c | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/camlibs/sonydscf1/sonydscf1.c b/camlibs/sonydscf1/sonydscf1.c index 707630d26..5fa377fde 100644 --- a/camlibs/sonydscf1/sonydscf1.c +++ b/camlibs/sonydscf1/sonydscf1.c @@ -59,7 +59,7 @@ int camera_abilities (CameraAbilitiesList *list) { return (GP_OK); } -static int camera_exit (Camera *camera) { +static int camera_exit (Camera *camera, GPContext *context) { if(F1ok()) return(GP_ERROR); return (F1fclose()); @@ -119,7 +119,7 @@ static int delete_file_func (CameraFilesystem *fs, const char *folder, /*return (F1deletepicture(file_number));*/ } -static int camera_summary (Camera *camera, CameraText *summary) +static int camera_summary (Camera *camera, CameraText *summary, GPContext *context) { /*printf("->camera summary");*/ int i; @@ -129,15 +129,7 @@ static int camera_summary (Camera *camera, CameraText *summary) return (F1newstatus(1, summary->text)); } -static int camera_manual (Camera *camera, CameraText *manual) -{ - /*printf("sony dscf1: manual\n");*/ - strcpy(manual->text, _("Manual Not Available")); - - return (GP_OK); -} - -static int camera_about (Camera *camera, CameraText *about) +static int camera_about (Camera *camera, CameraText *about, GPContext *context) { strcpy(about->text, _("Sony DSC-F1 Digital Camera Support\nM. Adam Kendall <joker@penguinpub.com>\nBased on the chotplay CLI interface from\nKen-ichi Hayashi\nGphoto2 port by Bart van Leeuwen <bart@netage.nl>")); @@ -161,12 +153,11 @@ static int file_list_func (CameraFilesystem *fs, const char *folder, return GP_OK; } -int camera_init (Camera *camera) { +int camera_init (Camera *camera, GPContext *context) { GPPortSettings settings; camera->functions->exit = camera_exit; camera->functions->summary = camera_summary; - camera->functions->manual = camera_manual; camera->functions->about = camera_about; /* FIXME: This won't work with several frontends. NO GLOBALS PLEASE! */ |