SuccessChanges

Summary

  1. Stubs reformat
  2. Merged in ayshih/magic-lantern-50d/mlv_play (pull request #551) mlv_play: fixed printing of month in timestamp
  3. mlv_play: fixed printing of month in timestamp
  4. Merged in escho/escho-magiclantern/600D_stubs (pull request #541) 600D: memory suite stubs
  5. 600D memory suite stubs
  6. Created new branch 600D_stubs
  7. Merged in srm-memory (pull request #529) SRM memory allocation (very large buffers)
  8. 550D: SRM stubs
  9. 5D2: SRM stubs
  10. SRM memory: allow autofocus while allocated, but keep full shutter locked. Test on "don't click me".
  11. Re-applied 964f3df (please test on 50D)
  12. prop_request_change_wait: never wait when called from a property handler
  13. mlv_play: renamed a variable for consistency
  14. mlv_play: fix minor OSD quirk, issue #2000
  15. mlv_play: start from the last file from the playlist, for consistency with Canon's playback
  16. mlv_play: if the requested filename does not exist, play the first file from the playlist
  17. mlv_play: show correct error message when called with a specific filename that does not exist
  18. mlv_play: fix deletion of RAW files; better error checking
  19. mlv_play: fix deletion of stopped files
  20. mlv_play: prevent failed delete requests from propagating to next session
  21. mlv_play: nicer error message when delete fails
  22. mlv_play: fix issue #2044
  23. gui-common: added getter for GUI mode
  24. Merged in ayshih/magic-lantern-50d/mlv_play (pull request #550) "Exact" playback in `mlv_play` at any FPS
  25. mlv_play: removed FPS matching for exact playback
  26. mlv_rec: removed MENU rec key hack (was needed on EOS-M)
  27. Removed custom movie mode hack (was needed EOS-M)
  28. Merged in jpaana/ml/srm-stubs-eosm (pull request #548) SRM stubs for EOSM.202
  29. SRM stubs for EOSM.202
  30. Fix merge conflict
  31. mlv_rec: remove cruft
  32. Merged unified into srm-memory
  33. mlv_rec: dropped memory hack
  34. raw_rec: dropped memory hack (no longer needed on 5D3, it gives less total memory)
  35. raw_rec: renamed "Debug info" to "Show buffer graph" to match mlv_rec
  36. mlv_rec: dropped the waste hack to simplify memory management
  37. raw_rec: dropped the waste hack to simplify memory management
  38. Merged in dmilligan/magic-lantern/srm-raw-video (pull request #540) Update raw_rec and mlv_rec to use new SRM job memory
  39. raw_rec: use new memory from SRM job buffers
  40. mlv_rec: use new memory from SRM job buffers
  41. Merged in Audionut/user-builds/6D-SRM (pull request #537) 6D: missing stubs from nikfreak, http://www.magiclantern.fm/forum/index.php?topic=12528.msg120721#msg120721
  42. 6D: missing stubs from nikfreak, http://www.magiclantern.fm/forum/index.php?topic=12528.msg120721#msg120721
  43. Merged in dmilligan/magic-lantern/srm-1100D (pull request #534) 1100D stubs for SRM
  44. stubs for 1100D srm maybe?
  45. Merged in dmilligan/magic-lantern/srm-60D (pull request #533) 60D stubs for SRM
  46. 60D stubs for SRM
  47. Merged in mk11174/magic-lantern-srm/srm-memory (pull request #544) 700d srm_memory stubs
  48. 700d srm_memory stubs
  49. Merged in ayshih/magic-lantern-50d/srm-memory-50d (pull request #543) SRM stubs for 50D
  50. 50D: SRM stubs
  51. Undo 964f3df (breaks 50D, because gui_uilock is called from a prop handler)
  52. fixed chunk and suite structures, added comments
  53. exmem: modified the SRM memory test from "don't click me" to allow taking pictures during the test
  54. exmem: prefer not to use SRM malloc (shoot_malloc is much better for regular use) and added srm_malloc for those cases when you actually want this buffer
  55. exmem: more defensive shutter lock (now you can take pictures while running the test from "don't click me", if you comment out the shoot_malloc_suite call first)
  56. gui_uilock: wait until the request is complete, and timeout after 2 seconds
  57. exmem: a quick test for the malloc wrappers (don't click me)
  58. exmem: attempt to allow malloc wrappers to work with more than one block
  59. exmem: experimental malloc wrappers, limited to one large block for now
  60. exmem: allow a single SRM malloc call at a time, and block shutter, to prevent ERR70
  61. exmem: testing routines for the SRM allocator in the Free Memory dialog
  62. exmem: experimental interface for SRM job memory
  63. 5D3.113: stubs for CreateMemoryChunk/AddMemoryChunk (will be required for the SRM malloc wrappers, please find them for the other cameras)
Changeset 10513:d054a2e6450e by Alex:
Stubs reformat
The file was modifiedcontrib/stub-format/stub-cleanup.py (diff)
The file was modifiedplatform/50D.109/stubs.S (diff)
The file was modifiedplatform/550D.109/stubs.S (diff)
The file was modifiedplatform/5D2.212/stubs.S (diff)
The file was modifiedplatform/5D3.113/stubs.S (diff)
The file was modifiedplatform/600D.102/stubs.S (diff)
The file was modifiedplatform/650D.104/stubs.S (diff)
The file was modifiedplatform/6D.113/stubs.S (diff)
The file was modifiedplatform/700D.113/stubs.S (diff)
The file was modifiedplatform/7D.203/stubs.S (diff)
Changeset 10512:c27dc2f2ad9a by a1ex <broscutamaker@gmail.com>:
Merged in ayshih/magic-lantern-50d/mlv_play (pull request #551)<br><br>mlv_play: fixed printing of month in timestamp
Changeset 10511:47fc2951b48f by Albert Shih <ayshih@gmail.com>:
mlv_play: fixed printing of month in timestamp
The file was modifiedmodules/mlv_play/mlv_play.c (diff)
Changeset 10510:e2eddc394d3a by a1ex <broscutamaker@gmail.com>:
Merged in escho/escho-magiclantern/600D_stubs (pull request #541)<br><br>600D: memory suite stubs
Changeset 10509:5ef1d4f51c40 by escho:
600D memory suite stubs
The file was modifiedplatform/600D.102/stubs.S (diff)
Changeset 10508:f653617b7013 by escho <hipescho@t-online.de>:
Created new branch 600D_stubs
Changeset 10507:5820133e5096 by a1ex <broscutamaker@gmail.com>:
Merged in srm-memory (pull request #529)<br><br>SRM memory allocation (very large buffers)
Changeset 10506:aa8c8bb7779c by Alex:
550D: SRM stubs
The file was modifiedplatform/550D.109/stubs.S (diff)
Changeset 10505:69a0b8c61f51 by Alex:
5D2: SRM stubs
The file was modifiedplatform/5D2.212/stubs.S (diff)
Changeset 10504:92536576a20d by Alex:
SRM memory: allow autofocus while allocated, but keep full shutter locked. Test on &quot;don&#039;t click me&quot;.
The file was modifiedsrc/debug.c (diff)
The file was modifiedsrc/exmem.c (diff)
Changeset 10503:3c58bff2c8da by Alex:
Re-applied 964f3df (please test on 50D)
The file was modifiedsrc/gui-common.c (diff)
Changeset 10502:171fca0f3224 by Alex:
prop_request_change_wait: never wait when called from a property handler
The file was modifiedsrc/property.c (diff)
Changeset 10501:7d5ddf1bbc33 by Alex:
mlv_play: renamed a variable for consistency
The file was modifiedmodules/mlv_play/mlv_play.c (diff)
Changeset 10500:a4aab5190af2 by Alex:
mlv_play: fix minor OSD quirk, issue #2000
The file was modifiedmodules/mlv_play/mlv_play.c (diff)
Changeset 10499:da270f46b6d9 by Alex:
mlv_play: start from the last file from the playlist, for consistency with Canon&#039;s playback
The file was modifiedmodules/mlv_play/mlv_play.c (diff)
Changeset 10498:36bc589aca64 by Alex:
mlv_play: if the requested filename does not exist, play the first file from the playlist
The file was modifiedmodules/mlv_play/mlv_play.c (diff)
Changeset 10497:00cf154d4aaf by Alex:
mlv_play: show correct error message when called with a specific filename that does not exist
The file was modifiedmodules/mlv_play/mlv_play.c (diff)
Changeset 10496:fc5b8783c094 by Alex:
mlv_play: fix deletion of RAW files; better error checking
The file was modifiedmodules/mlv_play/mlv_play.c (diff)
Changeset 10495:e6d1ef34bcdb by Alex:
mlv_play: fix deletion of stopped files
The file was modifiedmodules/mlv_play/mlv_play.c (diff)
Changeset 10494:c7d8eb67972c by Alex:
mlv_play: prevent failed delete requests from propagating to next session
The file was modifiedmodules/mlv_play/mlv_play.c (diff)
Changeset 10493:f2d95b8f5538 by Alex:
mlv_play: nicer error message when delete fails
The file was modifiedmodules/mlv_play/mlv_play.c (diff)
Changeset 10492:50b4885daee2 by Alex:
mlv_play: fix issue #2044
The file was modifiedmodules/mlv_play/mlv_play.c (diff)
Changeset 10491:6ca62ffaa78d by Alex:
gui-common: added getter for GUI mode
The file was modifiedsrc/gui-common.c (diff)
The file was modifiedsrc/gui-common.h (diff)
Changeset 10490:2f553a974fc2 by a1ex <broscutamaker@gmail.com>:
Merged in ayshih/magic-lantern-50d/mlv_play (pull request #550)<br><br>&quot;Exact&quot; playback in `mlv_play` at any FPS
Changeset 10489:8b3295db10f5 by Albert Shih <ayshih@gmail.com>:
mlv_play: removed FPS matching for exact playback
The file was modifiedmodules/mlv_play/mlv_play.c (diff)
Changeset 10488:023f410164c3 by Alex:
mlv_rec: removed MENU rec key hack (was needed on EOS-M)
The file was modifiedmodules/mlv_rec/mlv_rec.c (diff)
Changeset 10487:9ee23a70a05e by Alex:
Removed custom movie mode hack (was needed EOS-M)
The file was modifiedmodules/mlv_rec/mlv_rec.c (diff)
The file was modifiedmodules/raw_rec/raw_rec.c (diff)
The file was modifiedsrc/debug.c (diff)
The file was modifiedsrc/lens.c (diff)
The file was modifiedsrc/propvalues.c (diff)
The file was modifiedsrc/propvalues.h (diff)
Changeset 10486:8c3866f2d2cf by a1ex <broscutamaker@gmail.com>:
Merged in jpaana/ml/srm-stubs-eosm (pull request #548)<br><br>SRM stubs for EOSM.202
Changeset 10485:cb7676580ac9 by Jarno Paananen <jarno.paananen@gmail.com>:
SRM stubs for EOSM.202
The file was modifiedplatform/EOSM.202/stubs.S (diff)
Changeset 10484:bb0dd25c81a1 by Alex:
Fix merge conflict
The file was modifiedmodules/mlv_rec/mlv_rec.c (diff)
The file was modifiedmodules/raw_rec/raw_rec.c (diff)
Changeset 10483:34498346dacd by Alex:
mlv_rec: remove cruft
The file was modifiedmodules/mlv_rec/mlv_rec.c (diff)
Changeset 10482:d048c9928195 by a1ex <broscutamaker@gmail.com>:
Merged unified into srm-memory
Changeset 10481:18b2eaceb68c by Alex:
mlv_rec: dropped memory hack
The file was modifiedmodules/mlv_rec/mlv_rec.c (diff)
Changeset 10480:5e1ded25e003 by Alex:
raw_rec: dropped memory hack (no longer needed on 5D3, it gives less total memory)
The file was modifiedmodules/raw_rec/raw_rec.c (diff)
Changeset 10479:3d6a945e0966 by Alex:
raw_rec: renamed &quot;Debug info&quot; to &quot;Show buffer graph&quot; to match mlv_rec
The file was modifiedmodules/mlv_rec/mlv_rec.c (diff)
The file was modifiedmodules/raw_rec/raw_rec.c (diff)
Changeset 10478:3af05699dfd5 by Alex:
mlv_rec: dropped the waste hack to simplify memory management
The file was modifiedmodules/mlv_rec/mlv_rec.c (diff)
Changeset 10477:5e860335da60 by Alex:
raw_rec: dropped the waste hack to simplify memory management
The file was modifiedmodules/raw_rec/raw_rec.c (diff)
Changeset 10476:48a3a9b45d02 by a1ex <broscutamaker@gmail.com>:
Merged in dmilligan/magic-lantern/srm-raw-video (pull request #540)<br><br>Update raw_rec and mlv_rec to use new SRM job memory
Changeset 10475:968258312ee5 by David Milligan <david.l.milligan@gmail.com>:
raw_rec: use new memory from SRM job buffers
The file was modifiedmodules/raw_rec/raw_rec.c (diff)
Changeset 10474:26dae23c406d by David Milligan <david.l.milligan@gmail.com>:
mlv_rec: use new memory from SRM job buffers
The file was modifiedmodules/mlv_rec/mlv_rec.c (diff)
Changeset 10473:b1299a72fa7a by a1ex <broscutamaker@gmail.com>:
Merged in Audionut/user-builds/6D-SRM (pull request #537)<br><br>6D: missing stubs from nikfreak, http://www.magiclantern.fm/forum/index.php?topic=12528.msg120721#msg120721
Changeset 10472:34079be800ed by Audionut:
6D: missing stubs from nikfreak, http://www.magiclantern.fm/forum/index.php?topic=12528.msg120721#msg120721
The file was modifiedplatform/6D.113/stubs.S (diff)
Changeset 10471:bfd9b4a32fce by a1ex <broscutamaker@gmail.com>:
Merged in dmilligan/magic-lantern/srm-1100D (pull request #534)<br><br>1100D stubs for SRM
Changeset 10470:1ea66dd42310 by David Milligan <david.l.milligan@gmail.com>:
stubs for 1100D srm maybe?
The file was modifiedplatform/1100D.105/stubs.S (diff)
Changeset 10469:54d2ec837170 by a1ex <broscutamaker@gmail.com>:
Merged in dmilligan/magic-lantern/srm-60D (pull request #533)<br><br>60D stubs for SRM
The file was modifiedplatform/60D.111/stubs.S (diff)
Changeset 10467:9c230e758986 by a1ex <broscutamaker@gmail.com>:
Merged in mk11174/magic-lantern-srm/srm-memory (pull request #544)<br><br>700d srm_memory stubs
Changeset 10466:ea435eddc920 by Mathew Kelly <dkelly11@tampabay.rr.com>:
700d srm_memory stubs
The file was modifiedplatform/700D.113/stubs.S (diff)
Changeset 10465:11db84542a89 by a1ex <broscutamaker@gmail.com>:
Merged in ayshih/magic-lantern-50d/srm-memory-50d (pull request #543)<br><br>SRM stubs for 50D
Changeset 10464:93a3d84eb871 by Albert Shih <ayshih@gmail.com>:
50D: SRM stubs
The file was modifiedplatform/50D.109/stubs.S (diff)
Changeset 10463:55958ad2bc2e by Alex:
Undo 964f3df (breaks 50D, because gui_uilock is called from a prop handler)
The file was modifiedsrc/gui-common.c (diff)
Changeset 10462:d6d37ee7b310 by g3gg0:
fixed chunk and suite structures, added comments
The file was modifiedsrc/exmem.h (diff)
Changeset 10461:27a827f59aa5 by Alex:
exmem: modified the SRM memory test from &quot;don&#039;t click me&quot; to allow taking pictures during the test
The file was modifiedsrc/debug.c (diff)
Changeset 10460:52a607c50f29 by Alex:
exmem: prefer not to use SRM malloc (shoot_malloc is much better for regular use) and added srm_malloc for those cases when you actually want this buffer
The file was modifiedsrc/mem.c (diff)
The file was modifiedsrc/mem.h (diff)
Changeset 10459:645c2afb29e6 by Alex:
exmem: more defensive shutter lock (now you can take pictures while running the test from &quot;don&#039;t click me&quot;, if you comment out the shoot_malloc_suite call first)
The file was modifiedsrc/debug.c (diff)
The file was modifiedsrc/exmem.c (diff)
Changeset 10458:964f3df1d1a2 by Alex:
gui_uilock: wait until the request is complete, and timeout after 2 seconds
The file was modifiedsrc/gui-common.c (diff)
Changeset 10457:01906cc7ed65 by Alex:
exmem: a quick test for the malloc wrappers (don&#039;t click me)
The file was modifiedsrc/debug.c (diff)
The file was modifiedsrc/exmem.c (diff)
Changeset 10456:cb8c3c1f6055 by Alex:
exmem: attempt to allow malloc wrappers to work with more than one block
The file was modifiedsrc/exmem.c (diff)
The file was modifiedsrc/exmem.h (diff)
The file was modifiedsrc/mem.c (diff)
Changeset 10455:b888b31ac7fb by Alex:
exmem: experimental malloc wrappers, limited to one large block for now
The file was modifiedsrc/exmem.c (diff)
The file was modifiedsrc/exmem.h (diff)
The file was modifiedsrc/mem.c (diff)
Changeset 10454:76a4b4fc2483 by Alex:
exmem: allow a single SRM malloc call at a time, and block shutter, to prevent ERR70
The file was modifiedsrc/exmem.c (diff)
Changeset 10453:ff3f916fa35e by Alex:
exmem: testing routines for the SRM allocator in the Free Memory dialog
The file was modifiedsrc/mem.c (diff)
Changeset 10452:707f092e0415 by Alex:
exmem: experimental interface for SRM job memory
The file was modifiedsrc/exmem.c (diff)
The file was modifiedsrc/exmem.h (diff)
Changeset 10451:5d9d95301724 by Alex:
5D3.113: stubs for CreateMemoryChunk/AddMemoryChunk (will be required for the SRM malloc wrappers, please find them for the other cameras)
The file was modifiedplatform/5D3.113/stubs.S (diff)