Changeset 1157

Show
Ignore:
Timestamp:
04/25/11 01:47:29 (2 years ago)
Author:
reyalP
Message:

enable CAM_DATE_FOLDER_NAMING - Allows RAW and DNG files to be save in the same folders as their corresponging JPG's. From waterwingz in  http://chdk.setepontos.com/index.php?topic=650.msg65355#msg65355

Location:
trunk/platform/ixus120_sd940
Files:
6 modified

Legend:

Unmodified
Added
Removed

  • trunk/platform/ixus120_sd940/platform_camera.h

    r1141 r1157  
    129129                                                    // see http://chdk.setepontos.com/index.php?topic=6179.0 
    130130 
     131        #define CAM_DATE_FOLDER_NAMING          0x100   //Value found in the last function, which is called in GetImageFolder. (first compare) 
    131132   //---------------------------------------------------------- 
    132133 

  • trunk/platform/ixus120_sd940/shooting.c

    r1056 r1157  
    126126} 
    127127 
     128#if defined(CAM_DATE_FOLDER_NAMING) 
     129void get_target_dir_name(char *out) { 
     130    extern void _GetImageFolder(char*,int,int,int); 
     131    out[0] = 'A'; 
     132    _GetImageFolder(out+1,get_file_next_counter(),CAM_DATE_FOLDER_NAMING,time(NULL)); 
     133    out[15] = '\0'; 
     134} 
     135#else 
    128136long get_target_dir_num() { 
    129137        long n; 
    … …  
    134142} 
    135143 
     144#endif 
     145 
    136146int circle_of_confusion = 5; 

  • trunk/platform/ixus120_sd940/sub/101a/stubs_entry_2.S

    r1149 r1157  
    7474NHSTUB(time, 0xFF87EAE4) 
    7575NHSTUB(UnlockMainPower, 0xFF88A9B4)      
     76NHSTUB(GetImageFolder, 0xFF91901C) // function before 'GetCameraObjectTmpPath ERROR' string 
    7677NHSTUB(kbd_pwr_on , NULLSUB) 
    7778NHSTUB(kbd_pwr_off, NULLSUB) 

  • trunk/platform/ixus120_sd940/sub/102c/stubs_entry_2.S

    r1127 r1157  
    9494NHSTUB(stat, 0xff83550c) 
    9595 
     96NHSTUB(GetImageFolder, 0xFFA1901C) // function before 'GetCameraObjectTmpPath ERROR' string 
    9697 
    9798 
    98  

  • trunk/platform/ixus120_sd940/sub/103b/stubs_entry_2.S

    r1134 r1157  
    9191NHSTUB(time, 0xFF87EAF0)                                                //      SD940 103b matched with SD940 103c ff87eb40 SystemTime 
    9292NHSTUB(UnlockMainPower, 0xFF88A9C0)                             //      SD940 103b matched with SD940 103c ff88aa10 UnlockMainPower 
    93  
     93NHSTUB(GetImageFolder, 0xFF919028)                              // function before 'GetCameraObjectTmpPath ERROR' string 
    9494 
    9595//** obsolete / unknown / not found subs 

  • trunk/platform/ixus120_sd940/sub/103c/stubs_entry_2.S

    r1067 r1157  
    103103NHSTUB(Unmount_FileSystem, NULLSUB)                             //** not found in SD90 or SD940-102c 
    104104NHSTUB(Mount_FileSystem, NULLSUB)                               //** not found in SD90 or SD940-102c 
     105 
     106NHSTUB(GetImageFolder, 0xFF919078)      // function before 'GetCameraObjectTmpPath ERROR' string