Changeset 88


Ignore:
Timestamp:
04/07/07 12:38:16 (7 years ago)
Author:
GrAnd
Message:
  • Platform-dependent increment of next number RAW saving
Location:
branches/grand
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • branches/grand/core/gui.c

    r87 r88  
    438438    if (memcmp(&old_conf, &conf, sizeof(Conf)) != 0) { 
    439439        conf_save(); 
     440        conf_store_old_settings(); 
    440441        return 1; 
    441442    } 
     
    526527{ 
    527528    // XXX set custom palette 
     529#ifdef OPTIONS_AUTOSAVE 
     530    conf_store_old_settings(); 
     531#endif 
    528532    gui_mode = GUI_MODE_ALT; 
    529533} 
     
    553557    m = mode_get(); 
    554558 
    555     if (conf.flashlight && (m&MODE_SCREEN_OPENED) && (m&MODE_SCREEN_ROTATED) && (gui_mode==GUI_MODE_NONE /*|| gui_mode==GUI_MODE_ALT*/)) { 
     559    if (conf.flashlight && (m&MODE_SCREEN_OPENED) && (m&MODE_SCREEN_ROTATED) && (gui_mode==GUI_MODE_NONE /* || gui_mode==GUI_MODE_ALT */)) { 
    556560        draw_filled_rect(0, 0, screen_width-1, screen_height-1, MAKE_COLOR(COLOR_WHITE, COLOR_WHITE)); 
    557561        flashlight = 1; 
    558         return; 
    559562    } 
    560563    if (flashlight) { 
    561         flashlight = 0; 
    562         draw_restore(); 
    563         gui_force_restore(); 
     564        if ((!((m&MODE_SCREEN_OPENED) && (m&MODE_SCREEN_ROTATED))) || (gui_mode!=GUI_MODE_NONE /* && gui_mode!=GUI_MODE_ALT */)) { 
     565            flashlight = 0; 
     566            draw_restore(); 
     567        } 
    564568        return; 
    565569    } 
  • branches/grand/core/raw.c

    r87 r88  
    3333 
    3434        t.actime = t.modtime = time(NULL); 
    35         v=get_file_counter(); 
     35        v=get_file_next_counter(); 
    3636 
    3737        sprintf(dir, RAW_TARGET_DIRECTORY, (conf.raw_in_dir)?((v>>18)&0x3FF):100); 
     
    3939 
    4040        sprintf(fn, "%s/", dir); 
    41         sprintf(fn+strlen(fn), RAW_TARGET_FILENAME, prefixes[conf.raw_prefix], ((v>>4)&0x3FFF)+1, exts[conf.raw_ext]); 
     41        sprintf(fn+strlen(fn), RAW_TARGET_FILENAME, prefixes[conf.raw_prefix], (v>>4)&0x3FFF, exts[conf.raw_ext]); 
    4242 
    4343        fd = fopen(fn, "wb"); 
  • branches/grand/include/platform.h

    r87 r88  
    7171long set_parameter_data(long id, void *buf, long bufsize); 
    7272long get_file_counter(); 
     73long get_file_next_counter(); 
    7374 
    7475long get_tick_count(); 
  • branches/grand/platform/a610/main.c

    r87 r88  
    752752    return v; 
    753753} 
     754 
     755long get_file_next_counter() { 
     756    return ((get_file_counter()>>4)+1)<<4; 
     757} 
  • branches/grand/platform/a620/main.c

    r87 r88  
    729729    return v; 
    730730} 
     731 
     732long get_file_next_counter() { 
     733    return ((get_file_counter()>>4)+1)<<4; 
     734} 
  • branches/grand/platform/a630/main.c

    r87 r88  
    729729    return v; 
    730730} 
     731 
     732long get_file_next_counter() { 
     733    return ((get_file_counter()>>4)+1)<<4; 
     734} 
  • branches/grand/platform/a640/main.c

    r87 r88  
    729729    return v; 
    730730} 
     731 
     732long get_file_next_counter() { 
     733    return ((get_file_counter()>>4)+1)<<4; 
     734} 
  • branches/grand/platform/a710/main.c

    r87 r88  
    735735    return v; 
    736736} 
     737 
     738long get_file_next_counter() { 
     739    return get_file_counter(); 
     740} 
Note: See TracChangeset for help on using the changeset viewer.