Changeset 499

Timestamp:

09/03/08 21:34:05 (5 years ago)

Author:

phyrephox

Message:

• fixed small glitch in core/makefile
• extended ubasic command mode_get: now returns 2 when modedial is set to videomode AND camera is in record mode (tested on a620 & s3is).

small committ for a man, but a small committ for mankind as well :D

Location:

branches/juciphox

Files:

• Makefile (modified) (1 diff)
• core/Makefile (modified) (1 diff)
• lib/ubasic/ubasic.c (modified) (1 diff)
• platform/sx100is/sub/100c/movie_rec.c (modified) (1 diff)

branches/juciphox/Makefile

@@ -190 +190 @@
         cat $(topdir)bin/caminfo.txt
         rm -f $(topdir)bin/caminfo.txt   > $(DEVNULL)
-        
+
 batch-zip-complete: version
         $(MAKE) -s --no-print-directory PLATFORM=a610 PLATFORMSUB=100e NO_INC_BUILD=1 firzipsubcomplete

branches/juciphox/core/Makefile

@@ -43 +43 @@
         @printf " %s-%s (%s, #%s): MEMISOSIZE used: 0x%s / %s\n" \
    $(PLATFORM) $(PLATFORMSUB) $(PLATFORMOS) $(PLATFORMID) \
-   `tail -c16 $(topdir)size.txt | head -c5` $(MEMISOSIZE) >> $(topdir)bin/caminfo.txt
+   `tail -c16 $(topdir)size.txt | head -c6` $(MEMISOSIZE) >> $(topdir)bin/caminfo.txt
         rm -f $(topdir)size.txt
 

branches/juciphox/lib/ubasic/ubasic.c

@@ -220 +220 @@
  case TOKENIZER_GET_MODE:
     accept(TOKENIZER_GET_MODE);
-    r = ((mode_get()&MODE_MASK) == MODE_PLAY)?1:0;    
+    int m=mode_get()&MODE_SHOOTING_MASK;
+                int mode_video=MODE_IS_VIDEO(m);
+                if ((mode_get()&MODE_MASK) != MODE_PLAY) r = 0;
+    if ((mode_get()&MODE_MASK) == MODE_PLAY) r = 1;
+    if (((mode_get()&MODE_MASK) != MODE_PLAY) && mode_video) r = 2;
    break;
  case TOKENIZER_GET_RAW_NR:

branches/juciphox/platform/sx100is/sub/100c/movie_rec.c

@@ -1959 +1959 @@
 
 long CompressionRateTable[]={0x60, 0x5D, 0x5A, 0x57, 0x54, 0x51, 0x4D, 0x48, 0x42, 0x3B, 0x32, 0x29, 0x22, 0x1D, 0x17, 0x14, 0x10, 0xE, 0xB, 9, 7, 6, 5, 4, 3, 2, 1};
-
-