aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--config.php8
-rw-r--r--formats.php8
-rw-r--r--player.php13
-rw-r--r--template/player-video.phtml30
-rw-r--r--template/player.phtml2
5 files changed, 49 insertions, 12 deletions
diff --git a/config.php b/config.php
index efcae3a..0837b84 100644
--- a/config.php
+++ b/config.php
@@ -12,4 +12,12 @@ $GLOBALS['CONFIG']['ROOMS'] = array(
'sendezentrum' => 'Sendezentrum',
);
+$GLOBALS['CONFIG']['FORMATS'] = array(
+ 'hd' => 'FullHD',
+ 'hq' => 'High Quality',
+ 'lq' => 'Low Quality',
+ 'audio' => 'Audio-Only',
+ 'slides' => 'Slide-Images + Audio',
+);
+
?>
diff --git a/formats.php b/formats.php
index df2a4c8..4084804 100644
--- a/formats.php
+++ b/formats.php
@@ -14,11 +14,5 @@ echo $tpl->render(array(
'subtitle' => $GLOBALS['CONFIG']['ROOMS'][$room],
'room' => $room,
- 'formats' => array(
- 'hd' => 'FullHD',
- 'hq' => 'High Quality',
- 'lq' => 'Low Quality',
- 'audio' => 'Audio-Only',
- 'slides' => 'Slide-Images + Audio',
- ),
+ 'formats' => $GLOBALS['CONFIG']['FORMATS'],
));
diff --git a/player.php b/player.php
index 6afdb5f..f41c0a2 100644
--- a/player.php
+++ b/player.php
@@ -17,19 +17,19 @@ switch($format) {
$type = 'slides';
break;
- case 'hq':
+ case 'hd':
$type = 'video';
$width = 1920;
$height = 1080;
break;
- case 'hd':
+ case 'hq':
$type = 'video';
$width = 1024;
$height = 576;
break;
- case 'ld':
+ case 'lq':
$type = 'video';
$width = 640;
$height = 360;
@@ -38,9 +38,12 @@ switch($format) {
$tpl = new PhpTemplate('template/page.phtml');
echo $tpl->render(array(
- 'page' => $type,
+ 'page' => 'player',
+ 'playertype' => $type,
+
'baseurl' => baseurl(),
- 'title' => 'Rooms',
+ 'title' => $GLOBALS['CONFIG']['ROOMS'][$room],
+ 'subtitle' => $GLOBALS['CONFIG']['FORMATS'][$format],
'room' => $room,
'roomname' => $GLOBALS['CONFIG']['ROOMS'][$room],
diff --git a/template/player-video.phtml b/template/player-video.phtml
new file mode 100644
index 0000000..824a776
--- /dev/null
+++ b/template/player-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>
diff --git a/template/player.phtml b/template/player.phtml
new file mode 100644
index 0000000..f663213
--- /dev/null
+++ b/template/player.phtml
@@ -0,0 +1,2 @@
+A Player:<br />
+<? include("player-$playertype.phtml") ?> \ No newline at end of file