From ebaecb018a797ac9bf29ca6731dedf2cc89b2441 Mon Sep 17 00:00:00 2001
From: MaZderMind
Date: Sat, 18 Oct 2014 14:31:23 +0200
Subject: move player templates to subfolder

---
 template/assemblies/player-video.phtml | 30 ------------------------------
 template/player.phtml                  |  2 +-
 template/players/video.phtml           | 30 ++++++++++++++++++++++++++++++
 3 files changed, 31 insertions(+), 31 deletions(-)
 delete mode 100644 template/assemblies/player-video.phtml
 create mode 100644 template/players/video.phtml

diff --git a/template/assemblies/player-video.phtml b/template/assemblies/player-video.phtml
deleted file mode 100644
index 824a776..0000000
--- a/template/assemblies/player-video.phtml
+++ /dev/null
@@ -1,30 +0,0 @@
-<video
-	autoplay="autoplay"
-	controls="controls"
-	id="video-tag"
-	preload="auto"
-	width="<?=h($width)?>"
-	height="<?=h($height)?>"
->
-	<source
-		data-plugin-type="flash"
-		src="rtmp://rtmp.streaming.media.ccc.de:1935/stream/<?=h($room)?>_<?=h($language)?>_<?=h($format)?>"
-		title="h.H264 (RTMP)"
-		type="video/rtmp"
-	/>
-	<source
-		data-plugin-type="native"
-		src="http://hls.streaming.media.ccc.de/hls/<?=h($room)?>_<?=h($language)?>_<?=h($format)?>.m3u8"
-		title="h.264 (HLS)"
-		type="application/vnd.apple.mpegURL"
-	/>
-
-	<object
-		data="static/flashmediaelement.swf"
-		type="application/x-shockwave-flash"
-		width="<?=h($width)?>"
-		height="<?=h($height)?>"
-	>
-		<param name="allowFullScreen" value="true">
-	</object>
-</video>
diff --git a/template/player.phtml b/template/player.phtml
index f663213..9fe7bfb 100644
--- a/template/player.phtml
+++ b/template/player.phtml
@@ -1,2 +1,2 @@
 A Player:<br />
-<? include("player-$playertype.phtml") ?>
\ No newline at end of file
+<? include("players/$playertype.phtml") ?>
\ No newline at end of file
diff --git a/template/players/video.phtml b/template/players/video.phtml
new file mode 100644
index 0000000..824a776
--- /dev/null
+++ b/template/players/video.phtml
@@ -0,0 +1,30 @@
+<video
+	autoplay="autoplay"
+	controls="controls"
+	id="video-tag"
+	preload="auto"
+	width="<?=h($width)?>"
+	height="<?=h($height)?>"
+>
+	<source
+		data-plugin-type="flash"
+		src="rtmp://rtmp.streaming.media.ccc.de:1935/stream/<?=h($room)?>_<?=h($language)?>_<?=h($format)?>"
+		title="h.H264 (RTMP)"
+		type="video/rtmp"
+	/>
+	<source
+		data-plugin-type="native"
+		src="http://hls.streaming.media.ccc.de/hls/<?=h($room)?>_<?=h($language)?>_<?=h($format)?>.m3u8"
+		title="h.264 (HLS)"
+		type="application/vnd.apple.mpegURL"
+	/>
+
+	<object
+		data="static/flashmediaelement.swf"
+		type="application/x-shockwave-flash"
+		width="<?=h($width)?>"
+		height="<?=h($height)?>"
+	>
+		<param name="allowFullScreen" value="true">
+	</object>
+</video>
-- 
cgit v1.2.3