--- a/bin/curvecalc	Sun Jun 26 00:52:09 2011 +0000
+++ b/bin/curvecalc	Tue Jun 05 20:40:35 2012 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!bin/python
 
 """
 now launches like this:
@@ -26,7 +26,7 @@
 from twisted.internet.defer import succeed
 from twisted.web.iweb import IBodyProducer
 from rdflib import Literal, URIRef, RDF, RDFS
-from rdflib.Graph import Graph
+from rdflib import Graph
 import rdflib
 import logging
 log = logging.getLogger()
@@ -500,7 +500,7 @@
 
 def currentlyPlayingSong():
     """ask the music player what song it's on"""
-    t = jsonlib.read(restkit.Resource(networking.musicUrl()).get("time").body)
+    t = jsonlib.read(restkit.Resource(networking.musicPlayer.url).get("time").body)
     if t['song'] is None:
         raise ValueError("music player is not playing any song")
     return URIRef(t['song'])