Changeset 2426


Ignore:
Timestamp:
12/30/12 18:35:39 (16 months ago)
Author:
srsa
Message:

shooting_can_focus(): return FALSE when either PROPCASE_CONTINUOUS_AF or PROPCASE_SERVO_AF is active (1), to prevent conflicts with other camera tasks dealing with focusing
discussion: http://chdk.setepontos.com/index.php?topic=9133.msg94947#msg94947

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/core/shooting.c

    r2349 r2426  
    737737    return (shooting_get_zoom()<8) && (m!=MODE_AUTO) && (m!=MODE_SCN_UNDERWATER); 
    738738#else 
     739#ifdef PROPCASE_CONTINUOUS_AF 
     740    if (shooting_get_prop(PROPCASE_CONTINUOUS_AF)) 
     741        return 0; 
     742#endif 
     743#ifdef PROPCASE_SERVO_AF 
     744    if (shooting_get_prop(PROPCASE_SERVO_AF)) 
     745        return 0; 
     746#endif 
    739747    return 1; 
    740748#endif 
Note: See TracChangeset for help on using the changeset viewer.