Skip to content

Commit 392dc42

Browse files
committed
Caption is optional.
1 parent 14bb942 commit 392dc42

File tree

2 files changed

+20
-4
lines changed

2 files changed

+20
-4
lines changed

LOG

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
v0.2-rc.1
2+
Date: TBD
3+
Commit#: TBD
4+
* Pause feature no longer additionally stops the video.
5+
* Improved audio/video syncing in live preview.
6+
* Fixed bugs in front half of Video compiler.
7+
* Made 'canvas' an optional parameter
8+
19
v0.2-rc
210
Date: 2018-06-10
311
Commit#: d65af7c7826210b6ba8c777bc83b2f4c535be2e7

video/private/video-canvas.rkt

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -480,6 +480,7 @@
480480
(mixin (render<%>) ()
481481
(super-new)
482482
(inherit-field stop-rendering-flag)
483+
(init [(ic canvas) #f])
483484
(define canvas #f)
484485
(define play-video? #t)
485486
(define play-audio? #t)
@@ -490,6 +491,15 @@
490491
(define stop-video-thread-flag #f)
491492
(define width #f)
492493
(define height #f)
494+
(define/public (set-canvas c)
495+
(set! canvas c)
496+
(set! width (if c
497+
(send c get-video-width)
498+
50))
499+
(set! height (if c
500+
(send c get-video-height)
501+
50)))
502+
(set-canvas ic)
493503
(define/override (setup rs)
494504
(unless (and width height)
495505
(error 'video-canvas-render-mixin
@@ -503,10 +513,6 @@
503513
[sample-rate 44100]
504514
[channel-layout 'stereo]
505515
[format 'raw])))
506-
(define/public (set-canvas c)
507-
(set! canvas c)
508-
(set! width (send c get-video-width))
509-
(set! height (send c get-video-height)))
510516
(define/override (write-output-callback-constructor #:render-status rs-box)
511517
(λ (mode obj)
512518
(match obj
@@ -558,6 +564,8 @@
558564
(stop-audio)
559565
(set! stop-audio #f))]
560566
[('video 'open)
567+
(unless canvas
568+
(error 'player "Canvas must be set to play video"))
561569
(set! video-buffer (new video-buffer% [canvas canvas]))
562570
(send video-buffer set-time-base (avcodec-context-time-base ctx))
563571
(set! stop-video-thread-flag #f)

0 commit comments

Comments
 (0)