Changeset 1723 for trunk/core/gui.c


Ignore:
Timestamp:
03/11/12 07:38:39 (2 years ago)
Author:
reyalp
Message:

a800 100a port from mland, patch by waterwings in http://chdk.setepontos.com/index.php?topic=650.msg81174#msg81174

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/core/gui.c

    r1719 r1723  
    21112111        if (conf.unlock_optical_zoom_for_video && (movie_status==VIDEO_RECORD_IN_PROGRESS) &&  kbd_is_key_clicked(key)){ 
    21122112            short x; 
    2113             get_property_case(PROPCASE_DIGITAL_ZOOM_STATE, &x, sizeof(x)); 
    2114             if (x) { 
    2115                 get_property_case(PROPCASE_DIGITAL_ZOOM_POSITION, &x, sizeof(x)); 
    2116     #if defined (CAMERA_s90) || defined (CAMERA_s95) || defined (CAMERA_g12) || defined (CAMERA_a3000) 
    2117         if (x==0) zoom_status=ZOOM_OPTICAL_MAX; //ERR99: No zoom back from digital to optical zoom possible if set to medium 
    2118     #else 
    2119         if (x==0) zoom_status=ZOOM_OPTICAL_MEDIUM; 
     2113     get_property_case(PROPCASE_DIGITAL_ZOOM_STATE, &x, sizeof(x)); 
     2114     if (x) { 
     2115      get_property_case(PROPCASE_DIGITAL_ZOOM_POSITION, &x, sizeof(x)); 
     2116#if defined (CAMERA_s90) || defined (CAMERA_s95) || defined (CAMERA_g12) || defined (CAMERA_a3000) || defined (CAMERA_a800) 
     2117          if (x==0) zoom_status=ZOOM_OPTICAL_MAX; //ERR99: No zoom back from digital to optical zoom possible if set to medium 
     2118#else 
     2119          if (x==0) zoom_status=ZOOM_OPTICAL_MEDIUM; 
    21202120    #endif 
    21212121 
Note: See TracChangeset for help on using the changeset viewer.