diff options
| author | Lutz Mueller <lutz@users.sourceforge.net> | 2002-01-10 23:06:56 +0000 |
|---|---|---|
| committer | Lutz Mueller <lutz@users.sourceforge.net> | 2002-01-10 23:06:56 +0000 |
| commit | 0dedb0e1639c480e93fb1b1bc88a681a92492740 (patch) | |
| tree | 284d72379a31ce09610ed2f76a34259e41d830f7 /camlibs/barbie | |
| parent | 232f43bcb5acde993c540be4f3035532199ffd59 (diff) | |
| download | libgphoto2-0dedb0e1639c480e93fb1b1bc88a681a92492740.tar.gz | |
2002-01-10 Lutz M�ller <urc8@rz.uni-karlsruhe.de>
* libgphoto2/gphoto2-filesys.[c,h]: Add a GPContext to all functions
that potentially access the camera. This makes cancelling of
all operations possible and improves error reporting.
* tests/test-filesys.c:
* libgphoto2/gphoto2-camera.c:
* camlibs: Adjust to reflect above changes
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@3798 67ed7778-7388-44ab-90cf-0a291f65f57c
Diffstat (limited to 'camlibs/barbie')
| -rw-r--r-- | camlibs/barbie/barbie.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/camlibs/barbie/barbie.c b/camlibs/barbie/barbie.c index e5b50cac6..6d83a7af9 100644 --- a/camlibs/barbie/barbie.c +++ b/camlibs/barbie/barbie.c @@ -68,7 +68,7 @@ camera_abilities (CameraAbilitiesList *list) static int file_list_func (CameraFilesystem *fs, const char *folder, CameraList *list, - void *data) + void *data, GPContext *context) { Camera *camera = data; int count; @@ -81,14 +81,15 @@ file_list_func (CameraFilesystem *fs, const char *folder, CameraList *list, static int get_file_func (CameraFilesystem *fs, const char *folder, const char *filename, - CameraFileType type, CameraFile *file, void *user_data) + CameraFileType type, CameraFile *file, void *user_data, + GPContext *context) { Camera *camera = user_data; int size, num; char *data; /* Retrieve the number of the photo on the camera */ - num = gp_filesystem_number (camera->fs, "/", filename); + num = gp_filesystem_number (camera->fs, "/", filename, context); switch (type) { case GP_FILE_TYPE_NORMAL: |