# HG changeset patch
# User drewp@bigasterisk.com
# Date 1276415766 0
# Node ID 519adb4e539f4a1033b1c40a1488c4fc901057db
# Parent  481aa9a970b37842372b130065e8ec58dd4a2ca7
asco startup improvements
Ignore-this: 41a4ce074e02e64166164813879380b

diff -r 481aa9a970b3 -r 519adb4e539f bin/ascoltami2
--- a/bin/ascoltami2	Sat Jun 12 19:47:45 2010 +0000
+++ b/bin/ascoltami2	Sun Jun 13 07:56:06 2010 +0000
@@ -6,8 +6,8 @@
 from light9.ascoltami.webapp import makeApp
 from light9 import networking, showconfig
 
+logging.basicConfig()
 log = logging.getLogger()
-logging.basicConfig()
 gobject.threads_init()
 
 parser = optparse.OptionParser()
@@ -15,16 +15,14 @@
     help='show URI, like http://light9.bigasterisk.com/show/dance2008')
 parser.add_option("-v", "--verbose", action="store_true",
                   help="logging.DEBUG")
-graph = showconfig.getGraph()
 (options, args) = parser.parse_args()
 
-
 log.setLevel(logging.DEBUG if options.verbose else logging.INFO)
 
-graph = showconfig.getGraph()
 if not options.show:
     raise ValueError("missing --show http://...")
         
+graph = showconfig.getGraph()
 player = Player()
 
 # the cherrypy server would wedge when vidref pounds on it; this
diff -r 481aa9a970b3 -r 519adb4e539f light9/ascoltami/index.html
--- a/light9/ascoltami/index.html	Sat Jun 12 19:47:45 2010 +0000
+++ b/light9/ascoltami/index.html	Sun Jun 13 07:56:06 2010 +0000
@@ -29,7 +29,8 @@
       <button id="cmd-go">Go  <div class="key">space</div></button>
     </div>
 
-todo: go button actions, display next action
+    todo: go button actions, display next action
+    <a href="">reload</a>
 
 <script type="text/javascript">
 // <![CDATA[
diff -r 481aa9a970b3 -r 519adb4e539f light9/ascoltami/player.py
--- a/light9/ascoltami/player.py	Sat Jun 12 19:47:45 2010 +0000
+++ b/light9/ascoltami/player.py	Sun Jun 13 07:56:06 2010 +0000
@@ -64,6 +64,7 @@
         log.info("set song to %r" % songUri)
         self.pipeline.set_state(gst.STATE_READY)
         self.pipeline.set_property("uri", songUri)
+        # todo: don't have any error report yet if the uri can't be read
         self.pipeline.set_state(gst.STATE_PLAYING)
         self.playStartTime = time.time()
 
diff -r 481aa9a970b3 -r 519adb4e539f light9/ascoltami/webapp.py
--- a/light9/ascoltami/webapp.py	Sat Jun 12 19:47:45 2010 +0000
+++ b/light9/ascoltami/webapp.py	Sun Jun 13 07:56:06 2010 +0000
@@ -33,7 +33,6 @@
 
 class songs(object):
     def GET(self):
-
         playList = graph.value(show, L9['playList'])
         if not playList:
             raise ValueError("%r has no l9:playList" % show)