ascoltami

Song:

diff --git a/light9/ascoltami/webapp.py b/light9/ascoltami/webapp.py --- a/light9/ascoltami/webapp.py +++ b/light9/ascoltami/webapp.py @@ -1,9 +1,10 @@ -import web, jsonlib +import web, jsonlib, socket from twisted.python.util import sibpath from light9.namespaces import L9 from light9.showconfig import getSongsFromShow from rdflib import URIRef - +from web.contrib.template import render_genshi +render = render_genshi([sibpath(__file__, ".")]) app = None def songLocation(graph, songUri): @@ -23,7 +24,7 @@ class root(object): web.header("Content-type", "application/xhtml+xml") # todo: use a template; embed the show name and the intro/post # times into the page - return open(sibpath(__file__, "index.html")).read() + return render.index(host=socket.gethostname()) class timeResource(object): def GET(self): @@ -35,6 +36,7 @@ class timeResource(object): song = songUri(graph, URIRef(playingLocation)) else: song = None + web.header("content-type", "application/json") return jsonlib.write({ "song" : song, "started" : player.playStartTime, @@ -56,6 +58,7 @@ class timeResource(object): player.resume() if 't' in params: player.seek(params['t']) + web.header("content-type", "text/plain") return "ok" class songs(object): @@ -76,6 +79,7 @@ class songResource(object): graph = app.graph app.player.setSong(songLocation(graph, URIRef(web.data()))) + web.header("content-type", "text/plain") return "ok" class seekPlayOrPause(object): diff --git a/show/dance2010/readme b/show/dance2010/readme --- a/show/dance2010/readme +++ b/show/dance2010/readme @@ -48,7 +48,7 @@ for 2011: - factor out music dir so it can be different per machine - all settings should be in RDF and live-shared across all apps, maybe with anzo for updates - when curvecalc says 'Slider 1', the X coordinates of the curve get misaligned -- asco should say clearly what machine it's running on +OK asco should say clearly what machine it's running on - asco should have GUI for picking which sound output you want, and store the setting - vidref should have snapshot button for taking pics of the stage - bring mini tripod or beanbag for the vidref camera

ascoltami on ${host}