summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Pointner <equinox@spreadspace.org>2018-02-27 01:55:56 +0100
committerChristian Pointner <equinox@spreadspace.org>2018-02-27 01:55:56 +0100
commit46e0fc1c7cf86e0450c98039aa3ae80a2760a349 (patch)
treeac183561c9ce8003794c1b8e346588f6b57cce9d
parentadded config for stream site (diff)
add nocache to stream urls, no more background
Diffstat
-rw-r--r--contrib/site/images/background.jpgbin928996 -> 0 bytes
-rw-r--r--contrib/site/images/background.pngbin0 -> 4025 bytes
-rw-r--r--contrib/site/index.html14
-rw-r--r--contrib/site/js/config.js34
-rw-r--r--contrib/site/js/config2.js34
-rw-r--r--contrib/site/style.css5
6 files changed, 9 insertions, 78 deletions
diff --git a/contrib/site/images/background.jpg b/contrib/site/images/background.jpg
deleted file mode 100644
index cbea4e7..0000000
--- a/contrib/site/images/background.jpg
+++ /dev/null
Binary files differ
diff --git a/contrib/site/images/background.png b/contrib/site/images/background.png
new file mode 100644
index 0000000..3467cf4
--- /dev/null
+++ b/contrib/site/images/background.png
Binary files differ
diff --git a/contrib/site/index.html b/contrib/site/index.html
index 9a7f749..ca4cbc6 100644
--- a/contrib/site/index.html
+++ b/contrib/site/index.html
@@ -12,7 +12,7 @@
<meta property="og:image:type" content="image/jpg">
<meta property="og:type" content="article">
</head>
-<body background="images/background.jpg">
+<body>
<h1>Elevate Festival 2018 - Live Stream</h1>
<div class="center">
<table id="header">
@@ -77,10 +77,7 @@
<td><a href="https://dorftv.at"><img src="images/sponsors/dorfTV.png" /></a></td>
<td><a href="http://helsinki.at"><img src="images/sponsors/helsinki.png" /></a></td>
<td>&nbsp;</td>
- <td><a href="http://www.livesolution.at/"><img src="images/sponsors/livesolution.png" /></a></td>
<td><a href="http://citycom-austria.com"><img src="images/sponsors/citycom.png" /></a></td>
- <td>&nbsp;</td>
- <td><a href="http://culturesofresistance.org"><img src="images/sponsors/CoR.png" /></a></td>
</tr>
</table>
</div>
@@ -89,7 +86,7 @@
<script type="text/javascript" src="js/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="js/flowplayer/flowplayer-3.2.6.min.js"></script>
<script type="text/javascript" src="js/parseLocationHref.js"></script>
- <script type="text/javascript" src="js/config2.js"></script>
+ <script type="text/javascript" src="js/config.js"></script>
<script>
var Model = function(config, uri) {
this.config = config;
@@ -168,16 +165,17 @@
};
Model.prototype.getStreamUrl = function (thing) {
+ var nocache = Date.now();
switch(thing) {
case 'webm':
return this.config.streamBaseUrl + '/' + this.parameters.src + '-webm-' +
- this.parameters.profile + '.webm';
+ this.parameters.profile + '.webm?nocache=' + nocache;
case 'hls':
return this.config.streamBaseUrl + '/hls/' + this.parameters.src + '-' +
- this.parameters.profile + '/index.m3u8';
+ this.parameters.profile + '/index.m3u8?nocache=' + nocache;
case 'flash':
return this.config.streamBaseUrl + '/' + this.parameters.src + '-flash-' +
- this.parameters.profile + '.flv';
+ this.parameters.profile + '.flv?nocache=' + nocache;
}
};
diff --git a/contrib/site/js/config.js b/contrib/site/js/config.js
deleted file mode 100644
index d306e94..0000000
--- a/contrib/site/js/config.js
+++ /dev/null
@@ -1,34 +0,0 @@
-var config = {
- "resolutions": {
- "1080p25": {"width": 1920, "height": 1080},
- "720p25": {"width": 1280, "height": 720},
- "480p25": {"width": 854, "height": 480},
- "360p25": {"width": 640, "height": 360},
- "240p25": {"width": 426, "height": 240}
- },
- "profiles": {
- "full": {"video": "1080p25"},
- "high": {"video": "720p25"},
- "medium": {"video": "480p25"},
- "low": {"video": "360p25"},
- "mini": {"video": "240p25"}
- },
- "muxes": {
- "av-orig": {
- "video": "sdi-orig:video",
- "audio": "sdi-orig:audio",
- "formats": {
- "flash": ["high", "medium", "low", "mini"],
- "webm": ["high", "medium", "low", "mini"]
- }
- },
- "audio-orig": {
- "audio": "sdi-orig:audio",
- "formats": {
- "ogg": ["high", "medium", "low", "mini"],
- "mp3": ["high", "medium", "low", "mini"]
- }
- }
- },
- "streamBaseUrl": "http://emc-03.spreadspace.org:8000"
-};
diff --git a/contrib/site/js/config2.js b/contrib/site/js/config2.js
deleted file mode 100644
index d306e94..0000000
--- a/contrib/site/js/config2.js
+++ /dev/null
@@ -1,34 +0,0 @@
-var config = {
- "resolutions": {
- "1080p25": {"width": 1920, "height": 1080},
- "720p25": {"width": 1280, "height": 720},
- "480p25": {"width": 854, "height": 480},
- "360p25": {"width": 640, "height": 360},
- "240p25": {"width": 426, "height": 240}
- },
- "profiles": {
- "full": {"video": "1080p25"},
- "high": {"video": "720p25"},
- "medium": {"video": "480p25"},
- "low": {"video": "360p25"},
- "mini": {"video": "240p25"}
- },
- "muxes": {
- "av-orig": {
- "video": "sdi-orig:video",
- "audio": "sdi-orig:audio",
- "formats": {
- "flash": ["high", "medium", "low", "mini"],
- "webm": ["high", "medium", "low", "mini"]
- }
- },
- "audio-orig": {
- "audio": "sdi-orig:audio",
- "formats": {
- "ogg": ["high", "medium", "low", "mini"],
- "mp3": ["high", "medium", "low", "mini"]
- }
- }
- },
- "streamBaseUrl": "http://emc-03.spreadspace.org:8000"
-};
diff --git a/contrib/site/style.css b/contrib/site/style.css
index 88f8668..772bb4d 100644
--- a/contrib/site/style.css
+++ b/contrib/site/style.css
@@ -1,12 +1,13 @@
body {
- background-color: #FFFFFF;
font-family: "Lucida Grande","bitstream vera sans","trebuchet ms",verdana,arial;
text-align: center;
+ background-image: url(/images/background.png);
+ background-repeat: repeat;
}
h1 {
letter-spacing: -1px;
- color: #FFFFFF;
+ color: #000000;
font-weight: bold;
font-size: 1.7em;
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-19 09:59:54 +0000