From: <mar...@us...> - 2012-07-12 18:22:37
|
Revision: 14061 http://gphoto.svn.sourceforge.net/gphoto/?rev=14061&view=rev Author: marcusmeissner Date: 2012-07-12 18:22:30 +0000 (Thu, 12 Jul 2012) Log Message: ----------- merged improvements to EOS Shutter press code (also renamed) Modified Paths: -------------- trunk/libgphoto2/camlibs/ptp2/config.c Modified: trunk/libgphoto2/camlibs/ptp2/config.c =================================================================== --- trunk/libgphoto2/camlibs/ptp2/config.c 2012-07-10 08:11:09 UTC (rev 14060) +++ trunk/libgphoto2/camlibs/ptp2/config.c 2012-07-12 18:22:30 UTC (rev 14061) @@ -4038,10 +4038,10 @@ /* FIXME: remember state of release */ gp_widget_add_choice (*widget, _("None")); - gp_widget_add_choice (*widget, _("On 1")); - gp_widget_add_choice (*widget, _("On 2")); - gp_widget_add_choice (*widget, _("Off")); - gp_widget_add_choice (*widget, _("Immediate")); + gp_widget_add_choice (*widget, _("Press Half")); + gp_widget_add_choice (*widget, _("Press Full")); + gp_widget_add_choice (*widget, _("Release Half")); + gp_widget_add_choice (*widget, _("Release Full")); gp_widget_set_value (*widget, _("None")); return (GP_OK); } @@ -4058,12 +4058,12 @@ if (!strcmp (val, _("None"))) return GP_OK; - if (!strcmp (val, _("On 1"))) { + if (!strcmp (val, _("Press Half"))) { ret = ptp_canon_eos_remotereleaseon (params, 1); goto leave; } - if (!strcmp (val, _("On 2"))) { - ret = ptp_canon_eos_remotereleaseon (params, 2); + if (!strcmp (val, _("Press Full"))) { + ret = ptp_canon_eos_remotereleaseon (params, 3); goto leave; } if (!strcmp (val, _("Immediate"))) { @@ -4071,13 +4071,17 @@ Avoids autofocus drive while focus-switch on the lens is in AF state */ ret = ptp_canon_eos_remotereleaseon (params, 1); if (ret == PTP_RC_OK) - ret = ptp_canon_eos_remotereleaseon (params, 2); + ret = ptp_canon_eos_remotereleaseon (params, 3); goto leave; } - if (!strcmp (val, _("Off"))) { + if (!strcmp (val, _("Release Half"))) { ret = ptp_canon_eos_remotereleaseoff (params, 1); goto leave; } + if (!strcmp (val, _("Release Full"))) { + ret = ptp_canon_eos_remotereleaseoff (params, 3); + goto leave; + } gp_log (GP_LOG_DEBUG, "ptp2/canon_eos_remoterelease", "Unknown value %s", val); return GP_ERROR_NOT_SUPPORTED; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |