aboutsummaryrefslogtreecommitdiff
path: root/template
diff options
context:
space:
mode:
authorAndreas Hubel2019-01-24 22:35:22 +0100
committerAndreas Hubel2019-01-24 22:35:22 +0100
commitae3695aaa721592d9a1a2279d799227c3b2076ed (patch)
tree26e2cad4f7ae2861629627150ee3a4cf1d24d4cd /template
parent217a9ac55579b4792f74503fefa5cdd93a0a46eb (diff)
implement feedback of PR #82
Diffstat (limited to 'template')
-rw-r--r--template/about-global.phtml11
1 files changed, 3 insertions, 8 deletions
diff --git a/template/about-global.phtml b/template/about-global.phtml
index 2a091ae..682ee4b 100644
--- a/template/about-global.phtml
+++ b/template/about-global.phtml
@@ -6,9 +6,7 @@
<p>Wir versuchen alle Events (Vorträge, Lightningtalks, Podien, etc) der Konferenzen, auf denen wir zugegen sind, aufzuzeichnen und zu streamen. Ausnahmen bilden hier Events, bei denen der Speaker dies explizit nicht wünscht. Für dich als User bieten wir folgende Dienste an.</p>
<h2>Vor Ort</h2>
- <p>Auf Veranstaltungen auf denen <a href="https://eventphone.de">Eventphone</a> zu gegen ist, könnt ihr vor Ort die Audiospur auch per DECT oder GSM empfangen. Dies ist besonders interessant, wenn es Übersetzungen gibt. Schaut einfach im <a href="https://eventphone.de/guru2/phonebook">GURU</a>, ob eine entsprechende Durchwahl eingetragen ist.</p>
-
- <p>Auf Congress und Camp versuchen wir auch DVB-T zur Verfügung zu stellen. Dies kündigen wir per <a href="https://twitter.com/c3voc">Twitter</a> an.</p>
+ <p>Auf Veranstaltungen auf denen <a href="https://eventphone.de">Eventphone</a> zu gegen ist, könnt ihr vor Ort die Audiospur auch per DECT oder GSM empfangen. Dies ist besonders interessant, wenn es Übersetzungen gibt. Schaut einfach im <a href="https://guru3.eventphone.de/event.vba/phonebook">GURU</a>, ob eine entsprechende Durchwahl eingetragen ist.</p>
<h2>Live Content</h2>
<p>Unsere Streams findest du unter <a href="//streaming.media.ccc.de">streaming.media.ccc.de</a>. Dort sind die Streams in verschiedenen Formaten und Auflösungen und je nach Event sogar in mehreren Sprachen abrufbar.</p>
@@ -33,15 +31,12 @@
<p>We try to record and stream events (lectures, lightning talks, podiums, etc) of the conferences we are present at. We exclude events where the speaker opts out. We provide the following services to our users.</p>
<h2>At the conference</h2>
- <p>At conferences where <a href="https://eventphone.de">Eventphone</a> is offering their services, we provide audio feeds via the DECT and GSM network. At conferences where live translation is available, these feeds are also provided this way. Have a look at the <a href="https://eventphone.de/guru2/phonebook">GURU</a> to find out which numbers are used.</p>
-
- <p>During CCC Congress and Camp we try to offer the video feeds via DVB-T. Check out <a href="https://twitter.com/c3voc">Twitter</a> for announcements.</p>
+ <p>At conferences where <a href="https://eventphone.de">Eventphone</a> offers its services, we provide audio feeds via the DECT and GSM network. At conferences where live translation is available, these feeds are also provided this way. Have a look at the <a href="https://guru3.eventphone.de/event.vba/phonebook">GURU</a> to find out which numbers are used.</p>
<h2>Live content</h2>
-
<p>Our streams are available on <a href="//streaming.media.ccc.de">streaming.media.ccc.de</a>. We provide the streams in a number of codecs, containers and resolutions and on some conferences even different translations.</p>
- <p>The web player will hopefully chose the right format depending on your operation system and browser. As video streaming in web browsers is still broken in <?=h(date('Y'))?>, we recommend to use the streaming client application of choice to consume the streams. We suggest VLC for desktop usage.</p>
+ <p>The web player will hopefully choose the right format depending on your operation system and browser. As video streaming in web browsers is still broken in <?=h(date('Y'))?>, we recommend to use the streaming client application of choice to consume the streams. We suggest VLC for desktop usage.</p>
<p>Probably the most comfortable way to watch the streams is the <a href="https://github.com/cccc/plugin.video.media-ccc-de">KODI (former XBMC) add-on</a>. This add-on integrates live streams and recordings into a nice media center UI. The add-on is available via the offical kodi add-on repository (<code>Add-ons / Video add-ons / CCC-TV (media.ccc.de)</code>).</p>