Changeset 1798 for branches/release-1_0/include/conf.h

Timestamp:

04/11/12 04:38:05 (14 months ago)

Author:

philmoz

Message:

Merged revision(s) 1797 from trunk:
Add option to disable the 'zoom assist' button on the SX30 and SX40.

Location:

branches/release-1_0

Files:

• . (modified) (1 prop)
• include/conf.h (modified) (1 diff)

branches/release-1_0/include/conf.h

@@ -317 +317 @@
     int usb_info_enable;
     int ext_video_time;     // save gps_track_time
+
+#if defined(CAM_ZOOM_ASSIST_BUTTON_CONTROL)
+    int zoom_assist_button_disable;    // used to disable the zoom assist button on SX30 & SX40 for people who keep accidentaly pressing it
+#endif
+
 #ifdef CAM_HAS_GPS
     int gps_record;