From 5350c78adf023f9086d4dda631fcc1bfc3f3d879 Mon Sep 17 00:00:00 2001
From: MaZderMind
Date: Sun, 19 Oct 2014 13:55:21 +0200
Subject: rename player files

---
 template/assemblies/player/audio.phtml   | 39 ++++++++++++++++++++++++++++++++
 template/assemblies/player/slides.phtml  | 39 ++++++++++++++++++++++++++++++++
 template/assemblies/player/video.phtml   | 35 ++++++++++++++++++++++++++++
 template/assemblies/players/audio.phtml  | 39 --------------------------------
 template/assemblies/players/slides.phtml | 39 --------------------------------
 template/assemblies/players/video.phtml  | 37 ------------------------------
 template/room.phtml                      |  2 +-
 7 files changed, 114 insertions(+), 116 deletions(-)
 create mode 100644 template/assemblies/player/audio.phtml
 create mode 100644 template/assemblies/player/slides.phtml
 create mode 100644 template/assemblies/player/video.phtml
 delete mode 100644 template/assemblies/players/audio.phtml
 delete mode 100644 template/assemblies/players/slides.phtml
 delete mode 100644 template/assemblies/players/video.phtml

diff --git a/template/assemblies/player/audio.phtml b/template/assemblies/player/audio.phtml
new file mode 100644
index 0000000..f9993c1
--- /dev/null
+++ b/template/assemblies/player/audio.phtml
@@ -0,0 +1,39 @@
+<pre><?=print_r(array(
+	'file' => basename(__FILE__),
+	'room' => $room,
+	'language' => $language,
+	'format' => $format
+), true)?></pre>
+
+<?/*
+<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/assemblies/player/slides.phtml b/template/assemblies/player/slides.phtml
new file mode 100644
index 0000000..f9993c1
--- /dev/null
+++ b/template/assemblies/player/slides.phtml
@@ -0,0 +1,39 @@
+<pre><?=print_r(array(
+	'file' => basename(__FILE__),
+	'room' => $room,
+	'language' => $language,
+	'format' => $format
+), true)?></pre>
+
+<?/*
+<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/assemblies/player/video.phtml b/template/assemblies/player/video.phtml
new file mode 100644
index 0000000..03026f7
--- /dev/null
+++ b/template/assemblies/player/video.phtml
@@ -0,0 +1,35 @@
+<video
+	autoplay="autoplay"
+	controls="controls"
+	id="video-tag"
+	preload="auto"
+	width="<?=h($width)?>"
+	height="<?=h($height)?>"
+>
+	<source
+		data-plugin-type="flash"
+		src="<?=h(link_stream('rtmp', $room, $format, $translated))?>"
+		title="h.H264 (RTMP)"
+		type="video/rtmp"
+	/>
+	<source
+		data-plugin-type="native"
+		src="<?=h(link_stream('hls', $room, $format, $translated))?>"
+		title="h.264 (HLS)"
+		type="application/vnd.apple.mpegURL"
+	/>
+
+	<object
+		data="assets/js/lib/flashmediaelement.swf"
+		type="application/x-shockwave-flash"
+		width="<?=h($width)?>"
+		height="<?=h($height)?>"
+	>
+		<param name="movie" value="assets/js/lib/flashmediaelement.swf" />
+		<param name="flashvars" value="controls=true&file=<?=h(link_stream('rtmp', $room, $format, $translated))?>" />
+
+		<param name="allowFullScreen" value="true">
+
+		<pre>Sorry, Lynx is not supported.</pre>
+	</object>
+</video>
diff --git a/template/assemblies/players/audio.phtml b/template/assemblies/players/audio.phtml
deleted file mode 100644
index f9993c1..0000000
--- a/template/assemblies/players/audio.phtml
+++ /dev/null
@@ -1,39 +0,0 @@
-<pre><?=print_r(array(
-	'file' => basename(__FILE__),
-	'room' => $room,
-	'language' => $language,
-	'format' => $format
-), true)?></pre>
-
-<?/*
-<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/assemblies/players/slides.phtml b/template/assemblies/players/slides.phtml
deleted file mode 100644
index f9993c1..0000000
--- a/template/assemblies/players/slides.phtml
+++ /dev/null
@@ -1,39 +0,0 @@
-<pre><?=print_r(array(
-	'file' => basename(__FILE__),
-	'room' => $room,
-	'language' => $language,
-	'format' => $format
-), true)?></pre>
-
-<?/*
-<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/assemblies/players/video.phtml b/template/assemblies/players/video.phtml
deleted file mode 100644
index ca0e87b..0000000
--- a/template/assemblies/players/video.phtml
+++ /dev/null
@@ -1,37 +0,0 @@
-<pre><?=print_r(array(
-	'file' => basename(__FILE__),
-	'room' => $room,
-	'language' => $language,
-	'format' => $format
-), true)?></pre>
-
-<video
-	autoplay="autoplay"
-	controls="controls"
-	id="video-tag"
-	preload="auto"
-	width="<?=h($width)?>"
-	height="<?=h($height)?>"
->
-	<source
-		data-plugin-type="flash"
-		src="<?=h(link_stream('rtmp', $room, $format, $translated))?>"
-		title="h.H264 (RTMP)"
-		type="video/rtmp"
-	/>
-	<source
-		data-plugin-type="native"
-		src="<?=h(link_stream('hls', $room, $format, $translated))?>"
-		title="h.264 (HLS)"
-		type="application/vnd.apple.mpegURL"
-	/>
-
-	<object
-		data="/assets/js/lib/flashmediaelement.swf"
-		type="application/x-shockwave-flash"
-		width="<?=h($width)?>"
-		height="<?=h($height)?>"
-	>
-		<param name="allowFullScreen" value="true">
-	</object>
-</video>
diff --git a/template/room.phtml b/template/room.phtml
index 81e3af8..1060652 100644
--- a/template/room.phtml
+++ b/template/room.phtml
@@ -15,7 +15,7 @@
 
 
 	<div class="tab-content">
-		<? include("assemblies/players/$type.phtml") ?>
+		<? include("assemblies/player/$type.phtml") ?>
 		<div class="switcher">
 			<? include("assemblies/switcher/$type.phtml") ?>
 		</div>
-- 
cgit v1.2.3