Commit Graph

3596 Commits

Author SHA1 Message Date
Lutz Mueller
d1d9ffb8bd Image numbers start with 1.
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@3203 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-11-25 17:41:53 +00:00
Lutz Mueller
6f4c326544 Again a patch to correctly initialize CameraFileInfo...
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@3201 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-11-25 17:26:20 +00:00
Lutz Mueller
9c37a91c98 Correctly initialize CameraFileInfo (didn't get it right the first time...).
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@3200 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-11-25 17:22:27 +00:00
Lutz Mueller
c46e6fb104 Initialize camera->functions to 0 after failure in camera_init.
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@3199 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-11-25 17:18:20 +00:00
Lutz Mueller
f0c669e3a5 Initialize the CameraFileInfo to 0 to guard against sloppy camera drivers.
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@3197 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-11-25 16:19:20 +00:00
Lutz Mueller
ba0af0d95c 2001-11-25 Lutz M�ller <urc8@rz.uni-karlsruhe.de>
* libgphoto2/gphoto2-filesys.h: Support "downloaded"-flag through
          CameraFileStatus.


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@3195 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-11-25 10:52:49 +00:00
Lutz Mueller
83e8467ba3 2001-11-25 Lutz M�ller <urc8@rz.uni-karlsruhe.de>
* serial/unix.c: Always set the speed at the beginning - don't assume
          it to be at 9600.


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@3194 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-11-25 10:24:50 +00:00
Lutz Mueller
9fe3f0c64f 2001-11-25 Lutz M�ller <urc8@rz.uni-karlsruhe.de>
* serial/unix.c: For flush and break, check that the device is open
          and at the right speed.


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@3193 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-11-25 10:20:27 +00:00
Hans Ulrich Niedermann
5d4c544beb cleaned up and clarified source file headers
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@3192 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-11-25 02:35:43 +00:00
Hans Ulrich Niedermann
6ac1f9f65d * camlibs/canon/serial.h
* camlibs/canon/canon.c
	* camlibs/canon/usb.h: small cleanups


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@3191 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-11-25 01:25:27 +00:00
Hans Ulrich Niedermann
75ff489cd8 ignore -symbols.txt
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@3190 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-11-25 01:03:00 +00:00
Hans Ulrich Niedermann
999f4f8032 2001-11-25 Hans Ulrich Niedermann <hun@n-dimensional.de>
* configure.in: 2.0beta4dev2
	* camlibs/canon/canon.c: added support for PowerShot S30
	* camlibs/canon/canon.h: added support for PowerShot S30
	* camlibs/canon/library.c: added support for PowerShot S30
	* camlibs/canon/usb.c: added support for PowerShot S30
	* intl/Makefile.in: add include dir for config.h
	* libgphoto2_port/intl/Makefile.in: add include dir for config.h


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@3189 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-11-25 00:50:57 +00:00
Hans Ulrich Niedermann
d33c063a6b see diff
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@3188 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-11-25 00:15:36 +00:00
Hans Ulrich Niedermann
edf36003a2 include canon.h
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@3187 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-11-25 00:05:52 +00:00
Hans Ulrich Niedermann
592cb67929 The G2 has no serial interface
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@3186 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-11-25 00:05:15 +00:00
Hans Ulrich Niedermann
d82297edbd added canon developers' docs
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@3185 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-11-24 23:06:06 +00:00
Hans Ulrich Niedermann
a991a163e8 COTD
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@3184 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-11-24 23:00:31 +00:00
Hans Ulrich Niedermann
a81b0a3368 reflect changes in canon file set
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@3183 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-11-24 23:00:00 +00:00
Hans Ulrich Niedermann
b7cba2d362 renamed files correctly, added developers' docs
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@3182 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-11-24 22:57:56 +00:00
Hans Ulrich Niedermann
aa06c61886 hopefully really correct checks for libdl and libintl
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@3181 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-11-24 22:11:17 +00:00
Johannes Erdfelt
d144452f11 Woops, don't set the speed so early
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@3180 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-11-24 22:01:57 +00:00
Johannes Erdfelt
4fbcabb54d If no speed is specified, try the maximum
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@3179 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-11-24 21:16:49 +00:00
Lutz Mueller
7f35c8640b Remove cruft.
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@3178 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-11-24 10:52:20 +00:00
Lutz Mueller
1e147a1a7f 2001-11-24 Lutz M�ller <urc8@rz.uni-karlsruhe.de>
* configure.in: Check for mcheck.h
        * tests: #ifdef HAVE_MCHECK_H


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@3177 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-11-24 10:49:57 +00:00
Lutz Mueller
8de9e5e8fd Formatting.
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@3176 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-11-24 10:35:32 +00:00
Lutz Mueller
fab4956ce7 2001-11-24 Lutz M�ller <urc8@rz.uni-karlsruhe.de>
* serial/unix.c: Try to fix logic of speed setting: Now check before
          each read/write operation if the current speed is the requested one.
          If not, change it and remember it in dev->pl->baudrate.


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@3175 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-11-24 10:32:19 +00:00
Lutz Mueller
327c607cbe 2001-11-24 Lutz M�ller <urc8@rz.uni-karlsruhe.de>
* libgphoto2_port/Makefile.am: @IOLIB_CFLAGS@ doesn't exist any more.


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@3174 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-11-24 10:09:36 +00:00
Marcus Meissner
0ec6fdb8ea * camlibs/stv0680/library.c: Major rework of the Capture Preview
mode. It now supports all common formats of the camera and should
          not stop after some captures.                                                   Removed some of the double error conversions.

        * camlibs/stv0680/stv680.html: Some documentation fixes regarding
          Capture Image.


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@3172 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-11-23 19:09:53 +00:00
Lutz Mueller
1e54992ae7 2001-11-23 Lutz M�ller <urc8@rz.uni-karlsruhe.de>
* libgphoto2/gphoto2-camera.c: Don't free a camera if it is
          currently in use. This fixes reentrancy crashes in gtkam on
          shutdown during an operation.


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@3170 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-11-23 12:01:28 +00:00
Lutz Mueller
620ce4e5ed 2001-11-23 Lutz M�ller <urc8@rz.uni-karlsruhe.de>
* serial/unix.c: Only set the baudrate if the device is open. If you
          set parameters on device 0, you mess up the console...


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@3168 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-11-23 11:02:06 +00:00
Lutz Mueller
78e84a7e57 Speed improvement.
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@3167 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-11-23 10:28:58 +00:00
Lutz Mueller
e200bdba14 2001-11-23 Lutz M�ller <urc8@rz.uni-karlsruhe.de>
* configure.in:
        * serial/Makefile.am
        * usb/Makefile.am: Clean up Makefiles. Avoid version on io-drivers
          (we don't check it anyways)


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@3166 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-11-23 10:23:45 +00:00
Colin Marquardt
bde09cfa87 Fix ChangeLog conflict.
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@3165 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-11-22 23:23:29 +00:00
Colin Marquardt
7cc7978469 * frontends/command-line/options.c (usage):
Make the help table format string translatable.
  Make table lines 79 chars wide.

* de.po (Message): All command line help table entries are now
  translated.


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@3164 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-11-22 23:20:16 +00:00
Mariusz Woloszyn
8cc95cedd4 added info, minor fixes
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@3163 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-11-22 23:05:35 +00:00
Marcus Meissner
5b5f80e530 changelog entry for last stv0680 change (number of pictures can be 2 byte)
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@3162 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-11-22 21:53:21 +00:00
Marcus Meissner
0043984d66 There is another call to get the number of pictures , 0x8d.
Also, both number of picture calls get actually 2 bytes. (My camera can
store like 320 QCIF pictures, so this actually a problem.)
Adapted file_count accordingly.


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@3161 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-11-22 21:51:34 +00:00
Lutz Mueller
c601b6a7fe 2001-11-22 Lutz M�ller <urc8@rz.uni-karlsruhe.de>
Patch from Marr <marr@shianet.org>:

        * libgphoto2/gphoto2-port.c: Fix bug whereby hexadecimal output is
          erroneously shown in decimal format.
        * serial/unix.c (gp_port_serial_update): Don't open/close the port
          here (does this break anything?)


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@3160 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-11-22 21:41:47 +00:00
Colin Marquardt
7d8b1b2813 2001-11-22 Colin Marquardt <colin@marquardt-home.de>
* libgphoto2_port/libgphoto2_port/gphoto2-port.c (gp_port_write):
 	    Patch from Bill Marr <marr@shianet.org>:
	    Fix bug whereby hexadecimal output is erroneously
            shown in decimal format.


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@3159 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-11-22 21:39:01 +00:00
Lutz Mueller
e8b3eafb9a 2001-11-22 Lutz M�ller <urc8@rz.uni-karlsruhe.de>
* configure.in:
        * acconfig.h: No need for --with-multi any more
        * libgphoto2/gphoto2-camera.c: Add some comments about the
          problems with HAVE_MULTI.


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@3158 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-11-22 12:27:19 +00:00
Lutz Mueller
c6890a1456 2001-11-22 Lutz M�ller <urc8@rz.uni-karlsruhe.de>
* libgphoto2/gphoto2-camera.[c,h]: Expose gp_camera_exit to the world.


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@3151 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-11-22 07:35:33 +00:00
Lutz Mueller
c5a35cef10 2001-11-22 Lutz M�ller <urc8@rz.uni-karlsruhe.de>
* frontends/command-line/main.c: Mark more strings for translation


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@3150 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-11-22 06:59:31 +00:00
Colin Marquardt
97191be750 frontends/command-line/options.c: Make help descriptions translatable.
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@3149 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-11-21 23:48:44 +00:00
Colin Marquardt
4870a43b70 po/de.po: Update.
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@3148 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-11-21 23:04:47 +00:00
Colin Marquardt
784d87086c * frontends/command-line/main.c: Mark up more strings for
translation.

* camlibs/sierra/sierra.c: Spelling fixes.


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@3147 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-11-21 23:03:57 +00:00
Dan Fandrich
3476d45450 Added default library flag for aalib if aalib-config isn't available
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@3146 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-11-21 21:49:30 +00:00
Marcus Meissner
4222fdf418 collected the stv0680 programming information into a nice HTML table.
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@3145 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-11-21 21:44:37 +00:00
Marcus Meissner
e9288c5e25 Collected USB programming information for this camera from various sources,
including some own research.


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@3144 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-11-21 21:42:46 +00:00
Colin Marquardt
60b949b94c po/POTFILES.in: Removed ../camlibs/canon/psa50.c
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@3143 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-11-21 21:12:20 +00:00
Colin Marquardt
b4f4c7f690 POTFILES.in: Removed ../camlibs/canon/psa50.c
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@3142 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-11-21 21:07:41 +00:00