Changeset 577


Ignore:
Timestamp:
11/18/08 13:18:39 (5 years ago)
Author:
phyrephox
Message:
  • enabled sd1100/ixus80 build again

about the video_control: perhaps it is worth digging out this old thread to check for ewavrs "2nd" way: ​http://chdk.setepontos.com/index.php/topic,952.msg18413.html#msg18413
i just uncommented this function from cameras that are KNOWN to crash using it. we need more reports.
also: this is a dirty workaround, it just wont show the fast movie control item in the menu of the reported cams. actually it should also be uncommented from the ubasic and lua function.
(added this quickfix because of this bugreport: ​http://chdk.kernreaktor.org/mantis/view.php?id=90)

Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/Makefile

    r576 r577  
    194194        $(MAKE) -s --no-print-directory PLATFORM=ixus60_sd600  PLATFORMSUB=100d NO_INC_BUILD=1 firzipsub 
    195195        $(MAKE) -s --no-print-directory PLATFORM=ixus960_sd950  PLATFORMSUB=100d NO_INC_BUILD=1 firzipsub 
    196 #       $(MAKE) -s --no-print-directory PLATFORM=ixus80_sd1100  PLATFORMSUB=100c NO_INC_BUILD=1 firzipsub 
    197 #       $(MAKE) -s --no-print-directory PLATFORM=ixus80_sd1100  PLATFORMSUB=101a NO_INC_BUILD=1 firzipsub 
     196        $(MAKE) -s --no-print-directory PLATFORM=ixus80_sd1100  PLATFORMSUB=100c NO_INC_BUILD=1 firzipsub 
     197        $(MAKE) -s --no-print-directory PLATFORM=ixus80_sd1100  PLATFORMSUB=101a NO_INC_BUILD=1 firzipsub 
    198198        @echo "**** All firmwares created successfully" 
    199199        @echo "**** Copying duplicate Firmwares" 
    … …  
    204204        cp $(topdir)bin/$(VER)-ixus70_sd1000-101b-$(BUILD_NUMBER).zip $(topdir)bin/$(VER)-ixus70_sd1000-101a-$(BUILD_NUMBER).zip 
    205205        cp $(topdir)bin/$(VER)-ixus75_sd750-101a-$(BUILD_NUMBER).zip $(topdir)bin/$(VER)-ixus75_sd750-101b-$(BUILD_NUMBER).zip 
    206 #       cp $(topdir)bin/$(VER)-ixus80_sd1100-101a-$(BUILD_NUMBER).zip $(topdir)bin/$(VER)-ixus80_sd1100-101b-$(BUILD_NUMBER).zip 
     206        cp $(topdir)bin/$(VER)-ixus80_sd1100-101a-$(BUILD_NUMBER).zip $(topdir)bin/$(VER)-ixus80_sd1100-101b-$(BUILD_NUMBER).zip 
    207207        cp $(topdir)bin/$(VER)-g9-100g-$(BUILD_NUMBER).zip $(topdir)bin/$(VER)-g9-100f-$(BUILD_NUMBER).zip 
    208208        @echo "**** Done Copying duplicate Firmwares" 
    … …  
    272272        $(MAKE) -s --no-print-directory PLATFORM=ixus60_sd600  PLATFORMSUB=100d NO_INC_BUILD=1 firzipsubcomplete 
    273273        $(MAKE) -s --no-print-directory PLATFORM=ixus960_sd950  PLATFORMSUB=100d NO_INC_BUILD=1 firzipsubcomplete 
    274 #       $(MAKE) -s --no-print-directory PLATFORM=ixus80_sd1100  PLATFORMSUB=100c NO_INC_BUILD=1 firzipsubcomplete 
    275 #       $(MAKE) -s --no-print-directory PLATFORM=ixus80_sd1100  PLATFORMSUB=101a NO_INC_BUILD=1 firzipsubcomplete 
     274        $(MAKE) -s --no-print-directory PLATFORM=ixus80_sd1100  PLATFORMSUB=100c NO_INC_BUILD=1 firzipsubcomplete 
     275        $(MAKE) -s --no-print-directory PLATFORM=ixus80_sd1100  PLATFORMSUB=101a NO_INC_BUILD=1 firzipsubcomplete 
    276276        @echo "**** All zipfiles including firmwares and extra stuff created successfully" 
    277277        @echo "**** Copying duplicate Firmwares" 
    … …  
    288288        cp $(topdir)bin/ixus75_sd750-101a-$(BUILD_NUMBER)-full.zip $(topdir)bin/ixus75_sd750-101b-$(BUILD_NUMBER)-full.zip 
    289289        cp $(topdir)bin/ixus75_sd750-101a-$(BUILD_NUMBER).zip $(topdir)bin/ixus75_sd750-101b-$(BUILD_NUMBER).zip 
    290 #       cp $(topdir)bin/ixus80_sd1100-101a-$(BUILD_NUMBER)-full.zip $(topdir)bin/ixus80_sd1100-101b-$(BUILD_NUMBER)-full.zip 
    291 #       cp $(topdir)bin/ixus80_sd1100-101a-$(BUILD_NUMBER).zip $(topdir)bin/ixus80_sd1100-101b-$(BUILD_NUMBER).zip 
     290        cp $(topdir)bin/ixus80_sd1100-101a-$(BUILD_NUMBER)-full.zip $(topdir)bin/ixus80_sd1100-101b-$(BUILD_NUMBER)-full.zip 
     291        cp $(topdir)bin/ixus80_sd1100-101a-$(BUILD_NUMBER).zip $(topdir)bin/ixus80_sd1100-101b-$(BUILD_NUMBER).zip 
    292292        cp $(topdir)bin/g9-100g-$(BUILD_NUMBER)-full.zip $(topdir)bin/g9-100f-$(BUILD_NUMBER)-full.zip 
    293293        cp $(topdir)bin/g9-100g-$(BUILD_NUMBER).zip $(topdir)bin/g9-100f-$(BUILD_NUMBER).zip 
    … …  
    360360        $(MAKE) -s --no-print-directory PLATFORM=ixus60_sd600  PLATFORMSUB=100d NO_INC_BUILD=1 clean 
    361361        $(MAKE) -s --no-print-directory PLATFORM=ixus960_sd950  PLATFORMSUB=100d NO_INC_BUILD=1 clean 
    362 #       $(MAKE) -s --no-print-directory PLATFORM=ixus80_sd1100  PLATFORMSUB=100c NO_INC_BUILD=1 clean 
    363 #       $(MAKE) -s --no-print-directory PLATFORM=ixus80_sd1100  PLATFORMSUB=101a NO_INC_BUILD=1 clean 
     362        $(MAKE) -s --no-print-directory PLATFORM=ixus80_sd1100  PLATFORMSUB=100c NO_INC_BUILD=1 clean 
     363        $(MAKE) -s --no-print-directory PLATFORM=ixus80_sd1100  PLATFORMSUB=101a NO_INC_BUILD=1 clean 
    364364         
    365365 

  • trunk/core/gui.c

    r576 r577  
    488488      {0x60,LANG_MENU_VIDEO_QUALITY,           MENUITEM_INT|MENUITEM_F_UNSIGNED|MENUITEM_F_MINMAX,  &conf.video_quality, MENU_MINMAX(1, 99)},  
    489489      {0x5c,LANG_MENU_CLEAR_VIDEO_VALUES,    MENUITEM_BOOL,    (int*)&conf.clear_video}, 
     490#if CAM_VIDEO_CONTROL 
    490491      {0x5c,LANG_MENU_FAST_SWITCH_VIDEO,   MENUITEM_BOOL,  &conf.fast_movie_control}, 
     492#endif 
    491493      {0x5c,LANG_MENU_FAST_SWITCH_QUALITY_VIDEO,   MENUITEM_BOOL,  &conf.fast_movie_quality_control}, 
    492494#if CAM_CAN_UNLOCK_OPTICAL_ZOOM_IN_VIDEO 

  • trunk/doc/version.txt

    r576 r577  
    22 
    33version / revision / author 
     4 
     50.7.7 / #577 / php 
     6 
     7* enabled sd1100/ixus80 build again 
     8about the video_control: perhaps it is worth digging out this old thread to check for ewavrs "2nd" way: http://chdk.setepontos.com/index.php/topic,952.msg18413.html#msg18413  
     9i just uncommented this function from cameras that are KNOWN to crash using it. we need more reports. 
     10also: this is a dirty workaround, it just wont show the fast movie control item in the menu of the reported cams. actually it should also be uncommented from the ubasic and lua function. 
     11(added this quickfix because of this bugreport: http://chdk.kernreaktor.org/mantis/view.php?id=90) 
    412 
    5130.7.7 / #576 / PhyrePhoX 

  • trunk/include/camera.h

    r576 r577  
    4545    #undef  CAM_HAS_VIDEO_BUTTON            // Camera can take stills in video mode, and vice versa 
    4646    #undef  CAM_EV_IN_VIDEO                 // CHDK can change exposure in video mode 
     47    #define CAM_VIDEO_CONTROL      1   // pause / unpause video recordings 
     48 
    4749// better: OPT_ stuff in makefile.inc 
    4850    #define ZOOM_OVERRIDE               0   // Shall zoom-override be used? default 0 becoz not implemented right now 
    … …  
    335337    #define CAM_AF_SCAN_DURING_VIDEO_RECORD 1 
    336338    #define CAM_EV_IN_VIDEO             1 
     339    #undef  CAM_VIDEO_CONTROL 
    337340 
    338341//========================================================== 
    … …  
    373376    #undef  CAM_HAS_IS 
    374377        //#define CAM_CONSOLE_LOG_ENABLED     1 
     378    #undef  CAM_VIDEO_CONTROL 
    375379 
    376380//---------------------------------------------------------- 
    … …  
    606610        #define CAM_CAN_UNLOCK_OPTICAL_ZOOM_IN_VIDEO 1 
    607611    #undef  CAM_CAN_MUTE_MICROPHONE 
    608      
     612    #undef  CAM_VIDEO_CONTROL 
    609613//---------------------------------------------------------- 
    610614#elif defined (CAMERA_ixus950_sd850) 
    … …  
    653657    #define CAM_ADJUSTABLE_ALT_BUTTON   1 
    654658    #undef  CAM_CAN_UNLOCK_OPTICAL_ZOOM_IN_VIDEO 
    655     #define  CAM_HAS_VIDEO_BUTTON       1 
    656  
     659    #define CAM_HAS_VIDEO_BUTTON       1 
     660    #undef  CAM_VIDEO_CONTROL 
    657661 
    658662//---------------------------------------------------------- 
    … …  
    719723   #define CAM_ADJUSTABLE_ALT_BUTTON   1 
    720724   #define CAM_SHOW_OSD_IN_SHOOT_MENU  1 
    721  
     725   #undef  CAM_VIDEO_CONTROL 
    722726//---------------------------------------------------------- 
    723727 
Note: See TracChangeset for help on using the changeset viewer.