Changeset 744

Timestamp:

08/09/11 15:01:22 (22 months ago)

Author:

CHDKLover

Message:

 

Location:

trunk/platform

Files:

• generic/shooting.c (modified) (1 diff)
• sx30/sub/100p/stubs_entry.S (modified) (1 diff)

trunk/platform/generic/shooting.c

@@ -1300 +1300 @@
 
 void shooting_bracketing(void){
-  
   if (shooting_get_drive_mode()!=0)  {
-     int m=mode_get()&MODE_SHOOTING_MASK;
-     if (m!=MODE_STITCH&& m!=MODE_SCN_BEST_IMAGE) {
-       if (state_shooting_progress != SHOOTING_PROGRESS_PROCESSING) { 
-           bracketing.shoot_counter=0;
-           bracketing.av96=0;
-           bracketing.dav96=0;
-           bracketing.tv96=0;
-           bracketing.dtv96=0;
-           bracketing.sv96=0;
-           bracketing.dsv96=0;
-           bracketing.iso=0;
-           bracketing.diso=0;
-           bracketing.subj_dist=0;
-           bracketing.dsubj_dist=0;
-           bracketing.type=0;
-       }
-           if (conf.tv_bracket_value && !(conf.override_disable==1 && conf.override_disable_all))  shooting_tv_bracketing(); 
-              else if (conf.av_bracket_value && !(conf.override_disable==1 && conf.override_disable_all)) shooting_av_bracketing(); 
-              else if ((conf.iso_bracket_value && !(conf.override_disable==1 && conf.override_disable_all)) && (conf.iso_bracket_koef)) {
-                          shooting_iso_bracketing();
-               }
-              else if ((conf.subj_dist_bracket_value && !(conf.override_disable==1 && conf.override_disable_all)) && (conf.subj_dist_bracket_koef)) shooting_subject_distance_bracketing();           else if ((conf.subj_dist_bracket_value) && (conf.subj_dist_bracket_koef)) shooting_subject_distance_bracketing();
+    int m=mode_get()&MODE_SHOOTING_MASK;
+    if (m!=MODE_STITCH && m!=MODE_SCN_BEST_IMAGE) {
+      if (state_shooting_progress != SHOOTING_PROGRESS_PROCESSING) { 
+        bracketing.shoot_counter=0;
+        bracketing.av96=0;
+        bracketing.dav96=0;
+        bracketing.tv96=0;
+        bracketing.dtv96=0;
+        bracketing.sv96=0;
+        bracketing.dsv96=0;
+        bracketing.iso=0;
+        bracketing.diso=0;
+        bracketing.subj_dist=0;
+        bracketing.dsubj_dist=0;
+        bracketing.type=0;
       }
-   }
+      if (conf.tv_bracket_value && !(conf.override_disable==1 && conf.override_disable_all))  shooting_tv_bracketing(); 
+      else if (conf.av_bracket_value && !(conf.override_disable==1 && conf.override_disable_all)) shooting_av_bracketing(); 
+      else if ((conf.iso_bracket_value && !(conf.override_disable==1 && conf.override_disable_all)) && (conf.iso_bracket_koef)) shooting_iso_bracketing();
+      else if ((conf.subj_dist_bracket_value && !(conf.override_disable==1 && conf.override_disable_all)) && (conf.subj_dist_bracket_koef)) shooting_subject_distance_bracketing();
+      else if ((conf.subj_dist_bracket_value) && (conf.subj_dist_bracket_koef)) shooting_subject_distance_bracketing();
+    }
+  }
 }
 

trunk/platform/sx30/sub/100p/stubs_entry.S

@@ -84 +84 @@
 // Best match: 81%
 NSTUB(SetCurrentCaptureModeType, 0xff8a922c)
-// Best match: 55%
-NSTUB(SetFileTimeStamp, 0xff96ca64)
+NSTUB(SetFileAttributes, 0xff8373d4)
+// Best match: 96%
+NSTUB(SetFileTimeStamp, 0xff837390)
 // Best match: 64%
 NSTUB(SetLogicalEventActive, 0xff89ffd0)