From 25d9247d41c99746fa5bc008d58788b1fded6de5 Mon Sep 17 00:00:00 2001 From: Astro Date: Mon, 26 Mar 2012 02:45:08 +0200 Subject: [PATCH 1/5] xsd/c3d2web: permit podlove markup in --- xsd/c3d2web.xsd | 2 ++ 1 file changed, 2 insertions(+) diff --git a/xsd/c3d2web.xsd b/xsd/c3d2web.xsd index 3d438e620..a6b583d82 100644 --- a/xsd/c3d2web.xsd +++ b/xsd/c3d2web.xsd @@ -57,6 +57,8 @@ + From 34fb2423fc1a63127a5cdad3485807c7524b2ca7 Mon Sep 17 00:00:00 2001 From: Astro Date: Mon, 26 Mar 2012 02:45:29 +0200 Subject: [PATCH 2/5] pentacast-43-28c3: chapter marks with podlove --- content/news/pentacast-43-28c3.xml | 49 ++++++++++++++---------------- 1 file changed, 23 insertions(+), 26 deletions(-) diff --git a/content/news/pentacast-43-28c3.xml b/content/news/pentacast-43-28c3.xml index 01140efe1..da8cff530 100644 --- a/content/news/pentacast-43-28c3.xml +++ b/content/news/pentacast-43-28c3.xml @@ -16,32 +16,6 @@

Ich bedanke mich bei allen Engeln die mir Rede und Antwort standen oder Gespräche zu Stande gebracht haben. Da die Interviews teilweise länglich sind, habe ich eine CUE-Datei fertig gemacht, mit der ihr das MP3 in mundgerechte Happen zerteilen könnt. In den Shownotes findet ihr eine Übersicht, wer ungefähr wann redet und in welcher Sprache.

-

Shownotes:

-
    -
  • 0:00 Intro, koeart, DE
    • -
  • 8:03 Engelsystem, msquare, DE
    • -
  • Engelsystem
    • -
  • 12:17 FEM, ??, DE
    • -
  • FEM TU Ilmenau
    • -
  • WP: HTTP Live Streaming
    • -
  • 36:24 Masken tiefziehen, Aram Bartholl, DE
    • -
  • Aram Bartholl
    • -
  • CRE181: Aram Bartholl
    • -
  • 43:07 Strom, friedrich, DE
    • -
  • 48:34 CERT, vt, DE
    • -
  • 54:56 Herold Angel, Nick Farr, EN
    • -
  • 28c3: No Nerd Left Behind
    • -
  • 64:12 ERFA's, Maha, DE
    • -
  • CCC Regional
    • -
  • 79:19 Pressearbeit, Constanze Kurz, DE
    • -
  • 97:31 Eventphone, sascha, DE
    • -
  • Eventphone
    • -
  • 108:33 Foodangel, simon, DE
    • -
  • 111:00 Chefangel, Frantisek Apfelbeck, EN
    • -
  • Frantisek Apfelbeck, Foodhacking
    • -
  • 123:10 Nick Farr Lullaby (Machine Lullaby by Fear of Ghosts Remix)
    • -
  • 28c3 Recordings
    • -
