Ignore:
Timestamp:
02/18/12 05:27:03 (2 years ago)
Author:
philmoz
Message:

Re-align CHDK and CHDK-DE code base (part 5) - http://chdk.setepontos.com/index.php?topic=7601.0

  • whitespace cleanup in core & lib
  • align propsetX.h files
  • add some of the CHDK-DE script functions to CHDK
File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/release-1_0/platform/generic/shooting.c

    r1671 r1678  
    790790#elif !CAM_CAN_SD_OVERRIDE 
    791791  return 0; 
    792 #else 
     792#else  
    793793  return shooting_get_focus_mode(); 
    794 #endif 
     794#endif                     
    795795} 
    796796 
     
    802802} 
    803803 
     804short shooting_get_real_focus_mode() 
     805{ 
     806  short f=shooting_get_focus_mode(); 
     807  short m; 
     808  _GetPropertyCase(PROPCASE_REAL_FOCUS_MODE, &m, sizeof(m)); 
     809  if (f==0 && m!=0) f=(m==1)?4:m; 
     810  return f; 
     811} 
     812 
     813short shooting_get_focus_state() 
     814{ 
     815  if (shooting_get_focus_mode()==1) return -1; 
     816  int m; 
     817  _GetPropertyCase(PROPCASE_FOCUS_STATE, &m, sizeof(m)); 
     818  return (short) m; 
     819} 
     820  
     821short shooting_get_focus_ok() 
     822{ 
     823  return ((shooting_get_focus_state()!=0) && shooting_in_progress()); 
     824} 
    804825 
    805826/* 
     
    829850  } 
    830851} 
    831 #endif 
     852#endif         
    832853} 
    833854 
     
    839860    shooting_set_user_av_by_id(cv+v); 
    840861} 
    841 #endif 
     862#endif     
    842863} 
    843864 
     
    878899int shooting_is_flash() 
    879900{ 
    880  int t = 0; 
     901 int t = 0;      
    881902 _GetPropertyCase(PROPCASE_IS_FLASH_READY, &t,sizeof(&t)); 
    882903 return t; 
     
    944965    int dist; 
    945966if ((mode_get()&MODE_MASK) != MODE_PLAY) 
    946         { 
     967    { 
    947968    dist = shooting_get_focus(); 
    948969    lens_set_zoom_point(v); 
    949 #if defined(CAM_NEED_SET_ZOOM_DELAY) 
    950     msleep(CAM_NEED_SET_ZOOM_DELAY); 
    951 #endif 
     970#if defined(CAM_NEED_SET_ZOOM_DELAY)  
     971    msleep(CAM_NEED_SET_ZOOM_DELAY);  
     972#endif  
    952973    shooting_set_focus(dist, SET_NOW); 
    953974  } 
Note: See TracChangeset for help on using the changeset viewer.