Fixing issues of leaking window

[watersofshiloah] / src / mormonchannel_gtk.py

diff --git a/src/mormonchannel_gtk.py b/src/mormonchannel_gtk.py
index 0ddff73..d86f226 100755 (executable)
--- a/src/mormonchannel_gtk.py
+++ b/src/mormonchannel_gtk.py
@@ -2,8 +2,19 @@
 # -*- coding: utf-8 -*-
 
 """
-@todo Reverse order option.  Toggle between playing ascending/descending chronological order
+@todo Restructure so there is a windows/ folder with a file per source
+@todo Add additional sources
+@todo Switch home icon color
+@todo Switch from swappping icons on press to the pressed version of icons
+@bug Fix presenter display
 @todo Track recent
+@todo Favorites
+@todo Sequential playback
+@todo Enable Call Monitor
+@todo Audio seek bar
+@todo Persisted Pause
+@todo Reverse order option.  Toggle between playing ascending/descending chronological order
+@todo Podcast integration
 """
 
 from __future__ import with_statement
@@ -12,14 +23,10 @@ import gc
 import logging
 import ConfigParser
 
+import gobject
 import gtk
 
 try:
-       import hildon
-except ImportError:
-       hildon = None
-
-try:
        import osso
 except ImportError:
        osso = None
@@ -30,6 +37,7 @@ import util.misc as misc_utils
 
 import imagestore
 import player
+import stream_index
 import windows
 
 
@@ -41,24 +49,32 @@ class MormonChannelProgram(hildonize.get_app_class()):
 
        def __init__(self):
                super(MormonChannelProgram, self).__init__()
-               self._player = player.Player()
                self._store = imagestore.ImageStore("../data", "../data")
+               self._index = stream_index.AudioIndex()
+               self._player = player.Player(self._index)
 
-               if not hildonize.IS_HILDON_SUPPORTED:
-                       _moduleLogger.info("No hildonization support")
-
-               if osso is not None:
-                       self._osso_c = osso.Context(constants.__app_name__, constants.__version__, False)
-                       self._deviceState = osso.DeviceState(self._osso_c)
-                       self._deviceState.set_device_state_callback(self._on_device_state_change, 0)
-               else:
-                       _moduleLogger.info("No osso support")
-                       self._osso_c = None
-                       self._deviceState = None
+               self._index.start()
+               try:
 
-               self._sourceSelector = windows.SourceSelector(self._player, self._store)
-               self._sourceSelector.window.connect("destroy", self._on_destroy)
-               self._load_settings()
+                       if not hildonize.IS_HILDON_SUPPORTED:
+                               _moduleLogger.info("No hildonization support")
+
+                       if osso is not None:
+                               self._osso_c = osso.Context(constants.__app_name__, constants.__version__, False)
+                               self._deviceState = osso.DeviceState(self._osso_c)
+                               self._deviceState.set_device_state_callback(self._on_device_state_change, 0)
+                       else:
+                               _moduleLogger.info("No osso support")
+                               self._osso_c = None
+                               self._deviceState = None
+
+                       self._sourceSelector = windows.SourceSelector(self._player, self._store, self._index)
+                       self._sourceSelector.window.connect("destroy", self._on_destroy)
+                       self._sourceSelector.show()
+                       self._load_settings()
+               except:
+                       self._index.stop()
+                       raise
 
        def _save_settings(self):
                config = ConfigParser.SafeConfigParser()
@@ -89,9 +105,14 @@ class MormonChannelProgram(hildonize.get_app_class()):
 
        @misc_utils.log_exception(_moduleLogger)
        def _on_destroy(self, widget = None, data = None):
+               self.quit()
+
+       def quit(self):
                try:
                        self._save_settings()
 
+                       self._index.stop()
+
                        try:
                                self._deviceState.close()
                        except AttributeError:
@@ -119,11 +140,17 @@ class MormonChannelProgram(hildonize.get_app_class()):
 
 
 def run():
-       if hildonize.IS_HILDON_SUPPORTED:
-               gtk.set_application_name(constants.__pretty_app_name__)
+       gobject.threads_init()
+       gtk.gdk.threads_init()
+
+       hildonize.set_application_title(constants.__pretty_app_name__)
        app = MormonChannelProgram()
        if not PROFILE_STARTUP:
-               gtk.main()
+               try:
+                       gtk.main()
+               except KeyboardInterrupt:
+                       app.quit()
+                       raise
 
 
 if __name__ == "__main__":