From: Kristoffer Grönlund Date: Sun, 3 Jan 2010 01:20:15 +0000 (+0100) Subject: Fixed playlist bug X-Git-Url: http://git.maemo.org/git/?p=jamaendo;a=commitdiff_plain;h=197d6453df2f45b3e6998b1ef85d5fa5cf9fb8eb Fixed playlist bug --- diff --git a/jamaendo/api.py b/jamaendo/api.py index 6748aaa..5fccc25 100644 --- a/jamaendo/api.py +++ b/jamaendo/api.py @@ -468,7 +468,7 @@ class GetQuery(Query): }, 'radio' : { 'url' : _GET2+'+'.join(_TRACK_FIELDS)+'/track/json/radio_track_inradioplaylist+track_album+album_artist/?', - 'params' : 'order=random_asc&radio_id=%d', + 'params' : 'order=random_asc&radio_id=%d&n=16', 'constructor' : [Track] }, 'favorite_albums' : { diff --git a/jamaui/__init__.py b/jamaui/__init__.py index fd73b72..9705ea1 100644 --- a/jamaui/__init__.py +++ b/jamaui/__init__.py @@ -26,7 +26,7 @@ import logging import sys LOG_FILENAME = '/tmp/jamaendo.log' -LOG_LEVEL = logging.INFO +LOG_LEVEL = logging.DEBUG #LOG_FORMAT = "%(asctime)s %(name)-19s %(levelname)-5s - %(message)s" LOG_FORMAT = "%(asctime)s %(name)-10s: [%(lineno)4d] %(levelname)-5s %(message)s" logging.basicConfig(filename=LOG_FILENAME, level=LOG_LEVEL, format=LOG_FORMAT) diff --git a/jamaui/player.py b/jamaui/player.py index dd51a92..70d261a 100644 --- a/jamaui/player.py +++ b/jamaui/player.py @@ -190,10 +190,10 @@ class GStreamer(_Player): if t == gst.MESSAGE_EOS: log.debug("Gstreamer: End of stream") self.eos_callback() - elif t == gst.MESSAGE_STATE_CHANGED: - if (message.src == self.player and - message.structure['new-state'] == gst.STATE_PLAYING): - log.debug("gstreamer: state -> playing") + #elif t == gst.MESSAGE_STATE_CHANGED: + # if (message.src == self.player and + # message.structure['new-state'] == gst.STATE_PLAYING): + # log.debug("gstreamer: state -> playing") elif t == gst.MESSAGE_ERROR: err, debug = message.parse_error() log.critical( 'Error: %s %s', err, debug ) @@ -349,7 +349,6 @@ class Player(object): self.backend = PlayerBackend() self.backend.set_eos_callback(self._on_eos) self.playlist = Playlist() - self.__in_end_notify = False # ugly... def get_position_duration(self): return self.backend.get_position_duration() @@ -386,17 +385,17 @@ class Player(object): self.backend.stop(reset=False) entry = self.playlist.next() self.backend.play_url('mp3', entry.mp3_url()) - log.debug("playing %s", entry) + log.debug("playing %s:%s", entry.ID, entry.name) postoffice.notify('next', entry) - elif not self.__in_end_notify: - self.__in_end_notify = True - postoffice.notify('playlist-end', self.playlist) - self.__in_end_notify = False - # if the notification refills the playlist, - # we do nothing after this point so we don't - # mess things up - if not self.playlist.has_next(): + elif self.playlist.radio_mode: + log.debug("Refilling radio %s", self.playlist) + self.playlist.add(jamaendo.get_radio_tracks(self.playlist.radio_id)) + if self.playlist.has_next(): + self.next() + else: self.stop() + else: + self.stop() def prev(self): if self.playlist.has_prev(): diff --git a/jamaui/playerwindow.py b/jamaui/playerwindow.py index 2c441ec..724e73d 100644 --- a/jamaui/playerwindow.py +++ b/jamaui/playerwindow.py @@ -52,9 +52,7 @@ 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() @@ -97,19 +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('playlist-end', self, self.on_playlist_end) 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() @@ -118,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)) @@ -166,7 +154,7 @@ class PlayerWindow(hildon.StackableWindow): def on_destroy(self, wnd): self.stop_position_timer() - postoffice.disconnect(['album-cover', 'playlist-end', 'next', 'prev', 'play', 'stop'], self) + postoffice.disconnect(['album-cover', 'next', 'prev', 'play', 'stop'], self) def add_stock_button(self, btns, stock, cb): btn = hildon.GtkButton(gtk.HILDON_SIZE_FINGER_HEIGHT) @@ -244,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: @@ -251,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: @@ -265,26 +257,16 @@ class PlayerWindow(hildon.StackableWindow): self.cover.set_from_file(cover) def play_radio(self, radio_name, radio_id): - playlist = Playlist() + 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.refill_radio(playlist) - - def refill_radio(self, playlist): - if playlist.radio_mode: - playlist.add(jamaendo.get_radio_tracks(playlist.radio_id)) - log.debug("Refilling radio %s", playlist) - self.player.playlist = playlist - self.playlist = playlist - self.player.next() - log.debug("Playlist current: %s, playing? %s", playlist.current_index(), - self.player.playing()) - - def on_playlist_end(self, playlist): - if playlist.radio_mode: - self.refill_radio(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) @@ -295,6 +277,7 @@ class PlayerWindow(hildon.StackableWindow): self.playlist = tracks else: self.playlist = Playlist(tracks) + log.debug("Playing: %s", self.playlist) self.player.stop() self.player.play(self.playlist)