Fixed playlist bug

[jamaendo] / jamaui / playerwindow.py

diff --git a/jamaui/playerwindow.py b/jamaui/playerwindow.py
index ce13494..724e73d 100644 (file)
--- a/jamaui/playerwindow.py
+++ b/jamaui/playerwindow.py
@@ -26,6 +26,7 @@ import gobject
 import hildon
 import util
 import pango
+import jamaendo
 from settings import settings
 from postoffice import postoffice
 from player import Playlist, the_player
@@ -51,19 +52,17 @@ class PlayerWindow(hildon.StackableWindow):
         hbox = gtk.HBox(False, 8)
 
         self.cover = gtk.Image()
-        tmp = util.find_resource('album.png')
-        if tmp:
-            self.cover.set_from_file(tmp)
+        self.set_default_cover()
 
         vbox2 = gtk.VBox()
 
         self.playlist_pos = gtk.Label()
         self.playlist_pos.set_alignment(1.0,0)
         self.track = gtk.Label()
-        self.track.set_alignment(0,0)
+        self.track.set_alignment(0,1)
         self.track.set_ellipsize(pango.ELLIPSIZE_END)
         self.artist = gtk.Label()
-        self.artist.set_alignment(0,0)
+        self.artist.set_alignment(0,0.5)
         self.artist.set_ellipsize(pango.ELLIPSIZE_END)
         self.album = gtk.Label()
         self.album.set_alignment(0,0)
@@ -96,18 +95,11 @@ class PlayerWindow(hildon.StackableWindow):
         self.add_stock_button(btns, gtk.STOCK_MEDIA_STOP, self.on_stop)
         self.add_stock_button(btns, gtk.STOCK_MEDIA_NEXT, self.on_next)
 
-        #self.volume = hildon.VVolumebar()
-        #self.volume.set_property('can-focus', False)
-        #self.volume.connect('level_changed', self.volume_changed_hildon)
-        #self.volume.connect('mute_toggled', self.mute_toggled)
-        #hbox.pack_start(self.volume, False)
         self.add(vbox)
 
         postoffice.connect('album-cover', self, self.set_album_cover)
         postoffice.connect(['next', 'prev', 'play', 'pause', 'stop'], self, self.on_state_changed)
 
-        #print "Created player window, playlist: %s" % (self.playlist)
-
         self.on_state_changed()
 
         self.create_menu()
@@ -116,14 +108,12 @@ class PlayerWindow(hildon.StackableWindow):
         self.menu = hildon.AppMenu()
 
         def to_artist(*args):
-            import jamaendo
             from showartist import ShowArtist
             track = self.playlist.current()
             artist = jamaendo.get_artist(int(track.artist_id))
             wnd = ShowArtist(artist)
             wnd.show_all()
         def to_album(*args):
-            import jamaendo
             from showalbum import ShowAlbum
             track = self.playlist.current()
             album = jamaendo.get_album(int(track.album_id))
@@ -199,7 +189,11 @@ class PlayerWindow(hildon.StackableWindow):
             self.playbtn.set_data('state', 'play')
 
     def set_labels(self, track, artist, album, playlist_pos, playlist_size):
-        self.playlist_pos.set_markup('<span size="small">Track %s of %s</span>'%(int(playlist_pos)+1, playlist_size))
+        if self.playlist.radio_mode:
+            ppstr = '<span size="small">Radio: %s</span>'%(cgi.escape(self.playlist.radio_name))
+        else:
+            ppstr = '<span size="small">Track %s of %s</span>'%(int(playlist_pos)+1, playlist_size)
+        self.playlist_pos.set_markup(ppstr)
         self.track.set_markup('<span size="x-large">%s</span>'%(cgi.escape(track)))
         self.artist.set_markup('<span size="large">%s</span>'%(cgi.escape(artist)))
         self.album.set_markup('<span foreground="#aaaaaa">%s</span>'%(cgi.escape(album)))
@@ -238,6 +232,11 @@ class PlayerWindow(hildon.StackableWindow):
         value = (float(time_elapsed) / float(total_time)) if total_time else 0
         self.progress.set_position(value)
 
+    def set_default_cover(self):
+        tmp = util.find_resource('album.png')
+        if tmp:
+            self.cover.set_from_file(tmp)
+
     def update_state(self):
         item = self.playlist.current()
         if item:
@@ -245,12 +244,11 @@ class PlayerWindow(hildon.StackableWindow):
                 item.load()
             self.set_labels(item.name, item.artist_name, item.album_name,
                             self.playlist.current_index(), self.playlist.size())
+            self.set_default_cover()
             postoffice.notify('request-album-cover', int(item.album_id), 300)
         else:
             self.set_labels('', '', '', 0, 0)
-            tmp = util.find_resource('album.png')
-            if tmp:
-                self.cover.set_from_file(tmp)
+            self.set_default_cover()
 
     def set_album_cover(self, albumid, size, cover):
         if size == 300:
@@ -258,9 +256,28 @@ class PlayerWindow(hildon.StackableWindow):
             if playing and albumid and (int(playing) == int(albumid)):
                 self.cover.set_from_file(cover)
 
+    def play_radio(self, radio_name, radio_id):
+        playlist = Playlist([])
+        playlist.radio_mode = True
+        playlist.radio_name = radio_name
+        playlist.radio_id = radio_id
+        playlist.add(jamaendo.get_radio_tracks(playlist.radio_id))
+        log.debug("Playing radio: %s", playlist)
+        self.__play_tracks(playlist)
+        log.debug("Playlist current: %s, playing? %s",
+                  playlist.current_index(),
+                  self.player.playing())
+
     def play_tracks(self, tracks):
+        self.__play_tracks(tracks)
+
+    def __play_tracks(self, tracks):
         self.clear_position()
-        self.playlist = Playlist(tracks)
+        if isinstance(tracks, Playlist):
+            self.playlist = tracks
+        else:
+            self.playlist = Playlist(tracks)
+        log.debug("Playing: %s", self.playlist)
         self.player.stop()
         self.player.play(self.playlist)