diff --git a/camlibs/canon/ChangeLog b/camlibs/canon/ChangeLog index 1e51930c3..7f11f06d6 100644 --- a/camlibs/canon/ChangeLog +++ b/camlibs/canon/ChangeLog @@ -1,3 +1,8 @@ +2004-01-14 Hans Ulrich Niedermann + + * canon.c, canon.h: Add support for Canon ZR-70MC + Thanks for the report by Kevin R. Bulgrien. + 2004-01-02 Marcus Meissner * canon.c, usb.c: lock keys and audio support in PowerShot S50, from diff --git a/camlibs/canon/canon.c b/camlibs/canon/canon.c index 7c4c9ab6d..c305202be 100644 --- a/camlibs/canon/canon.c +++ b/camlibs/canon/canon.c @@ -85,114 +85,116 @@ * - No IEEE1394 cameras supported yet. **/ -#define S32K (32 * 1024) -#define S1M (1024 * 1024) -#define S2M (2 * S1M) -#define S10M (10 * S1M) -#define S99M (99 * S1M) +/* SL_* - size limit constants */ +#define KILOBYTE (1024) +#define MEGABYTE (1024 * KILOBYTE) +#define SL_THUMB ( 100 * KILOBYTE) +#define SL_PICTURE ( 10 * MEGABYTE) +#define SL_MOVIE_SMALL ( 100 * MEGABYTE) +#define SL_MOVIE_LARGE (2048 * MEGABYTE) #define NO_USB 0 const struct canonCamModelData models[] = { /* *INDENT-OFF* */ - {"Canon:PowerShot A5", CANON_PS_A5, NO_USB, NO_USB, CAP_NON, S2M, S32K, S2M, "DE300 Canon Inc."}, - {"Canon:PowerShot A5 Zoom", CANON_PS_A5_ZOOM, NO_USB, NO_USB, CAP_NON, S2M, S32K, S2M, "Canon PowerShot A5 Zoom"}, - {"Canon:PowerShot A50", CANON_PS_A50, NO_USB, NO_USB, CAP_NON, S2M, S32K, S2M, "Canon PowerShot A50"}, - {"Canon:PowerShot Pro70", CANON_PS_PRO70, NO_USB, NO_USB, CAP_NON, S2M, S32K, S2M, "Canon PowerShot Pro70"}, - {"Canon:PowerShot S10", CANON_PS_S10, 0x04A9, 0x3041, CAP_NON, S10M, S32K, S2M, "Canon PowerShot S10"}, + {"Canon:PowerShot A5", CANON_PS_A5, NO_USB, NO_USB, CAP_NON, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, "DE300 Canon Inc."}, + {"Canon:PowerShot A5 Zoom", CANON_PS_A5_ZOOM, NO_USB, NO_USB, CAP_NON, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, "Canon PowerShot A5 Zoom"}, + {"Canon:PowerShot A50", CANON_PS_A50, NO_USB, NO_USB, CAP_NON, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, "Canon PowerShot A50"}, + {"Canon:PowerShot Pro70", CANON_PS_PRO70, NO_USB, NO_USB, CAP_NON, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, "Canon PowerShot Pro70"}, + {"Canon:PowerShot S10", CANON_PS_S10, 0x04A9, 0x3041, CAP_NON, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, "Canon PowerShot S10"}, - {"Canon:PowerShot S20", CANON_PS_S20, 0x04A9, 0x3043, CAP_NON, S10M, S32K, S2M, "Canon PowerShot S20"}, - {"Canon:EOS D30", CANON_EOS_D30, 0x04A9, 0x3044, CAP_SUP, S10M, S32K, S2M, NULL}, - {"Canon:PowerShot S100", CANON_PS_S100, 0x04A9, 0x3045, CAP_NON, S10M, S32K, S2M, NULL}, - {"Canon:IXY DIGITAL", CANON_PS_S100, 0x04A9, 0x3046, CAP_NON, S10M, S32K, S2M, NULL}, - {"Canon:Digital IXUS", CANON_PS_S100, 0x04A9, 0x3047, CAP_NON, S10M, S32K, S2M, NULL}, - {"Canon:PowerShot G1", CANON_PS_G1, 0x04A9, 0x3048, CAP_SUP, S10M, S32K, S2M, "Canon PowerShot G1"}, - {"Canon:PowerShot Pro90 IS", CANON_PS_PRO90_IS, 0x04A9, 0x3049, CAP_SUP, S10M, S32K, S2M, "Canon PowerShot Pro90 IS"}, + {"Canon:PowerShot S20", CANON_PS_S20, 0x04A9, 0x3043, CAP_NON, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, "Canon PowerShot S20"}, + {"Canon:EOS D30", CANON_EOS_D30, 0x04A9, 0x3044, CAP_SUP, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL}, + {"Canon:PowerShot S100", CANON_PS_S100, 0x04A9, 0x3045, CAP_NON, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL}, + {"Canon:IXY DIGITAL", CANON_PS_S100, 0x04A9, 0x3046, CAP_NON, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL}, + {"Canon:Digital IXUS", CANON_PS_S100, 0x04A9, 0x3047, CAP_NON, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL}, + {"Canon:PowerShot G1", CANON_PS_G1, 0x04A9, 0x3048, CAP_SUP, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, "Canon PowerShot G1"}, + {"Canon:PowerShot Pro90 IS", CANON_PS_PRO90_IS, 0x04A9, 0x3049, CAP_SUP, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, "Canon PowerShot Pro90 IS"}, - {"Canon:IXY DIGITAL 300", CANON_PS_S300, 0x04A9, 0x304B, CAP_SUP, S10M, S32K, S2M, NULL}, - {"Canon:PowerShot S300", CANON_PS_S300, 0x04A9, 0x304C, CAP_SUP, S10M, S32K, S2M, NULL}, - {"Canon:Digital IXUS 300", CANON_PS_S300, 0x04A9, 0x304D, CAP_SUP, S10M, S32K, S2M, NULL}, - {"Canon:PowerShot A20", CANON_PS_A20, 0x04A9, 0x304E, CAP_SUP, S10M, S32K, S2M, NULL}, - {"Canon:PowerShot A10", CANON_PS_A10, 0x04A9, 0x304F, CAP_SUP, S10M, S32K, S2M, NULL}, + {"Canon:IXY DIGITAL 300", CANON_PS_S300, 0x04A9, 0x304B, CAP_SUP, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL}, + {"Canon:PowerShot S300", CANON_PS_S300, 0x04A9, 0x304C, CAP_SUP, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL}, + {"Canon:Digital IXUS 300", CANON_PS_S300, 0x04A9, 0x304D, CAP_SUP, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL}, + {"Canon:PowerShot A20", CANON_PS_A20, 0x04A9, 0x304E, CAP_SUP, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL}, + {"Canon:PowerShot A10", CANON_PS_A10, 0x04A9, 0x304F, CAP_SUP, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL}, /* Mac OS includes this as a valid ID; don't know which camera model --swestin */ - {"Canon:PowerShot unknown 1", CANON_PS_UNK1, 0x04A9, 0x3050, CAP_SUP, S10M, S32K, S2M, NULL}, + {"Canon:PowerShot unknown 1", CANON_PS_UNK1, 0x04A9, 0x3050, CAP_SUP, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL}, /* Canon IXY DIGITAL 200 here? */ - {"Canon:PowerShot S110", CANON_PS_S100, 0x04A9, 0x3051, CAP_SUP, S10M, S32K, S2M, NULL}, - {"Canon:DIGITAL IXUS v", CANON_PS_S100, 0x04A9, 0x3052, CAP_SUP, S10M, S32K, S2M, NULL}, + {"Canon:PowerShot S110", CANON_PS_S100, 0x04A9, 0x3051, CAP_SUP, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL}, + {"Canon:DIGITAL IXUS v", CANON_PS_S100, 0x04A9, 0x3052, CAP_SUP, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL}, - {"Canon:PowerShot G2", CANON_PS_G2, 0x04A9, 0x3055, CAP_SUP, S10M, S32K, S2M, NULL}, - {"Canon:PowerShot S40", CANON_PS_S40, 0x04A9, 0x3056, CAP_SUP, S10M, S32K, S2M, NULL}, - {"Canon:PowerShot S30", CANON_PS_S30, 0x04A9, 0x3057, CAP_SUP, S10M, S32K, S2M, NULL}, - {"Canon:PowerShot A40", CANON_PS_A40, 0x04A9, 0x3058, CAP_SUP, S10M, S32K, S2M, NULL}, - {"Canon:PowerShot A30", CANON_PS_A30, 0x04A9, 0x3059, CAP_SUP, S10M, S32K, S2M, NULL}, + {"Canon:PowerShot G2", CANON_PS_G2, 0x04A9, 0x3055, CAP_SUP, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL}, + {"Canon:PowerShot S40", CANON_PS_S40, 0x04A9, 0x3056, CAP_SUP, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL}, + {"Canon:PowerShot S30", CANON_PS_S30, 0x04A9, 0x3057, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL}, + {"Canon:PowerShot A40", CANON_PS_A40, 0x04A9, 0x3058, CAP_SUP, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL}, + {"Canon:PowerShot A30", CANON_PS_A30, 0x04A9, 0x3059, CAP_SUP, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL}, /* 305c is in MacOS Info.plist, but I don't know what it is --swestin. */ - {"Canon:PowerShot unknown 2", CANON_PS_UNK2, 0x04A9, 0x305c, CAP_SUP, S10M, S32K, S2M, NULL}, + {"Canon:PowerShot unknown 2", CANON_PS_UNK2, 0x04A9, 0x305c, CAP_SUP, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL}, - {"Canon:EOS D60", CANON_EOS_D60, 0x04A9, 0x3060, CAP_SUP, S10M, S32K, S2M, NULL}, - {"Canon:PowerShot A100", CANON_PS_A100, 0x04A9, 0x3061, CAP_SUP, S10M, S32K, S2M, NULL}, - {"Canon:PowerShot A200", CANON_PS_A200, 0x04A9, 0x3062, CAP_SUP, S10M, S32K, S2M, NULL}, + {"Canon:EOS D60", CANON_EOS_D60, 0x04A9, 0x3060, CAP_SUP, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL}, + {"Canon:PowerShot A100", CANON_PS_A100, 0x04A9, 0x3061, CAP_SUP, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL}, + {"Canon:PowerShot A200", CANON_PS_A200, 0x04A9, 0x3062, CAP_SUP, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL}, - {"Canon:PowerShot S200", CANON_PS_S200, 0x04A9, 0x3065, CAP_SUP, S10M, S32K, S2M, NULL}, - {"Canon:Digital IXUS v2", CANON_PS_S200, 0x04A9, 0x3065, CAP_SUP, S10M, S32K, S2M, NULL}, - {"Canon:Digital IXUS 330", CANON_PS_S330, 0x04A9, 0x3066, CAP_SUP, S10M, S32K, S2M, NULL}, + {"Canon:PowerShot S200", CANON_PS_S200, 0x04A9, 0x3065, CAP_SUP, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL}, + {"Canon:Digital IXUS v2", CANON_PS_S200, 0x04A9, 0x3065, CAP_SUP, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL}, + {"Canon:Digital IXUS 330", CANON_PS_S330, 0x04A9, 0x3066, CAP_SUP, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL}, /* 306a is in MacOS Info.plist, but I don't know what it is --swestin. */ - {"Canon:Digital unknown 3", CANON_PS_UNK3, 0x04A9, 0x306a, CAP_SUP, S10M, S32K, S2M, NULL}, + {"Canon:Digital unknown 3", CANON_PS_UNK3, 0x04A9, 0x306a, CAP_SUP, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL}, /* Canon MVX2i in some mode is 0x3067 - probably PTP */ - {"Canon:MVX2i", CANON_OPT_200, 0x04A9, 0x306B, CAP_SUP, S99M, S32K, S2M, NULL}, - {"Canon:Optura 200 MC", CANON_OPT_200, 0x04A9, 0x306B, CAP_SUP, S99M, S32K, S2M, NULL}, - {"Canon:PowerShot S45 (normal mode)", CANON_PS_S45, 0x04A9, 0x306C, CAP_SUP, S99M, S32K, S2M, NULL}, + {"Canon:MVX2i", CANON_OPT_200, 0x04A9, 0x306B, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL}, + {"Canon:Optura 200 MC", CANON_OPT_200, 0x04A9, 0x306B, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL}, + {"Canon:PowerShot S45 (normal mode)", CANON_PS_S45, 0x04A9, 0x306C, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL}, /* 0x306D is S45 in PTP mode */ - {"Canon:PowerShot G3 (normal mode)", CANON_PS_G3, 0x04A9, 0x306E, CAP_SUP, S99M, S32K, S2M, NULL}, + {"Canon:PowerShot G3 (normal mode)", CANON_PS_G3, 0x04A9, 0x306E, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL}, /* 0x306F is G3 in PTP mode */ - {"Canon:PowerShot S230 (normal mode)", CANON_PS_S230, 0x04A9, 0x3070, CAP_SUP, S99M, S32K, S2M, NULL}, - {"Canon:Digital IXUS v3 (normal mode)", CANON_PS_S230, 0x04A9, 0x3070, CAP_SUP, S99M, S32K, S2M, NULL}, + {"Canon:PowerShot S230 (normal mode)", CANON_PS_S230, 0x04A9, 0x3070, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL}, + {"Canon:Digital IXUS v3 (normal mode)", CANON_PS_S230, 0x04A9, 0x3070, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL}, /* 0x3071 is S230/IXUS v3 in PTP mode */ - {"Canon:PowerShot SD100 (normal mode)", CANON_PS_SD100, 0x04A9, 0x3072, CAP_SUP, S99M, S32K, S2M, NULL}, - {"Canon:Digital IXUS II (normal mode)", CANON_PS_SD100, 0x04A9, 0x3072, CAP_SUP, S99M, S32K, S2M, NULL}, + {"Canon:PowerShot SD100 (normal mode)", CANON_PS_SD100, 0x04A9, 0x3072, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL}, + {"Canon:Digital IXUS II (normal mode)", CANON_PS_SD100, 0x04A9, 0x3072, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL}, /* added from report on mailinglist. XXX: assuming capture works -Marcus */ /* PS A70 uses the same ProductID for PTP and Canon, with protocol autodetection */ - {"Canon:PowerShot A70", CANON_PS_A70, 0x04A9, 0x3073, CAP_SUP, S99M, S32K, S2M, NULL}, + {"Canon:PowerShot A70", CANON_PS_A70, 0x04A9, 0x3073, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL}, /* PS A60 uses the same ProductID for PTP and Canon, with protocol autodetection */ - {"Canon:PowerShot A60", CANON_PS_A60, 0x04A9, 0x3074, CAP_SUP, S99M, S32K, S2M, NULL}, + {"Canon:PowerShot A60", CANON_PS_A60, 0x04A9, 0x3074, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL}, /* reported working on SourceForge patch tracker. */ - {"Canon:Digital IXUS 400", CANON_PS_S400, 0x04A9, 0x3075, CAP_SUP, S99M, S32K, S2M, NULL}, + {"Canon:Digital IXUS 400", CANON_PS_S400, 0x04A9, 0x3075, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL}, /* PS S400 used the same ProductID for PTP and Canon, with protocol autodetection */ - {"Canon:PowerShot S400", CANON_PS_S400, 0x04A9, 0x3075, CAP_SUP, S99M, S32K, S2M, NULL}, + {"Canon:PowerShot S400", CANON_PS_S400, 0x04A9, 0x3075, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL}, - {"Canon:PowerShot A300", CANON_PS_A300, 0x04A9, 0x3076, CAP_SUP, S99M, S32K, S2M, NULL}, - {"Canon:PowerShot S50 (normal mode)", CANON_PS_S50, 0x04A9, 0x3077, CAP_SUP, S99M, S32K, S2M, NULL}, + {"Canon:PowerShot A300", CANON_PS_A300, 0x04A9, 0x3076, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL}, + {"Canon:PowerShot S50 (normal mode)", CANON_PS_S50, 0x04A9, 0x3077, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL}, + + {"Canon:ZR70MC", CANON_ZR70MC, 0x04A9, 0x3078, CAP_SUP, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL}, /* 3078 and 307a are in MacOS Info.plist, but I don't know * what they are --swestin. */ - {"Canon:PowerShot unknown 4", CANON_PS_UNK4, 0x04A9, 0x3078, CAP_SUP, S10M, S32K, S2M, NULL}, - - {"Canon:PowerShot unknown 5", CANON_PS_UNK5, 0x04A9, 0x307a, CAP_SUP, S10M, S32K, S2M, NULL}, + {"Canon:PowerShot unknown 5", CANON_PS_UNK5, 0x04A9, 0x307a, CAP_SUP, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL}, /* MV630i seems to be a DV camcorder */ - {"Canon:MV630i", CANON_MV630I, 0x04A9, 0x307b, CAP_SUP, S99M, S32K, S2M, NULL}, - {"Canon:Optura 20", CANON_OPT_20, 0x04A9, 0x307f, CAP_SUP, S99M, S32K, S2M, NULL}, - {"Canon:Optura 10", CANON_OPT_10, 0x04A9, 0x3081, CAP_SUP, S99M, S32K, S2M, NULL}, + {"Canon:MV630i", CANON_MV630I, 0x04A9, 0x307b, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL}, + {"Canon:Optura 20", CANON_OPT_20, 0x04A9, 0x307f, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL}, + {"Canon:Optura 10", CANON_OPT_10, 0x04A9, 0x3081, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL}, - {"Canon:EOS 10D", CANON_EOS_10D, 0x04A9, 0x3083, CAP_SUP, S10M, S32K, S2M, NULL}, + {"Canon:EOS 10D", CANON_EOS_10D, 0x04A9, 0x3083, CAP_SUP, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL}, /* 0x3099 is the EOS 300D/Digital Rebel in PTP mode */ - {"Canon:EOS 300D (normal mode)", CANON_EOS_300D, 0x04A9, 0x3084, CAP_SUP, S10M, S32K, S2M, NULL}, - {"Canon:EOS Digital Rebel (normal mode)",CANON_EOS_300D,0x04A9, 0x3084, CAP_SUP, S10M, S32K, S2M, NULL}, - {"Canon:EOS Kiss Digital (normal mode)",CANON_EOS_300D, 0x04A9, 0x3084, CAP_SUP, S10M, S32K, S2M, NULL}, + {"Canon:EOS 300D (normal mode)", CANON_EOS_300D, 0x04A9, 0x3084, CAP_SUP, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL}, + {"Canon:EOS Digital Rebel (normal mode)",CANON_EOS_300D,0x04A9, 0x3084, CAP_SUP, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL}, + {"Canon:EOS Kiss Digital (normal mode)",CANON_EOS_300D, 0x04A9, 0x3084, CAP_SUP, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL}, /* PS G5 uses the same ProductID for PTP and Canon, with protocol autodetection */ - {"Canon:PowerShot G5 (normal mode)", CANON_PS_G5, 0x04A9, 0x3085, CAP_SUP, S99M, S32K, S2M, NULL}, - {"Canon:PowerShot A80 (normal mode)",CANON_PS_A80, 0x04A9, 0x309A, CAP_SUP, S99M, S32K, S2M, NULL}, + {"Canon:PowerShot G5 (normal mode)", CANON_PS_G5, 0x04A9, 0x3085, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL}, + {"Canon:PowerShot A80 (normal mode)",CANON_PS_A80, 0x04A9, 0x309A, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL}, {NULL} /* *INDENT-ON* */ }; #undef NO_USB -#undef S99M -#undef S10M -#undef S2M +#undef SL_MOVIE_LARGE +#undef SL_MOVIE_SMALL +#undef SL_PICTURE #undef S1M -#undef S32K +#undef SL_THUMB #ifndef HAVE_TM_GMTOFF /* required for time conversions in canon_int_set_time() */ diff --git a/camlibs/canon/canon.h b/camlibs/canon/canon.h index 276746531..4d0840ada 100644 --- a/camlibs/canon/canon.h +++ b/camlibs/canon/canon.h @@ -103,7 +103,7 @@ typedef enum { * @CANON_PS_UNK1: Unknown camera seen in Mac OS X Image Capture * @CANON_PS_UNK2: Unknown camera seen in Mac OS X Image Capture * @CANON_PS_UNK3: Unknown camera seen in Mac OS X Image Capture - * @CANON_PS_UNK4: Unknown camera seen in Mac OS X Image Capture + * @CANON_ZR70MC: Canon ZR70MC Mini-DV Camcorder * @CANON_PS_UNK5: Unknown camera seen in Mac OS X Image Capture * @CANON_EOS_300D: EOS 300D / Digital Rebel / KISS Rebel * @CANON_PS_S50: PowerShot S50 @@ -152,7 +152,7 @@ typedef enum { CANON_PS_UNK1, CANON_PS_UNK2, CANON_PS_UNK3, - CANON_PS_UNK4, + CANON_ZR70MC, CANON_PS_UNK5, /* other cameras */ CANON_PS_S400, @@ -256,9 +256,9 @@ struct canonCamModelData unsigned short usb_vendor; unsigned short usb_product; canonCaptureSupport usb_capture_support; - unsigned int max_picture_size; unsigned int max_movie_size; unsigned int max_thumbnail_size; + unsigned int max_picture_size; char *serial_id_string; /* set to NULL if camera doesn't support serial connections */ }; diff --git a/camlibs/canon/library.c b/camlibs/canon/library.c index 1cd5681ba..f6015b5bd 100644 --- a/camlibs/canon/library.c +++ b/camlibs/canon/library.c @@ -131,9 +131,8 @@ camera_manual (Camera *camera, CameraText *manual, GPContext *context) GP_DEBUG ("camera_manual()"); strcpy (manual->text, - _("For the A50, 115200 may not be faster than 57600\n" - "Folders are NOT supported\n" - "if you experience a lot of serial transmission errors," + _("For the A50, using 115200 may effectively be slower than using 57600\n" + "If you experience a lot of serial transmission errors," " try to have your computer as idle as possible\n" " (i.e. no disk activity)\n" ));