summaryrefslogtreecommitdiff
path: root/camlibs/sonydscf55/camera.c
diff options
context:
space:
mode:
authorLutz Mueller <lutz@users.sourceforge.net>2002-01-12 23:31:45 +0000
committerLutz Mueller <lutz@users.sourceforge.net>2002-01-12 23:31:45 +0000
commitcd437aae95664443dbac48dd6e0f893d808e3c02 (patch)
tree59ad67833c2d2243c665bedb4a33b258c74f77ca /camlibs/sonydscf55/camera.c
parent6aabebdc005abd6a46cb1a86aabd7d0a2663c5f7 (diff)
downloadlibgphoto2-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/sonydscf55/camera.c')
-rw-r--r--camlibs/sonydscf55/camera.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/camlibs/sonydscf55/camera.c b/camlibs/sonydscf55/camera.c
index 3d6181c34..7089c74e2 100644
--- a/camlibs/sonydscf55/camera.c
+++ b/camlibs/sonydscf55/camera.c
@@ -62,7 +62,7 @@ int camera_abilities(CameraAbilitiesList * list)
/**
* De-initialises camera
*/
-static int camera_exit(Camera * camera)
+static int camera_exit(Camera * camera, GPContext *context)
{
int rc;
@@ -82,7 +82,7 @@ static int camera_exit(Camera * camera)
-static int camera_about(Camera * camera, CameraText * about)
+static int camera_about(Camera * camera, CameraText * about, GPContext *context)
{
strcpy(about->text,
_("Sony DSC-F55/505 gPhoto library\n"
@@ -173,7 +173,7 @@ get_info_func (CameraFilesystem *fs, const char *folder,
/**
* Initialises camera
*/
-int camera_init(Camera * camera)
+int camera_init(Camera * camera, GPContext *context)
{
CameraAbilities a;
int is_msac, rc;