diff --git a/modules/music_player/music_objects/song.py b/modules/music_player/music_objects/song.py index 25117d9..e0079a7 100644 --- a/modules/music_player/music_objects/song.py +++ b/modules/music_player/music_objects/song.py @@ -74,6 +74,7 @@ class song: loader = gtk.gdk.PixbufLoader() loader.write(data) loader.close() + if self.music_player.glossMgr.debug: print "Music_Player:Image successfully written to pixbuf loader: " + str(img.mimeType) return loader.get_pixbuf() except gobject.GError: if self.music_player.glossMgr.debug: diff --git a/modules/music_player/music_player.py b/modules/music_player/music_player.py index f108e1c..d06c042 100644 --- a/modules/music_player/music_player.py +++ b/modules/music_player/music_player.py @@ -157,10 +157,11 @@ class Module: #Just a little test code self.artistImageRow.objectLibrary[0].unpause_threads() artist = self.artistImageRow.get_current_object() - thread = threading.Thread(target=self.backend.get_albums_by_artistID, args=(artist.artistID,)) - thread.start() - #thread.start_new_thread(self.backend.get_albums_by_artistID, (artist.artistID,)) self.conn_id = self.backend.connect("query-complete", self.update_for_albums, artist) + self.backend.get_albums_by_artistID(artist.artistID) + #thread = threading.Thread(target=self.backend.get_albums_by_artistID, args=(artist.artistID,)) + #thread.start() + def update_for_albums(self, data, artist = None): if not artist == self.artistImageRow.get_current_object(): return @@ -169,14 +170,14 @@ class Module: self.backend.disconnect(self.conn_id) self.current_albums = self.backend.get_albums_by_artistID(artist.artistID) - clutter.threads_enter() + #clutter.threads_enter() self.list1.clear() for album in self.current_albums: tmpItem = self.list1.add_item(album.name) tmpItem.connect("selected", self.process_songlist_from_album, album) self.list1.display() self.update_main_img() - clutter.threads_leave() + #clutter.threads_leave() def update_main_img(self, data = None): #clutter.threads_enter()