Adding additional sources

[watersofshiloah] / src / mormonchannel_gtk.py

diff --git a/src/mormonchannel_gtk.py b/src/mormonchannel_gtk.py
index 80fb976..fb2132d 100755 (executable)
--- a/src/mormonchannel_gtk.py
+++ b/src/mormonchannel_gtk.py
@@ -2,8 +2,13 @@
 # -*- coding: utf-8 -*-
 
 """
+@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 Reverse order option.  Toggle between playing ascending/descending chronological order
-@todo Track recent
+@todo Podcast integration
 """
 
 from __future__ import with_statement
@@ -13,6 +18,8 @@ import logging
 import ConfigParser
 
 import gobject
+import dbus
+import dbus.mainloop.glib
 import gtk
 
 try:
@@ -26,7 +33,7 @@ import util.misc as misc_utils
 
 import imagestore
 import player
-import index
+import stream_index
 import windows
 
 
@@ -39,12 +46,11 @@ class MormonChannelProgram(hildonize.get_app_class()):
        def __init__(self):
                super(MormonChannelProgram, self).__init__()
                self._store = imagestore.ImageStore("../data", "../data")
-               self._index = index.AudioIndex()
-               self._player = player.Player()
+               self._index = stream_index.AudioIndex()
+               self._player = player.Player(self._index)
 
                self._index.start()
                try:
-
                        if not hildonize.IS_HILDON_SUPPORTED:
                                _moduleLogger.info("No hildonization support")
 
@@ -57,8 +63,9 @@ 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._player, self._store, self._index)
                        self._sourceSelector.window.connect("destroy", self._on_destroy)
+                       self._sourceSelector.show()
                        self._load_settings()
                except:
                        self._index.stop()
@@ -130,6 +137,7 @@ class MormonChannelProgram(hildonize.get_app_class()):
 def run():
        gobject.threads_init()
        gtk.gdk.threads_init()
+       l = dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
 
        hildonize.set_application_title(constants.__pretty_app_name__)
        app = MormonChannelProgram()