From 50dbc53f8625d88908aded35222383ecd67b4dbf Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Fri, 26 Oct 2012 15:03:40 +0200 Subject: www has now lower as well --- contrib/www/2012/embed-orf.php | 21 +++++++++++++++++++ contrib/www/2012/embed-test-orf.html | 14 +++++++++++++ contrib/www/2012/init.php | 14 ++++++++++--- contrib/www/2012/player.php | 40 +++++++++++++++++++++++++++++++----- contrib/www/2012/style.css | 2 +- 5 files changed, 82 insertions(+), 9 deletions(-) create mode 100644 contrib/www/2012/embed-orf.php create mode 100644 contrib/www/2012/embed-test-orf.html (limited to 'contrib') diff --git a/contrib/www/2012/embed-orf.php b/contrib/www/2012/embed-orf.php new file mode 100644 index 0000000..168b53f --- /dev/null +++ b/contrib/www/2012/embed-orf.php @@ -0,0 +1,21 @@ + + + + Elevate Festival 2012 - Live Stream + + + + + + + + + diff --git a/contrib/www/2012/embed-test-orf.html b/contrib/www/2012/embed-test-orf.html new file mode 100644 index 0000000..6608979 --- /dev/null +++ b/contrib/www/2012/embed-test-orf.html @@ -0,0 +1,14 @@ + + + + Elevate Festival 2012 - Live Stream + + + +

Elevate Festival 2012 - Live Stream (embedded, orf)

+ + + + + diff --git a/contrib/www/2012/init.php b/contrib/www/2012/init.php index 4afba69..e6f2318 100644 --- a/contrib/www/2012/init.php +++ b/contrib/www/2012/init.php @@ -11,7 +11,9 @@ if (($browser['name'] == 'firefox' && $browser['majorver'] >= 4) || $DEFAULT_MODE = 'html5'; } -if ( isset($EMBED) && $EMBED >= 2 ) { +if ( isset($EMBED) && $EMBED >= 3 ) { + $DEFAULT_PROFILE = 'lower'; +} elseif ( isset($EMBED) && $EMBED >= 2 ) { $DEFAULT_PROFILE = 'low'; } else { $DEFAULT_PROFILE = 'medium'; @@ -21,6 +23,7 @@ $PROFILE= isset($_GET['profile']) ? $_GET['profile'] : $DEFAULT_PROFILE; switch($PROFILE) { case 'high': { $WIDTH = 1280; $HEIGHT = 720; break; } case 'low': { $WIDTH = 640; $HEIGHT = 360; break; } + case 'lower': { $WIDTH = 426; $HEIGHT = 240; break; } default: { $PROFILE = 'medium'; $WIDTH = 854; $HEIGHT = 480; break; } } @@ -37,7 +40,7 @@ switch($MODE) { } $URL_BASE = 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF']; -$URL_BASE_IDX = str_replace("embed.php", "index.php", $URL_BASE); +$URL_BASE_IDX = preg_replace("/embed(-.*)?\.php/", "index.php", $URL_BASE); $URL_FLASH = $URL_BASE . "?mode=flash&src=$SRC&profile=$PROFILE"; $URL_HTML5 = $URL_BASE . "?mode=html5&src=$SRC&profile=$PROFILE"; @@ -55,7 +58,12 @@ if ( isset($EMBED) && $EMBED >= 2 ) { } else { $URL_MEDIUM = $URL_BASE . "?mode=$MODE&src=$SRC&profile=medium"; } -$URL_LOW = $URL_BASE . "?mode=$MODE&src=$SRC&profile=low"; +if ( isset($EMBED) && $EMBED >= 3 ) { + $URL_LOW = $URL_BASE_IDX . "?mode=$MODE&src=$SRC&profile=low"; +} else { + $URL_LOW = $URL_BASE . "?mode=$MODE&src=$SRC&profile=low"; +} +$URL_LOWER = $URL_BASE . "?mode=$MODE&src=$SRC&profile=lower"; $STREAM_URL_BASE = 'http://elevate-live.spreadspace.org'; diff --git a/contrib/www/2012/player.php b/contrib/www/2012/player.php index cb9edba..0e4e390 100644 --- a/contrib/www/2012/player.php +++ b/contrib/www/2012/player.php @@ -1,7 +1,7 @@ - - -

medium"; } - echo " low"; + if ( isset($EMBED) && $EMBED >= 3 ) { + echo " low"; + } else { + echo " low"; + } + echo " lower"; break; } case 'medium': { @@ -53,7 +58,12 @@ echo " high"; } echo " medium"; - echo " low"; + if ( isset($EMBED) && $EMBED >= 3 ) { + echo " low"; + } else { + echo " low"; + } + echo " lower"; break; } case 'low': { @@ -68,6 +78,26 @@ echo " medium"; } echo " low"; + echo " lower"; + break; + } + case 'lower': { + if ( isset($EMBED) ) { + echo " high"; + } else { + echo " high"; + } + if ( isset($EMBED) && $EMBED >= 2 ) { + echo " medium"; + } else { + echo " medium"; + } + if ( isset($EMBED) && $EMBED >= 3 ) { + echo " low"; + } else { + echo " low"; + } + echo " lower"; break; } } diff --git a/contrib/www/2012/style.css b/contrib/www/2012/style.css index 987d9bd..bc8919a 100644 --- a/contrib/www/2012/style.css +++ b/contrib/www/2012/style.css @@ -24,7 +24,7 @@ table#header } td { - padding: 0.5em 1em; + padding: 0.5em 0.7em; } td span { -- cgit v1.2.3