27 files changed, 8 insertions, 9 deletions
diff --git a/templates/default/flumotion/aac-encode.xml b/templates/default/flumotion/aac-encode.xml.j2
index 950f144..950f144 100644
--- a/templates/default/flumotion/aac-encode.xml
+++ b/templates/default/flumotion/aac-encode.xml.j2
diff --git a/templates/default/flumotion/audio-resample.xml b/templates/default/flumotion/audio-resample.xml.j2
index 7182b01..7182b01 100644
--- a/templates/default/flumotion/audio-resample.xml
+++ b/templates/default/flumotion/audio-resample.xml.j2
diff --git a/templates/default/flumotion/audiotest.xml b/templates/default/flumotion/audiotest.xml.j2
index 9e0f208..9e0f208 100644
--- a/templates/default/flumotion/audiotest.xml
+++ b/templates/default/flumotion/audiotest.xml.j2
diff --git a/templates/default/flumotion/decklink.xml b/templates/default/flumotion/decklink.xml.j2
index cc82727..cc82727 100644
--- a/templates/default/flumotion/decklink.xml
+++ b/templates/default/flumotion/decklink.xml.j2
diff --git a/templates/default/flumotion/flv-mux.xml b/templates/default/flumotion/flv-mux.xml.j2
index be77ddb..be77ddb 100644
--- a/templates/default/flumotion/flv-mux.xml
+++ b/templates/default/flumotion/flv-mux.xml.j2
diff --git a/templates/default/flumotion/h264-encode.xml b/templates/default/flumotion/h264-encode.xml.j2
index a3c6edc..a3c6edc 100644
--- a/templates/default/flumotion/h264-encode.xml
+++ b/templates/default/flumotion/h264-encode.xml.j2
diff --git a/templates/default/flumotion/http-stream.xml b/templates/default/flumotion/http-stream.xml.j2
index d0cce33..d0cce33 100644
--- a/templates/default/flumotion/http-stream.xml
+++ b/templates/default/flumotion/http-stream.xml.j2
diff --git a/templates/default/flumotion/mjpeg-encode.xml b/templates/default/flumotion/mjpeg-encode.xml.j2
index da8947e..da8947e 100644
--- a/templates/default/flumotion/mjpeg-encode.xml
+++ b/templates/default/flumotion/mjpeg-encode.xml.j2
diff --git a/templates/default/flumotion/mkv-mux.xml b/templates/default/flumotion/mkv-mux.xml.j2
index 0be8da0..0be8da0 100644
--- a/templates/default/flumotion/mkv-mux.xml
+++ b/templates/default/flumotion/mkv-mux.xml.j2
diff --git a/templates/default/flumotion/mp3-encode.xml b/templates/default/flumotion/mp3-encode.xml.j2
index 10255df..10255df 100644
--- a/templates/default/flumotion/mp3-encode.xml
+++ b/templates/default/flumotion/mp3-encode.xml.j2
diff --git a/templates/default/flumotion/mp3-mux.xml b/templates/default/flumotion/mp3-mux.xml.j2
index f7ac81d..f7ac81d 100644
--- a/templates/default/flumotion/mp3-mux.xml
+++ b/templates/default/flumotion/mp3-mux.xml.j2
diff --git a/templates/default/flumotion/mpeg2-encode.xml b/templates/default/flumotion/mpeg2-encode.xml.j2
index 05a56c4..05a56c4 100644
--- a/templates/default/flumotion/mpeg2-encode.xml
+++ b/templates/default/flumotion/mpeg2-encode.xml.j2
diff --git a/templates/default/flumotion/mpegts-mux.xml b/templates/default/flumotion/mpegts-mux.xml.j2
index 8d8be6a..8d8be6a 100644
--- a/templates/default/flumotion/mpegts-mux.xml
+++ b/templates/default/flumotion/mpegts-mux.xml.j2
diff --git a/templates/default/flumotion/ogg-mux.xml b/templates/default/flumotion/ogg-mux.xml.j2
index 8827be1..8827be1 100644
--- a/templates/default/flumotion/ogg-mux.xml
+++ b/templates/default/flumotion/ogg-mux.xml.j2
diff --git a/templates/default/flumotion/opus-encode.xml b/templates/default/flumotion/opus-encode.xml.j2
index 531bd84..531bd84 100644
--- a/templates/default/flumotion/opus-encode.xml
+++ b/templates/default/flumotion/opus-encode.xml.j2
diff --git a/templates/default/flumotion/planet.xml b/templates/default/flumotion/planet.xml.j2
index 9c4e31a..2f99c0e 100644
--- a/templates/default/flumotion/planet.xml
+++ b/templates/default/flumotion/planet.xml.j2
@@ -14,44 +14,44 @@
 
   <atmosphere>
 {% for name, component in atmosphere.items() %}
