Skip to content

Commit bcaa8cc

Browse files
authored
Merge pull request #194 from smj-edison/main
Follow up to #192
2 parents 22838db + 9864b19 commit bcaa8cc

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

setup.folk.default

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Copy this file to ~/folk-live/setup.folk and edit it to make
22
# changes.
33

4-
Assert $this wishes $::thisNode uses camera "/dev/video0" with width 1280 height 720 bufferCount 4
4+
Assert $this wishes $::thisNode uses camera "/dev/video0" with width 1280 height 720
55

6-
Assert $this wishes $::thisNode uses display 0 with swapchainPadding 1
6+
Assert $this wishes $::thisNode uses display 0

virtual-programs/camera-usb.folk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,7 @@ When /someone/ wishes $::thisNode uses camera /cameraPath/ with /...options/ {
301301

302302
set width [dict get $options width]
303303
set height [dict get $options height]
304-
set bufferCount [dict_getdef $options bufferCount 4]
304+
set bufferCount [dict_getdef $options bufferCount 2]
305305

306306
if {[dict exists $options crop]} {
307307
set crop [dict get $options crop]

virtual-programs/display.folk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1640,9 +1640,9 @@ Start-display-process {
16401640
Wish $::thisProcess shares statements like \
16411641
[list /someone/ has error /err/ with info /errorInfo/]
16421642

1643-
# for backwards compatibility
1643+
# If swapchain padding isn't indicated, default to this
16441644
When /someone/ wishes $::thisNode uses display /displayIdx/ {
1645-
Wish $::thisNode uses display $displayIdx with swapchainPadding 1
1645+
Wish $::thisNode uses display $displayIdx with swapchainPadding 0
16461646
}
16471647

16481648
When /someone/ wishes $::thisNode uses display /displayIdx/ with /...options/ {

0 commit comments

Comments
 (0)