Mercurial > code > home > repos > light9
changeset 621:9ec0396c6f1f
small asco bugs left over from last year
Ignore-this: e4ff6d000a1f51ee35c507f9f9e74fe9
| author | drewp@bigasterisk.com |
|---|---|
| date | Tue, 14 Jun 2011 07:40:36 +0000 |
| parents | ef09899cd92c |
| children | 9d5867bb16c4 |
| files | bin/ascoltami2 light9/ascoltami/player.py light9/ascoltami/playlist.py |
| diffstat | 3 files changed, 5 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/bin/ascoltami2 Tue Jun 14 07:34:43 2011 +0000 +++ b/bin/ascoltami2 Tue Jun 14 07:40:36 2011 +0000 @@ -4,7 +4,7 @@ sys.path.append(".") from light9.ascoltami.player import Player from light9.ascoltami.playlist import Playlist, NoSuchSong -from light9.ascoltami.webapp import makeApp +from light9.ascoltami.webapp import makeWebApp from light9 import networking, showconfig class App:
--- a/light9/ascoltami/player.py Tue Jun 14 07:34:43 2011 +0000 +++ b/light9/ascoltami/player.py Tue Jun 14 07:40:36 2011 +0000 @@ -21,7 +21,8 @@ self.playStartTime = 0 self.lastWatchTime = 0 self.autoStopTime = 0 - + self.onEOS = onEOS + # before playbin2: #self.pipeline = gst.parse_launch("filesrc name=file location=%s ! wavparse name=src ! audioconvert ! alsasink name=out" % songFile)
--- a/light9/ascoltami/playlist.py Tue Jun 14 07:34:43 2011 +0000 +++ b/light9/ascoltami/playlist.py Tue Jun 14 07:40:36 2011 +0000 @@ -7,6 +7,7 @@ class Playlist(object): def __init__(self, graph, playlistUri): + self.graph = graph self.songs = list(graph.items(playlistUri)) def nextSong(self, currentSong): """Returns the next song in the playlist or raises NoSuchSong if @@ -31,7 +32,7 @@ """Returns a list of the filesystem paths to all songs in order.""" paths = [] for song in self.songs: - p = graph.value(song, L9['showPath']) + p = self.graph.value(song, L9['showPath']) assert p.startswith("file://"), p p = p[len("file://"):] paths.append(p)