Changeset 1911


Ignore:
Timestamp:
06/11/12 02:32:34 (11 months ago)
Author:
reyalp
Message:

update live view branch to trunk 1910

Location:
branches/reyalp-ptp-live
Files:
152 edited
1 copied

Legend:

Unmodified
Added
Removed

  • branches/reyalp-ptp-live

  • branches/reyalp-ptp-live/Makefile

    r1878 r1911  
    44tmp:=$(shell echo "BUILD_SVNREV := $(DEF_SVN_REF)" > revision.inc) 
    55 
     6# can override on command line or *buildconf.inc for custom subsets 
     7CAMERA_LIST=camera_list.csv 
     8 
    69include makefile.inc 
    710 
    … …  
    2629ZIPDIRS:=$(shell ls -R CHDK | grep CHDK/ | $(ESED) 's?:?/*?') 
    2730 
    28 SUBDIRS=tools lib platform core loader CHDK 
     31SUBDIRS=lib platform core loader CHDK 
     32 
     33# SKIP_TOOLS prevents re-building tools in root level make, to speed up batch builds 
     34ifndef SKIP_TOOLS 
     35SUBDIRS:=tools $(SUBDIRS) 
     36endif 
    2937 
    3038.PHONY: fir 
    … …  
    178186        rm -f $(topdir)bin/DISKBOOT.BIN 
    179187 
     188print-missing-dump: 
     189        if [ ! -s $(PRIMARY_ROOT)/$(PLATFORM)/sub/$(PLATFORMSUB)/PRIMARY.BIN ] ; then \ 
     190                echo "missing primary for $(PLATFORM) $(PLATFORMSUB)" ; \ 
     191        fi 
     192 
     193 
     194# for batch builds, build tools for vx and dryos once, instead of once for every firmware 
     195alltools: 
     196        $(MAKE) -C tools PLATFORM=a610 PLATFORMSUB=100e clean all 
     197        $(MAKE) -C tools PLATFORM=a720 PLATFORMSUB=100c clean all 
     198 
     199# note assumes PLATFORMOS is always in same case! 
     200os-camera-list-entry: 
     201        echo $(PLATFORM),$(PLATFORMSUB),$(subst _,,$(STATE)),$(COPY_TO), >> camera_list_$(PLATFORMOS).csv 
     202 
    180203# define targets to batch build all cameras & firmware versions 
    181204# list of cameras/firmware versions is in 'camera_list.csv' 
    … …  
    188211# - skip auto build (optional) :- any value in this column will exclude the camera/firmware from the auto build 
    189212 
    190 batch-zip: version 
    191         sh tools/auto_build.sh $(MAKE) firzipsub camera_list.csv 
     213batch-zip: version alltools 
     214        SKIP_TOOLS=1 sh tools/auto_build.sh $(MAKE) firzipsub $(CAMERA_LIST) 
    192215        @echo "**** Summary of memisosizes" 
    193216        cat $(topdir)bin/caminfo.txt 
    194217        rm -f $(topdir)bin/caminfo.txt   > $(DEVNULL) 
    195218 
    196 batch-zip-complete: version 
    197         sh tools/auto_build.sh $(MAKE) firzipsubcomplete camera_list.csv 
     219batch-zip-complete: version alltools 
     220        SKIP_TOOLS=1 sh tools/auto_build.sh $(MAKE) firzipsubcomplete $(CAMERA_LIST) 
    198221        @echo "**** Summary of memisosizes" 
    199222        cat $(topdir)bin/caminfo.txt 
    200223        rm -f $(topdir)bin/caminfo.txt   > $(DEVNULL) 
    201224 
     225# note, this will not include cameras with SKIP_AUTOBUILD set 
     226os-camera-lists: 
     227        echo 'CAMERA,FIRMWARE,BETA_STATUS,COPY_TO,SKIP_AUTOBUILD' > camera_list_dryos.csv 
     228        echo 'CAMERA,FIRMWARE,BETA_STATUS,COPY_TO,SKIP_AUTOBUILD' > camera_list_vxworks.csv 
     229        sh tools/auto_build.sh $(MAKE) os-camera-list-entry $(CAMERA_LIST) 
     230 
     231# make sure each enabled firmware/sub has a PRIMARY.BIN 
     232# Note this will not fail, just prints all the missing ones 
     233batch-print-missing-dumps: 
     234        sh tools/auto_build.sh $(MAKE) print-missing-dump $(CAMERA_LIST) 
     235 
    202236batch-clean: 
    203         sh tools/auto_build.sh $(MAKE) clean camera_list.csv 
     237        sh tools/auto_build.sh $(MAKE) clean $(CAMERA_LIST) 

  • branches/reyalp-ptp-live/camera_list.csv

    r1878 r1911  
    7777ixus120_sd940,103b,,, 
    7878ixus120_sd940,103c,,, 
     79ixus200_sd980,100c,BETA,, 
    7980ixus200_sd980,101c,BETA,, 
    8081ixus200_sd980,101d,BETA,, 

  • branches/reyalp-ptp-live/core/games/gui_4wins.c

    r1594 r1911  
    333333        draw_txt_string((camera_screen.ts_button_border/FONT_WIDTH)+30, 3, lang_str(LANG_CONNECT4_RIVAL), TEXT_COLOR); 
    334334    sprintf(str, "%d",count_win[0]); 
    335         draw_txt_string((camera_screen.width-camera_screen.ts_button_border)/FONT_WIDTH-2-10, camera_screen.height/FONT_HEIGHT-9, str, MAKE_COLOR(INFO_COLOR, P1_COLOR)); 
     335        draw_txt_string((camera_screen.ts_button_border/FONT_WIDTH)+34, camera_screen.height/FONT_HEIGHT-9, str, MAKE_COLOR(INFO_COLOR, P1_COLOR)); 
    336336    sprintf(str, ":"); 
    337         draw_txt_string((camera_screen.width-camera_screen.ts_button_border)/FONT_WIDTH-2-7, camera_screen.height/FONT_HEIGHT-9, str, INFO_TEXT_COLOR); 
     337        draw_txt_string((camera_screen.ts_button_border/FONT_WIDTH)+36, camera_screen.height/FONT_HEIGHT-9, str, INFO_TEXT_COLOR); 
    338338    sprintf(str, "%d",count_win[1]); 
    339         draw_txt_string((camera_screen.width-camera_screen.ts_button_border)/FONT_WIDTH-2-4, camera_screen.height/FONT_HEIGHT-9, str, MAKE_COLOR(INFO_COLOR, P2_COLOR)); 
     339        draw_txt_string((camera_screen.ts_button_border/FONT_WIDTH)+38, camera_screen.height/FONT_HEIGHT-9, str, MAKE_COLOR(INFO_COLOR, P2_COLOR)); 
    340340        draw_mode(); 
    341341        if(cur_player==2&&!mode_rival) set(); 
    … …  
    371371void gui_4wins_draw(int enforce_redraw) { 
    372372  static char str[16]; 
    373   sprintf(str, "%3d%%", get_batt_perc()); 
    374   draw_txt_string((camera_screen.width-camera_screen.ts_button_border)/FONT_WIDTH-2-13, camera_screen.height/FONT_HEIGHT-2, str, INFO_TEXT_COLOR); 
    375   gui_osd_draw_clock(camera_screen.ts_button_border+290,208,INFO_TEXT_COLOR); 
     373  sprintf(str, "Batt: %3d%%", get_batt_perc()); 
     374  draw_txt_string((camera_screen.ts_button_border/FONT_WIDTH)+31, camera_screen.height/FONT_HEIGHT-2, str, INFO_TEXT_COLOR); 
     375  gui_osd_draw_clock(camera_screen.ts_button_border+35*FONT_WIDTH,208-FONT_HEIGHT,INFO_TEXT_COLOR); 
    376376} 
    377377 

  • branches/reyalp-ptp-live/core/gui.c

    r1893 r1911  
    13361336    register int p=0, i; 
    13371337 
    1338     for (i=0; i<sizeof(script_submenu_items_top)/sizeof(script_submenu_items_top[0]); ++p, ++i) { 
     1338    for (i=0; i<sizeof(script_submenu_items_top)/sizeof(script_submenu_items_top[0]); ++p, ++i) 
     1339    { 
    13391340        script_submenu_items[p]=script_submenu_items_top[i]; 
    13401341    } 
    1341     for (i=0; i<SCRIPT_NUM_PARAMS; ++i) { 
    1342         if (script_param_order[i]) { 
    1343             script_submenu_items[p].symbol=0x0; 
    1344             script_submenu_items[p].text=(int)script_params[script_param_order[i]-1]; 
    1345             script_submenu_items[p].type=MENUITEM_INT; 
    1346             script_submenu_items[p].value=&conf.script_vars[script_param_order[i]-1]; 
     1342    for (i=0; i<SCRIPT_NUM_PARAMS; ++i) 
     1343    { 
     1344        if (script_param_order[i]) 
     1345        { 
     1346            int n = script_param_order[i]-1; 
     1347 
     1348            script_submenu_items[p].symbol = 0x0; 
     1349            script_submenu_items[p].text = (int)script_params[n]; 
     1350            script_submenu_items[p].type = MENUITEM_INT; 
     1351            script_submenu_items[p].value = &conf.script_vars[n]; 
     1352 
     1353            if (script_range_values[n] != 0) 
     1354            { 
     1355                if (script_range_values[n] == MENU_MINMAX(0,1)) 
     1356                { 
     1357                    script_submenu_items[p].type = MENUITEM_BOOL; 
     1358                } 
     1359                else 
     1360                { 
     1361                    script_submenu_items[p].type |= MENUITEM_F_MINMAX; 
     1362                    script_submenu_items[p].arg = script_range_values[n]; 
     1363                } 
     1364            } 
     1365            else if (script_named_counts[n] != 0) 
     1366            { 
     1367                script_submenu_items[p].type = MENUITEM_ENUM2; 
     1368                script_submenu_items[p].opt_len = script_named_counts[n]; 
     1369                script_submenu_items[p].arg = (int)script_named_values[n]; 
     1370            } 
     1371 
    13471372            ++p; 
    13481373        } 
    13491374    } 
    1350     for (i=0; i<sizeof(script_submenu_items_bottom)/sizeof(script_submenu_items_bottom[0]); ++p, ++i) { 
     1375    for (i=0; i<sizeof(script_submenu_items_bottom)/sizeof(script_submenu_items_bottom[0]); ++p, ++i) 
     1376    { 
    13511377        script_submenu_items[p]=script_submenu_items_bottom[i]; 
    13521378    } 

  • branches/reyalp-ptp-live/core/gui_menu.h

    r1878 r1911  
    3333#define MENUITEM_ARG_CALLBACK   0x0300 
    3434 
    35 #define MENU_MINMAX(min, max)   (((max)<<16)|(min)) 
     35#define MENU_MINMAX(min, max)   (((max)<<16)|(min&0xFFFF)) 
    3636 
    3737//------------------------------------------------------------------- 

  • branches/reyalp-ptp-live/core/script.c

    r1893 r1911  
    55#include "gui.h" 
    66#include "gui_draw.h" 
     7#include "gui_menu.h" 
    78#include "conf.h" 
    89#include "script.h" 
    … …  
    106107int script_param_order[SCRIPT_NUM_PARAMS];                  // Ordered as_in_script list of variables ( [idx] = id_of_var ) 
    107108                                                            // to display in same order in script 
     109int script_range_values[SCRIPT_NUM_PARAMS];                 // Min/Max values for param validation 
     110const char **script_named_values[SCRIPT_NUM_PARAMS];        // Array of list values for named parameters 
     111int script_named_counts[SCRIPT_NUM_PARAMS];                 // Count of # of entries in each script_list_values array 
     112char *script_named_strings[SCRIPT_NUM_PARAMS];              // Base storage for named value string data 
    108113static char script_params_update[SCRIPT_NUM_PARAMS];        // Flag is such parameter exist 
    109114static int script_loaded_params[SCRIPT_NUM_PARAMS];         // Copy of original values of parameters  
    … …  
    113118 
    114119//------------------------------------------------------------------- 
     120 
     121const char* skip_whitespace(const char* p)  { while (*p==' ' || *p=='\t') p++; return p; }  // Skip past whitespace 
     122const char* skip_token(const char* p)       { while (*p && *p!='\r' && *p!='\n' && *p!=' ' && *p!='\t') p++; return p; }  // Skip past current token value 
     123const char* skip_toeol(const char* p)       { while (*p!='\r' && *p!='\n') p++; return p; } // Skip to end of line 
     124 
     125//------------------------------------------------------------------- 
    115126static void process_title(const char *title) { 
    116127    register const char *ptr = title; 
    117128    register int i=0; 
    118129 
    119     while (ptr[0]==' ' || ptr[0]=='\t') ++ptr; // whitespaces 
     130    ptr = skip_whitespace(ptr); 
    120131    while (i<(sizeof(script_title)-1) && ptr[i] && ptr[i]!='\r' && ptr[i]!='\n') { 
    121132        script_title[i]=ptr[i]; 
    … …  
    134145// RETURN VALUE: 0 if err, 1..26 = id of var 
    135146//------------------------------------------------------------------- 
    136 static int process_param(const char *param, int update) { 
     147static int process_param(const char *param, int update) 
     148{ 
    137149    register const char *ptr = param; 
    138150    register int n, i=0; 
    139151 
    140     while (ptr[0]==' ' || ptr[0]=='\t') ++ptr; // whitespaces 
     152    ptr = skip_whitespace(ptr); 
    141153    if (ptr[0] && (ptr[0]>='a' && ptr[0]<='a'+SCRIPT_NUM_PARAMS) && (ptr[1]==' ' || ptr[1]=='\t')) { 
    142154        n=ptr[0]-'a'; 
    143         ptr+=2; 
    144         while (ptr[0]==' ' || ptr[0]=='\t') ++ptr; // whitespaces 
     155        ptr = skip_whitespace(ptr+2); 
    145156        script_params_update[n] = 1; 
    146157        while (i<(sizeof(script_params[0])-1) && ptr[i] && ptr[i]!='\r' && ptr[i]!='\n') { 
    … …  
    165176//               1 - only if updated 
    166177//------------------------------------------------------------------- 
    167 static void process_default(const char *param, char update) { 
     178static void process_default(const char *param, char update) 
     179{ 
    168180    register const char *ptr = param; 
    169181    register int n; 
    170182 
    171     while (ptr[0]==' ' || ptr[0]=='\t') ++ptr; // whitespaces 
     183    ptr = skip_whitespace(ptr); 
    172184    if (ptr[0] && (ptr[0]>='a' && ptr[0]<='a'+SCRIPT_NUM_PARAMS) && (ptr[1]==' ' || ptr[1]=='\t')) { 
    173185        n=ptr[0]-'a'; 
    174         ptr+=2; 
     186        ptr = skip_whitespace(ptr+2); 
    175187        if (!update || script_params_update[n]) 
    176188        { 
    177189            conf.script_vars[n] = strtol(ptr, NULL, 0); 
    178190            script_loaded_params[n] = conf.script_vars[n]; 
     191        } 
     192    } // ??? else produce error message 
     193} 
     194 
     195//------------------------------------------------------------------- 
     196// Process one entry "@range VAR MIN MAX" 
     197//      param = ptr right after descriptor (should point to var) 
     198//      update = 0 - get 
     199//               1 - only if updated 
     200//------------------------------------------------------------------- 
     201static void process_range(const char *param, char update) 
     202{ 
     203    register const char *ptr = param; 
     204    register int n; 
     205 
     206    ptr = skip_whitespace(ptr); 
     207    if (ptr[0] && (ptr[0]>='a' && ptr[0]<='a'+SCRIPT_NUM_PARAMS) && (ptr[1]==' ' || ptr[1]=='\t')) 
     208    { 
     209        n=ptr[0]-'a'; 
     210        ptr = skip_whitespace(ptr+2); 
     211        if (!update || script_params_update[n]) 
     212        { 
     213            short min = strtol(ptr,NULL,0); 
     214            ptr = skip_whitespace(skip_token(ptr)); 
     215            short max = strtol(ptr,NULL,0); 
     216            script_range_values[n] = MENU_MINMAX(min,max); 
     217        } 
     218    } // ??? else produce error message 
     219} 
     220 
     221//------------------------------------------------------------------- 
     222// Process one entry "@values VAR A B C D ..." 
     223//      param = ptr right after descriptor (should point to var) 
     224//      update = 0 - get 
     225//               1 - only if updated 
     226//------------------------------------------------------------------- 
     227static void process_values(const char *param, char update) 
     228{ 
     229    register const char *ptr = param; 
     230    register int n; 
     231 
     232    ptr = skip_whitespace(ptr); 
     233    if (ptr[0] && (ptr[0]>='a' && ptr[0]<='a'+SCRIPT_NUM_PARAMS) && (ptr[1]==' ' || ptr[1]=='\t')) 
     234    { 
     235        n=ptr[0]-'a'; 
     236        ptr = skip_whitespace(ptr+2); 
     237        if (!update || script_params_update[n]) 
     238        { 
     239            int len = skip_toeol(ptr) - ptr; 
     240            script_named_strings[n] = malloc(len+1); 
     241            strncpy(script_named_strings[n], ptr, len); 
     242            script_named_strings[n][len] = 0; 
     243 
     244            const char *p = script_named_strings[n]; 
     245            int cnt = 0; 
     246            while (*p) 
     247            { 
     248                p = skip_whitespace(skip_token(p)); 
     249                cnt++; 
     250            } 
     251            script_named_counts[n] = cnt; 
     252            script_named_values[n] = malloc(cnt * sizeof(char*)); 
     253 
     254            p = script_named_strings[n]; 
     255            cnt = 0; 
     256            while (*p) 
     257            { 
     258                script_named_values[n][cnt] = p; 
     259                p = skip_token(p); 
     260                if (*p) 
     261                { 
     262                    *((char*)p) = 0; 
     263                    p = skip_whitespace(p+1); 
     264                } 
     265                cnt++; 
     266            } 
    179267        } 
    180268    } // ??? else produce error message 
    … …  
    201289        script_params[i][0]=0; 
    202290        script_param_order[i]=0; 
     291        script_range_values[i] = 0; 
     292        if (script_named_values[i]) free(script_named_values[i]); 
     293        script_named_values[i] = 0; 
     294        if (script_named_strings[i]) free(script_named_strings[i]); 
     295        script_named_strings[i] = 0; 
     296        script_named_counts[i] = 0; 
    203297    } 
    204298 
    205299    while (ptr[0]) { 
    206         while (ptr[0]==' ' || ptr[0]=='\t') ++ptr; // whitespaces 
     300        ptr = skip_whitespace(ptr); 
    207301        if (ptr[0]=='@') { 
    208302            if (strncmp("@title", ptr, 6)==0) { 
    … …  
    219313                ptr+=8; 
    220314                process_default(ptr, 0); 
     315            } else if (update_vars && strncmp("@range", ptr, 6)==0) { 
     316                ptr+=6; 
     317                process_range(ptr, 0); 
     318            } else if (update_vars && strncmp("@values", ptr, 7)==0) { 
     319                ptr+=7; 
     320                process_values(ptr, 0); 
    221321            } 
    222322        } 
    … …  
    329429                ptr+=8; 
    330430                process_default(ptr, 1); 
     431            } else if (strncmp("@range", ptr, 6)==0) { 
     432                ptr+=6; 
     433                process_range(ptr, 1); 
     434            } else if (strncmp("@values", ptr, 7)==0) { 
     435                ptr+=7; 
     436                process_values(ptr, 0); 
    331437            } 
    332438        } 
    … …  
    353459{ 
    354460    int i, n, fd, changed=0; 
    355     char *buf,*p; 
     461    char *buf; 
    356462    for(i = 0; i < SCRIPT_NUM_PARAMS; i++) 
    357463    { 
    … …  
    375481 
    376482    // max possible params * (param description + some extra for @default etc) 
    377     buf=umalloc(SCRIPT_NUM_PARAMS*(28 + 20)); 
     483    buf=umalloc(256); 
    378484    if(!buf) 
    379485        return; 
    … …  
    385491    } 
    386492    buf[0] = 0; 
    387     p=buf; 
    388493    for(n = 0; n < SCRIPT_NUM_PARAMS; ++n) 
    389494    { 
    390495        if (script_params[n][0] != 0) 
    391496        { 
    392             p+=sprintf(p,"@param %c %s\n@default %c %d\n",'a'+n,script_params[n],'a'+n,conf.script_vars[n]); 
    393         } 
    394     } 
    395     write(fd, buf, strlen(buf)); 
     497            sprintf(buf,"@param %c %s\n@default %c %d\n",'a'+n,script_params[n],'a'+n,conf.script_vars[n]); 
     498            if (script_range_values[n] != 0) 
     499                sprintf(buf+strlen(buf),"@range %c %d %d\n",'a'+n,(short)(script_range_values[n]&0xFFFF),(short)(script_range_values[n]>>16)); 
     500            if (script_named_counts[n] != 0) 
     501            { 
     502                sprintf(buf+strlen(buf),"@values %c",'a'+n); 
     503                for (i=0; i<script_named_counts[n]; i++) 
     504                    sprintf(buf+strlen(buf)," %s",script_named_values[n][i]); 
     505                strcat(buf,"\n"); 
     506            } 
     507            write(fd, buf, strlen(buf)); 
     508        } 
     509    } 
    396510    close(fd); 
    397511    ufree(buf); 

  • branches/reyalp-ptp-live/include/script.h

    r1720 r1911  
    1919extern char script_title[36]; 
    2020extern char script_params[SCRIPT_NUM_PARAMS][28]; 
     21extern int script_range_values[SCRIPT_NUM_PARAMS]; 
    2122extern int script_param_order[SCRIPT_NUM_PARAMS]; 
     23extern const char **script_named_values[SCRIPT_NUM_PARAMS]; 
     24extern int script_named_counts[SCRIPT_NUM_PARAMS]; 
    2225 
    2326//------------------------------------------------------------------- 

  • branches/reyalp-ptp-live/lib/ubasic/tokenizer.c

    r1720 r1911  
    202202  {"@param",                  TOKENIZER_REM}, 
    203203  {"@default",                TOKENIZER_REM}, 
     204  {"@range",                  TOKENIZER_REM}, 
     205  {"@values",                 TOKENIZER_REM}, 
    204206 
    205207  {"md_detect_motion",        TOKENIZER_MD_DETECT_MOTION}, 

  • branches/reyalp-ptp-live/platform/a1000/sub/100a/stubs_entry.S

    r1878 r1911  
    132132NSTUB(GetPropertyCase                         ,0xffc594cc) //102 
    133133NSTUB(GetSystemTime                           ,0xffdefe78) //101 
     134NSTUB(GetVRAMHPixelsSize                      ,0xffca2420) //102 
     135NSTUB(GetVRAMVPixelsSize                      ,0xffca242c) //102 
    134136NSTUB(GetZoomLensCurrentPoint                 ,0xffd033a4) //102 
    135137NSTUB(GetZoomLensCurrentPosition              ,0xffde9db0) //102 

  • branches/reyalp-ptp-live/platform/a1000/sub/100b/stubs_entry.S

    r1878 r1911  
    132132NSTUB(GetPropertyCase                         ,0xffc594cc) //102 
    133133NSTUB(GetSystemTime                           ,0xffdefe78) //101 
     134NSTUB(GetVRAMHPixelsSize                      ,0xffca2420) //102 
     135NSTUB(GetVRAMVPixelsSize                      ,0xffca242c) //102 
    134136NSTUB(GetZoomLensCurrentPoint                 ,0xffd033a4) //102 
    135137NSTUB(GetZoomLensCurrentPosition              ,0xffde9db0) //102 

  • branches/reyalp-ptp-live/platform/a1100/sub/100c/stubs_entry.S

    r1878 r1911  
    127127NSTUB(GetPropertyCase                         ,0xffc593fc) //102 
    128128NSTUB(GetSystemTime                           ,0xffdf5404) //101 
     129NSTUB(GetVRAMHPixelsSize                      ,0xffc959f0) //102 
     130NSTUB(GetVRAMVPixelsSize                      ,0xffc959fc) //102 
    129131NSTUB(GetZoomLensCurrentPoint                 ,0xffcf4b00) //102 
    130132NSTUB(GetZoomLensCurrentPosition              ,0xffded338) //102 

  • branches/reyalp-ptp-live/platform/a2000/sub/100c/stubs_entry.S

    r1878 r1911  
    130130NSTUB(GetPropertyCase                         ,0xffc590ac) //102 
    131131NSTUB(GetSystemTime                           ,0xffdf0aa8) //101 
     132NSTUB(GetVRAMHPixelsSize                      ,0xffca2058) //102 
     133NSTUB(GetVRAMVPixelsSize                      ,0xffca2064) //102 
    132134NSTUB(GetZoomLensCurrentPoint                 ,0xffd0349c) //102 
    133135NSTUB(GetZoomLensCurrentPosition              ,0xffdea9dc) //102 

  • branches/reyalp-ptp-live/platform/a3000/sub/100b/stubs_entry.S

    r1878 r1911  
    136136NSTUB(GetPropertyCase                         ,0xffc6c614) //102 
    137137NSTUB(GetSystemTime                           ,0xffe08208) //101 
     138NSTUB(GetVRAMHPixelsSize                      ,0xffcba714) //102 
     139NSTUB(GetVRAMVPixelsSize                      ,0xffcba720) //102 
    138140NSTUB(GetZoomLensCurrentPoint                 ,0xffd0fa4c) //102 
    139141NSTUB(GetZoomLensCurrentPosition              ,0xffdff83c) //102 

  • branches/reyalp-ptp-live/platform/a3000/sub/100c/stubs_entry.S

    r1878 r1911  
    136136NSTUB(GetPropertyCase                         ,0xffc6c664) //102 
    137137NSTUB(GetSystemTime                           ,0xffe082b8) //101 
     138NSTUB(GetVRAMHPixelsSize                      ,0xffcba764) //102 
     139NSTUB(GetVRAMVPixelsSize                      ,0xffcba770) //102 
    138140NSTUB(GetZoomLensCurrentPoint                 ,0xffd0fafc) //102 
    139141NSTUB(GetZoomLensCurrentPosition              ,0xffdff8ec) //102 

  • branches/reyalp-ptp-live/platform/a3000/sub/100d/stubs_entry.S

    r1878 r1911  
    136136NSTUB(GetPropertyCase                         ,0xffc6c664) //102 
    137137NSTUB(GetSystemTime                           ,0xffe0820c) //101 
     138NSTUB(GetVRAMHPixelsSize                      ,0xffcba764) //102 
     139NSTUB(GetVRAMVPixelsSize                      ,0xffcba770) //102 
    138140NSTUB(GetZoomLensCurrentPoint                 ,0xffd0fafc) //102 
    139141NSTUB(GetZoomLensCurrentPosition              ,0xffdff840) //102 

  • branches/reyalp-ptp-live/platform/a3300/sub/100a/stubs_entry.S

    r1878 r1911  
    139139NSTUB(GetPropertyCase                         ,0xff88cfac) //102 
    140140NSTUB(GetSystemTime                           ,0xffab6d84) //101 
     141NSTUB(GetVRAMHPixelsSize                      ,0xff853c54) //102 
     142NSTUB(GetVRAMVPixelsSize                      ,0xff853c60) //102 
    141143NSTUB(GetZoomLensCurrentPoint                 ,0xff96523c) //102 
    142144NSTUB(GetZoomLensCurrentPosition              ,0xffaa3b04) //102 

  • branches/reyalp-ptp-live/platform/a3300/sub/100c/stubs_entry.S

    r1878 r1911  
    139139NSTUB(GetPropertyCase                         ,0xff88cfac) //102 
    140140NSTUB(GetSystemTime                           ,0xffab6d84) //101 
     141NSTUB(GetVRAMHPixelsSize                      ,0xff853c54) //102 
     142NSTUB(GetVRAMVPixelsSize                      ,0xff853c60) //102 
    141143NSTUB(GetZoomLensCurrentPoint                 ,0xff96523c) //102 
    142144NSTUB(GetZoomLensCurrentPosition              ,0xffaa3b04) //102 

  • branches/reyalp-ptp-live/platform/a3300/sub/100d/stubs_entry.S

    r1878 r1911  
    139139NSTUB(GetPropertyCase                         ,0xff88cfac) //102 
    140140NSTUB(GetSystemTime                           ,0xffab6d90) //101 
     141NSTUB(GetVRAMHPixelsSize                      ,0xff853c54) //102 
     142NSTUB(GetVRAMVPixelsSize                      ,0xff853c60) //102 
    141143NSTUB(GetZoomLensCurrentPoint                 ,0xff96523c) //102 
    142144NSTUB(GetZoomLensCurrentPosition              ,0xffaa3b04) //102 

  • branches/reyalp-ptp-live/platform/a470/sub/100e/stubs_entry.S

    r1878 r1911  
    121121NSTUB(GetPropertyCase                         ,0xffc56f08) //102 
    122122NSTUB(GetSystemTime                           ,0xffdda8c0) //101 
     123NSTUB(GetVRAMHPixelsSize                      ,0xffca18c0) //102 
     124NSTUB(GetVRAMVPixelsSize                      ,0xffca18cc) //102 
    123125NSTUB(GetZoomLensCurrentPoint                 ,0xffd060a0) //102 
    124126NSTUB(GetZoomLensCurrentPosition              ,0xffdd1c94) //102 

  • branches/reyalp-ptp-live/platform/a470/sub/101b/stubs_entry.S

    r1878 r1911  
    121121NSTUB(GetPropertyCase                         ,0xffc56f08) //102 
    122122NSTUB(GetSystemTime                           ,0xffdda8bc) //101 
     123NSTUB(GetVRAMHPixelsSize                      ,0xffca18c0) //102 
     124NSTUB(GetVRAMVPixelsSize                      ,0xffca18cc) //102 
    123125NSTUB(GetZoomLensCurrentPoint                 ,0xffd060a0) //102 
    124126NSTUB(GetZoomLensCurrentPosition              ,0xffdd1c90) //102 

  • branches/reyalp-ptp-live/platform/a470/sub/102c/stubs_entry.S

    r1878 r1911  
    121121NSTUB(GetPropertyCase                         ,0xffc57424) //102 
    122122NSTUB(GetSystemTime                           ,0xffddb2fc) //101 
     123NSTUB(GetVRAMHPixelsSize                      ,0xffca1ddc) //102 
     124NSTUB(GetVRAMVPixelsSize                      ,0xffca1de8) //102 
    123125NSTUB(GetZoomLensCurrentPoint                 ,0xffd06ae0) //102 
    124126NSTUB(GetZoomLensCurrentPosition              ,0xffdd26d0) //102 

  • branches/reyalp-ptp-live/platform/a480/sub/100b/stubs_entry.S

    r1878 r1911  
    128128NSTUB(GetPropertyCase                         ,0xffc51944) //102 
    129129NSTUB(GetSystemTime                           ,0xffdc4608) //101 
     130NSTUB(GetVRAMHPixelsSize                      ,0xffc8aa34) //102 
     131NSTUB(GetVRAMVPixelsSize                      ,0xffc8aa40) //102 
    130132NSTUB(GetZoomLensCurrentPoint                 ,0xffce3dac) //102 
    131133NSTUB(GetZoomLensCurrentPosition              ,0xffdbcdf4) //102 

  • branches/reyalp-ptp-live/platform/a490/sub/100d/stubs_entry.S

    r1878 r1911  
    133133NSTUB(GetPropertyCase                         ,0xffc69454) //102 
    134134NSTUB(GetSystemTime                           ,0xffdfa400) //101 
     135NSTUB(GetVRAMHPixelsSize                      ,0xffcb69ac) //102 
     136NSTUB(GetVRAMVPixelsSize                      ,0xffcb69b8) //102 
    135137NSTUB(GetZoomLensCurrentPoint                 ,0xffd09bc8) //102 
    136138NSTUB(GetZoomLensCurrentPosition              ,0xffdf2444) //102 

  • branches/reyalp-ptp-live/platform/a490/sub/100e/stubs_entry.S

    r1878 r1911  
    129129NSTUB(GetPropertyCase                         ,0xffc694a4) //102 
    130130NSTUB(GetSystemTime                           ,0xffdfa4b0) //101 
     131NSTUB(GetVRAMHPixelsSize                      ,0xffcb69fc) //102 
     132NSTUB(GetVRAMVPixelsSize                      ,0xffcb6a08) //102 
    131133NSTUB(GetZoomLensCurrentPoint                 ,0xffd09c78) //102 
    132134NSTUB(GetZoomLensCurrentPosition              ,0xffdf24f4) //102 

  • branches/reyalp-ptp-live/platform/a490/sub/100f/stubs_entry.S

    r1878 r1911  
    133133NSTUB(GetPropertyCase                         ,0xffc694a4) //102 
    134134NSTUB(GetSystemTime                           ,0xffdfa404) //101 
     135NSTUB(GetVRAMHPixelsSize                      ,0xffcb69fc) //102 
     136NSTUB(GetVRAMVPixelsSize                      ,0xffcb6a08) //102 
    135137NSTUB(GetZoomLensCurrentPoint                 ,0xffd09c78) //102 
    136138NSTUB(GetZoomLensCurrentPosition              ,0xffdf2448) //102 

  • branches/reyalp-ptp-live/platform/a495/sub/100d/stubs_entry.S

    r1878 r1911  
    142142NSTUB(GetPropertyCase                         ,0xffc6952c) //102 
    143143NSTUB(GetSystemTime                           ,0xffdfd1c0) //101 
     144NSTUB(GetVRAMHPixelsSize                      ,0xffcb6c54) //102 
     145NSTUB(GetVRAMVPixelsSize                      ,0xffcb6c60) //102 
    144146NSTUB(GetZoomLensCurrentPoint                 ,0xffd09cd0) //102 
    145147NSTUB(GetZoomLensCurrentPosition              ,0xffdf520c) //102 

  • branches/reyalp-ptp-live/platform/a495/sub/100e/stubs_entry.S

    r1878 r1911  
    142142NSTUB(GetPropertyCase                         ,0xffc6957c) //102 
    143143NSTUB(GetSystemTime                           ,0xffdfd270) //101 
     144NSTUB(GetVRAMHPixelsSize                      ,0xffcb6ca4) //102 
     145NSTUB(GetVRAMVPixelsSize                      ,0xffcb6cb0) //102 
    144146NSTUB(GetZoomLensCurrentPoint                 ,0xffd09d80) //102 
    145147NSTUB(GetZoomLensCurrentPosition              ,0xffdf52bc) //102 

  • branches/reyalp-ptp-live/platform/a495/sub/100f/stubs_entry.S

    r1878 r1911  
    142142NSTUB(GetPropertyCase                         ,0xffc6957c) //102 
    143143NSTUB(GetSystemTime                           ,0xffdfd1c4) //101 
     144NSTUB(GetVRAMHPixelsSize                      ,0xffcb6ca4) //102 
     145NSTUB(GetVRAMVPixelsSize                      ,0xffcb6cb0) //102 
    144146NSTUB(GetZoomLensCurrentPoint                 ,0xffd09d80) //102 
    145147NSTUB(GetZoomLensCurrentPosition              ,0xffdf5210) //102 

  • branches/reyalp-ptp-live/platform/a580/sub/101b/stubs_entry.S

    r1878 r1911  
    126126NSTUB(GetPropertyCase                         ,0xffc5819c) //102 
    127127NSTUB(GetSystemTime                           ,0xffde5028) //101 
     128NSTUB(GetVRAMHPixelsSize                      ,0xffca3318) //102 
     129NSTUB(GetVRAMVPixelsSize                      ,0xffca3324) //102 
    128130NSTUB(GetZoomLensCurrentPoint                 ,0xffd08940) //102 
    129131NSTUB(GetZoomLensCurrentPosition              ,0xffddc3a8) //102 

  • branches/reyalp-ptp-live/platform/a590/sub/100e/stubs_entry.S

    r1878 r1911  
    126126NSTUB(GetPropertyCase                         ,0xffc5dab4) //102 
    127127NSTUB(GetSystemTime                           ,0xffdf1dcc) //101 
     128NSTUB(GetVRAMHPixelsSize                      ,0xffc2a77c) //102 
     129NSTUB(GetVRAMVPixelsSize                      ,0xffc2a788) //102 
    128130NSTUB(GetZoomLensCurrentPoint                 ,0xffd0fcc0) //102 
    129131NSTUB(GetZoomLensCurrentPosition              ,0xffde89e0) //102 

  • branches/reyalp-ptp-live/platform/a590/sub/101b/stubs_entry.S

    r1878 r1911  
    126126NSTUB(GetPropertyCase                         ,0xffc5dab4) //102 
    127127NSTUB(GetSystemTime                           ,0xffdf1dc8) //101 
     128NSTUB(GetVRAMHPixelsSize                      ,0xffc2a77c) //102 
     129NSTUB(GetVRAMVPixelsSize                      ,0xffc2a788) //102 
    128130NSTUB(GetZoomLensCurrentPoint                 ,0xffd0fcc0) //102 
    129131NSTUB(GetZoomLensCurrentPosition              ,0xffde89dc) //102 

  • branches/reyalp-ptp-live/platform/a650/sub/100d/stubs_entry.S

    r1878 r1911  
    123123NSTUB(GetPropertyCase                         ,0xffc5aecc) //101 
    124124NSTUB(GetSystemTime                           ,0xffde6fb4) //  1 
     125NSTUB(GetVRAMHPixelsSize                      ,0xffc2c9ec) //102 
     126NSTUB(GetVRAMVPixelsSize                      ,0xffc2c9f8) //102 
    125127NSTUB(GetZoomLensCurrentPoint                 ,0xffd07444) //102 
    126128NSTUB(GiveSemaphore                           ,0xffc0ba5c) //112 

  • branches/reyalp-ptp-live/platform/a720/sub/100c/stubs_entry.S

    r1878 r1911  
    128128NSTUB(GetPropertyCase                         ,0xffc59c2c) //101 
    129129NSTUB(GetSystemTime                           ,0xffdd7efc) //  1 
     130NSTUB(GetVRAMHPixelsSize                      ,0xffc2bbf8) //102 
     131NSTUB(GetVRAMVPixelsSize                      ,0xffc2bc04) //102 
    130132NSTUB(GetZoomLensCurrentPoint                 ,0xffd02fdc) //102 
    131133NSTUB(GiveSemaphore                           ,0xffc0bb2c) //112 

  • branches/reyalp-ptp-live/platform/a800/sub/100b/stubs_entry.S

    r1878 r1911  
    136136NSTUB(GetPropertyCase                         ,0xffc6ba84) //102 
    137137NSTUB(GetSystemTime                           ,0xffe193fc) //101 
     138NSTUB(GetVRAMHPixelsSize                      ,0xffcbf898) //102 
     139NSTUB(GetVRAMVPixelsSize                      ,0xffcbf8a4) //102 
    138140NSTUB(GetZoomLensCurrentPoint                 ,0xffd151e8) //102 
    139141NSTUB(GetZoomLensCurrentPosition              ,0xffe09db4) //102 

  • branches/reyalp-ptp-live/platform/a800/sub/100c/stubs_entry.S

    r1878 r1911  
    136136NSTUB(GetPropertyCase                         ,0xffc6ba84) //102 
    137137NSTUB(GetSystemTime                           ,0xffe19408) //101 
     138NSTUB(GetVRAMHPixelsSize                      ,0xffcbf898) //102 
     139NSTUB(GetVRAMVPixelsSize                      ,0xffcbf8a4) //102 
    138140NSTUB(GetZoomLensCurrentPoint                 ,0xffd151e8) //102 
    139141NSTUB(GetZoomLensCurrentPosition              ,0xffe09db4) //102 

  • branches/reyalp-ptp-live/platform/d10/sub/100a/stubs_entry.S

    r1878 r1911  
    127127NSTUB(GetPropertyCase                         ,0xff871ccc) //102 
    128128NSTUB(GetSystemTime                           ,0xffa4861c) //101 
     129NSTUB(GetVRAMHPixelsSize                      ,0xff839b9c) //102 
     130NSTUB(GetVRAMVPixelsSize                      ,0xff839ba8) //102 
    129131NSTUB(GetZoomLensCurrentPoint                 ,0xff92ba1c) //102 
    130132NSTUB(GetZoomLensCurrentPosition              ,0xffa3c378) //102 

  • branches/reyalp-ptp-live/platform/g10/sub/102a/stubs_entry.S

    r1878 r1911  
    126126NSTUB(GetPropertyCase                         ,0xff8777cc) //102 
    127127NSTUB(GetSystemTime                           ,0xffa688c4) //101 
     128NSTUB(GetVRAMHPixelsSize                      ,0xff83ce54) //102 
     129NSTUB(GetVRAMVPixelsSize                      ,0xff83ce60) //102 
    128130NSTUB(GetZoomLensCurrentPoint                 ,0xff93e7c8) //102 
    129131NSTUB(GetZoomLensCurrentPosition              ,0xffa5dcb8) //102 

  • branches/reyalp-ptp-live/platform/g10/sub/103b/stubs_entry.S

    r1878 r1911  
    126126NSTUB(GetPropertyCase                         ,0xff8777cc) //102 
    127127NSTUB(GetSystemTime                           ,0xffa688c0) //101 
     128NSTUB(GetVRAMHPixelsSize                      ,0xff83ce54) //102 
     129NSTUB(GetVRAMVPixelsSize                      ,0xff83ce60) //102 
    128130NSTUB(GetZoomLensCurrentPoint                 ,0xff93e7c8) //102 
    129131NSTUB(GetZoomLensCurrentPosition              ,0xffa5dcb4) //102 

  • branches/reyalp-ptp-live/platform/g10/sub/104a/stubs_entry.S

    r1878 r1911  
    126126NSTUB(GetPropertyCase                         ,0xff8777cc) //102 
    127127NSTUB(GetSystemTime                           ,0xffa688d4) //101 
     128NSTUB(GetVRAMHPixelsSize                      ,0xff83ce54) //102 
     129NSTUB(GetVRAMVPixelsSize                      ,0xff83ce60) //102 
    128130NSTUB(GetZoomLensCurrentPoint                 ,0xff93e7c8) //102 
    129131NSTUB(GetZoomLensCurrentPosition              ,0xffa5dcc8) //102 

  • branches/reyalp-ptp-live/platform/g11/sub/100f/stubs_entry.S

    r1878 r1911  
    131131NSTUB(GetPropertyCase                         ,0xff88d5e0) //102 
    132132NSTUB(GetSystemTime                           ,0xffaa3490) //101 
     133NSTUB(GetVRAMHPixelsSize                      ,0xff850ad8) //102 
     134NSTUB(GetVRAMVPixelsSize                      ,0xff850ae4) //102 
    133135NSTUB(GetZoomLensCurrentPoint                 ,0xff95ed28) //102 
    134136NSTUB(GetZoomLensCurrentPosition              ,0xffa9669c) //102 

  • branches/reyalp-ptp-live/platform/g11/sub/100j/stubs_entry.S

    r1878 r1911  
    131131NSTUB(GetPropertyCase                         ,0xff88d6b0) //102 
    132132NSTUB(GetSystemTime                           ,0xffaa3594) //101 
     133NSTUB(GetVRAMHPixelsSize                      ,0xff850b08) //102 
     134NSTUB(GetVRAMVPixelsSize                      ,0xff850b14) //102 
    133135NSTUB(GetZoomLensCurrentPoint                 ,0xff95ee0c) //102 
    134136NSTUB(GetZoomLensCurrentPosition              ,0xffa967a0) //102 

  • branches/reyalp-ptp-live/platform/g11/sub/100l/stubs_entry.S

    r1878 r1911  
    132132NSTUB(GetPropertyCase                         ,0xff88d700) //102 
    133133NSTUB(GetSystemTime                           ,0xffaa3750) //101 
     134NSTUB(GetVRAMHPixelsSize                      ,0xff850b08) //102 
     135NSTUB(GetVRAMVPixelsSize                      ,0xff850b14) //102 
    134136NSTUB(GetZoomLensCurrentPoint                 ,0xff95efc8) //102 
    135137NSTUB(GetZoomLensCurrentPosition              ,0xffa9695c) //102 

  • branches/reyalp-ptp-live/platform/g12/lib.c

    r1837 r1911  
    101101int vid_get_viewport_width() 
    102102{ 
    103     if (shooting_get_prop(PROPCASE_SHOOTING_MODE) == 16908) // Stitch mode 
     103    if ((mode_get() & MODE_MASK) == MODE_PLAY) 
     104    { 
     105        return 360; 
     106    } 
     107    else if (shooting_get_prop(PROPCASE_SHOOTING_MODE) == 16908) // Stitch mode 
    104108    { 
    105109        return 180; 
    … …  
    114118} 
    115119 
     120// viewport width offset table for each image size 
     121// 0 = 4:3, 1 = 16:9, 2 = 3:2, 3 = 1:1, 4 = 4:5 
     122static long vp_xo[5] = { 0, 0, 0, 44, 72 };                             // should all be even values for edge overlay 
     123 
    116124int vid_get_viewport_xoffset() 
    117125{ 
    118     if (shooting_get_prop(PROPCASE_SHOOTING_MODE) == 16908) // Stitch mode 
    119     { 
    120         return 0; 
    121     } 
    122     else 
    123     { 
    124             // viewport width offset table for each image size 
    125             // 0 = 4:3, 1 = 16:9, 2 = 3:2, 3 = 1:1, 4 = 4:5 
    126             static long vp_w[5] = { 0, 0, 0, 44, 72 };                          // should all be even values for edge overlay 
    127             return vp_w[shooting_get_prop(PROPCASE_ASPECT_RATIO)]; 
     126    if ((mode_get() & MODE_MASK) == MODE_PLAY) 
     127    { 
     128        return 0; 
     129    } 
     130    else if (shooting_get_prop(PROPCASE_SHOOTING_MODE) == 16908) // Stitch mode 
     131    { 
     132        return 0; 
     133    } 
     134    else 
     135    { 
     136            return vp_xo[shooting_get_prop(PROPCASE_ASPECT_RATIO)]; 
    128137    } 
    129138} 
    … …  
    131140int vid_get_viewport_display_xoffset() 
    132141{ 
    133     if (shooting_get_prop(PROPCASE_SHOOTING_MODE) == 16908) // Stitch mode 
     142    if ((mode_get() & MODE_MASK) == MODE_PLAY) 
     143    { 
     144        return 0; 
     145    } 
     146    else if (shooting_get_prop(PROPCASE_SHOOTING_MODE) == 16908) // Stitch mode 
    134147    { 
    135148        if (shooting_get_prop(PROPCASE_STITCH_DIRECTION) == 0)      // Direction check 
    … …  
    146159    else 
    147160    { 
    148         return vid_get_viewport_xoffset(); 
     161            return vp_xo[shooting_get_prop(PROPCASE_ASPECT_RATIO)]; 
    149162    } 
    150163} 
    … …  
    152165long vid_get_viewport_height() 
    153166{ 
    154     if (shooting_get_prop(PROPCASE_SHOOTING_MODE) == 16908) // Stitch mode 
     167    if ((mode_get() & MODE_MASK) == MODE_PLAY) 
     168    { 
     169        return 240; 
     170    } 
     171    else if (shooting_get_prop(PROPCASE_SHOOTING_MODE) == 16908) // Stitch mode 
    155172    { 
    156173        return 120; 
    … …  
    165182} 
    166183 
     184// viewport height offset table for each image size 
     185// 0 = 4:3, 1 = 16:9, 2 = 3:2, 3 = 1:1, 4 = 4:5 
     186static long vp_yo[5] = { 0, 30, 13, 0, 0 }; 
     187 
    167188int vid_get_viewport_yoffset() 
    168189{ 
    169     if (shooting_get_prop(PROPCASE_SHOOTING_MODE) == 16908) // Stitch mode 
    170     { 
    171         return 0; 
    172     } 
    173     else 
    174     { 
    175             // viewport height offset table for each image size 
    176             // 0 = 4:3, 1 = 16:9, 2 = 3:2, 3 = 1:1, 4 = 4:5 
    177             static long vp_h[5] = { 0, 30, 13, 0, 0 }; 
    178             return vp_h[shooting_get_prop(PROPCASE_ASPECT_RATIO)]; 
     190    if ((mode_get() & MODE_MASK) == MODE_PLAY) 
     191    { 
     192        return 0; 
     193    } 
     194    else if (shooting_get_prop(PROPCASE_SHOOTING_MODE) == 16908) // Stitch mode 
     195    { 
     196        return 0; 
     197    } 
     198    else 
     199    { 
     200            return vp_yo[shooting_get_prop(PROPCASE_ASPECT_RATIO)]; 
    179201    } 
    180202} 
    … …  
    182204int vid_get_viewport_display_yoffset() 
    183205{ 
    184     if (shooting_get_prop(PROPCASE_SHOOTING_MODE) == 16908) // Stitch mode 
     206    if ((mode_get() & MODE_MASK) == MODE_PLAY) 
     207    { 
     208        return 0; 
     209    } 
     210    else if (shooting_get_prop(PROPCASE_SHOOTING_MODE) == 16908) // Stitch mode 
    185211    { 
    186212        return 72; 
    … …  
    188214    else 
    189215    { 
    190         return vid_get_viewport_yoffset(); 
     216            return vp_yo[shooting_get_prop(PROPCASE_ASPECT_RATIO)]; 
    191217    } 
    192218} 

  • branches/reyalp-ptp-live/platform/g12/sub/100c/stubs_entry.S

    r1878 r1911  
    135135NSTUB(GetPropertyCase                         ,0xff8954f0) //102 
    136136NSTUB(GetSystemTime                           ,0xffb08d38) //101 
     137NSTUB(GetVRAMHPixelsSize                      ,0xff854320) //102 
     138NSTUB(GetVRAMVPixelsSize                      ,0xff85432c) //102 
    137139NSTUB(GetZoomLensCurrentPoint                 ,0xff9819e0) //102 
    138140NSTUB(GetZoomLensCurrentPosition              ,0xffaf6874) //102 

  • branches/reyalp-ptp-live/platform/g12/sub/100e/stubs_entry.S

    r1878 r1911  
    135135NSTUB(GetPropertyCase                         ,0xff8954f0) //102 
    136136NSTUB(GetSystemTime                           ,0xffb08ee8) //101 
     137NSTUB(GetVRAMHPixelsSize                      ,0xff854320) //102 
     138NSTUB(GetVRAMVPixelsSize                      ,0xff85432c) //102 
    137139NSTUB(GetZoomLensCurrentPoint                 ,0xff9819e0) //102 
    138140NSTUB(GetZoomLensCurrentPosition              ,0xffaf6880) //102 

  • branches/reyalp-ptp-live/platform/g12/sub/100f/stubs_entry.S

    r1878 r1911  
    135135NSTUB(GetPropertyCase                         ,0xff8954f0) //102 
    136136NSTUB(GetSystemTime                           ,0xffb08ee8) //101 
     137NSTUB(GetVRAMHPixelsSize                      ,0xff854320) //102 
     138NSTUB(GetVRAMVPixelsSize                      ,0xff85432c) //102 
    137139NSTUB(GetZoomLensCurrentPoint                 ,0xff9819e0) //102 
    138140NSTUB(GetZoomLensCurrentPosition              ,0xffaf6880) //102 

  • branches/reyalp-ptp-live/platform/g12/sub/100g/stubs_entry.S

    r1878 r1911  
    135135NSTUB(GetPropertyCase                         ,0xff8954f0) //102 
    136136NSTUB(GetSystemTime                           ,0xffb08ef4) //101 
     137NSTUB(GetVRAMHPixelsSize                      ,0xff854320) //102 
     138NSTUB(GetVRAMVPixelsSize                      ,0xff85432c) //102 
    137139NSTUB(GetZoomLensCurrentPoint                 ,0xff9819e0) //102 
    138140NSTUB(GetZoomLensCurrentPosition              ,0xffaf6880) //102 

  • branches/reyalp-ptp-live/platform/g1x/lib.c

    r1878 r1911  
    100100int vid_get_viewport_width() 
    101101{ 
    102     if (shooting_get_prop(PROPCASE_SHOOTING_MODE) == 16909) // Stitch mode 
     102    if ((mode_get() & MODE_MASK) == MODE_PLAY) 
     103    { 
     104        return 360; 
     105    } 
     106    else if (shooting_get_prop(PROPCASE_SHOOTING_MODE) == 16909) // Stitch mode 
    103107    { 
    104108        return 180; 
    … …  
    115119int vid_get_viewport_display_xoffset() 
    116120{ 
    117     if (shooting_get_prop(PROPCASE_SHOOTING_MODE) == 16909) // Stitch mode 
     121    if ((mode_get() & MODE_MASK) == MODE_PLAY) 
     122    { 
     123        return 0; 
     124    } 
     125    else if (shooting_get_prop(PROPCASE_SHOOTING_MODE) == 16909) // Stitch mode 
    118126    { 
    119127        if (shooting_get_prop(PROPCASE_STITCH_DIRECTION) == 0)      // Direction check 
    … …  
    139147long vid_get_viewport_height() 
    140148{ 
    141     if (shooting_get_prop(PROPCASE_SHOOTING_MODE) == 16909) // Stitch mode 
     149    if ((mode_get() & MODE_MASK) == MODE_PLAY) 
     150    { 
     151        return 240; 
     152    } 
     153    else if (shooting_get_prop(PROPCASE_SHOOTING_MODE) == 16909) // Stitch mode 
    142154    { 
    143155        return 120; 
    … …  
    154166int vid_get_viewport_yoffset() 
    155167{ 
    156     if (shooting_get_prop(PROPCASE_SHOOTING_MODE) == 16909) // Stitch mode 
     168    if ((mode_get() & MODE_MASK) == MODE_PLAY) 
     169    { 
     170        return 0; 
     171    } 
     172    else if (shooting_get_prop(PROPCASE_SHOOTING_MODE) == 16909) // Stitch mode 
    157173    { 
    158174        return 0; 
    … …  
    169185int vid_get_viewport_display_yoffset() 
    170186{ 
    171     if (shooting_get_prop(PROPCASE_SHOOTING_MODE) == 16909) // Stitch mode 
     187    if ((mode_get() & MODE_MASK) == MODE_PLAY) 
     188    { 
     189        return 0; 
     190    } 
     191    else if (shooting_get_prop(PROPCASE_SHOOTING_MODE) == 16909) // Stitch mode 
    172192    { 
    173193        return 72; 

  • branches/reyalp-ptp-live/platform/g1x/sub/100e/stubs_entry.S

    r1878 r1911  
    131131NSTUB(GetPropertyCase                         ,0xff08fa60) //102 
    132132NSTUB(GetSystemTime                           ,0xff3745f4) //101 
     133NSTUB(GetVRAMHPixelsSize                      ,0xff047814) //102 
     134NSTUB(GetVRAMVPixelsSize                      ,0xff047820) //102 
    133135NSTUB(GetZoomLensCurrentPoint                 ,0xff1c3ca4) //102 
    134136NSTUB(GetZoomLensCurrentPosition              ,0xff360b28) //102 

  • branches/reyalp-ptp-live/platform/g1x/sub/100f/stubs_entry.S

    r1878 r1911  
    131131NSTUB(GetPropertyCase                         ,0xff08fa60) //102 
    132132NSTUB(GetSystemTime                           ,0xff3747c0) //101 
     133NSTUB(GetVRAMHPixelsSize                      ,0xff047814) //102 
     134NSTUB(GetVRAMVPixelsSize                      ,0xff047820) //102 
    133135NSTUB(GetZoomLensCurrentPoint                 ,0xff1c3ca4) //102 
    134136NSTUB(GetZoomLensCurrentPosition              ,0xff360cf4) //102 

  • branches/reyalp-ptp-live/platform/g9/sub/100d/stubs_entry.S

    r1878 r1911  
    131131NSTUB(GetPropertyCase                         ,0xff86f768) //101 
    132132NSTUB(GetSystemTime                           ,0xffa47d60) //  1 
     133NSTUB(GetVRAMHPixelsSize                      ,0xff83dedc) //102 
     134NSTUB(GetVRAMVPixelsSize                      ,0xff83dee8) //102 
    133135NSTUB(GetZoomLensCurrentPoint                 ,0xff93a220) //102 
    134136NSTUB(GetZoomLensCurrentPosition              ,0xffa3e5e8) //102 

  • branches/reyalp-ptp-live/platform/g9/sub/100g/stubs_entry.S

    r1878 r1911  
    131131NSTUB(GetPropertyCase                         ,0xff86f768) //101 
    132132NSTUB(GetSystemTime                           ,0xffa47dd0) //  1 
     133NSTUB(GetVRAMHPixelsSize                      ,0xff83dedc) //102 
     134NSTUB(GetVRAMVPixelsSize                      ,0xff83dee8) //102 
    133135NSTUB(GetZoomLensCurrentPoint                 ,0xff93a290) //102 
    134136NSTUB(GetZoomLensCurrentPosition              ,0xffa3e658) //102 

  • branches/reyalp-ptp-live/platform/g9/sub/100i/stubs_entry.S

    r1878 r1911  
    123123NSTUB(GetPropertyCase                         ,0xff86f768) //101 
    124124NSTUB(GetSystemTime                           ,0xffa47df8) //  1 
     125NSTUB(GetVRAMHPixelsSize                      ,0xff83dedc) //102 
     126NSTUB(GetVRAMVPixelsSize                      ,0xff83dee8) //102 
    125127NSTUB(GetZoomLensCurrentPoint                 ,0xff93a29c) //102 
    126128NSTUB(GetZoomLensCurrentPosition              ,0xffa3e680) //102 

  • branches/reyalp-ptp-live/platform/ixus1000_sd4500/sub/100d/stubs_entry.S

    r1878 r1911  
    133133NSTUB(GetPropertyCase                         ,0xff895dbc) //102 
    134134NSTUB(GetSystemTime                           ,0xffae56f0) //101 
     135NSTUB(GetVRAMHPixelsSize                      ,0xff854000) //102 
     136NSTUB(GetVRAMVPixelsSize                      ,0xff85400c) //102 
    135137NSTUB(GetZoomLensCurrentPoint                 ,0xff97ae10) //102 
    136138NSTUB(GetZoomLensCurrentPosition              ,0xffacd184) //102 

  • branches/reyalp-ptp-live/platform/ixus1000_sd4500/sub/100f/stubs_entry.S

    r1878 r1911  
    133133NSTUB(GetPropertyCase                         ,0xff895dbc) //102 
    134134NSTUB(GetSystemTime                           ,0xffae56f4) //101 
     135NSTUB(GetVRAMHPixelsSize                      ,0xff854000) //102 
     136NSTUB(GetVRAMVPixelsSize                      ,0xff85400c) //102 
    135137NSTUB(GetZoomLensCurrentPoint                 ,0xff97ae10) //102 
    136138NSTUB(GetZoomLensCurrentPosition              ,0xffacd188) //102 

  • branches/reyalp-ptp-live/platform/ixus1000_sd4500/sub/102b/stubs_entry.S

    r1878 r1911  
    133133NSTUB(GetPropertyCase                         ,0xff895de8) //102 
    134134NSTUB(GetSystemTime                           ,0xffae57e0) //101 
     135NSTUB(GetVRAMHPixelsSize                      ,0xff854030) //102 
     136NSTUB(GetVRAMVPixelsSize                      ,0xff85403c) //102 
    135137NSTUB(GetZoomLensCurrentPoint                 ,0xff97aec0) //102 
    136138NSTUB(GetZoomLensCurrentPosition              ,0xffacd274) //102 

  • branches/reyalp-ptp-live/platform/ixus100_sd780/sub/100b/stubs_entry.S

    r1878 r1911  
    139139NSTUB(GetPropertyCase                         ,0xff86e284) //102 
    140140NSTUB(GetSystemTime                           ,0xffa3df98) //101 
     141NSTUB(GetVRAMHPixelsSize                      ,0xff8b1568) //102 
     142NSTUB(GetVRAMVPixelsSize                      ,0xff8b1574) //102 
    141143NSTUB(GetZoomLensCurrentPoint                 ,0xff916a6c) //102 
    142144NSTUB(GetZoomLensCurrentPosition              ,0xffa31828) //102 

  • branches/reyalp-ptp-live/platform/ixus100_sd780/sub/100c/stubs_entry.S

    r1878 r1911  
    139139NSTUB(GetPropertyCase                         ,0xff86e284) //102 
    140140NSTUB(GetSystemTime                           ,0xffa3dfb4) //101 
     141NSTUB(GetVRAMHPixelsSize                      ,0xff8b1568) //102 
     142NSTUB(GetVRAMVPixelsSize                      ,0xff8b1574) //102 
    141143NSTUB(GetZoomLensCurrentPoint                 ,0xff916a6c) //102 
    142144NSTUB(GetZoomLensCurrentPosition              ,0xffa31844) //102 

  • branches/reyalp-ptp-live/platform/ixus120_sd940/sub/100e/stubs_entry.S

    r1878 r1911  
    129129NSTUB(GetPropertyCase                         ,0xff884948) //102 
    130130NSTUB(GetSystemTime                           ,0xffa69cd8) //101 
     131NSTUB(GetVRAMHPixelsSize                      ,0xff8da2c8) //102 
     132NSTUB(GetVRAMVPixelsSize                      ,0xff8da2d4) //102 
    131133NSTUB(GetZoomLensCurrentPoint                 ,0xff93a78c) //102 
    132134NSTUB(GetZoomLensCurrentPosition              ,0xffa5d8e8) //102 

  • branches/reyalp-ptp-live/platform/ixus120_sd940/sub/101a/stubs_entry.S

    r1878 r1911  
    129129NSTUB(GetPropertyCase                         ,0xff884948) //102 
    130130NSTUB(GetSystemTime                           ,0xffa69d0c) //101 
     131NSTUB(GetVRAMHPixelsSize                      ,0xff8da2e4) //102 
     132NSTUB(GetVRAMVPixelsSize                      ,0xff8da2f0) //102 
    131133NSTUB(GetZoomLensCurrentPoint                 ,0xff93a7a8) //102 
    132134NSTUB(GetZoomLensCurrentPosition              ,0xffa5d91c) //102 

  • branches/reyalp-ptp-live/platform/ixus120_sd940/sub/102c/stubs_entry.S

    r1878 r1911  
    129129NSTUB(GetPropertyCase                         ,0xff884948) //102 
    130130NSTUB(GetSystemTime                           ,0xffa69d30) //101 
     131NSTUB(GetVRAMHPixelsSize                      ,0xff8da2e4) //102 
     132NSTUB(GetVRAMVPixelsSize                      ,0xff8da2f0) //102 
    131133NSTUB(GetZoomLensCurrentPoint                 ,0xff93a7a8) //102 
    132134NSTUB(GetZoomLensCurrentPosition              ,0xffa5d940) //102 

  • branches/reyalp-ptp-live/platform/ixus120_sd940/sub/103b/stubs_entry.S

    r1878 r1911  
    129129NSTUB(GetPropertyCase                         ,0xff884954) //102 
    130130NSTUB(GetSystemTime                           ,0xffa69d3c) //101 
     131NSTUB(GetVRAMHPixelsSize                      ,0xff8da2f0) //102 
     132NSTUB(GetVRAMVPixelsSize                      ,0xff8da2fc) //102 
    131133NSTUB(GetZoomLensCurrentPoint                 ,0xff93a7b4) //102 
    132134NSTUB(GetZoomLensCurrentPosition              ,0xffa5d94c) //102 

  • branches/reyalp-ptp-live/platform/ixus120_sd940/sub/103c/stubs_entry.S

    r1878 r1911  
    129129NSTUB(GetPropertyCase                         ,0xff8849a4) //102 
    130130NSTUB(GetSystemTime                           ,0xffa69ef8) //101 
     131NSTUB(GetVRAMHPixelsSize                      ,0xff8da340) //102 
     132NSTUB(GetVRAMVPixelsSize                      ,0xff8da34c) //102 
    131133NSTUB(GetZoomLensCurrentPoint                 ,0xff93a970) //102 
    132134NSTUB(GetZoomLensCurrentPosition              ,0xffa5db08) //102 

  • branches/reyalp-ptp-live/platform/ixus200_sd980/lib.c

    r1212 r1911  
    4545} 
    4646 
    47 int get_flash_params_count(void){ 
    48  return 120; 
     47int get_flash_params_count(void)  
     48{  
     49        return 0x84;                           // Found @0xff979b5c 
    4950} 
    5051 

  • branches/reyalp-ptp-live/platform/ixus200_sd980/sub/101c/capt_seq.c

    r1212 r1911  
    44#include "conf.h" 
    55 
    6 static long *nrflag = (long*)0x6cb4; 
     6//static long *nrflag = (long*)0x6cb4; 
     7static long *nrflag = (long*)(0x6cb8-0x08);  // Found @ ff94ff04 & ff94ff20 
    78 
    89#include "../../../generic/capt_seq.c" 

  • branches/reyalp-ptp-live/platform/ixus200_sd980/sub/101c/lib.c

    r1877 r1911  
    6161char *camera_jpeg_count_str() 
    6262{ 
    63         return (char*)0x4C138; 
     63//      return (char*)0x4C138; 
     64        return (char*)0x00084ca4;      // Found @0xff9e8aa8 
    6465} 
    6566 

  • branches/reyalp-ptp-live/platform/ixus200_sd980/sub/101c/stubs_entry.S

    r1878 r1911  
    1616// Stubs below should be checked. Stub not matched 100%, or difference found to current 'stubs_entry_2.S' 
    1717//    Name                                     Address      Rule  %  Comp to stubs_entry_2.S 
    18 //NSTUB(SetScriptMode                         ,0xff89074c) //101        *** != 0x0ff810f4 
    1918NSTUB(kbd_pwr_off                             ,0xff85ae98) //  2 64% 
    2019// ERROR: kbd_pwr_on is not found.                         //--- ---    *** != 0x00000000 
    … …  
    5554DEF(levent_table                            ,0xffb7a2a0) // Found @0xffb7a2a0 
    5655DEF(FlashParamsTable                        ,0xffbdab94) // Found @0xffbdab94 
    57 //DEF(movie_status                            ,0x000067e0) // Found @0xff94ac20, ** != ** stubs_min = 0x00005430 (0x53F8+0x38) 
     56DEF(movie_status                            ,0x000067e0) // Found @0xff94ac20 
    5857DEF(full_screen_refresh                     ,0x0001b2dc) // Found @0xff9f751c 
    5958DEF(canon_menu_active                       ,0x00002ec8) // Found @0xff889704 
    … …  
    6867DEF(zoom_busy                               ,0x0000670c) // Found @0xff946e00 
    6968DEF(focus_busy                              ,0x00006608) // Found @0xff941f28 
    70 //DEF(recreview_hold                          ,0x00003818) // Found @0xff89a778, ** != ** stubs_min = 0x000077c4 (0x76F4+0xD0) 
     69DEF(recreview_hold                          ,0x00003818) // Found @0xff89a778 
    7170 
    7271// Values below go in 'lib.c': 
    … …  
    155154NSTUB(GetPropertyCase                         ,0xff888b48) //102 
    156155NSTUB(GetSystemTime                           ,0xffa9ee08) //101 
     156NSTUB(GetVRAMHPixelsSize                      ,0xff8e1e14) //102 
     157NSTUB(GetVRAMVPixelsSize                      ,0xff8e1e20) //102 
    157158NSTUB(GetZoomLensCurrentPoint                 ,0xff947174) //102 
    158159NSTUB(GetZoomLensCurrentPosition              ,0xffa904f8) //102 
    … …  
    194195NSTUB(SetParameterData                        ,0xff979a8c) //101 
    195196NSTUB(SetPropertyCase                         ,0xff888a44) //102 
     197NSTUB(SetScriptMode                           ,0xff89074c) //101 
    196198NSTUB(SleepTask                               ,0xff83865c) //101 
    197199NSTUB(TakeSemaphore                           ,0xff838324) //101 

  • branches/reyalp-ptp-live/platform/ixus200_sd980/sub/101c/stubs_entry_2.S

    r1641 r1911  
    33 
    44// Override stubs_entry.S 
    5 NHSTUB(SetScriptMode,               0xFF810F4) 
    65NHSTUB(kbd_pwr_on,                  NULL_SUB) 
    76 

  • branches/reyalp-ptp-live/platform/ixus200_sd980/sub/101c/stubs_min.S

    r1641 r1911  
    11#include "stubs_asm.h" 
    22 
    3 DEF(movie_status,                       0x53F8 + 0x38)  // routine @ FF94A89C 
    4 DEF(recreview_hold,                     0x76F4 + 0xD0)  // routine @ FF97B418 
    53DEF(enabled_refresh_physical_screen,    0x1B34C + 0x20) // routine @ FF9F8694 

  • branches/reyalp-ptp-live/platform/ixus200_sd980/sub/101d/capt_seq.c

    r1376 r1911  
    44#include "conf.h" 
    55 
    6 static long *nrflag = (long*)0x6cb4; 
     6//static long *nrflag = (long*)0x6cb4; 
     7static long *nrflag = (long*)(0x6cb8-0x08);  // Found @ ff9500c0 & ff9500dc 
    78 
    89#include "../../../generic/capt_seq.c" 

  • branches/reyalp-ptp-live/platform/ixus200_sd980/sub/101d/lib.c

    r1877 r1911  
    6161char *camera_jpeg_count_str() 
    6262{ 
    63         return (char*)0x4C138; 
     63//      return (char*)0x4C138; 
     64        return (char*)0x00084ca4; 
    6465} 
    6566 

  • branches/reyalp-ptp-live/platform/ixus200_sd980/sub/101d/stubs_entry.S

    r1878 r1911  
    6767DEF(zoom_busy                               ,0x0000670c) // Found @0xff946fbc 
    6868DEF(focus_busy                              ,0x00006608) // Found @0xff9420e4 
    69 //DEF(recreview_hold                          ,0x00003818) // Found @0xff89a7c8, ** != ** stubs_min = 0x000077c4 (0x76F4+0xD0) 
     69DEF(recreview_hold                          ,0x00003818) // Found @0xff89a7c8 
    7070 
    7171// Values below go in 'lib.c': 
    … …  
    154154NSTUB(GetPropertyCase                         ,0xff888b98) //102 
    155155NSTUB(GetSystemTime                           ,0xffa9efc4) //101 
     156NSTUB(GetVRAMHPixelsSize                      ,0xff8e1e64) //102 
     157NSTUB(GetVRAMVPixelsSize                      ,0xff8e1e70) //102 
    156158NSTUB(GetZoomLensCurrentPoint                 ,0xff947330) //102 
    157159NSTUB(GetZoomLensCurrentPosition              ,0xffa906b4) //102 

  • branches/reyalp-ptp-live/platform/ixus200_sd980/sub/101d/stubs_min.S

    r1641 r1911  
    11#include "stubs_asm.h" 
    22 
    3 DEF(recreview_hold,                     0x76F4 + 0xD0)  // routine @ FF97B418 
    43DEF(enabled_refresh_physical_screen,    0x1B34C + 0x20) // routine @ FF9F8694 

  • branches/reyalp-ptp-live/platform/ixus220_elph300hs/sub/100c/stubs_entry.S

    r1878 r1911  
    135135NSTUB(GetPropertyCase                         ,0xff895e60) //102 
    136136NSTUB(GetSystemTime                           ,0xffaf2534) //101 
     137NSTUB(GetVRAMHPixelsSize                      ,0xff856300) //102 
     138NSTUB(GetVRAMVPixelsSize                      ,0xff85630c) //102 
    137139NSTUB(GetZoomLensCurrentPoint                 ,0xff9801ec) //102 
    138140NSTUB(GetZoomLensCurrentPosition              ,0xffadcc9c) //102 

  • branches/reyalp-ptp-live/platform/ixus220_elph300hs/sub/101a/stubs_entry.S

    r1878 r1911  
    135135NSTUB(GetPropertyCase                         ,0xff895e60) //102 
    136136NSTUB(GetSystemTime                           ,0xffaf254c) //101 
     137NSTUB(GetVRAMHPixelsSize                      ,0xff856300) //102 
     138NSTUB(GetVRAMVPixelsSize                      ,0xff85630c) //102 
    137139NSTUB(GetZoomLensCurrentPoint                 ,0xff9801ec) //102 
    138140NSTUB(GetZoomLensCurrentPosition              ,0xffadcc9c) //102 

  • branches/reyalp-ptp-live/platform/ixus220_elph300hs/sub/101c/stubs_entry.S

    r1878 r1911  
    135135NSTUB(GetPropertyCase                         ,0xff895e60) //102 
    136136NSTUB(GetSystemTime                           ,0xffaf2560) //101 
     137NSTUB(GetVRAMHPixelsSize                      ,0xff856300) //102 
     138NSTUB(GetVRAMVPixelsSize                      ,0xff85630c) //102 
    137139NSTUB(GetZoomLensCurrentPoint                 ,0xff9801ec) //102 
    138140NSTUB(GetZoomLensCurrentPosition              ,0xffadcc9c) //102 

  • branches/reyalp-ptp-live/platform/ixus220_elph300hs/sub/101g/stubs_entry.S

    r1878 r1911  
    135135NSTUB(GetPropertyCase                         ,0xff895e60) //102 
    136136NSTUB(GetSystemTime                           ,0xffaf2594) //101 
     137NSTUB(GetVRAMHPixelsSize                      ,0xff856300) //102 
     138NSTUB(GetVRAMVPixelsSize                      ,0xff85630c) //102 
    137139NSTUB(GetZoomLensCurrentPoint                 ,0xff9801ec) //102 
    138140NSTUB(GetZoomLensCurrentPosition              ,0xffadccd0) //102 

  • branches/reyalp-ptp-live/platform/ixus230_elph310hs/sub/100b/stubs_entry.S

    r1878 r1911  
    134134NSTUB(GetPropertyCase                         ,0xff08a35c) //102 
    135135NSTUB(GetSystemTime                           ,0xff2efd8c) //101 
     136NSTUB(GetVRAMHPixelsSize                      ,0xff046c94) //102 
     137NSTUB(GetVRAMVPixelsSize                      ,0xff046ca0) //102 
    136138NSTUB(GetZoomLensCurrentPoint                 ,0xff17f8b4) //102 
    137139NSTUB(GetZoomLensCurrentPosition              ,0xff2dbcd8) //102 

  • branches/reyalp-ptp-live/platform/ixus300_sd4000/sub/100d/stubs_entry.S

    r1878 r1911  
    142142NSTUB(GetPropertyCase                         ,0xff88f660) //102 
    143143NSTUB(GetSystemTime                           ,0xffab8d48) //101 
     144NSTUB(GetVRAMHPixelsSize                      ,0xff851900) //102 
     145NSTUB(GetVRAMVPixelsSize                      ,0xff85190c) //102 
    144146NSTUB(GetZoomLensCurrentPoint                 ,0xff965e54) //102 
    145147NSTUB(GetZoomLensCurrentPosition              ,0xffaa9298) //102 

  • branches/reyalp-ptp-live/platform/ixus310_elph500hs/lib.c

    r1837 r1911  
    9595int vid_get_viewport_width() 
    9696{ 
    97         // viewport width table for each image size 
    98         // 0 = 4:3, 1 = 16:9, 2 = 3:2, 3 = 1:1 
    99         static long vp_w[5] = { 360, 480, 408, 272 }; 
    100         return vp_w[shooting_get_prop(PROPCASE_ASPECT_RATIO)]; 
     97        if ((mode_get() & MODE_MASK) == MODE_PLAY) 
     98    { 
     99        return 480; 
     100    } 
     101    else  
     102    { 
     103        // viewport width table for each image size 
     104        // 0 = 4:3, 1 = 16:9, 2 = 3:2, 3 = 1:1 
     105            static long vp_w[5] = { 360, 480, 408, 272 }; 
     106            return vp_w[shooting_get_prop(PROPCASE_ASPECT_RATIO)]; 
     107    } 
    101108} 
    102109 
    103110int vid_get_viewport_display_xoffset() 
    104111{ 
    105         // viewport width offset table for each image size 
    106         // 0 = 4:3, 1 = 16:9, 2 = 3:2, 3 = 1:1 
    107         static long vp_w[5] = { 60, 0, 36, 104 };                               // should all be even values for edge overlay 
    108         return vp_w[shooting_get_prop(PROPCASE_ASPECT_RATIO)]; 
     112        if ((mode_get() & MODE_MASK) == MODE_PLAY) 
     113    { 
     114        return 0; 
     115    } 
     116    else  
     117    { 
     118        // viewport width offset table for each image size 
     119            // 0 = 4:3, 1 = 16:9, 2 = 3:2, 3 = 1:1 
     120            static long vp_w[5] = { 60, 0, 36, 104 };                           // should all be even values for edge overlay 
     121            return vp_w[shooting_get_prop(PROPCASE_ASPECT_RATIO)]; 
     122    } 
    109123} 
    110124 

  • branches/reyalp-ptp-live/platform/ixus310_elph500hs/sub/100a/stubs_entry.S

    r1878 r1911  
    130130NSTUB(GetPropertyCase                         ,0xff087d48) //102 
    131131NSTUB(GetSystemTime                           ,0xff30fb2c) //101 
     132NSTUB(GetVRAMHPixelsSize                      ,0xff045a10) //102 
     133NSTUB(GetVRAMVPixelsSize                      ,0xff045a1c) //102 
    132134NSTUB(GetZoomLensCurrentPoint                 ,0xff179f70) //102 
    133135NSTUB(GetZoomLensCurrentPosition              ,0xff2f9ac8) //102 

  • branches/reyalp-ptp-live/platform/ixus310_elph500hs/sub/101a/stubs_entry.S

    r1878 r1911  
    130130NSTUB(GetPropertyCase                         ,0xff087d48) //102 
    131131NSTUB(GetSystemTime                           ,0xff30fb44) //101 
     132NSTUB(GetVRAMHPixelsSize                      ,0xff045a10) //102 
     133NSTUB(GetVRAMVPixelsSize                      ,0xff045a1c) //102 
    132134NSTUB(GetZoomLensCurrentPoint                 ,0xff179f70) //102 
    133135NSTUB(GetZoomLensCurrentPosition              ,0xff2f9ac8) //102 

  • branches/reyalp-ptp-live/platform/ixus310_elph500hs/sub/101c/stubs_entry.S

    r1878 r1911  
    130130NSTUB(GetPropertyCase                         ,0xff087d48) //102 
    131131NSTUB(GetSystemTime                           ,0xff30fb3c) //101 
     132NSTUB(GetVRAMHPixelsSize                      ,0xff045a10) //102 
     133NSTUB(GetVRAMVPixelsSize                      ,0xff045a1c) //102 
    132134NSTUB(GetZoomLensCurrentPoint                 ,0xff179f70) //102 
    133135NSTUB(GetZoomLensCurrentPosition              ,0xff2f9ac8) //102 

  • branches/reyalp-ptp-live/platform/ixus80_sd1100/sub/100c/stubs_entry.S

    r1878 r1911  
    66//   Firmware Ver GM1.00C 
    77//   Possible corrupt firmware dump - file size to small for start address 0xff810000 
    8 //     file size = 3.06MB, should be 7.94MB 
    9 //   Could not find Camera name - possible corrupt firmware dump 
     8//     file size = 7.92MB, should be 7.94MB 
     9//   Canon DIGITAL IXUS 82 IS 
    1010 
    1111// Values for makefile.inc 
    1212//   PLATFORMOSVER = 23 
     13//   PLATFORMID = 12676 (0x3184) // Found @ 0xfffe0130 
    1314//   MAXRAMADDR = 0x01ffffff 
     15//   KEYSYS = d3enc              // Found @ 0xffff3308 
     16//   NEED_ENCODED_DISKBOOT = 1   // Found @ 0xffff32e8 
    1417 
    1518// Stubs below should be checked. Stub not matched 100%, or difference found to current 'stubs_entry_2.S' 
    … …  
    3437DEF(zoom_status                             ,0x0000d1cc) // Found @0xffa38f24 
    3538DEF(some_flag_for_af_scan                   ,0x0000cf50) // Found @0xffa24144 
     39// focus_len_table contains zoom focus lengths for use in 'get_focal_length' (main.c). 
     40// each entry contains 3 int value(s), the first is the zoom focus length. 
     41// there are 7 entries in the table - set NUM_FL to 7 
     42DEF(focus_len_table                         ,0xfffe297c) // Found @0xfffe297c 
    3643DEF(zoom_busy                               ,0x000085f0) // Found @0xff92ee60 
    3744//DEF(focus_busy                              ,0x000084fc) // Found @0xff92aa0c, ** != ** stubs_min = 0x00008578 (0x8578) 
    … …  
    122129NSTUB(GetPropertyCase                         ,0xff86cd80) //102 
    123130NSTUB(GetSystemTime                           ,0xffa27044) //101 
     131NSTUB(GetVRAMHPixelsSize                      ,0xff8c5d1c) //102 
     132NSTUB(GetVRAMVPixelsSize                      ,0xff8c5d28) //102 
    124133NSTUB(GetZoomLensCurrentPoint                 ,0xff92f1c4) //102 
    125134NSTUB(GetZoomLensCurrentPosition              ,0xffa1d084) //102 

  • branches/reyalp-ptp-live/platform/ixus80_sd1100/sub/101a/stubs_entry.S

    r1878 r1911  
    127127NSTUB(GetPropertyCase                         ,0xff86cd80) //102 
    128128NSTUB(GetSystemTime                           ,0xffa27040) //101 
     129NSTUB(GetVRAMHPixelsSize                      ,0xff8c5d1c) //102 
     130NSTUB(GetVRAMVPixelsSize                      ,0xff8c5d28) //102 
    129131NSTUB(GetZoomLensCurrentPoint                 ,0xff92f1c4) //102 
    130132NSTUB(GetZoomLensCurrentPosition              ,0xffa1d080) //102 

  • branches/reyalp-ptp-live/platform/ixus85_sd770/sub/100a/stubs_entry.S

    r1878 r1911  
    131131NSTUB(GetPropertyCase                         ,0xff86cddc) //102 
    132132NSTUB(GetSystemTime                           ,0xffa291d0) //101 
     133NSTUB(GetVRAMHPixelsSize                      ,0xff8c64c0) //102 
     134NSTUB(GetVRAMVPixelsSize                      ,0xff8c64cc) //102 
    133135NSTUB(GetZoomLensCurrentPoint                 ,0xff930564) //102 
    134136NSTUB(GetZoomLensCurrentPosition              ,0xffa1f220) //102 

  • branches/reyalp-ptp-live/platform/ixus860_sd870/sub/100c/stubs_entry.S

    r1878 r1911  
    125125NSTUB(GetPropertyCase                         ,0xff869470) //101 
    126126NSTUB(GetSystemTime                           ,0xffa1d890) //  1 
     127NSTUB(GetVRAMHPixelsSize                      ,0xff8c0e50) //102 
     128NSTUB(GetVRAMVPixelsSize                      ,0xff8c0e5c) //102 
    127129NSTUB(GetZoomLensCurrentPoint                 ,0xff928038) //102 
    128130NSTUB(GetZoomLensCurrentPosition              ,0xffa14b84) //102 

  • branches/reyalp-ptp-live/platform/ixus870_sd880/sub/100e/stubs_entry.S

    r1878 r1911  
    121121NSTUB(GetPropertyCase                         ,0xff8717a8) //102 
    122122NSTUB(GetSystemTime                           ,0xffa3d900) //101 
     123NSTUB(GetVRAMHPixelsSize                      ,0xff8c415c) //102 
     124NSTUB(GetVRAMVPixelsSize                      ,0xff8c4168) //102 
    123125NSTUB(GetZoomLensCurrentPoint                 ,0xff92b9c8) //102 
    124126NSTUB(GetZoomLensCurrentPosition              ,0xffa337e0) //102 

  • branches/reyalp-ptp-live/platform/ixus870_sd880/sub/101a/stubs_entry.S

    r1878 r1911  
    122122NSTUB(GetPropertyCase                         ,0xff8717a8) //102 
    123123NSTUB(GetSystemTime                           ,0xffa3d910) //101 
     124NSTUB(GetVRAMHPixelsSize                      ,0xff8c4160) //102 
     125NSTUB(GetVRAMVPixelsSize                      ,0xff8c416c) //102 
    124126NSTUB(GetZoomLensCurrentPoint                 ,0xff92b9cc) //102 
    125127NSTUB(GetZoomLensCurrentPosition              ,0xffa337f0) //102 

  • branches/reyalp-ptp-live/platform/ixus870_sd880/sub/102b/stubs_entry.S

    r1878 r1911  
    122122NSTUB(GetPropertyCase                         ,0xff8717a8) //102 
    123123NSTUB(GetSystemTime                           ,0xffa3d910) //101 
     124NSTUB(GetVRAMHPixelsSize                      ,0xff8c4160) //102 
     125NSTUB(GetVRAMVPixelsSize                      ,0xff8c416c) //102 
    124126NSTUB(GetZoomLensCurrentPoint                 ,0xff92b9cc) //102 
    125127NSTUB(GetZoomLensCurrentPosition              ,0xffa337f0) //102 

  • branches/reyalp-ptp-live/platform/ixus90_sd790/sub/100c/stubs_entry.S

    r1878 r1911  
    121121NSTUB(GetPropertyCase                         ,0xff86d25c) //102 
    122122NSTUB(GetSystemTime                           ,0xffa2d21c) //101 
     123NSTUB(GetVRAMHPixelsSize                      ,0xff8c8aec) //102 
     124NSTUB(GetVRAMVPixelsSize                      ,0xff8c8af8) //102 
    123125NSTUB(GetZoomLensCurrentPoint                 ,0xff932b74) //102 
    124126NSTUB(GetZoomLensCurrentPosition              ,0xffa2326c) //102 

  • branches/reyalp-ptp-live/platform/ixus90_sd790/sub/100d/stubs_entry.S

    r1878 r1911  
    121121NSTUB(GetPropertyCase                         ,0xff86d25c) //102 
    122122NSTUB(GetSystemTime                           ,0xffa2d218) //101 
     123NSTUB(GetVRAMHPixelsSize                      ,0xff8c8aec) //102 
     124NSTUB(GetVRAMVPixelsSize                      ,0xff8c8af8) //102 
    123125NSTUB(GetZoomLensCurrentPoint                 ,0xff932b74) //102 
    124126NSTUB(GetZoomLensCurrentPosition              ,0xffa23268) //102 

  • branches/reyalp-ptp-live/platform/ixus95_sd1200/sub/100c/stubs_entry.S

    r1878 r1911  
    137137NSTUB(GetPropertyCase                         ,0xffc5a2e8) //102 
    138138NSTUB(GetSystemTime                           ,0xffded940) //101 
     139NSTUB(GetVRAMHPixelsSize                      ,0xffc966a8) //102 
     140NSTUB(GetVRAMVPixelsSize                      ,0xffc966b4) //102 
    139141NSTUB(GetZoomLensCurrentPoint                 ,0xffcf4ad4) //102 
    140142NSTUB(GetZoomLensCurrentPosition              ,0xffde56b4) //102 

  • branches/reyalp-ptp-live/platform/ixus960_sd950/sub/100d/stubs_entry.S

    r1878 r1911  
    125125NSTUB(GetPropertyCase                         ,0xff8697f4) //101 
    126126NSTUB(GetSystemTime                           ,0xffa238c0) //  1 
     127NSTUB(GetVRAMHPixelsSize                      ,0xff8c2660) //102 
     128NSTUB(GetVRAMVPixelsSize                      ,0xff8c266c) //102 
    127129NSTUB(GetZoomLensCurrentPoint                 ,0xff92a680) //102 
    128130NSTUB(GetZoomLensCurrentPosition              ,0xffa1abc8) //102 

  • branches/reyalp-ptp-live/platform/ixus970_sd890/sub/100b/stubs_entry.S

    r1878 r1911  
    126126NSTUB(GetPropertyCase                         ,0xff86d008) //102 
    127127NSTUB(GetSystemTime                           ,0xffa2e488) //101 
     128NSTUB(GetVRAMHPixelsSize                      ,0xff8c8598) //102 
     129NSTUB(GetVRAMVPixelsSize                      ,0xff8c85a4) //102 
    128130NSTUB(GetZoomLensCurrentPoint                 ,0xff932dec) //102 
    129131NSTUB(GetZoomLensCurrentPosition              ,0xffa244d8) //102 

  • branches/reyalp-ptp-live/platform/ixus970_sd890/sub/100c/stubs_entry.S

    r1878 r1911  
    126126NSTUB(GetPropertyCase                         ,0xff86d008) //102 
    127127NSTUB(GetSystemTime                           ,0xffa2e488) //101 
     128NSTUB(GetVRAMHPixelsSize                      ,0xff8c8598) //102 
     129NSTUB(GetVRAMVPixelsSize                      ,0xff8c85a4) //102 
    128130NSTUB(GetZoomLensCurrentPoint                 ,0xff932dec) //102 
    129131NSTUB(GetZoomLensCurrentPosition              ,0xffa244d8) //102 

  • branches/reyalp-ptp-live/platform/ixus970_sd890/sub/100f/stubs_entry.S

    r1878 r1911  
    126126NSTUB(GetPropertyCase                         ,0xff86cf8c) //102 
    127127NSTUB(GetSystemTime                           ,0xffa2e3f8) //101 
     128NSTUB(GetVRAMHPixelsSize                      ,0xff8c851c) //102 
     129NSTUB(GetVRAMVPixelsSize                      ,0xff8c8528) //102 
    128130NSTUB(GetZoomLensCurrentPoint                 ,0xff932d74) //102 
    129131NSTUB(GetZoomLensCurrentPosition              ,0xffa24448) //102 

  • branches/reyalp-ptp-live/platform/ixus980_sd990/sub/100e/stubs_entry.S

    r1878 r1911  
    127127NSTUB(GetPropertyCase                         ,0xff876358) //102 
    128128NSTUB(GetSystemTime                           ,0xffa49a98) //101 
     129NSTUB(GetVRAMHPixelsSize                      ,0xff83c2a8) //102 
     130NSTUB(GetVRAMVPixelsSize                      ,0xff83c2b4) //102 
    129131NSTUB(GetZoomLensCurrentPoint                 ,0xff933afc) //102 
    130132NSTUB(GetZoomLensCurrentPosition              ,0xffa4059c) //102 

  • branches/reyalp-ptp-live/platform/ixus980_sd990/sub/101b/stubs_entry.S

    r1878 r1911  
    127127NSTUB(GetPropertyCase                         ,0xff876358) //102 
    128128NSTUB(GetSystemTime                           ,0xffa49a98) //101 
     129NSTUB(GetVRAMHPixelsSize                      ,0xff83c2a8) //102 
     130NSTUB(GetVRAMVPixelsSize                      ,0xff83c2b4) //102 
    129131NSTUB(GetZoomLensCurrentPoint                 ,0xff933afc) //102 
    130132NSTUB(GetZoomLensCurrentPosition              ,0xffa4059c) //102 

  • branches/reyalp-ptp-live/platform/s100/sub/100d/stubs_entry.S

    r1878 r1911  
    134134NSTUB(GetPropertyCase                         ,0xff091950) //102 
    135135NSTUB(GetSystemTime                           ,0xff37445c) //101 
     136NSTUB(GetVRAMHPixelsSize                      ,0xff048f34) //102 
     137NSTUB(GetVRAMVPixelsSize                      ,0xff048f40) //102 
    136138NSTUB(GetZoomLensCurrentPoint                 ,0xff1c6590) //102 
    137139NSTUB(GetZoomLensCurrentPosition              ,0xff35f990) //102 

  • branches/reyalp-ptp-live/platform/s100/sub/100e/stubs_entry.S

    r1878 r1911  
    134134NSTUB(GetPropertyCase                         ,0xff091950) //102 
    135135NSTUB(GetSystemTime                           ,0xff374464) //101 
     136NSTUB(GetVRAMHPixelsSize                      ,0xff048f34) //102 
     137NSTUB(GetVRAMVPixelsSize                      ,0xff048f40) //102 
    136138NSTUB(GetZoomLensCurrentPoint                 ,0xff1c6590) //102 
    137139NSTUB(GetZoomLensCurrentPosition              ,0xff35f998) //102 

  • branches/reyalp-ptp-live/platform/s100/sub/101a/stubs_entry.S

    r1878 r1911  
    134134NSTUB(GetPropertyCase                         ,0xff091950) //102 
    135135NSTUB(GetSystemTime                           ,0xff374464) //101 
     136NSTUB(GetVRAMHPixelsSize                      ,0xff048f34) //102 
     137NSTUB(GetVRAMVPixelsSize                      ,0xff048f40) //102 
    136138NSTUB(GetZoomLensCurrentPoint                 ,0xff1c6590) //102 
    137139NSTUB(GetZoomLensCurrentPosition              ,0xff35f998) //102 

  • branches/reyalp-ptp-live/platform/s5is/sub/101a/stubs_entry.S

    r1878 r1911  
    127127NSTUB(GetPropertyCase                         ,0xff874864) //101 
    128128NSTUB(GetSystemTime                           ,0xffa4126c) //  1 
     129NSTUB(GetVRAMHPixelsSize                      ,0xff8412f0) //102 
     130NSTUB(GetVRAMVPixelsSize                      ,0xff8412fc) //102 
    129131NSTUB(GiveSemaphore                           ,0xff81b930) //112 
    130132NSTUB(IsStrobeChargeCompleted                 ,0xff8db5fc) //102 

  • branches/reyalp-ptp-live/platform/s5is/sub/101b/stubs_entry.S

    r1878 r1911  
    127127NSTUB(GetPropertyCase                         ,0xff87479c) //101 
    128128NSTUB(GetSystemTime                           ,0xffa411a4) //  1 
     129NSTUB(GetVRAMHPixelsSize                      ,0xff841228) //102 
     130NSTUB(GetVRAMVPixelsSize                      ,0xff841234) //102 
    129131NSTUB(GiveSemaphore                           ,0xff81b868) //112 
    130132NSTUB(IsStrobeChargeCompleted                 ,0xff8db534) //102 

  • branches/reyalp-ptp-live/platform/s90/sub/100c/stubs_entry.S

    r1878 r1911  
    1919NSTUB(GetFocusLensSubjectDistance             ,0xff958928) //  1 93% 
    2020//NSTUB(GetPropertyCase                       ,0xff88c960) //  5        *** != 0xff88ca64 
     21//NSTUB(GetVRAMHPixelsSize                    ,0xffafb0ec) //102        *** != 0xff84f110 
     22//NSTUB(GetVRAMVPixelsSize                    ,0xffaff288) //  1        *** != 0xff84f11c 
    2123NSTUB(IsStrobeChargeCompleted                 ,0xff8d8710) //  1 96% 
    2224NSTUB(MoveFocusLensToDistance                 ,0xffafbcf0) //  1 68% 

  • branches/reyalp-ptp-live/platform/s90/sub/100c/stubs_entry_2.S

    r1641 r1911  
    1919NHSTUB(UnRegisterEvntProc,          0xFF888C68) 
    2020NHSTUB(closefastdir,                0xFFA7D5D0) 
     21 
     22// these are overridden because we don't have a correct full dump for this cam 
     23NHSTUB(GetVRAMHPixelsSize,          0xFF84F110) 
     24NHSTUB(GetVRAMVPixelsSize,          0xFF84F11C) 

  • branches/reyalp-ptp-live/platform/s90/sub/101a/stubs_entry.S

    r1878 r1911  
    126126NSTUB(GetPropertyCase                         ,0xff88ca90) //102 
    127127NSTUB(GetSystemTime                           ,0xffa9d214) //101 
     128NSTUB(GetVRAMHPixelsSize                      ,0xff84f110) //102 
     129NSTUB(GetVRAMVPixelsSize                      ,0xff84f11c) //102 
    128130NSTUB(GetZoomLensCurrentPoint                 ,0xff95da40) //102 
    129131NSTUB(GetZoomLensCurrentPosition              ,0xffa90e60) //102 

  • branches/reyalp-ptp-live/platform/s90/sub/101c/stubs_entry.S

    r1878 r1911  
    126126NSTUB(GetPropertyCase                         ,0xff88cae0) //102 
    127127NSTUB(GetSystemTime                           ,0xffa9d3d0) //101 
     128NSTUB(GetVRAMHPixelsSize                      ,0xff84f110) //102 
     129NSTUB(GetVRAMVPixelsSize                      ,0xff84f11c) //102 
    128130NSTUB(GetZoomLensCurrentPoint                 ,0xff95dbfc) //102 
    129131NSTUB(GetZoomLensCurrentPosition              ,0xffa9101c) //102 

  • branches/reyalp-ptp-live/platform/s95/sub/100e/stubs_entry.S

    r1878 r1911  
    135135NSTUB(GetPropertyCase                         ,0xff896414) //102 
    136136NSTUB(GetSystemTime                           ,0xffafad34) //101 
     137NSTUB(GetVRAMHPixelsSize                      ,0xff854118) //102 
     138NSTUB(GetVRAMVPixelsSize                      ,0xff854124) //102 
    137139NSTUB(GetZoomLensCurrentPoint                 ,0xff980d38) //102 
    138140NSTUB(GetZoomLensCurrentPosition              ,0xffae90e8) //102 

  • branches/reyalp-ptp-live/platform/s95/sub/100h/stubs_entry.S

    r1878 r1911  
    135135NSTUB(GetPropertyCase                         ,0xff896414) //102 
    136136NSTUB(GetSystemTime                           ,0xffafaee4) //101 
     137NSTUB(GetVRAMHPixelsSize                      ,0xff854118) //102 
     138NSTUB(GetVRAMVPixelsSize                      ,0xff854124) //102 
    137139NSTUB(GetZoomLensCurrentPoint                 ,0xff980d38) //102 
    138140NSTUB(GetZoomLensCurrentPosition              ,0xffae90f4) //102 

  • branches/reyalp-ptp-live/platform/s95/sub/100i/stubs_entry.S

    r1878 r1911  
    135135NSTUB(GetPropertyCase                         ,0xff896414) //102 
    136136NSTUB(GetSystemTime                           ,0xffafaee4) //101 
     137NSTUB(GetVRAMHPixelsSize                      ,0xff854118) //102 
     138NSTUB(GetVRAMVPixelsSize                      ,0xff854124) //102 
    137139NSTUB(GetZoomLensCurrentPoint                 ,0xff980d38) //102 
    138140NSTUB(GetZoomLensCurrentPosition              ,0xffae90f4) //102 

  • branches/reyalp-ptp-live/platform/s95/sub/100k/stubs_entry.S

    r1878 r1911  
    135135NSTUB(GetPropertyCase                         ,0xff896414) //102 
    136136NSTUB(GetSystemTime                           ,0xffafaf0c) //101 
     137NSTUB(GetVRAMHPixelsSize                      ,0xff854118) //102 
     138NSTUB(GetVRAMVPixelsSize                      ,0xff854124) //102 
    137139NSTUB(GetZoomLensCurrentPoint                 ,0xff980d38) //102 
    138140NSTUB(GetZoomLensCurrentPosition              ,0xffae90f4) //102 

  • branches/reyalp-ptp-live/platform/sx1/sub/200h/stubs_entry.S

    r1878 r1911  
    120120NSTUB(GetPropertyCase                         ,0xff87dbcc) //102 
    121121NSTUB(GetSystemTime                           ,0xffa91bf4) //101 
     122NSTUB(GetVRAMHPixelsSize                      ,0xff83d4e8) //102 
     123NSTUB(GetVRAMVPixelsSize                      ,0xff83d4f4) //102 
    122124NSTUB(GetZoomLensCurrentPoint                 ,0xff9548a8) //102 
    123125NSTUB(GetZoomLensCurrentPosition              ,0xffa820f8) //102 

  • branches/reyalp-ptp-live/platform/sx1/sub/201a/stubs_entry.S

    r1878 r1911  
    120120NSTUB(GetPropertyCase                         ,0xff87dbcc) //102 
    121121NSTUB(GetSystemTime                           ,0xffa91c08) //101 
     122NSTUB(GetVRAMHPixelsSize                      ,0xff83d4e8) //102 
     123NSTUB(GetVRAMVPixelsSize                      ,0xff83d4f4) //102 
    122124NSTUB(GetZoomLensCurrentPoint                 ,0xff9548a8) //102 
    123125NSTUB(GetZoomLensCurrentPosition              ,0xffa8210c) //102 

  • branches/reyalp-ptp-live/platform/sx10/sub/100c/stubs_entry.S

    r1878 r1911  
    120120NSTUB(GetPropertyCase                         ,0xff8796d0) //102 
    121121NSTUB(GetSystemTime                           ,0xffa67b3c) //101 
     122NSTUB(GetVRAMHPixelsSize                      ,0xff83ccb4) //102 
     123NSTUB(GetVRAMVPixelsSize                      ,0xff83ccc0) //102 
    122124NSTUB(GetZoomLensCurrentPoint                 ,0xff941128) //102 
    123125NSTUB(GetZoomLensCurrentPosition              ,0xffa5b23c) //102 

  • branches/reyalp-ptp-live/platform/sx10/sub/101a/stubs_entry.S

    r1878 r1911  
    120120NSTUB(GetPropertyCase                         ,0xff8796d8) //102 
    121121NSTUB(GetSystemTime                           ,0xffa67b4c) //101 
     122NSTUB(GetVRAMHPixelsSize                      ,0xff83ccb4) //102 
     123NSTUB(GetVRAMVPixelsSize                      ,0xff83ccc0) //102 
    122124NSTUB(GetZoomLensCurrentPoint                 ,0xff941130) //102 
    123125NSTUB(GetZoomLensCurrentPosition              ,0xffa5b24c) //102 

  • branches/reyalp-ptp-live/platform/sx10/sub/101b/stubs_entry.S

    r1878 r1911  
    120120NSTUB(GetPropertyCase                         ,0xff879778) //102 
    121121NSTUB(GetSystemTime                           ,0xffa67c78) //101 
     122NSTUB(GetVRAMHPixelsSize                      ,0xff83ccb4) //102 
     123NSTUB(GetVRAMVPixelsSize                      ,0xff83ccc0) //102 
    122124NSTUB(GetZoomLensCurrentPoint                 ,0xff9411d0) //102 
    123125NSTUB(GetZoomLensCurrentPosition              ,0xffa5b350) //102 

  • branches/reyalp-ptp-live/platform/sx10/sub/102b/stubs_entry.S

    r1878 r1911  
    120120NSTUB(GetPropertyCase                         ,0xff879778) //102 
    121121NSTUB(GetSystemTime                           ,0xffa67c78) //101 
     122NSTUB(GetVRAMHPixelsSize                      ,0xff83ccb4) //102 
     123NSTUB(GetVRAMVPixelsSize                      ,0xff83ccc0) //102 
    122124NSTUB(GetZoomLensCurrentPoint                 ,0xff9411d0) //102 
    123125NSTUB(GetZoomLensCurrentPosition              ,0xffa5b350) //102 

  • branches/reyalp-ptp-live/platform/sx10/sub/103a/stubs_entry.S

    r1878 r1911  
    120120NSTUB(GetPropertyCase                         ,0xff879778) //102 
    121121NSTUB(GetSystemTime                           ,0xffa67c8c) //101 
     122NSTUB(GetVRAMHPixelsSize                      ,0xff83ccb4) //102 
     123NSTUB(GetVRAMVPixelsSize                      ,0xff83ccc0) //102 
    122124NSTUB(GetZoomLensCurrentPoint                 ,0xff9411d0) //102 
    123125NSTUB(GetZoomLensCurrentPosition              ,0xffa5b364) //102 

  • branches/reyalp-ptp-live/platform/sx100is/sub/100b/stubs_entry.S

    r1878 r1911  
    129129NSTUB(GetPropertyCase                         ,0xffc5bc8c) //101 
    130130NSTUB(GetSystemTime                           ,0xffdf2fc8) //  1 
     131NSTUB(GetVRAMHPixelsSize                      ,0xffc2cd38) //102 
     132NSTUB(GetVRAMVPixelsSize                      ,0xffc2cd44) //102 
    131133NSTUB(GetZoomLensCurrentPoint                 ,0xffd0e394) //102 
    132134NSTUB(GiveSemaphore                           ,0xffc0bb24) //112 

  • branches/reyalp-ptp-live/platform/sx100is/sub/100c/stubs_entry.S

    r1878 r1911  
    128128NSTUB(GetPropertyCase                         ,0xffc5bcc0) //101 
    129129NSTUB(GetSystemTime                           ,0xffdf2ffc) //  1 
     130NSTUB(GetVRAMHPixelsSize                      ,0xffc2cd38) //102 
     131NSTUB(GetVRAMVPixelsSize                      ,0xffc2cd44) //102 
    130132NSTUB(GetZoomLensCurrentPoint                 ,0xffd0e3c8) //102 
    131133NSTUB(GiveSemaphore                           ,0xffc0bb24) //112 

  • branches/reyalp-ptp-live/platform/sx110is/sub/100b/stubs_entry.S

    r1878 r1911  
    127127NSTUB(GetPropertyCase                         ,0xffc5f2a0) //102 
    128128NSTUB(GetSystemTime                           ,0xffe08398) //101 
     129NSTUB(GetVRAMHPixelsSize                      ,0xffc2aab4) //102 
     130NSTUB(GetVRAMVPixelsSize                      ,0xffc2aac0) //102 
    129131NSTUB(GetZoomLensCurrentPoint                 ,0xffd12370) //102 
    130132NSTUB(GetZoomLensCurrentPosition              ,0xffe02890) //102 

  • branches/reyalp-ptp-live/platform/sx120is/sub/100b/stubs_entry.S

    r1878 r1911  
    134134NSTUB(GetPropertyCase                         ,0xffc60ce0) //102 
    135135NSTUB(GetSystemTime                           ,0xffe14348) //101 
     136NSTUB(GetVRAMHPixelsSize                      ,0xffc29984) //102 
     137NSTUB(GetVRAMVPixelsSize                      ,0xffc29990) //102 
    136138NSTUB(GetZoomLensCurrentPoint                 ,0xffd10bdc) //102 
    137139NSTUB(GetZoomLensCurrentPosition              ,0xffe0d1e4) //102 

  • branches/reyalp-ptp-live/platform/sx130is/sub/101c/stubs_entry.S

    r1878 r1911  
    135135NSTUB(GetPropertyCase                         ,0xff88d7a0) //102 
    136136NSTUB(GetSystemTime                           ,0xffab1a34) //101 
     137NSTUB(GetVRAMHPixelsSize                      ,0xff8525f4) //102 
     138NSTUB(GetVRAMVPixelsSize                      ,0xff852600) //102 
    137139NSTUB(GetZoomLensCurrentPoint                 ,0xff963fc8) //102 
    138140NSTUB(GetZoomLensCurrentPosition              ,0xffa9fe7c) //102 

  • branches/reyalp-ptp-live/platform/sx130is/sub/101d/stubs_entry.S

    r1878 r1911  
    135135NSTUB(GetPropertyCase                         ,0xff88d7a0) //102 
    136136NSTUB(GetSystemTime                           ,0xffab1a34) //101 
     137NSTUB(GetVRAMHPixelsSize                      ,0xff8525f4) //102 
     138NSTUB(GetVRAMVPixelsSize                      ,0xff852600) //102 
    137139NSTUB(GetZoomLensCurrentPoint                 ,0xff963fc8) //102 
    138140NSTUB(GetZoomLensCurrentPosition              ,0xffa9fe7c) //102 

  • branches/reyalp-ptp-live/platform/sx130is/sub/101f/stubs_entry.S

    r1878 r1911  
    133133NSTUB(GetPropertyCase                         ,0xff88d7a0) //102 
    134134NSTUB(GetSystemTime                           ,0xffab1a58) //101 
     135NSTUB(GetVRAMHPixelsSize                      ,0xff8525f4) //102 
     136NSTUB(GetVRAMVPixelsSize                      ,0xff852600) //102 
    135137NSTUB(GetZoomLensCurrentPoint                 ,0xff963fc8) //102 
    136138NSTUB(GetZoomLensCurrentPosition              ,0xffa9fe7c) //102 

  • branches/reyalp-ptp-live/platform/sx150is/sub/100a/stubs_entry.S

    r1878 r1911  
    133133NSTUB(GetPropertyCase                         ,0xff894e58) //102 
    134134NSTUB(GetSystemTime                           ,0xffae4e54) //101 
     135NSTUB(GetVRAMHPixelsSize                      ,0xff855338) //102 
     136NSTUB(GetVRAMVPixelsSize                      ,0xff855344) //102 
    135137NSTUB(GetZoomLensCurrentPoint                 ,0xff981808) //102 
    136138NSTUB(GetZoomLensCurrentPosition              ,0xffad21ac) //102 

  • branches/reyalp-ptp-live/platform/sx20/sub/100f/stubs_entry.S

    r1878 r1911  
    129129NSTUB(GetPropertyCase                         ,0xff88f2dc) //102 
    130130NSTUB(GetSystemTime                           ,0xffa9b638) //101 
     131NSTUB(GetVRAMHPixelsSize                      ,0xff84f904) //102 
     132NSTUB(GetVRAMVPixelsSize                      ,0xff84f910) //102 
    131133NSTUB(GetZoomLensCurrentPoint                 ,0xff9566d4) //102 
    132134NSTUB(GetZoomLensCurrentPosition              ,0xffa8eac4) //102 

  • branches/reyalp-ptp-live/platform/sx20/sub/102b/stubs_entry.S

    r1878 r1911  
    129129NSTUB(GetPropertyCase                         ,0xff88f2dc) //102 
    130130NSTUB(GetSystemTime                           ,0xffa9b6c4) //101 
     131NSTUB(GetVRAMHPixelsSize                      ,0xff84f904) //102 
     132NSTUB(GetVRAMVPixelsSize                      ,0xff84f910) //102 
    131133NSTUB(GetZoomLensCurrentPoint                 ,0xff9566a8) //102 
    132134NSTUB(GetZoomLensCurrentPosition              ,0xffa8eb50) //102 

  • branches/reyalp-ptp-live/platform/sx20/sub/102d/stubs_entry.S

    r1878 r1911  
    129129NSTUB(GetPropertyCase                         ,0xff88f32c) //102 
    130130NSTUB(GetSystemTime                           ,0xffa9b880) //101 
     131NSTUB(GetVRAMHPixelsSize                      ,0xff84f904) //102 
     132NSTUB(GetVRAMVPixelsSize                      ,0xff84f910) //102 
    131133NSTUB(GetZoomLensCurrentPoint                 ,0xff956864) //102 
    132134NSTUB(GetZoomLensCurrentPosition              ,0xffa8ed0c) //102 

  • branches/reyalp-ptp-live/platform/sx200is/sub/100c/stubs_entry.S

    r1893 r1911  
    124124NSTUB(GetParameterData                        ,0xff9632e0) //101 
    125125NSTUB(GetPropertyCase                         ,0xff8742e8) //102 
     126NSTUB(GetVRAMHPixelsSize                      ,0xff8393a0) //102 
     127NSTUB(GetVRAMVPixelsSize                      ,0xff8393ac) //102 
    126128NSTUB(GetZoomLensCurrentPoint                 ,0xff93462c) //102 
    127129NSTUB(GetZoomLensCurrentPosition              ,0xffa5cb24) //102 

  • branches/reyalp-ptp-live/platform/sx220hs/sub/100a/stubs_entry.S

    r1878 r1911  
    142142NSTUB(GetPropertyCase                         ,0xff08a944) //102 
    143143NSTUB(GetSystemTime                           ,0xff307628) //101 
     144NSTUB(GetVRAMHPixelsSize                      ,0xff04600c) //102 
     145NSTUB(GetVRAMVPixelsSize                      ,0xff046018) //102 
    144146NSTUB(GetZoomLensCurrentPoint                 ,0xff182660) //102 
    145147NSTUB(GetZoomLensCurrentPosition              ,0xff2f14cc) //102 

  • branches/reyalp-ptp-live/platform/sx220hs/sub/101a/stubs_entry.S

    r1878 r1911  
    142142NSTUB(GetPropertyCase                         ,0xff08a944) //102 
    143143NSTUB(GetSystemTime                           ,0xff307640) //101 
     144NSTUB(GetVRAMHPixelsSize                      ,0xff04600c) //102 
     145NSTUB(GetVRAMVPixelsSize                      ,0xff046018) //102 
    144146NSTUB(GetZoomLensCurrentPoint                 ,0xff182660) //102 
    145147NSTUB(GetZoomLensCurrentPosition              ,0xff2f14cc) //102 

  • branches/reyalp-ptp-live/platform/sx220hs/sub/101b/stubs_entry.S

    r1878 r1911  
    142142NSTUB(GetPropertyCase                         ,0xff08a944) //102 
    143143NSTUB(GetSystemTime                           ,0xff30764c) //101 
     144NSTUB(GetVRAMHPixelsSize                      ,0xff04600c) //102 
     145NSTUB(GetVRAMVPixelsSize                      ,0xff046018) //102 
    144146NSTUB(GetZoomLensCurrentPoint                 ,0xff182660) //102 
    145147NSTUB(GetZoomLensCurrentPosition              ,0xff2f14cc) //102 

  • branches/reyalp-ptp-live/platform/sx230hs/sub/100c/stubs_entry.S

    r1878 r1911  
    144144NSTUB(GetPropertyCase                         ,0xff08bf58) //102 
    145145NSTUB(GetSystemTime                           ,0xff31195c) //101 
     146NSTUB(GetVRAMHPixelsSize                      ,0xff04659c) //102 
     147NSTUB(GetVRAMVPixelsSize                      ,0xff0465a8) //102 
    146148NSTUB(GetZoomLensCurrentPoint                 ,0xff187b80) //102 
    147149NSTUB(GetZoomLensCurrentPosition              ,0xff2fb048) //102 

  • branches/reyalp-ptp-live/platform/sx230hs/sub/101a/stubs_entry.S

    r1878 r1911  
    144144NSTUB(GetPropertyCase                         ,0xff08bf50) //102 
    145145NSTUB(GetSystemTime                           ,0xff311abc) //101 
     146NSTUB(GetVRAMHPixelsSize                      ,0xff0465b0) //102 
     147NSTUB(GetVRAMVPixelsSize                      ,0xff0465bc) //102 
    146148NSTUB(GetZoomLensCurrentPoint                 ,0xff187d3c) //102 
    147149NSTUB(GetZoomLensCurrentPosition              ,0xff2fb1a4) //102 

  • branches/reyalp-ptp-live/platform/sx230hs/sub/101b/stubs_entry.S

    r1878 r1911  
    144144NSTUB(GetPropertyCase                         ,0xff08bf50) //102 
    145145NSTUB(GetSystemTime                           ,0xff311ac8) //101 
     146NSTUB(GetVRAMHPixelsSize                      ,0xff0465b0) //102 
     147NSTUB(GetVRAMVPixelsSize                      ,0xff0465bc) //102 
    146148NSTUB(GetZoomLensCurrentPoint                 ,0xff187d3c) //102 
    147149NSTUB(GetZoomLensCurrentPosition              ,0xff2fb1a4) //102 

  • branches/reyalp-ptp-live/platform/sx30/lib.c

    r1818 r1911  
    9292int vid_get_viewport_width() 
    9393{ 
    94     if (shooting_get_prop(PROPCASE_SHOOTING_MODE) == 16908) // Stitch mode 
     94    if ((mode_get() & MODE_MASK) == MODE_PLAY) 
     95    { 
     96        return 360; 
     97    } 
     98    else if (shooting_get_prop(PROPCASE_SHOOTING_MODE) == 16908) // Stitch mode 
    9599    { 
    96100        return 180; 
    … …  
    104108int vid_get_viewport_display_xoffset() 
    105109{ 
    106     if (shooting_get_prop(PROPCASE_SHOOTING_MODE) == 16908) // Stitch mode 
     110    if ((mode_get() & MODE_MASK) == MODE_PLAY) 
     111    { 
     112        return 0; 
     113    } 
     114    else if (shooting_get_prop(PROPCASE_SHOOTING_MODE) == 16908) // Stitch mode 
    107115    { 
    108116        if (shooting_get_prop(PROPCASE_STITCH_DIRECTION) == 0)      // Direction check 
    … …  
    125133long vid_get_viewport_height() 
    126134{ 
    127     if (shooting_get_prop(PROPCASE_SHOOTING_MODE) == 16908) // Stitch mode 
     135    if ((mode_get() & MODE_MASK) == MODE_PLAY) 
     136    { 
     137        return 240; 
     138    } 
     139    else if (shooting_get_prop(PROPCASE_SHOOTING_MODE) == 16908) // Stitch mode 
    128140    { 
    129141        return 120; 
    … …  
    136148int vid_get_viewport_yoffset() 
    137149{ 
    138     if (shooting_get_prop(PROPCASE_SHOOTING_MODE) == 16908) // Stitch mode 
     150    if ((mode_get() & MODE_MASK) == MODE_PLAY) 
     151    { 
     152        return 0; 
     153    } 
     154    else if (shooting_get_prop(PROPCASE_SHOOTING_MODE) == 16908) // Stitch mode 
    139155    { 
    140156        return 0; 
    … …  
    147163int vid_get_viewport_display_yoffset() 
    148164{ 
    149     if (shooting_get_prop(PROPCASE_SHOOTING_MODE) == 16908) // Stitch mode 
     165    if ((mode_get() & MODE_MASK) == MODE_PLAY) 
     166    { 
     167        return 0; 
     168    } 
     169    else if (shooting_get_prop(PROPCASE_SHOOTING_MODE) == 16908) // Stitch mode 
    150170    { 
    151171        return 72; 
    152172    } 
    153     else 
    154     { 
    155         return vid_get_viewport_yoffset(); 
    156     } 
     173    else if (shooting_get_prop(PROPCASE_ASPECT_RATIO) == 1)     // Wide screen top & bottom 30 pixels not used in viewport 
     174                return 30; 
     175        return 0; 
    157176} 
    158177 

  • branches/reyalp-ptp-live/platform/sx30/sub/100e/stubs_entry.S

    r1878 r1911  
    133133NSTUB(GetPropertyCase                         ,0xff8999c8) //102 
    134134NSTUB(GetSystemTime                           ,0xffaedfa4) //101 
     135NSTUB(GetVRAMHPixelsSize                      ,0xff85413c) //102 
     136NSTUB(GetVRAMVPixelsSize                      ,0xff854148) //102 
    135137NSTUB(GetZoomLensCurrentPoint                 ,0xff87e9c4) //102 
    136138NSTUB(GetZoomLensCurrentPosition              ,0xff986474) //102 

  • branches/reyalp-ptp-live/platform/sx30/sub/100h/stubs_entry.S

    r1878 r1911  
    133133NSTUB(GetPropertyCase                         ,0xff8999c8) //102 
    134134NSTUB(GetSystemTime                           ,0xffaee060) //101 
     135NSTUB(GetVRAMHPixelsSize                      ,0xff85413c) //102 
     136NSTUB(GetVRAMVPixelsSize                      ,0xff854148) //102 
    135137NSTUB(GetZoomLensCurrentPoint                 ,0xff87e9c4) //102 
    136138NSTUB(GetZoomLensCurrentPosition              ,0xff9864a8) //102 

  • branches/reyalp-ptp-live/platform/sx30/sub/100l/stubs_entry.S

    r1878 r1911  
    133133NSTUB(GetPropertyCase                         ,0xff8999cc) //102 
    134134NSTUB(GetSystemTime                           ,0xffaee208) //101 
     135NSTUB(GetVRAMHPixelsSize                      ,0xff85413c) //102 
     136NSTUB(GetVRAMVPixelsSize                      ,0xff854148) //102 
    135137NSTUB(GetZoomLensCurrentPoint                 ,0xff87e9c4) //102 
    136138NSTUB(GetZoomLensCurrentPosition              ,0xff9864ac) //102 

  • branches/reyalp-ptp-live/platform/sx30/sub/100n/stubs_entry.S

    r1878 r1911  
    133133NSTUB(GetPropertyCase                         ,0xff8999cc) //102 
    134134NSTUB(GetSystemTime                           ,0xffaee28c) //101 
     135NSTUB(GetVRAMHPixelsSize                      ,0xff85413c) //102 
     136NSTUB(GetVRAMVPixelsSize                      ,0xff854148) //102 
    135137NSTUB(GetZoomLensCurrentPoint                 ,0xff87e9c4) //102 
    136138NSTUB(GetZoomLensCurrentPosition              ,0xff986530) //102 

  • branches/reyalp-ptp-live/platform/sx30/sub/100p/stubs_entry.S

    r1878 r1911  
    133133NSTUB(GetPropertyCase                         ,0xff8999cc) //102 
    134134NSTUB(GetSystemTime                           ,0xffaee28c) //101 
     135NSTUB(GetVRAMHPixelsSize                      ,0xff85413c) //102 
     136NSTUB(GetVRAMVPixelsSize                      ,0xff854148) //102 
    135137NSTUB(GetZoomLensCurrentPoint                 ,0xff87e9c4) //102 
    136138NSTUB(GetZoomLensCurrentPosition              ,0xff986530) //102 

  • branches/reyalp-ptp-live/platform/sx40hs/lib.c

    r1834 r1911  
    9393int vid_get_viewport_width() 
    9494{ 
    95     if (shooting_get_prop(PROPCASE_SHOOTING_MODE) == 16909) // Stitch mode 
     95    if ((mode_get() & MODE_MASK) == MODE_PLAY) 
     96    { 
     97        return 360; 
     98    } 
     99    else if (shooting_get_prop(PROPCASE_SHOOTING_MODE) == 16909) // Stitch mode 
    96100    { 
    97101        return 180; 
    … …  
    106110} 
    107111 
     112// viewport width offset table for each image size 
     113// 0 = 4:3, 1 = 16:9, 2 = 3:2, 3 = 1:1 
     114static long vp_xo[5] = { 0, 0, 0, 44 };                         // should all be even values for edge overlay 
     115 
    108116int vid_get_viewport_xoffset() 
    109117{ 
    110     if (shooting_get_prop(PROPCASE_SHOOTING_MODE) == 16909) // Stitch mode 
    111     { 
    112         return 0; 
    113     } 
    114     else 
    115     { 
    116             // viewport width offset table for each image size 
    117             // 0 = 4:3, 1 = 16:9, 2 = 3:2, 3 = 1:1 
    118             static long vp_w[5] = { 0, 0, 0, 44 };                              // should all be even values for edge overlay 
    119             return vp_w[shooting_get_prop(PROPCASE_ASPECT_RATIO)]; 
     118    if ((mode_get() & MODE_MASK) == MODE_PLAY) 
     119    { 
     120        return 0; 
     121    } 
     122    else if (shooting_get_prop(PROPCASE_SHOOTING_MODE) == 16909) // Stitch mode 
     123    { 
     124        return 0; 
     125    } 
     126    else 
     127    { 
     128            return vp_xo[shooting_get_prop(PROPCASE_ASPECT_RATIO)]; 
    120129    } 
    121130} 
    … …  
    123132int vid_get_viewport_display_xoffset() 
    124133{ 
    125     if (shooting_get_prop(PROPCASE_SHOOTING_MODE) == 16909) // Stitch mode 
     134    if ((mode_get() & MODE_MASK) == MODE_PLAY) 
     135    { 
     136        return 0; 
     137    } 
     138    else if (shooting_get_prop(PROPCASE_SHOOTING_MODE) == 16909) // Stitch mode 
    126139    { 
    127140        if (shooting_get_prop(PROPCASE_STITCH_DIRECTION) == 0)      // Direction check 
    … …  
    138151    else 
    139152    { 
    140         return vid_get_viewport_xoffset(); 
     153            return vp_xo[shooting_get_prop(PROPCASE_ASPECT_RATIO)]; 
    141154    } 
    142155} 
    … …  
    144157long vid_get_viewport_height() 
    145158{ 
    146     if (shooting_get_prop(PROPCASE_SHOOTING_MODE) == 16909) // Stitch mode 
     159    if ((mode_get() & MODE_MASK) == MODE_PLAY) 
     160    { 
     161        return 240; 
     162    } 
     163    else if (shooting_get_prop(PROPCASE_SHOOTING_MODE) == 16909) // Stitch mode 
    147164    { 
    148165        return 120; 
    … …  
    157174} 
    158175 
     176// viewport height offset table for each image size 
     177// 0 = 4:3, 1 = 16:9, 2 = 3:2, 3 = 1:1 
     178static long vp_yo[5] = { 0, 30, 13, 0 }; 
     179 
    159180int vid_get_viewport_yoffset() 
    160181{ 
    161     if (shooting_get_prop(PROPCASE_SHOOTING_MODE) == 16909) // Stitch mode 
    162     { 
    163         return 0; 
    164     } 
    165     else 
    166     { 
    167             // viewport height offset table for each image size 
    168             // 0 = 4:3, 1 = 16:9, 2 = 3:2, 3 = 1:1 
    169             static long vp_h[5] = { 0, 30, 13, 0 }; 
    170             return vp_h[shooting_get_prop(PROPCASE_ASPECT_RATIO)]; 
     182    if ((mode_get() & MODE_MASK) == MODE_PLAY) 
     183    { 
     184        return 0; 
     185    } 
     186    else if (shooting_get_prop(PROPCASE_SHOOTING_MODE) == 16909) // Stitch mode 
     187    { 
     188        return 0; 
     189    } 
     190    else 
     191    { 
     192            return vp_yo[shooting_get_prop(PROPCASE_ASPECT_RATIO)]; 
    171193    } 
    172194} 
    … …  
    174196int vid_get_viewport_display_yoffset() 
    175197{ 
    176     if (shooting_get_prop(PROPCASE_SHOOTING_MODE) == 16909) // Stitch mode 
     198    if ((mode_get() & MODE_MASK) == MODE_PLAY) 
     199    { 
     200        return 0; 
     201    } 
     202    else if (shooting_get_prop(PROPCASE_SHOOTING_MODE) == 16909) // Stitch mode 
    177203    { 
    178204        return 72; 
    … …  
    180206    else 
    181207    { 
    182         return vid_get_viewport_yoffset(); 
     208            return vp_yo[shooting_get_prop(PROPCASE_ASPECT_RATIO)]; 
    183209    } 
    184210} 

  • branches/reyalp-ptp-live/platform/sx40hs/sub/100d/stubs_entry.S

    r1878 r1911  
    134134NSTUB(GetPropertyCase                         ,0xff09107c) //102 
    135135NSTUB(GetSystemTime                           ,0xff359784) //101 
     136NSTUB(GetVRAMHPixelsSize                      ,0xff0487d8) //102 
     137NSTUB(GetVRAMVPixelsSize                      ,0xff0487e4) //102 
    136138NSTUB(GetZoomLensCurrentPoint                 ,0xff071fe4) //102 
    137139NSTUB(GetZoomLensCurrentPosition              ,0xff1c4f7c) //102 

  • branches/reyalp-ptp-live/platform/sx40hs/sub/100f/stubs_entry.S

    r1878 r1911  
    134134NSTUB(GetPropertyCase                         ,0xff0910a4) //102 
    135135NSTUB(GetSystemTime                           ,0xff3597c0) //101 
     136NSTUB(GetVRAMHPixelsSize                      ,0xff0487f0) //102 
     137NSTUB(GetVRAMVPixelsSize                      ,0xff0487fc) //102 
    136138NSTUB(GetZoomLensCurrentPoint                 ,0xff071ffc) //102 
    137139NSTUB(GetZoomLensCurrentPosition              ,0xff1c4fb8) //102 

  • branches/reyalp-ptp-live/platform/sx40hs/sub/100g/stubs_entry.S

    r1878 r1911  
    134134NSTUB(GetPropertyCase                         ,0xff0910a4) //102 
    135135NSTUB(GetSystemTime                           ,0xff3597bc) //101 
     136NSTUB(GetVRAMHPixelsSize                      ,0xff0487f0) //102 
     137NSTUB(GetVRAMVPixelsSize                      ,0xff0487fc) //102 
    136138NSTUB(GetZoomLensCurrentPoint                 ,0xff071ffc) //102 
    137139NSTUB(GetZoomLensCurrentPosition              ,0xff1c4fb4) //102 

  • branches/reyalp-ptp-live/platform/sx40hs/sub/100i/stubs_entry.S

    r1878 r1911  
    134134NSTUB(GetPropertyCase                         ,0xff0910a4) //102 
    135135NSTUB(GetSystemTime                           ,0xff3597e0) //101 
     136NSTUB(GetVRAMHPixelsSize                      ,0xff0487f0) //102 
     137NSTUB(GetVRAMVPixelsSize                      ,0xff0487fc) //102 
    136138NSTUB(GetZoomLensCurrentPoint                 ,0xff071ffc) //102 
    137139NSTUB(GetZoomLensCurrentPosition              ,0xff1c4fd8) //102 

  • branches/reyalp-ptp-live/tools/finsig_dryos.c

    r1878 r1911  
    12831283    { 2, "NR_GetDarkSubType", "NRTBL.GetDarkSubType", 1 }, 
    12841284    { 2, "SavePaletteData", "SavePaletteData", 1 }, 
     1285    { 2, "GetVRAMHPixelsSize", "GetVRAMHPixelsSize", 1 }, 
     1286    { 2, "GetVRAMVPixelsSize", "GetVRAMVPixelsSize", 1 }, 
    12851287         
    12861288        { 3, "AllocateMemory", "AllocateMemory", 1 }, 

  • branches/reyalp-ptp-live/tools/sig_ref_dryos_1.txt

    r1641 r1911  
    119119SetAE_ShutterSpeed 0xFFDA87C0 
    120120SetFileAttributes 0xFFC15358 
     121GetVRAMHPixelsSize 0xFFDA956C 
     122GetVRAMVPixelsSize 0xFFDA9570 

  • branches/reyalp-ptp-live/tools/signatures_dryos.h

    r1658 r1911  
    37523752        {  31, 0xe1a07000, 0xfdfff000 }, // mov:6:0xE1A07000 
    37533753        /* 32/32 */ 
     3754        { -1, -1, -1 }, 
     3755}; 
     3756 
     3757static FuncSig func_sig_GetVRAMHPixelsSize_1[] = { 
     3758        {   0, 0x0a000000, 0x0f000000 }, // b, bl:3:0xEAFA09A1 
     3759        {   1, 0x0a000000, 0x0f000000 }, // b, bl:3:0xEAFA09A3 
     3760        {   2, 0x0a000000, 0x0f000000 }, // b, bl:3:0xEAFA09D2 
     3761        {   3, 0xe92d0000, 0xffff0000 }, // stm:5:0xE92D41F0 
     3762        {   4, 0xe1a07000, 0xfdfff000 }, // mov:6:0xE1A07003 
     3763        {   5, 0xe1a06000, 0xfdfff000 }, // mov:6:0xE1A06002 
     3764        {   6, 0xe1a05000, 0xfdfff000 }, // mov:6:0xE1A05000 
     3765        {   7, 0xe1a04000, 0xfdfff000 }, // mov:6:0xE1A04001 
     3766        {   8, 0x0b000000, 0x0f000000 }, // b, bl:3:0xEBFA09D7 
     3767        {   9, 0xe1500000, 0xfdfff000 }, // cmp:7:0xE3500001 
     3768        {  10, 0x11a00000, 0xfdfff000 }, // mov:6:0x13A00011 
     3769        {  11, 0x18bd0000, 0xffff0000 }, // ldm:5:0x18BD81F0 
     3770        {  12, 0xe1550000, 0xfdfff000 }, // cmp:7:0xE355001E 
     3771        {  13, 0x0a000000, 0x0f000000 }, // b, bl:3:0x9A000003 
     3772        {  14, 0xe1a00000, 0xfdfff000 }, // mov:6:0xE1A00007 
     3773        {  16, 0xe1a00000, 0xfdfff000 }, // mov:6:0xE3A00003 
     3774        {  17, 0xe8bd0000, 0xffff0000 }, // ldm:5:0xE8BD81F0 
     3775        {  18, 0xe1a02000, 0xfdfff000 }, // mov:6:0xE1A02007 
     3776        {  19, 0xe1a01000, 0xfdfff000 }, // mov:6:0xE1A01006 
     3777        {  20, 0xe1a00000, 0xfdfff000 }, // mov:6:0xE1A00005 
     3778        {  21, 0x0b000000, 0x0f000000 }, // b, bl:3:0xEBFA099E 
     3779        {  22, 0xe00f1000, 0xf00ff000 }, // ldr:8:0xE59F1228 
     3780        {  23, 0xe00f0000, 0xf00ff000 }, // ldr:8:0xE59F0220 
     3781        {  24, 0xe5841000, 0xfdfff000 }, // str:4:0xE5841000 
     3782        {  25, 0xe5840000, 0xfdfff000 }, // str:4:0xE5840004 
     3783        {  26, 0xe00f0000, 0xf00ff000 }, // add:10:0xE28F0F95 
     3784        {  27, 0x0b000000, 0x0f000000 }, // b, bl:3:0xEB000D24 
     3785        {  28, 0xe5941000, 0xfdfff000 }, // ldr:4:0xE5941004 
     3786        {  29, 0xe00f0000, 0xf00ff000 }, // add:10:0xE28F0F97 
     3787        {  30, 0x0b000000, 0x0f000000 }, // b, bl:3:0xEB000D21 
     3788        {  31, 0xe1a00000, 0xfdfff000 }, // mov:6:0xE3A00000 
     3789        /* 31/32 */ 
     3790        { -1, -1, -1 }, 
     3791}; 
     3792 
     3793static FuncSig func_sig_GetVRAMVPixelsSize_1[] = { 
     3794        {   0, 0x0a000000, 0x0f000000 }, // b, bl:3:0xEAFA09A3 
     3795        {   1, 0x0a000000, 0x0f000000 }, // b, bl:3:0xEAFA09D2 
     3796        {   2, 0xe92d0000, 0xffff0000 }, // stm:5:0xE92D41F0 
     3797        {   3, 0xe1a07000, 0xfdfff000 }, // mov:6:0xE1A07003 
     3798        {   4, 0xe1a06000, 0xfdfff000 }, // mov:6:0xE1A06002 
     3799        {   5, 0xe1a05000, 0xfdfff000 }, // mov:6:0xE1A05000 
     3800        {   6, 0xe1a04000, 0xfdfff000 }, // mov:6:0xE1A04001 
     3801        {   7, 0x0b000000, 0x0f000000 }, // b, bl:3:0xEBFA09D7 
     3802        {   8, 0xe1500000, 0xfdfff000 }, // cmp:7:0xE3500001 
     3803        {   9, 0x11a00000, 0xfdfff000 }, // mov:6:0x13A00011 
     3804        {  10, 0x18bd0000, 0xffff0000 }, // ldm:5:0x18BD81F0 
     3805        {  11, 0xe1550000, 0xfdfff000 }, // cmp:7:0xE355001E 
     3806        {  12, 0x0a000000, 0x0f000000 }, // b, bl:3:0x9A000003 
     3807        {  13, 0xe1a00000, 0xfdfff000 }, // mov:6:0xE1A00007 
     3808        {  15, 0xe1a00000, 0xfdfff000 }, // mov:6:0xE3A00003 
     3809        {  16, 0xe8bd0000, 0xffff0000 }, // ldm:5:0xE8BD81F0 
     3810        {  17, 0xe1a02000, 0xfdfff000 }, // mov:6:0xE1A02007 
     3811        {  18, 0xe1a01000, 0xfdfff000 }, // mov:6:0xE1A01006 
     3812        {  19, 0xe1a00000, 0xfdfff000 }, // mov:6:0xE1A00005 
     3813        {  20, 0x0b000000, 0x0f000000 }, // b, bl:3:0xEBFA099E 
     3814        {  21, 0xe00f1000, 0xf00ff000 }, // ldr:8:0xE59F1228 
     3815        {  22, 0xe00f0000, 0xf00ff000 }, // ldr:8:0xE59F0220 
     3816        {  23, 0xe5841000, 0xfdfff000 }, // str:4:0xE5841000 
     3817        {  24, 0xe5840000, 0xfdfff000 }, // str:4:0xE5840004 
     3818        {  25, 0xe00f0000, 0xf00ff000 }, // add:10:0xE28F0F95 
     3819        {  26, 0x0b000000, 0x0f000000 }, // b, bl:3:0xEB000D24 
     3820        {  27, 0xe5941000, 0xfdfff000 }, // ldr:4:0xE5941004 
     3821        {  28, 0xe00f0000, 0xf00ff000 }, // add:10:0xE28F0F97 
     3822        {  29, 0x0b000000, 0x0f000000 }, // b, bl:3:0xEB000D21 
     3823        {  30, 0xe1a00000, 0xfdfff000 }, // mov:6:0xE3A00000 
     3824        {  31, 0xe8bd0000, 0xffff0000 }, // ldm:5:0xE8BD81F0 
     3825        /* 31/32 */ 
    37543826        { -1, -1, -1 }, 
    37553827}; 
    … …  
    78367908        { "GetSystemTime", func_sig_GetSystemTime_1, 1 }, 
    78377909        { "GetSystemTime", func_sig_GetSystemTime_2, 2 }, 
     7910        { "GetVRAMHPixelsSize", func_sig_GetVRAMHPixelsSize_1, 1 }, 
     7911        { "GetVRAMVPixelsSize", func_sig_GetVRAMVPixelsSize_1, 1 }, 
    78387912        { "GetZoomLensCurrentPoint", func_sig_GetZoomLensCurrentPoint_1, 1 }, 
    78397913        { "GetZoomLensCurrentPosition", func_sig_GetZoomLensCurrentPosition_1, 1 }, 
Note: See TracChangeset for help on using the changeset viewer.