diff --git a/13np/__init__.py b/13np/__init__.py index 895d949..2747d5b 100644 --- a/13np/__init__.py +++ b/13np/__init__.py @@ -8,9 +8,10 @@ scheduleUrl = 'http://live.ber.c3voc.de/releases/public/13np.xml' def introFrames(args): #fade in title - frames = 3*fps + frames = 2*fps for i in range(0, frames): yield( + ('personnames', 'style', 'opacity', 0), ('title', 'style', 'opacity', easeInQuad(i, 0, 1, frames)), ) # fade in subtitle and names @@ -18,16 +19,14 @@ def introFrames(args): for i in range(0, frames): yield( ('title', 'style', 'opacity', 1), - ('subtitle', 'style', 'opacity', easeInQuad(i, 0, 1, frames)), ('personnames', 'style', 'opacity', easeInQuad(i, 0, 1, frames)), ) - #show whole image for 2 seconds - frames = 2*fps + #show whole image for 3 seconds + frames = 3*fps for i in range(0, frames): yield( ('title', 'style', 'opacity', 1), ('personnames', 'style', 'opacity', 1), - ('subtitle', 'style', 'opacity', 1), ) def backgroundFrames(parameters): @@ -81,21 +80,21 @@ def debug(): } ) - render('outro.svg', - '../outro.ts', - outroFrames - ) - - render( - 'background.svg', - '../background.ts', - backgroundFrames - ) - - render('pause.svg', - '../pause.ts', - pauseFrames - ) +# render('outro.svg', +# '../outro.ts', +# outroFrames +# ) +# +# render( +# 'background.svg', +# '../background.ts', +# backgroundFrames +# ) +# +# render('pause.svg', +# '../pause.ts', +# pauseFrames +# ) def tasks(queue, args, idlist, skiplist): diff --git a/13np/artwork/intro.svg b/13np/artwork/intro.svg index 0b660c9..24453e7 100644 --- a/13np/artwork/intro.svg +++ b/13np/artwork/intro.svg @@ -15,7 +15,7 @@ viewBox="0 0 1920 1080" id="svg2" version="1.1" - inkscape:version="0.92.1 r15371" + inkscape:version="0.91 r13725" sodipodi:docname="intro.svg"> @@ -137,11 +137,11 @@ borderopacity="1.0" inkscape:pageopacity="0" inkscape:pageshadow="2" - inkscape:zoom="0.35" - inkscape:cx="1033.3333" - inkscape:cy="458.09524" + inkscape:zoom="0.34" + inkscape:cx="926.78049" + inkscape:cy="824.55794" inkscape:document-units="px" - inkscape:current-layer="layer2" + inkscape:current-layer="layer3" showgrid="false" units="px" inkscape:window-width="1366" @@ -150,7 +150,12 @@ inkscape:window-y="27" inkscape:window-maximized="1" showguides="true" - inkscape:guide-bbox="true" /> + inkscape:guide-bbox="true"> + + @@ -178,10 +183,10 @@ + x="1103.1431" + y="573.00006" /> - - $TITLE $SUBTITLE $SPEAKER - + $title $personnames