Added 'helldon' to transparently port the thing to the desktop :P

[jamaendo] / jamaui / radios.py

diff --git a/jamaui/radios.py b/jamaui/radios.py
index 2068b82..44d92f3 100644 (file)
--- a/jamaui/radios.py
+++ b/jamaui/radios.py
@@ -22,7 +22,10 @@
 #  (based on http://pygstdocs.berlios.de/pygst-tutorial/seeking.html)
 #
 import gtk
 #  (based on http://pygstdocs.berlios.de/pygst-tutorial/seeking.html)
 #
 import gtk

-import hildon
+try:
+    import hildon
+except:
+    import helldon as hildon

 import jamaendo
 from playerwindow import open_playerwindow
 from albumlist import RadioList
 import jamaendo
 from playerwindow import open_playerwindow
 from albumlist import RadioList

@@ -41,9 +44,10 @@ class RadiosWindow(hildon.StackableWindow):
 
         self.radios = {}
         hildon.hildon_gtk_window_set_progress_indicator(self, 1)
 
         self.radios = {}
         hildon.hildon_gtk_window_set_progress_indicator(self, 1)

-        for item in jamaendo.starred_radios():
+        radios = jamaendo.starred_radios()
+        for item in radios:

             self.radios[item.ID] = item
             self.radios[item.ID] = item

-            self.radiolist.add_radio(item)
+        self.radiolist.add_radios(radios)

         hildon.hildon_gtk_window_set_progress_indicator(self, 0)
 
         self.add(self.panarea)
         hildon.hildon_gtk_window_set_progress_indicator(self, 0)
 
         self.add(self.panarea)

@@ -59,14 +63,6 @@ class RadiosWindow(hildon.StackableWindow):
         return button
 
     def row_activated(self, treeview, path, view_column):
         return button
 
     def row_activated(self, treeview, path, view_column):

-        _id = self.radiolist.get_radio_id(path)
-        item = self.radios[_id]
-        self.open_item(item)
-
-    def open_item(self, item):
-        hildon.hildon_gtk_window_set_progress_indicator(self, 1)
-        tracks = jamaendo.get_radio_tracks(item.ID)
-        hildon.hildon_gtk_window_set_progress_indicator(self, 0)
-        if tracks:
-            wnd = open_playerwindow()
-            wnd.play_tracks(tracks)
+        name, _id = self.radiolist.get_radio_id(path)
+        wnd = open_playerwindow()
+        wnd.play_radio(name, _id)