Temporarily remove QuickMix support

jamessanders · Dec 22, 2010 · ba69c4f · ba69c4f
1 parent eae8b4a
commit ba69c4f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/pandora/PandoraSource.py b/pandora/PandoraSource.py
@@ -223,9 +223,10 @@ def pandora_ready(*ignore):
 
             print "Pandora connected"
             #TODO: Station already exists
-            for i in self.pandora.stations:
-                if i.isQuickMix:
-                    self.stations_model.add_station(i, "QuickMix")
+            #FIXME: Leave out QuickMix for now
+            #for i in self.pandora.stations:
+            #    if i.isQuickMix:
+            #        self.stations_model.add_station(i, "QuickMix")
 
             for i in self.pandora.stations:
                 if not i.isQuickMix:

diff --git a/pandora/actions/StationsAction.py b/pandora/actions/StationsAction.py
@@ -71,7 +71,7 @@ def add_station_cb(self, dialog, response):
     def station_added(self, station):
         # Add station to list and start playing it
         print "Added and switching to station: %s" %(repr(station))
-        station_entry = self.stations_model.add_station(station, station.name, 1) # After QuickMix
+        station_entry = self.stations_model.add_station(station, station.name, 0) #1) # After QuickMix
         self.source.play_station(station_entry)
 
 
@@ -93,7 +93,7 @@ def show_delete_dialog(self, *args):
             print "Deleted station %s " %(repr(station))
             if self.source.is_current_station(station):
                 # exclude "QuickMix"
-                if self.stations_model.get_num_entries() <= 1:
+                if self.stations_model.get_num_entries() <= 0: #1:
                     return
                 first_station_entry = self.stations_model.get_first_station()
                 print "Deleted current station, play first station instead"

diff --git a/pandora/models/StationsModel.py b/pandora/models/StationsModel.py
@@ -41,7 +41,7 @@ def get_num_entries(self):
     # Get the first station after "QuickMix"
     def get_first_station(self):
         iter = self.get_iter_first()
-        iter = self.iter_next(iter)
+        #iter = self.iter_next(iter)
         entry = self.iter_to_entry(iter)
         return entry