diff options
| author | Marcus Meissner <marcus@jet.franken.de> | 2009-02-16 08:09:49 +0000 |
|---|---|---|
| committer | Marcus Meissner <marcus@jet.franken.de> | 2009-02-16 08:09:49 +0000 |
| commit | bb3d18289e752db9dff5f7e60e5368f46bdd1a8a (patch) | |
| tree | 8b96a77cc35ca978600cbe450a0503d3dd6dc5aa /camlibs/sonydscf55 | |
| parent | 2d0eae7c878f9ee870df185d27e0fafd120a4b42 (diff) | |
| download | libgphoto2-bb3d18289e752db9dff5f7e60e5368f46bdd1a8a.tar.gz | |
Batch commit from weekend work:
- removed "type" from CameraFile handling:
- all put_file functions and hooks get "type" as argument now
- added type to the set_file_info_noop call
- started removal of "name" from CameraFile
- generate new filename from original filename + camerafile type + mimetype
- new gp_camera_autodetect() helper function
- adapted all drivers.
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@11818 67ed7778-7388-44ab-90cf-0a291f65f57c
Diffstat (limited to 'camlibs/sonydscf55')
| -rw-r--r-- | camlibs/sonydscf55/camera.c | 6 | ||||
| -rw-r--r-- | camlibs/sonydscf55/sony.c | 1 |
2 files changed, 0 insertions, 7 deletions
diff --git a/camlibs/sonydscf55/camera.c b/camlibs/sonydscf55/camera.c index 498e4d5af..026cd0c31 100644 --- a/camlibs/sonydscf55/camera.c +++ b/camlibs/sonydscf55/camera.c @@ -223,12 +223,6 @@ get_file_func (CameraFilesystem *fs, const char *folder, const char *filename, default: rc = GP_ERROR_NOT_SUPPORTED; } - - - if (rc == GP_OK) { - gp_file_set_name (file, filename); - } - return rc; } diff --git a/camlibs/sonydscf55/sony.c b/camlibs/sonydscf55/sony.c index 215b443f9..e15eb0329 100644 --- a/camlibs/sonydscf55/sony.c +++ b/camlibs/sonydscf55/sony.c @@ -722,7 +722,6 @@ sony_file_get(Camera * camera, int imageid, int file_type, * overwrites it with the correct one. */ sprintf(buffer, SONY_FILE_NAME_FMT, imageid); - gp_file_set_name (file, buffer); sony_baud_set(camera, baud_rate); |