slowly updating camera libraries to newer API scheme

git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@1700 67ed7778-7388-44ab-90cf-0a291f65f57c
This commit is contained in:
Scott Fritzinger
2001-03-10 20:32:24 +00:00
parent 9105dd3c7f
commit ac9691dfb0
7 changed files with 70 additions and 76 deletions

View File

@@ -61,8 +61,8 @@ int camera_init(Camera *camera) {
camera->functions->abilities = camera_abilities;
camera->functions->init = camera_init;
camera->functions->exit = camera_exit;
camera->functions->folder_list = camera_folder_list;
camera->functions->file_list = camera_file_list;
camera->functions->folder_list_folders = camera_folder_list_folders;
camera->functions->folder_list_files = camera_folder_list_files;
camera->functions->file_get = camera_file_get;
camera->functions->file_get_preview = camera_file_get_preview;
camera->functions->summary = camera_summary;
@@ -126,7 +126,7 @@ int camera_file_list (Camera *camera, CameraList *list, char *folder) {
return GP_OK;
}
int camera_file_get (Camera *camera, CameraFile *file, char *folder, char *filename) {
int camera_file_get (Camera *camera, char *folder, char *filename, CameraFile *file) {
int size, num;
BarbieStruct *b = (BarbieStruct*)camera->camlib_data;
@@ -147,7 +147,7 @@ int camera_file_get (Camera *camera, CameraFile *file, char *folder, char *filen
return GP_OK;
}
int camera_file_get_preview (Camera *camera, CameraFile *file, char *folder, char *filename) {
int camera_file_get_preview (Camera *camera, char *folder, char *filename, CameraFile *file) {
int size, num;
BarbieStruct *b = (BarbieStruct*)camera->camlib_data;

View File

@@ -150,7 +150,7 @@ int camera_abilities(CameraAbilitiesList *list)
return GP_OK;
}
int camera_folder_list(Camera *camera, CameraList *list, char *folder)
int camera_folder_list(Camera *camera, char *folder, CameraList *list)
{
gp_debug_printf(GP_DEBUG_LOW,"canon","camera_folder_list()");
@@ -503,7 +503,7 @@ static int canon_file_list(Camera *camera, CameraList *list, char *folder)
}
int camera_file_list(Camera *camera, CameraList *list, char *folder)
int camera_file_list(Camera *camera, char *folder, CameraList *list)
{
gp_debug_printf(GP_DEBUG_LOW,"canon","camera_file_list()");
@@ -666,7 +666,7 @@ static int get_file_path(Camera *camera, char *filename, char *path)
}
int camera_file_get(Camera *camera, CameraFile *file, char *folder, char *filename)
int camera_file_get(Camera *camera, char *folder, char *filename, CameraFile *file)
{
struct canon_info *cs = (struct canon_info*)camera->camlib_data;
char *data;
@@ -712,7 +712,7 @@ int camera_file_get(Camera *camera, CameraFile *file, char *folder, char *filena
return GP_OK;
}
int camera_file_get_preview(Camera *camera, CameraFile *preview, char *folder, char *filename)
int camera_file_get_preview(Camera *camera, char *folder, char *filename, CameraFile *preview)
{
struct canon_info *cs = (struct canon_info*)camera->camlib_data;
char *data;
@@ -805,19 +805,18 @@ int camera_init(Camera *camera)
camera->functions->abilities = camera_abilities;
camera->functions->init = camera_init;
camera->functions->exit = camera_exit;
camera->functions->folder_list = camera_folder_list;
camera->functions->file_list = camera_file_list;
camera->functions->file_get = camera_file_get;
camera->functions->folder_list_folders = camera_folder_list;
camera->functions->folder_list_files = camera_file_list;
camera->functions->folder_put_file = camera_folder_put_file;
camera->functions->file_get = camera_file_get;
camera->functions->file_get_preview = camera_file_get_preview;
camera->functions->folder_put_file = camera_folder_put_file;
camera->functions->file_delete = camera_file_delete;
camera->functions->config_get = camera_config_get;
camera->functions->config_set = camera_config_set;
camera->functions->file_config_get = camera_file_config_get;
camera->functions->file_config_set = camera_file_config_set;
camera->functions->folder_config_get = camera_folder_config_get;
camera->functions->folder_config_set = camera_folder_config_set;
camera->functions->config = camera_config;
camera->functions->get_config = camera_get_config;
camera->functions->set_config = camera_set_config;
camera->functions->file_get_config = camera_file_get_config;
camera->functions->file_set_config = camera_file_set_config;
camera->functions->folder_get_config = camera_folder_get_config;
camera->functions->folder_set_config = camera_folder_set_config;
camera->functions->capture = camera_capture;
camera->functions->summary = camera_summary;
camera->functions->manual = camera_manual;
@@ -1149,7 +1148,7 @@ static int get_last_picture(Camera *camera, char *directory, char *filename)
}
int camera_folder_put_file(Camera *camera, CameraFile *file, char *folder)
int camera_folder_put_file(Camera *camera, char *folder, CameraFile *file)
{
struct canon_info *cs = (struct canon_info*)camera->camlib_data;
char destpath[300], destname[300], dir[300], dcf_root_dir[10];
@@ -1251,7 +1250,7 @@ int camera_folder_put_file(Camera *camera, CameraFile *file, char *folder)
/****************************************************************************/
int camera_config_get(Camera *camera, CameraWidget **window)
int camera_get_config(Camera *camera, CameraWidget **window)
{
struct canon_info *cs = (struct canon_info*)camera->camlib_data;
CameraWidget *t, *section;
@@ -1260,7 +1259,7 @@ int camera_config_get(Camera *camera, CameraWidget **window)
struct tm *camtm;
time_t camtime;
gp_debug_printf(GP_DEBUG_LOW,"canon","camera_config_get()");
gp_debug_printf(GP_DEBUG_LOW,"canon","camera_get_config()");
*window = gp_widget_new(GP_WIDGET_WINDOW,
"Canon PowerShot Configuration");
@@ -1361,7 +1360,7 @@ int camera_config(Camera *camera)
{
CameraWidget *window;
camera_config_get (camera, &window);
camera_get_config (camera, &window);
/* Prompt the user with the config window */
if (gp_frontend_prompt (camera, window) == GP_PROMPT_CANCEL) {
@@ -1369,19 +1368,19 @@ int camera_config(Camera *camera)
return GP_OK;
}
camera_config_set (camera, window);
camera_set_config (camera, window);
gp_widget_unref (window);
return GP_OK;
}
int camera_config_set (Camera *camera, CameraWidget *window)
int camera_set_config (Camera *camera, CameraWidget *window)
{
struct canon_info *cs = (struct canon_info*)camera->camlib_data;
CameraWidget *w;
char *wvalue;
char buf[8];
gp_debug_printf(GP_DEBUG_LOW,"canon","camera_config_set()");
gp_debug_printf(GP_DEBUG_LOW,"canon","camera_set_config()");
w = gp_widget_child_by_label(window,"Debug level");
if (gp_widget_changed(w)) {
@@ -1438,7 +1437,7 @@ int camera_config_set (Camera *camera, CameraWidget *window)
/****************************************************************************/
int camera_capture(Camera *camera, CameraFilePath *path, CameraCaptureSetting *setting)
int camera_capture(Camera *camera, CameraFilePath *path)
{
gp_debug_printf(GP_DEBUG_LOW,"canon","camera_capture()");
@@ -1452,23 +1451,23 @@ int camera_capture_preview(Camera *camera, CameraFile *file)
return GP_ERROR_NOT_SUPPORTED;
}
int camera_file_config_get (Camera *camera, CameraWidget **window,
char *folder, char *filename)
int camera_file_get_config (Camera *camera, char *folder, char *filename,
CameraWidget **window)
{
return GP_ERROR;
}
int camera_file_config_set (Camera *camera, CameraWidget *window,
char *folder, char *filename)
int camera_file_set_config (Camera *camera, char *folder, char *filename,
CameraWidget *window)
{
return GP_ERROR;
}
int camera_folder_config_get(Camera *camera, CameraWidget **window,
char *folder)
int camera_folder_get_config(Camera *camera, char *folder,
CameraWidget **window)
{
return GP_ERROR;
}
int camera_folder_config_set(Camera *camera, CameraWidget *window,
char *folder)
int camera_folder_set_config(Camera *camera, char *folder,
CameraWidget *window)
{
return GP_ERROR;
}

View File

@@ -74,8 +74,8 @@ int camera_init(Camera *camera)
camera->functions->abilities = camera_abilities;
camera->functions->init = camera_init;
camera->functions->exit = camera_exit;
camera->functions->folder_list = camera_folder_list;
camera->functions->file_list = camera_file_list;
camera->functions->folder_list_folders = camera_folder_list_folders;
camera->functions->folder_list_files = camera_folder_list_files;
camera->functions->file_get = camera_file_get;
camera->functions->file_get_preview = camera_file_get_preview;
camera->functions->summary = camera_summary;
@@ -118,7 +118,7 @@ int camera_exit(Camera *camera)
return GP_OK;
}
int camera_folder_list(Camera *camera, CameraList *list, char *folder)
int camera_folder_list_folders(Camera *camera, char *folder, CameraList *list)
{
struct digita_device *dev = camera->camlib_data;
int i, i1;
@@ -175,7 +175,7 @@ printf("[digita]camera_folder_list %s\n", folder);
return GP_OK;
}
int camera_file_list(Camera *camera, CameraList *list, char *folder)
int camera_folder_list_files(Camera *camera, char *folder, CameraList *list)
{
struct digita_device *dev = camera->camlib_data;
int i;
@@ -283,8 +283,8 @@ printf("digita: getting %s%s\n", folder, filename);
return data;
}
int camera_file_get(Camera *camera, CameraFile *file, char *folder,
char *filename)
int camera_file_get(Camera *camera, char *folder, char *filename,
CameraFile *file)
{
struct digita_device *dev = camera->camlib_data;
unsigned char *data;
@@ -309,8 +309,8 @@ int camera_file_get(Camera *camera, CameraFile *file, char *folder,
return GP_OK;
}
int camera_file_get_preview(Camera *camera, CameraFile *file, char *folder,
char *filename)
int camera_file_get_preview(Camera *camera, char *folder, char *filename,
CameraFile *file)
{
struct digita_device *dev = camera->camlib_data;
int x, y;

View File

@@ -83,13 +83,12 @@ int camera_init (Camera *camera)
camera->functions->abilities = camera_abilities;
camera->functions->init = camera_init;
camera->functions->exit = camera_exit;
camera->functions->folder_list = camera_folder_list;
camera->functions->file_list = camera_file_list;
camera->functions->folder_list_folders = camera_folder_list_folders;
camera->functions->folder_list_files = camera_folder_list_files;
camera->functions->file_get = camera_file_get;
camera->functions->file_info_set = camera_file_info_set;
camera->functions->config_get = camera_config_get;
camera->functions->config_set = camera_config_set;
camera->functions->config = camera_config;
camera->functions->file_set_info = camera_file_set_info;
camera->functions->get_config = camera_get_config;
camera->functions->set_config = camera_set_config;
camera->functions->summary = camera_summary;
camera->functions->manual = camera_manual;
camera->functions->about = camera_about;
@@ -122,7 +121,7 @@ int camera_exit (Camera *camera)
return (GP_OK);
}
int camera_file_info_set (Camera *camera, CameraFileInfo *info, char *folder, char *file)
int camera_file_set_info (Camera *camera, char *folder, char *file, CameraFileInfo *info)
{
int retval;
char *path_old;
@@ -177,7 +176,7 @@ int camera_file_info_set (Camera *camera, CameraFileInfo *info, char *folder, ch
return (GP_OK);
}
int camera_file_list(Camera *camera, CameraList *list, char *folder)
int camera_folder_list_files(Camera *camera, char *folder, CameraList *list)
{
GP_SYSTEM_DIR d;
GP_SYSTEM_DIRENT de;
@@ -204,7 +203,7 @@ int camera_file_list(Camera *camera, CameraList *list, char *folder)
return (GP_OK);
}
int camera_folder_list(Camera *camera, CameraList *list, char *folder)
int camera_folder_list_folders(Camera *camera, char *folder, CameraList *list)
{
GP_SYSTEM_DIR d;
GP_SYSTEM_DIRENT de;
@@ -276,7 +275,7 @@ int directory_folder_set(Camera *camera, char *folder_name)
return (folder_index(camera));
}
int camera_file_get (Camera *camera, CameraFile *file, char *folder, char *filename)
int camera_file_get (Camera *camera, char *folder, char *filename, CameraFile *file)
{
/**********************************/
/* file_number now starts at 0!!! */
@@ -295,7 +294,7 @@ int camera_file_get (Camera *camera, CameraFile *file, char *folder, char *filen
return (GP_OK);
}
int camera_config_get (Camera *camera, CameraWidget **window)
int camera_get_config (Camera *camera, CameraWidget **window)
{
CameraWidget *widget;
char buf[256];
@@ -311,7 +310,7 @@ int camera_config_get (Camera *camera, CameraWidget **window)
return (GP_OK);
}
int camera_config_set (Camera *camera, CameraWidget *window)
int camera_set_config (Camera *camera, CameraWidget *window)
{
CameraWidget *widget;
char buf[256];
@@ -332,7 +331,7 @@ int camera_config (Camera *camera)
{
CameraWidget *window;
camera_config_get (camera, &window);
camera_get_config (camera, &window);
/* Prompt the user with the config window */
if (gp_frontend_prompt (camera, window) == GP_PROMPT_CANCEL) {
@@ -340,7 +339,7 @@ int camera_config (Camera *camera)
return GP_OK;
}
camera_config_set (camera, window);
camera_set_config (camera, window);
return (GP_OK);
} /* END DEPRECATED */

View File

@@ -60,12 +60,11 @@ int camera_init (Camera *camera) {
camera->functions->abilities = camera_abilities;
camera->functions->init = camera_init;
camera->functions->exit = camera_exit;
camera->functions->folder_list = camera_folder_list;
camera->functions->file_list = camera_file_list;
camera->functions->folder_list_folders = camera_folder_list_folders;
camera->functions->folder_list_files = camera_folder_list_files;
camera->functions->file_get = camera_file_get;
camera->functions->file_get_preview = camera_file_get_preview;
camera->functions->file_delete = camera_file_delete;
// camera->functions->capture = camera_capture;
camera->functions->summary = camera_summary;
camera->functions->manual = camera_manual;
camera->functions->about = camera_about;
@@ -142,7 +141,7 @@ int camera_exit (Camera *camera) {
return (GP_OK);
}
int camera_folder_list (Camera *camera, CameraList *list, char *folder) {
int camera_folder_list_folders (Camera *camera, char *folder, CameraList *list) {
DC120Data *dd = camera->camlib_data;
char buf[32];
@@ -169,7 +168,7 @@ int camera_folder_list (Camera *camera, CameraList *list, char *folder) {
return (GP_ERROR);
}
int camera_file_list (Camera *camera, CameraList *list, char *folder) {
int camera_folder_list_files (Camera *camera, char *folder, CameraList *list) {
DC120Data *dd = camera->camlib_data;
CameraListEntry *entry;
@@ -252,13 +251,12 @@ int camera_file_action (Camera *camera, int action, CameraFile *file, char *fold
return (dc120_file_action(dd, action, from_card, album_num, picnum+1, file));
}
int camera_file_get (Camera *camera, CameraFile *file, char *folder, char *filename) {
int camera_file_get (Camera *camera, char *folder, char *filename, CameraFile *file) {
return (camera_file_action(camera, DC120_ACTION_IMAGE, file, folder, filename));
}
int camera_file_get_preview (Camera *camera, CameraFile *file,
char *folder, char *filename) {
int camera_file_get_preview (Camera *camera, char *folder, char *filename, CameraFile *file) {
return (camera_file_action(camera, DC120_ACTION_PREVIEW, file, folder, filename));
}
@@ -277,7 +275,7 @@ int camera_file_delete (Camera *camera, char *folder, char *filename) {
}
#if 0
int camera_capture (Camera *camera, CameraFile *file, CameraCaptureInfo *info) {
int camera_capture (Camera *camera, CameraFile *file) {
DC120Data *dd = camera->camlib_data;

View File

@@ -59,8 +59,8 @@ int camera_init (Camera *camera) {
camera->functions->abilities = camera_abilities;
camera->functions->init = camera_init;
camera->functions->exit = camera_exit;
camera->functions->folder_list = camera_folder_list;
camera->functions->file_list = camera_file_list;
camera->functions->folder_list_folders = camera_folder_list_folders;
camera->functions->folder_list_files = camera_folder_list_files;
camera->functions->file_get = camera_file_get;
camera->functions->file_get_preview = camera_file_get_preview;
camera->functions->file_delete = camera_file_delete;
@@ -169,30 +169,28 @@ int camera_exit (Camera *camera) {
return (GP_OK);
}
int camera_folder_list (Camera *camera, CameraList *list, char *folder) {
int camera_folder_list_folders (Camera *camera, char *folder, CameraList *list) {
DC240Data *dd = camera->camlib_data;
return (dc240_get_folders(dd, list, folder));
}
int camera_file_list (Camera *camera, CameraList *list, char *folder) {
int camera_folder_list_files (Camera *camera, char *folder, CameraList *list) {
DC240Data *dd = camera->camlib_data;
return (dc240_get_filenames(dd, list, folder));
}
int camera_file_get (Camera *camera, CameraFile *file, char *folder,
char *filename) {
int camera_file_get (Camera *camera, char *folder, char *filename, CameraFile *file) {
DC240Data *dd = camera->camlib_data;
return (dc240_file_action(dd, DC240_ACTION_IMAGE, file, folder, filename));
}
int camera_file_get_preview (Camera *camera, CameraFile *file,
char *folder, char *filename) {
int camera_file_get_preview (Camera *camera, char *folder, char *filename, CameraFile *file) {
DC240Data *dd = camera->camlib_data;

View File

@@ -60,8 +60,8 @@ int camera_init (Camera *camera) {
camera->functions->abilities = camera_abilities;
camera->functions->init = camera_init;
camera->functions->exit = camera_exit;
camera->functions->folder_list = camera_folder_list;
camera->functions->file_list = camera_file_list;
camera->functions->folder_list_folders = camera_folder_list_folders;
camera->functions->folder_list_files = camera_folder_list_files;
camera->functions->file_get = camera_file_get;
camera->functions->file_get_preview = camera_file_get_preview;
camera->functions->summary = camera_summary;