+ + + + + + + + + + + + + + + + + + + + + + + From ae3990fda0d15f890acf7b1937c21cb9b3aa37ee Mon Sep 17 00:00:00 2001 From: Astro Date: Wed, 27 Jun 2012 02:20:02 +0200 Subject: [PATCH 3/5] xsl/atom,rss,podcast feeds: copy podlove chapters --- xsl/atom.xsl | 3 +++ xsl/podcast.xsl | 5 +++++ xsl/rss.xsl | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/xsl/atom.xsl b/xsl/atom.xsl index 656e4f53d..280385389 100644 --- a/xsl/atom.xsl +++ b/xsl/atom.xsl @@ -88,6 +88,9 @@ href="{$resource_href}" type="{@type}" length="{@size}" /> + + diff --git a/xsl/podcast.xsl b/xsl/podcast.xsl index 5ef6eca6d..d01190190 100644 --- a/xsl/podcast.xsl +++ b/xsl/podcast.xsl @@ -190,6 +190,8 @@ + @@ -201,6 +203,7 @@ + @@ -254,6 +257,8 @@ + + diff --git a/xsl/rss.xsl b/xsl/rss.xsl index a90294f29..f04827291 100644 --- a/xsl/rss.xsl +++ b/xsl/rss.xsl @@ -117,6 +117,10 @@ + + + From 860961e37735483773d1a23a10f91bc0ed3f7c11 Mon Sep 17 00:00:00 2001 From: Astro Date: Wed, 27 Jun 2012 03:39:58 +0200 Subject: [PATCH 4/5] update xsd/atom.rng, fix xsl/common.xsl for atom validation --- xsd/atom.rng | 11 +++++------ xsl/common.xsl | 8 ++++++++ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/xsd/atom.rng b/xsd/atom.rng index ac63ec4fc..f1407fc4d 100644 --- a/xsd/atom.rng +++ b/xsd/atom.rng @@ -2,10 +2,9 @@ - + @@ -354,9 +353,9 @@ - + - + @@ -570,7 +569,7 @@ - + diff --git a/xsl/common.xsl b/xsl/common.xsl index 2e413815f..96199eeb2 100644 --- a/xsl/common.xsl +++ b/xsl/common.xsl @@ -384,6 +384,14 @@ , ) + + + + + From efa2077840d0c9a90bbdb3752727eb4829075038 Mon Sep 17 00:00:00 2001 From: Astro Date: Wed, 27 Jun 2012 04:01:44 +0200 Subject: [PATCH 5/5] play-resources: chapters support --- content/static/script/play-resources.js | 41 ++++++++++++++++++++++--- content/static/style/default.css | 20 ++++++++++++ 2 files changed, 57 insertions(+), 4 deletions(-) diff --git a/content/static/script/play-resources.js b/content/static/script/play-resources.js index 86f5eb37c..835e30d1d 100644 --- a/content/static/script/play-resources.js +++ b/content/static/script/play-resources.js @@ -31,7 +31,7 @@ function arrayForEach(array, iter) { } } -function addButton(container, res) { +function addButton(container, res, chapters) { var button = $('▶ Play'); if (res.poster) { var img = $(''); @@ -54,7 +54,7 @@ function addButton(container, res) { button.click(function() { button.remove(); - addPlayer(container, res); + addPlayer(container, res, chapters); var section = container.parents(). filter(function() { @@ -66,7 +66,16 @@ function addButton(container, res) { container.append(button); } -function addPlayer(container, res) { +function parseTime(time) { + var parts = time.split(":"), part; + var r = 0; + while((part = parts.shift())) { + r = r * 60 + parseInt(part); + } + return r; +} + +function addPlayer(container, res, chapters) { var types = arrayMap(res, function(res) { return res.type; }); @@ -127,6 +136,30 @@ function addPlayer(container, res) { if (fallback) html5player.append(fallback); container.append(html5player); + if (chapters[0]) { + var dl = $('
'); + var prevStart; + chapters.find('chapter').each(function() { + var title = this.getAttribute('title'); + var start = this.getAttribute('start'); + var href = this.getAttribute('href'); + if (start && start != prevStart) { + var dt = $('
'); + var dt_a = dt.find('a'); + dt_a.text(start); + dt_a.click(function(ev) { + ev.preventDefault(); + html5player[0].currentTime = parseTime(start); + }); + dl.append(dt); + } + prevStart = start; + var dd = $('
'); + dd.text(title); + dl.append(dd); + }); + container.append(dl); + } } else if (fallback) { container.append(fallback); } else { @@ -164,7 +197,7 @@ $(document).ready(function() { }), canPlay)) { var liEl = $('
  • '); $(this).before(liEl); - var player = addButton(liEl, res); + var player = addButton(liEl, res, $(this).find('chapters')); } }); } catch (x) { diff --git a/content/static/style/default.css b/content/static/style/default.css index d2a168802..b2d35af22 100644 --- a/content/static/style/default.css +++ b/content/static/style/default.css @@ -717,6 +717,26 @@ li audio, li video, li .poster { color: #333; } +.chapters { + margin: 0.5em auto; +} +.chapters dt, .chapters dd { + line-height: 2em; + margin: 0; + padding: 0; +} +.chapters dt { + width: 8em; + text-align: right; + margin-bottom: -2em; +} +.chapters dt:after { + content: ''; +} +.chapters dd { + margin-left: 10em; +} + p.blockquote { padding: .5em .5em .5em 2em; border-left: 20px solid #eee;