aboutsummaryrefslogtreecommitdiff
path: root/template/assemblies
diff options
context:
space:
mode:
authorMaZderMind2014-10-19 20:47:36 +0200
committerMaZderMind2014-10-19 20:47:36 +0200
commit48d947b34e87a26ba8bdbc55861bb6cd451a3ccc (patch)
tree4a88ab7634b853a2c700e11d9e7ee1a7825bc649 /template/assemblies
parent51a8f9ebef4294513c5fde5d2bec8d2b34a33f49 (diff)
audio player page
Diffstat (limited to '')
-rw-r--r--template/assemblies/player/audio.phtml43
-rw-r--r--template/assemblies/switcher/audio.phtml23
2 files changed, 32 insertions, 34 deletions
diff --git a/template/assemblies/player/audio.phtml b/template/assemblies/player/audio.phtml
index f9993c1..a53e2e9 100644
--- a/template/assemblies/player/audio.phtml
+++ b/template/assemblies/player/audio.phtml
@@ -1,39 +1,18 @@
-<pre><?=print_r(array(
- 'file' => basename(__FILE__),
- 'room' => $room,
- 'language' => $language,
- 'format' => $format
-), true)?></pre>
-
-<?/*
-<video
+<audio
autoplay="autoplay"
- controls="controls"
- id="video-tag"
preload="auto"
- width="<?=h($width)?>"
- height="<?=h($height)?>"
+ style="width: 960px;"
>
<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"
+ src="<?=h(link_stream('icecast', $room, 'mp3', $translated))?>"
+ type="audio/mp3"
/>
<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"
+ src="<?=h(link_stream('icecast', $room, 'ogg', $translated))?>"
+ type="audio/ogg"
/>
-
- <object
- data="static/flashmediaelement.swf"
- type="application/x-shockwave-flash"
- width="<?=h($width)?>"
- height="<?=h($height)?>"
- >
- <param name="allowFullScreen" value="true">
- </object>
-</video>
-*/?>
+ <source
+ src="<?=h(link_stream('icecast', $room, 'opus', $translated))?>"
+ type="audio/opus"
+ />
+</audio>
diff --git a/template/assemblies/switcher/audio.phtml b/template/assemblies/switcher/audio.phtml
index 16b3a14..754c4d1 100644
--- a/template/assemblies/switcher/audio.phtml
+++ b/template/assemblies/switcher/audio.phtml
@@ -1,7 +1,7 @@
-<h3>Audio</h3>
+<h3>Formate</h3>
<ul>
<li>
- <span class="label filetype">MP3</span>
+ <span class="label filetype">AUDIO</span>
<a href="<?=h(link_player($room, 'audio'))?>">
<span class="fa fa-flag-o"></span>
native
@@ -12,3 +12,22 @@
</a>
</li>
</ul>
+
+<hr />
+
+<h3>Direktlinks</h3>
+<ul>
+ <? foreach(array('mp3', 'ogg', 'opus') as $iter): ?>
+ <li>
+ <span class="label filetype"><?=h(strtoupper($iter))?></span>
+ <a href="<?=h(link_stream('icecast', $room, $iter))?>">
+ <span class="fa fa-flag-o"></span>
+ native
+ </a>
+ <a href="<?=h(link_stream('icecast', $room, $iter, true))?>">
+ <span class="fa fa-flag"></span>
+ translated
+ </a>
+ </li>
+ <? endforeach ?>
+</ul>