-{% include '%s.xml' % component.type %}
+{% include '%s.xml.j2' % component.type %}
 {% endfor %}
   </atmosphere>
 
   <flow name="{{ globals.name }}">
 <!-- raw-input, resizing and resampling -->
 {% for name, component in flow['inputs'].items() %}
-{% include '%s.xml' % component.type %}
+{% include '%s.xml.j2' % component.type %}
 {% endfor %}
 
 <!-- encoding -->
   <!-- audio -->
 {% for name, component in flow['encoders-audio'].items() %}
-{% include '%s.xml' % component.type %}
+{% include '%s.xml.j2' % component.type %}
 {% endfor %}
   <!-- video -->
 {% for name, component in flow['encoders-video'].items() %}
-{% include '%s.xml' % component.type %}
+{% include '%s.xml.j2' % component.type %}
 {% endfor %}
 
 <!-- muxing -->
 {% for name, component in flow['muxers'].items() %}
-{% include '%s.xml' % component.type %}
+{% include '%s.xml.j2' % component.type %}
 {% endfor %}
 
 <!-- repeater -->
 {% for name, component in flow['repeaters'].items() %}
-{% include '%s.xml' % component.type %}
+{% include '%s.xml.j2' % component.type %}
 {% endfor %}
 
 <!-- streaming -->
 {% for name, component in flow['streamers'].items() %}
-{% include '%s.xml' % component.type %}
+{% include '%s.xml.j2' % component.type %}
 {% endfor %}
 
 <!-- recording -->
 {% for name, component in flow['recorders'].items() %}
-{% include '%s.xml' % component.type %}
+{% include '%s.xml.j2' % component.type %}
 {% endfor %}
   </flow>
 
diff --git a/templates/default/flumotion/porter.xml b/templates/default/flumotion/porter.xml.j2
index 86b72b3..86b72b3 100644
--- a/templates/default/flumotion/porter.xml
+++ b/templates/default/flumotion/porter.xml.j2
diff --git a/templates/default/flumotion/raw-encode.xml b/templates/default/flumotion/raw-encode.xml.j2
index c5e1c61..c5e1c61 100644
--- a/templates/default/flumotion/raw-encode.xml
+++ b/templates/default/flumotion/raw-encode.xml.j2
diff --git a/templates/default/flumotion/recorder.xml b/templates/default/flumotion/recorder.xml.j2
index b2fce9e..b2fce9e 100644
--- a/templates/default/flumotion/recorder.xml
+++ b/templates/default/flumotion/recorder.xml.j2
diff --git a/templates/default/flumotion/repeater.xml b/templates/default/flumotion/repeater.xml.j2
index aa469ec..aa469ec 100644
--- a/templates/default/flumotion/repeater.xml
+++ b/templates/default/flumotion/repeater.xml.j2
diff --git a/templates/default/flumotion/soundcard.xml b/templates/default/flumotion/soundcard.xml.j2
index 23df8a4..23df8a4 100644
--- a/templates/default/flumotion/soundcard.xml
+++ b/templates/default/flumotion/soundcard.xml.j2
diff --git a/templates/default/flumotion/video-resize.xml b/templates/default/flumotion/video-resize.xml.j2
index 7f858b9..7f858b9 100644
--- a/templates/default/flumotion/video-resize.xml
+++ b/templates/default/flumotion/video-resize.xml.j2
diff --git a/templates/default/flumotion/videotest.xml b/templates/default/flumotion/videotest.xml.j2
index 342d645..342d645 100644
--- a/templates/default/flumotion/videotest.xml
+++ b/templates/default/flumotion/videotest.xml.j2
diff --git a/templates/default/flumotion/vorbis-encode.xml b/templates/default/flumotion/vorbis-encode.xml.j2
index 83471fd..83471fd 100644
--- a/templates/default/flumotion/vorbis-encode.xml
+++ b/templates/default/flumotion/vorbis-encode.xml.j2
diff --git a/templates/default/flumotion/vp8-encode.xml b/templates/default/flumotion/vp8-encode.xml.j2
index 79dfdc9..dfb07d7 100644
--- a/templates/default/flumotion/vp8-encode.xml
+++ b/templates/default/flumotion/vp8-encode.xml.j2
@@ -1,4 +1,3 @@
-
     <component name="{{ name }}"
                type="pipeline-converter"
                label="{{ component.desc }}"
diff --git a/templates/default/flumotion/webm-mux.xml b/templates/default/flumotion/webm-mux.xml.j2
index ac58f13..ac58f13 100644
--- a/templates/default/flumotion/webm-mux.xml
+++ b/templates/default/flumotion/webm-mux.xml.j2
diff --git a/templates/default/flumotion/worker.xml b/templates/default/flumotion/worker.xml.j2
index b6f4667..b6f4667 100644
--- a/templates/default/flumotion/worker.xml
+++ b/templates/default/flumotion/worker.xml.j2