darktable/libgphoto2
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

converted to fsfuncs.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@8697 67ed7778-7388-44ab-90cf-0a291f65f57c
This commit is contained in:
Marcus Meissner
2006-03-31 21:15:30 +00:00
parent ae21f4d8f9
commit 29feb9bf8d
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
camlibs/sonydscf55/camera.c
View File

@@ -307,6 +307,12 @@ get_camera_model(Camera *camera, SonyModel *model)
}
static CameraFilesystemFuncs fsfuncs = {
.file_list_func = file_list_func,
.get_file_func = get_file_func,
.get_info_func = get_info_func
};
/**
* Initialises camera
*/
@@ -317,21 +323,16 @@ camera_init(Camera * camera, GPContext *context)
SonyModel model;
rc = get_camera_model(camera, &model);
if (rc != GP_OK) {
if (rc != GP_OK)
return rc;
}
camera->functions->exit = camera_exit;
camera->functions->about = camera_about;
gp_filesystem_set_info_funcs (camera->fs, get_info_func, NULL, camera);
gp_filesystem_set_list_funcs (camera->fs, file_list_func, NULL, camera);
gp_filesystem_set_file_funcs (camera->fs, get_file_func, NULL, camera);
gp_filesystem_set_funcs (camera->fs, &fsfuncs, camera);
camera->pl = malloc (sizeof (CameraPrivateLibrary));
if (!camera->pl) {
if (!camera->pl)
return (GP_ERROR_NO_MEMORY);
}
rc = sony_init (camera, model);
if (rc < 0) {
@@ -339,7 +340,6 @@ camera_init(Camera * camera, GPContext *context)
camera->pl = NULL;
return (rc);
}
return (GP_OK);
}