diff options
author | Christian Pointner <equinox@spreadspace.org> | 2018-02-03 00:14:04 +0100 |
---|---|---|
committer | Christian Pointner <equinox@spreadspace.org> | 2018-02-03 00:14:04 +0100 |
commit | bc55198e0ebd1fad58e8b10d9ecbdfab91edee68 (patch) | |
tree | 6b867de91916baa4c948aa903b58b388956b97c6 | |
parent | minor fix (diff) |
reorganized template dir
-rwxr-xr-x | src/flufigut.py | 4 | ||||
-rw-r--r-- | templates/default/flumotion/aac-encode.xml (renamed from templates/flumotion/default/aac-encode.xml) | 0 | ||||
-rw-r--r-- | templates/default/flumotion/audio-resample.xml (renamed from templates/flumotion/default/audio-resample.xml) | 0 | ||||
-rw-r--r-- | templates/default/flumotion/audiotest.xml (renamed from templates/flumotion/default/audiotest.xml) | 0 | ||||
-rw-r--r-- | templates/default/flumotion/decklink.xml (renamed from templates/flumotion/default/decklink.xml) | 0 | ||||
-rw-r--r-- | templates/default/flumotion/flv-mux.xml (renamed from templates/flumotion/default/flv-mux.xml) | 0 | ||||
-rw-r--r-- | templates/default/flumotion/h264-encode.xml (renamed from templates/flumotion/default/h264-encode.xml) | 0 | ||||
-rw-r--r-- | templates/default/flumotion/http-stream.xml (renamed from templates/flumotion/default/http-stream.xml) | 0 | ||||
-rw-r--r-- | templates/default/flumotion/mjpeg-encode.xml (renamed from templates/flumotion/default/mjpeg-encode.xml) | 0 | ||||
-rw-r--r-- | templates/default/flumotion/mkv-mux.xml (renamed from templates/flumotion/default/mkv-mux.xml) | 0 | ||||
-rw-r--r-- | templates/default/flumotion/mp3-encode.xml (renamed from templates/flumotion/default/mp3-encode.xml) | 0 | ||||
-rw-r--r-- | templates/default/flumotion/mp3-mux.xml (renamed from templates/flumotion/default/mp3-mux.xml) | 0 | ||||
-rw-r--r-- | templates/default/flumotion/mpeg2-encode.xml (renamed from templates/flumotion/default/mpeg2-encode.xml) | 0 | ||||
-rw-r--r-- | templates/default/flumotion/mpegts-mux.xml (renamed from templates/flumotion/default/mpegts-mux.xml) | 0 | ||||
-rw-r--r-- | templates/default/flumotion/ogg-mux.xml (renamed from templates/flumotion/default/ogg-mux.xml) | 0 | ||||
-rw-r--r-- | templates/default/flumotion/opus-encode.xml (renamed from templates/flumotion/default/opus-encode.xml) | 0 | ||||
-rw-r--r-- | templates/default/flumotion/planet.xml (renamed from templates/flumotion/default/planet.xml) | 0 | ||||
-rw-r--r-- | templates/default/flumotion/porter.xml (renamed from templates/flumotion/default/porter.xml) | 0 | ||||
-rw-r--r-- | templates/default/flumotion/raw-encode.xml (renamed from templates/flumotion/default/raw-encode.xml) | 0 | ||||
-rw-r--r-- | templates/default/flumotion/recorder.xml (renamed from templates/flumotion/default/recorder.xml) | 0 | ||||
-rw-r--r-- | templates/default/flumotion/repeater.xml (renamed from templates/flumotion/default/repeater.xml) | 0 | ||||
-rw-r--r-- | templates/default/flumotion/soundcard.xml (renamed from templates/flumotion/default/soundcard.xml) | 0 | ||||
-rw-r--r-- | templates/default/flumotion/video-resize.xml (renamed from templates/flumotion/default/video-resize.xml) | 0 | ||||
-rw-r--r-- | templates/default/flumotion/videotest.xml (renamed from templates/flumotion/default/videotest.xml) | 0 | ||||
-rw-r--r-- | templates/default/flumotion/vorbis-encode.xml (renamed from templates/flumotion/default/vorbis-encode.xml) | 0 | ||||
-rw-r--r-- | templates/default/flumotion/vp8-encode.xml (renamed from templates/flumotion/default/vp8-encode.xml) | 0 | ||||
-rw-r--r-- | templates/default/flumotion/webm-mux.xml (renamed from templates/flumotion/default/webm-mux.xml) | 0 | ||||
-rw-r--r-- | templates/default/flumotion/worker.xml (renamed from templates/flumotion/default/worker.xml) | 0 |
28 files changed, 2 insertions, 2 deletions
diff --git a/src/flufigut.py b/src/flufigut.py index e674118..39d4c71 100755 --- a/src/flufigut.py +++ b/src/flufigut.py @@ -514,7 +514,7 @@ class Planet: return self._unassigned_components def toXML(self, template_dir, output_file): - loader = jinja2.FileSystemLoader(os.path.join(template_dir, self._desc.globals['templates'])) + loader = jinja2.FileSystemLoader(os.path.join(template_dir, self._desc.globals['templates'], 'flumotion')) env = jinja2.Environment(loader=loader, line_statement_prefix='%%') template = env.get_template('planet.xml') planet_xml = template.render(globals=self._desc.globals, atmosphere=self.atmosphere, flow=self.flow) @@ -549,7 +549,7 @@ if __name__ == '__main__': print("- " + c) sys.exit(1) - p.toXML('../templates/flumotion/', 'output/planet.xml') + p.toXML('../templates/', 'output/planet.xml') print("****************************************************") print("** atmosphere **") diff --git a/templates/flumotion/default/aac-encode.xml b/templates/default/flumotion/aac-encode.xml index 950f144..950f144 100644 --- a/templates/flumotion/default/aac-encode.xml +++ b/templates/default/flumotion/aac-encode.xml diff --git a/templates/flumotion/default/audio-resample.xml b/templates/default/flumotion/audio-resample.xml index 7182b01..7182b01 100644 --- a/templates/flumotion/default/audio-resample.xml +++ b/templates/default/flumotion/audio-resample.xml diff --git a/templates/flumotion/default/audiotest.xml b/templates/default/flumotion/audiotest.xml index 9e0f208..9e0f208 100644 --- a/templates/flumotion/default/audiotest.xml +++ b/templates/default/flumotion/audiotest.xml diff --git a/templates/flumotion/default/decklink.xml b/templates/default/flumotion/decklink.xml index cc82727..cc82727 100644 --- a/templates/flumotion/default/decklink.xml +++ b/templates/default/flumotion/decklink.xml diff --git a/templates/flumotion/default/flv-mux.xml b/templates/default/flumotion/flv-mux.xml index be77ddb..be77ddb 100644 --- a/templates/flumotion/default/flv-mux.xml +++ b/templates/default/flumotion/flv-mux.xml diff --git a/templates/flumotion/default/h264-encode.xml b/templates/default/flumotion/h264-encode.xml index a3c6edc..a3c6edc 100644 --- a/templates/flumotion/default/h264-encode.xml +++ b/templates/default/flumotion/h264-encode.xml diff --git a/templates/flumotion/default/http-stream.xml b/templates/default/flumotion/http-stream.xml index d0cce33..d0cce33 100644 --- a/templates/flumotion/default/http-stream.xml +++ b/templates/default/flumotion/http-stream.xml diff --git a/templates/flumotion/default/mjpeg-encode.xml b/templates/default/flumotion/mjpeg-encode.xml index da8947e..da8947e 100644 --- a/templates/flumotion/default/mjpeg-encode.xml +++ b/templates/default/flumotion/mjpeg-encode.xml diff --git a/templates/flumotion/default/mkv-mux.xml b/templates/default/flumotion/mkv-mux.xml index 0be8da0..0be8da0 100644 --- a/templates/flumotion/default/mkv-mux.xml +++ b/templates/default/flumotion/mkv-mux.xml diff --git a/templates/flumotion/default/mp3-encode.xml b/templates/default/flumotion/mp3-encode.xml index 10255df..10255df 100644 --- a/templates/flumotion/default/mp3-encode.xml +++ b/templates/default/flumotion/mp3-encode.xml diff --git a/templates/flumotion/default/mp3-mux.xml b/templates/default/flumotion/mp3-mux.xml index f7ac81d..f7ac81d 100644 --- a/templates/flumotion/default/mp3-mux.xml +++ b/templates/default/flumotion/mp3-mux.xml diff --git a/templates/flumotion/default/mpeg2-encode.xml b/templates/default/flumotion/mpeg2-encode.xml index 05a56c4..05a56c4 100644 --- a/templates/flumotion/default/mpeg2-encode.xml +++ b/templates/default/flumotion/mpeg2-encode.xml diff --git a/templates/flumotion/default/mpegts-mux.xml b/templates/default/flumotion/mpegts-mux.xml index 8d8be6a..8d8be6a 100644 --- a/templates/flumotion/default/mpegts-mux.xml +++ b/templates/default/flumotion/mpegts-mux.xml diff --git a/templates/flumotion/default/ogg-mux.xml b/templates/default/flumotion/ogg-mux.xml index 8827be1..8827be1 100644 --- a/templates/flumotion/default/ogg-mux.xml +++ b/templates/default/flumotion/ogg-mux.xml diff --git a/templates/flumotion/default/opus-encode.xml b/templates/default/flumotion/opus-encode.xml index 531bd84..531bd84 100644 --- a/templates/flumotion/default/opus-encode.xml +++ b/templates/default/flumotion/opus-encode.xml diff --git a/templates/flumotion/default/planet.xml b/templates/default/flumotion/planet.xml index 9c4e31a..9c4e31a 100644 --- a/templates/flumotion/default/planet.xml +++ b/templates/default/flumotion/planet.xml diff --git a/templates/flumotion/default/porter.xml b/templates/default/flumotion/porter.xml index 86b72b3..86b72b3 100644 --- a/templates/flumotion/default/porter.xml +++ b/templates/default/flumotion/porter.xml diff --git a/templates/flumotion/default/raw-encode.xml b/templates/default/flumotion/raw-encode.xml index c5e1c61..c5e1c61 100644 --- a/templates/flumotion/default/raw-encode.xml +++ b/templates/default/flumotion/raw-encode.xml diff --git a/templates/flumotion/default/recorder.xml b/templates/default/flumotion/recorder.xml index b2fce9e..b2fce9e 100644 --- a/templates/flumotion/default/recorder.xml +++ b/templates/default/flumotion/recorder.xml diff --git a/templates/flumotion/default/repeater.xml b/templates/default/flumotion/repeater.xml index aa469ec..aa469ec 100644 --- a/templates/flumotion/default/repeater.xml +++ b/templates/default/flumotion/repeater.xml diff --git a/templates/flumotion/default/soundcard.xml b/templates/default/flumotion/soundcard.xml index 23df8a4..23df8a4 100644 --- a/templates/flumotion/default/soundcard.xml +++ b/templates/default/flumotion/soundcard.xml diff --git a/templates/flumotion/default/video-resize.xml b/templates/default/flumotion/video-resize.xml index 7f858b9..7f858b9 100644 --- a/templates/flumotion/default/video-resize.xml +++ b/templates/default/flumotion/video-resize.xml diff --git a/templates/flumotion/default/videotest.xml b/templates/default/flumotion/videotest.xml index 342d645..342d645 100644 --- a/templates/flumotion/default/videotest.xml +++ b/templates/default/flumotion/videotest.xml diff --git a/templates/flumotion/default/vorbis-encode.xml b/templates/default/flumotion/vorbis-encode.xml index 83471fd..83471fd 100644 --- a/templates/flumotion/default/vorbis-encode.xml +++ b/templates/default/flumotion/vorbis-encode.xml diff --git a/templates/flumotion/default/vp8-encode.xml b/templates/default/flumotion/vp8-encode.xml index 79dfdc9..79dfdc9 100644 --- a/templates/flumotion/default/vp8-encode.xml +++ b/templates/default/flumotion/vp8-encode.xml diff --git a/templates/flumotion/default/webm-mux.xml b/templates/default/flumotion/webm-mux.xml index ac58f13..ac58f13 100644 --- a/templates/flumotion/default/webm-mux.xml +++ b/templates/default/flumotion/webm-mux.xml diff --git a/templates/flumotion/default/worker.xml b/templates/default/flumotion/worker.xml index b6f4667..b6f4667 100644 --- a/templates/flumotion/default/worker.xml +++ b/templates/default/flumotion/worker.xml |