Merge branch 'master' of c3voc.de:intro-outro-generator

foss4g-2016/__init__.py

@@ -7,17 +7,23 @@ from easing import *
 scheduleUrl = 'http://frab.fossgis-konferenz.de/en/foss4g-2016/public/schedule.xml'
 
 titlemap = {
-	#708: "Neue WEB-Anwendungen des LGRB Baden-Württemberg im Überblick"
+	1533: "Building applications with FOSS4G bricks"
 }
 
 def introFrames(p):
 	move=50
 
+	nr = p['$id'];
+
 	# five initial frames
 	for i in range(0, 5):
 		yield (
 			('text', 'style',    'opacity', "%.4f" % 0),
 			('text', 'attr',     'transform', 'translate(%.4f, 0)' % -move),
+
+			('image%u' % ((nr+0)%3), 'style',    'opacity', "%.4f" % 1),
+			('image%u' % ((nr+1)%3), 'style',    'opacity', "%.4f" % 0),
+			('image%u' % ((nr+2)%3), 'style',    'opacity', "%.4f" % 0),
 		)
 
 	# 3 Sekunde Text Fadein
@@ -140,17 +146,3 @@ def tasks(queue, args):
 				'$personnames': event['personnames']
 			}
 		))
-
-	# place a task for the outro into the queue
-	queue.put(Rendertask(
-		infile = 'outro.svg',
-		outfile = 'outro.ts',
-		sequence = outroFrames
-	))
-
-	# place the pause-sequence into the queue
-	queue.put(Rendertask(
-		infile = 'pause.svg',
-		outfile = 'pause.ts',
-		sequence = pauseFrames
-	))

foss4g-2016/artwork/intro.svg

@@ -115,9 +115,29 @@
        height="1280"
        preserveAspectRatio="none"
        style="image-rendering:optimizeQuality"
-       id="image4277"
+       id="image0"
        x="0"
        y="-27.637316" />
+    <image
+       sodipodi:absref="/home/peter/VOC/intro-outro-generator/foss4g-2016/artwork/Panorama-v-Stadthaus-2013-02.jpg"
+       xlink:href="Panorama-v-Stadthaus-2013-02.jpg"
+       width="2220.386"
+       height="1110.0364"
+       preserveAspectRatio="none"
+       style="opacity:0;image-rendering:optimizeQuality"
+       id="image1"
+       x="-191.62154"
+       y="-33.373199" />
+    <image
+       sodipodi:absref="/home/peter/VOC/intro-outro-generator/foss4g-2016/artwork/ship.jpg"
+       xlink:href="ship.jpg"
+       width="1985.7144"
+       height="1116.9644"
+       preserveAspectRatio="none"
+       style="opacity:0;image-rendering:optimizeQuality"
+       id="image2"
+       x="-14.285739"
+       y="-39.066048" />
   </g>
   <g
      inkscape:groupmode="layer"
@@ -212,7 +232,7 @@
     <flowRoot
        xml:space="preserve"
        id="text"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:40px;line-height:559.99999046%;font-family:'TeX Gyre Adventor';-inkscape-font-specification:'TeX Gyre Adventor, Normal';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2.00000024;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:40px;line-height:559.99999046%;font-family:'TeX Gyre Adventor';-inkscape-font-specification:'TeX Gyre Adventor, Normal';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1.50000012;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:2;stroke-dasharray:none;stroke-opacity:1"
        inkscape:label="#flowRoot4837"><flowRegion
          id="flowRegion4839"><rect
            id="rect4841"
@@ -221,10 +241,10 @@
            x="20"
            y="530"
            ry="0"
-           style="stroke:#ffffff;stroke-width:2.00000024;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /></flowRegion><flowPara
+           style="stroke:#ffffff;stroke-width:1.50000012;stroke-miterlimit:2;stroke-dasharray:none;stroke-opacity:1" /></flowRegion><flowPara
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:93.75000763px;line-height:120.00000477%;font-family:'Passion One';-inkscape-font-specification:'Passion One';letter-spacing:0.75000006px;fill:#2980b9;fill-opacity:1;stroke:#ffffff;stroke-width:2.00000024;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:93.75000763px;line-height:120.00000477%;font-family:'Passion One';-inkscape-font-specification:'Passion One';letter-spacing:0.75000006px;fill:#2980b9;fill-opacity:1;stroke:#ffffff;stroke-width:1.50000012;stroke-linejoin:round;stroke-miterlimit:2;stroke-dasharray:none;stroke-opacity:1"
-         id="flowPara4845">$title</flowPara><flowPara
+         id="flowPara4225">$title</flowPara><flowPara
-         style="font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:62.50000381px;line-height:120.00000477%;font-family:'Open Sans';-inkscape-font-specification:'Open Sans Italic';fill:#cbd7d7;fill-opacity:1;stroke:none;stroke-width:2.00000024;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         style="font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:62.50000381px;line-height:120.00000477%;font-family:'Open Sans';-inkscape-font-specification:'Open Sans Italic';fill:#cbd7d7;fill-opacity:1;stroke:#404040;stroke-width:1.50000012;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:2;stroke-dasharray:none;stroke-opacity:1"
          id="flowPara5781">$personnames</flowPara></flowRoot>    <g
        transform="translate(393.29805,-6.6448132)"
        id="g4397">