Changeset 1834


Ignore:
Timestamp:
04/29/12 03:45:10 (13 months ago)
Author:
reyalp
Message:

remove unneeded vid_get_viewport_*offset_proper, plus some other trivial cleanup

Location:
branches/reyalp-ptp-live
Files:
8 edited

Legend:

Unmodified
Added
Removed

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

    r1818 r1834  
    242242// PTP Live View functions 
    243243// These functions return actual size/offset in pixels of the viewport and bitmap buffers 
    244 extern int vid_get_viewport_xoffset_proper();           // X Offset (for variable image size) 
    245 extern int vid_get_viewport_yoffset_proper();           // Y Offset (for variable image size) 
    246244extern int vid_get_viewport_display_xoffset_proper();   // X Offset (for variable image size) 
    247245extern int vid_get_viewport_display_yoffset_proper();   // Y Offset (for variable image size) 

  • branches/reyalp-ptp-live/platform/d10/sub/100a/lib.c

    r1818 r1834  
    7373int vid_get_viewport_max_height() { return 240; } 
    7474 
    75 // commented for now, protocol changes needed to handle correctly, values look correct 
    76 // both are 0 or last record value in playback mode 
    77 #if 1 
    7875// goes to 360 for stitch, 320x240 video, max digital zoom 
    7976int vid_get_viewport_width_proper() {  
    … …  
    8481    return ((mode_get()&MODE_MASK) == MODE_PLAY)?240:*(int*)(0x20E4+4); // GetVRAMVPixelSize 
    8582} 
    86 #endif 
     83 
    8784int vid_get_viewport_logical_height() { 
    8885    // except for stitch, always full screen 

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

    r1818 r1834  
    193193 
    194194// Functions for PTP Live View system 
    195  
    196 int vid_get_viewport_xoffset_proper()           { return vid_get_viewport_xoffset() * 2; } 
    197 int vid_get_viewport_yoffset_proper()           { return vid_get_viewport_yoffset() * 2; } 
    198195int vid_get_viewport_display_xoffset_proper()   { return vid_get_viewport_display_xoffset() * 2; } 
    199196int vid_get_viewport_display_yoffset_proper()   { return vid_get_viewport_display_yoffset() * 2; } 

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

    r1818 r1834  
    183183 
    184184// Functions for PTP Live View system 
    185  
    186 int vid_get_viewport_yoffset_proper()           { return vid_get_viewport_yoffset() * 2; } 
    187185int vid_get_viewport_display_xoffset_proper()   { return vid_get_viewport_display_xoffset() * 2; } 
    188186int vid_get_viewport_display_yoffset_proper()   { return vid_get_viewport_display_yoffset() * 2; } 

  • branches/reyalp-ptp-live/platform/generic/wrappers.c

    r1818 r1834  
    14981498// Override as needed for camera specific variations (see G12/SX30/IXUS310/SX130IS for working examples) 
    14991499 
    1500 int __attribute__((weak)) vid_get_viewport_xoffset_proper()         { return vid_get_viewport_xoffset(); } 
    1501 int __attribute__((weak)) vid_get_viewport_yoffset_proper()         { return vid_get_viewport_yoffset(); } 
    15021500int __attribute__((weak)) vid_get_viewport_display_xoffset_proper() { return vid_get_viewport_display_xoffset(); } 
    15031501int __attribute__((weak)) vid_get_viewport_display_yoffset_proper() { return vid_get_viewport_display_yoffset(); } 

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

    r1755 r1834  
    9494// Functions for PTP Live View system 
    9595 
    96 int vid_get_viewport_xoffset_proper()           { return vid_get_viewport_xoffset() * 2; } 
    97 int vid_get_viewport_width_proper()             { return vid_get_viewport_width() * 2; } 
    9896int vid_get_viewport_height_proper()            { return 480; } 
    9997int vid_get_viewport_max_width()                { return 960; } 

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

    r1755 r1834  
    9595 
    9696// Functions for PTP Live View system 
    97  
    98 int vid_get_viewport_xoffset_proper()           { return vid_get_viewport_xoffset() * 2; } 
    99 int vid_get_viewport_width_proper()             { return vid_get_viewport_width() * 2; } 
    10097int vid_get_viewport_height_proper()            { return 480; } 
    10198int vid_get_viewport_max_width()                { return 960; } 

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

    r1818 r1834  
    186186// Functions for PTP Live View system 
    187187 
    188 int vid_get_viewport_xoffset_proper()           { return vid_get_viewport_xoffset() * 2; } 
    189 int vid_get_viewport_display_xoffset_proper()   { return vid_get_viewport_display_xoffset() * 2; } 
    190188int vid_get_viewport_width_proper()             { return vid_get_viewport_width() * 2; } 
    191189int vid_get_viewport_height_proper()            { return vid_get_viewport_height(); } 
Note: See TracChangeset for help on using the changeset viewer.