todo work

[watersofshiloah] / src / mormonchannel_gtk.py

diff --git a/src/mormonchannel_gtk.py b/src/mormonchannel_gtk.py
index d6a64c9..1624f1c 100755 (executable)
--- a/src/mormonchannel_gtk.py
+++ b/src/mormonchannel_gtk.py
@@ -2,19 +2,24 @@
 # -*- coding: utf-8 -*-
 
 """
-@todo Restructure so there is a windows/ folder with a file per source
-@todo Add additional sources
-@todo Track recent
-@todo Sequential playback
-@todo Audio seek bar
-@todo Persisted Pause
-@todo Favorites
-@todo Reverse order option.  Toggle between playing ascending/descending chronological order
+@todo Need to confirm id's are persistent (not just for todos but broken behavior on transition)
+       @todo Track recent
+       @todo Persisted Pause
+       @todo Favorites
+@todo Sleep timer
 @todo Podcast integration
+       @todo Default with BYU Devotionals, http://speeches.byu.edu/?act=help&page=podcast
+       @todo Mormon Messages
+@todo Reverse order option.  Toggle between playing ascending/descending chronological order
+@todo Jump to website
+@todo Offline mode
+@todo Re-use windows for better performance
+@todo Make radio program updates only happen when the app has focus to reduce CPU wakes
 """
 
 from __future__ import with_statement
 
+import os
 import gc
 import logging
 import ConfigParser
@@ -47,10 +52,13 @@ class MormonChannelProgram(hildonize.get_app_class()):
 
        def __init__(self):
                super(MormonChannelProgram, self).__init__()
-               self._store = imagestore.ImageStore("../data", "../data")
+               currentPath = os.path.abspath(__file__)
+               storePath = os.path.join(os.path.split(os.path.dirname(currentPath))[0], "data")
+               self._store = imagestore.ImageStore(storePath, constants._cache_path_)
                self._index = stream_index.AudioIndex()
                self._player = player.Player(self._index)
 
+               self._store.start()
                self._index.start()
                try:
                        if not hildonize.IS_HILDON_SUPPORTED:
@@ -65,12 +73,14 @@ class MormonChannelProgram(hildonize.get_app_class()):
                                self._osso_c = None
                                self._deviceState = None
 
-                       self._sourceSelector = windows.SourceSelector(self._player, self._store, self._index)
+                       self._sourceSelector = windows.source.SourceSelector(self, self._player, self._store, self._index)
                        self._sourceSelector.window.connect("destroy", self._on_destroy)
+                       self._sourceSelector.window.set_default_size(400, 800)
                        self._sourceSelector.show()
                        self._load_settings()
                except:
                        self._index.stop()
+                       self._store.stop()
                        raise
 
        def _save_settings(self):
@@ -102,24 +112,26 @@ class MormonChannelProgram(hildonize.get_app_class()):
 
        @misc_utils.log_exception(_moduleLogger)
        def _on_destroy(self, widget = None, data = None):
-               self.quit()
+               try:
+                       self.quit()
+               finally:
+                       gtk.main_quit()
 
        def quit(self):
-               try:
-                       self._save_settings()
+               self._save_settings()
 
-                       self._index.stop()
+               self._player.stop()
+               self._index.stop()
+               self._store.stop()
 
-                       try:
-                               self._deviceState.close()
-                       except AttributeError:
-                               pass # Either None or close was removed (in Fremantle)
-                       try:
-                               self._osso_c.close()
-                       except AttributeError:
-                               pass # Either None or close was removed (in Fremantle)
-               finally:
-                       gtk.main_quit()
+               try:
+                       self._deviceState.close()
+               except AttributeError:
+                       pass # Either None or close was removed (in Fremantle)
+               try:
+                       self._osso_c.close()
+               except AttributeError:
+                       pass # Either None or close was removed (in Fremantle)
 
        @misc_utils.log_exception(_moduleLogger)
        def _on_show_about(self, widget = None, data = None):
@@ -141,7 +153,7 @@ def run():
        gtk.gdk.threads_init()
        l = dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
 
-       hildonize.set_application_title(constants.__pretty_app_name__)
+       hildonize.set_application_name("FMRadio") # Playback while silent on Maemo 5
        app = MormonChannelProgram()
        if not PROFILE_STARTUP:
                try:
@@ -149,6 +161,8 @@ def run():
                except KeyboardInterrupt:
                        app.quit()
                        raise
+       else:
+               app.quit()
 
 
 if __name__ == "__main__":