add dash tab (with dummy content)

6 files changed, 22 insertions, 2 deletions

diff --git a/configs/conferences/33c3/config.php b/configs/conferences/33c3/config.php
index 70800bf..a9a697a 100644
--- a/configs/conferences/33c3/config.php
+++ b/configs/conferences/33c3/config.php
@@ -200,6 +200,7 @@ $GLOBALS['CONFIG']['ROOMS'] = array(
 		 * als Default-Stream angenommen.
 		 */
 		'HD_VIDEO' => true,
+		'DASH' => true,
 
 		/**
 		 * Slide-Only-Stream (1024×576) verfügbar
@@ -361,6 +362,7 @@ $GLOBALS['CONFIG']['ROOMS'] = array(
 		'TRANSLATION' => true,
 		'SD_VIDEO' => true,
 		'HD_VIDEO' => true,
+		'DASH' => true,
 		'AUDIO' => true,
 		'SLIDES' => true,
 		'MUSIC' => false,
@@ -391,6 +393,7 @@ $GLOBALS['CONFIG']['ROOMS'] = array(
 		'TRANSLATION' => true,
 		'SD_VIDEO' => true,
 		'HD_VIDEO' => true,
+		'DASH' => true,
 		'AUDIO' => true,
 		'SLIDES' => true,
 		'MUSIC' => false,
@@ -420,6 +423,7 @@ $GLOBALS['CONFIG']['ROOMS'] = array(
 		'TRANSLATION' => true,
 		'SD_VIDEO' => true,
 		'HD_VIDEO' => true,
+		'DASH' => true,
 		'AUDIO' => true,
 		'SLIDES' => true,
 		'MUSIC' => false,
@@ -464,6 +468,7 @@ $GLOBALS['CONFIG']['ROOMS'] = array(
 
 		'SD_VIDEO' => true,
 		'HD_VIDEO' => true,
+		'DASH' => true,
 		'AUDIO' => true,
 
 		'SCHEDULE' => true,
diff --git a/index.php b/index.php
index 9a5e304..6713cee 100644
--- a/index.php
+++ b/index.php
@@ -267,7 +267,7 @@ try {
 		require('view/room.php');
 	}
 
-	else if(preg_match('@^([^/]+)/(sd|audio|slides)$@', $route, $m))
+	else if(preg_match('@^([^/]+)/(sd|audio|slides|dash)$@', $route, $m))
 	{
 		$_GET = array(
 			'room' => $m[1],
@@ -277,7 +277,7 @@ try {
 		require('view/room.php');
 	}
 
-	else if(preg_match('@^([^/]+)/(sd|audio|slides)/translated$@', $route, $m))
+	else if(preg_match('@^([^/]+)/(sd|audio|slides|dash)/translated$@', $route, $m))
 	{
 		$_GET = array(
 			'room' => $m[1],
diff --git a/model/Room.php b/model/Room.php
index df3d92c..3baa0cf 100644
--- a/model/Room.php
+++ b/model/Room.php
@@ -174,6 +174,10 @@ class Room extends ModelBase
 		return $this->get('ROOMS.'.$this->getSlug().'.MUSIC');
 	}
 
+	public function hasDash() {
+		return $this->get('ROOMS.'.$this->getSlug().'.DASH');
+	}
+
 	public function hasTranslation() {
 		return $this->get('ROOMS.'.$this->getSlug().'.TRANSLATION');
 	}
@@ -196,6 +200,9 @@ class Room extends ModelBase
 		if($this->hasMusic())
 			$selections[] = 'music';
 
+		if($this->hasDash())
+			$selections[] = 'dash';
+
 		return $selections;
 	}
 
@@ -214,6 +221,9 @@ class Room extends ModelBase
 		if($this->hasMusic())
 			$tabs[] = 'music';
 
+		if($this->hasDash())
+			$tabs[] = 'dash';
+
 		return $tabs;
 	}
 
diff --git a/model/RoomTab.php b/model/RoomTab.php
index 16a8359..dfe6e84 100644
--- a/model/RoomTab.php
+++ b/model/RoomTab.php
@@ -35,6 +35,9 @@ class RoomTab
 			case 'music':
 				return 'Radio';
 
+			case 'dash':
+				return 'DASH (beta)';
+
 			default:
 				return ucfirst($tab);
 		}
diff --git a/template/assemblies/player/dash.phtml b/template/assemblies/player/dash.phtml
new file mode 100644
index 0000000..89d3ee8
--- /dev/null
+++ b/template/assemblies/player/dash.phtml
@@ -0,0 +1 @@
+<h2 style="text-align: center; margin: 40px 0;">DASH-Player coming soon</h1>
diff --git a/template/assemblies/switcher/dash.phtml b/template/assemblies/switcher/dash.phtml
new file mode 100644
index 0000000..a597ad4
--- /dev/null
+++ b/template/assemblies/switcher/dash.phtml
@@ -0,0 +1 @@
+<h2 style="text-align: center; margin: 40px 0;">DASH-Format-Selector coming soon</h1>