diff --git a/fsck2025/__init__.py b/fsck2025/__init__.py
index deb0206..8aaa563 100644
--- a/fsck2025/__init__.py
+++ b/fsck2025/__init__.py
@@ -5,7 +5,7 @@ from schedulelib import *
from easing import *
# URL to Schedule-XML
-scheduleUrl = "https://cfp.ctbk.de/fsck-2024/schedule/export/schedule.xml"
+scheduleUrl = "https://cfp.ctbk.de/fsck-2025/schedule/export/schedule.xml"
def introFrames(args):
@@ -164,12 +164,12 @@ def debug():
def tasks(queue, args, idlist, skiplist):
# iterate over all events extracted from the schedule xml-export
for event in events(scheduleUrl):
- if event["room"] not in ("Medientheater", "Vortragssaal", "Blauer Salon"):
- print("skipping room %s (%s)" % (event["room"], event["title"]))
- continue
- if event["day"] not in ("0", "1", "2", "3", "4"):
- print("skipping day %s" % (event["day"]))
- continue
+ # if event["room"] not in ("Medientheater", "Vortragssaal", "Blauer Salon"):
+ # print("skipping room %s (%s)" % (event["room"], event["title"]))
+ # continue
+ # if event["day"] not in ("0", "1", "2", "3", "4"):
+ # print("skipping day %s" % (event["day"]))
+ # continue
if not (idlist == []):
if 000000 in idlist:
print("skipping id (%s [%s])" % (event["title"], event["id"]))
@@ -191,14 +191,14 @@ def tasks(queue, args, idlist, skiplist):
)
)
- # place a task for the outro into the queue
- if not "out" in skiplist:
- queue.put(
- Rendertask(infile="outro.svg", outfile="outro.ts", sequence=outroFrames)
- )
+ # # place a task for the outro into the queue
+ # if not "out" in skiplist:
+ # queue.put(
+ # Rendertask(infile="outro.svg", outfile="outro.ts", sequence=outroFrames)
+ # )
- if not "pause" in skiplist:
- # place the pause-sequence into the queue
- queue.put(
- Rendertask(infile="pause.svg", outfile="pause.ts", sequence=pauseFrames)
- )
+ # if not "pause" in skiplist:
+ # # place the pause-sequence into the queue
+ # queue.put(
+ # Rendertask(infile="pause.svg", outfile="pause.ts", sequence=pauseFrames)
+ # )
diff --git a/fsck2025/artwork/intro-soundtrack.flac b/fsck2025/artwork/intro-old.flac
similarity index 100%
rename from fsck2025/artwork/intro-soundtrack.flac
rename to fsck2025/artwork/intro-old.flac
diff --git a/fsck2025/artwork/intro.flac b/fsck2025/artwork/intro.flac
new file mode 100644
index 0000000..a1ad790
Binary files /dev/null and b/fsck2025/artwork/intro.flac differ
diff --git a/fsck2025/artwork/intro.svg b/fsck2025/artwork/intro.svg
index 6da939f..46cd44c 100644
--- a/fsck2025/artwork/intro.svg
+++ b/fsck2025/artwork/intro.svg
@@ -2,43 +2,78 @@
+ id="path1" />$title
+ $personnames
\ No newline at end of file
diff --git a/renderlib.py b/renderlib.py
index bf18748..b7b942d 100644
--- a/renderlib.py
+++ b/renderlib.py
@@ -101,9 +101,9 @@ def renderFrame(infile, task, outfile):
elif args.resvg:
# invoke inkscape to convert the generated svg-file into a png inside the .frames-directory
cmd = 'resvg --background white --width={1} --height={2} "{4}" "{3}" 2>&1 >/dev/null'.format(
- task.workdir, width, height, outfile, infile)
+ task.workdir, width, height, os.path.abspath(outfile), os.path.abspath(infile))
errorReturn = subprocess.check_output(
- cmd, shell=True, universal_newlines=True, stderr=subprocess.STDOUT, cwd=task.workdir)
+ cmd, shell=True, universal_newlines=True, cwd=task.workdir)
if errorReturn != '':
print("resvg exited with error\n" + errorReturn)
# sys.exit(42)