X-Git-Url: http://git.maemo.org/git/?p=watersofshiloah;a=blobdiff_plain;f=src%2Fmormonchannel_gtk.py;h=fe8af91d15d81ef44c9e3ad2f29e992bc9dd4569;hp=64762d3d734ba7bde4382091e309388eadb22c6a;hb=c69c9c71893a1939397868a35a35d72b0f9e75d9;hpb=e724d29ea307e3c0c1af0703ea5ed98cd4a46e08

diff --git a/src/mormonchannel_gtk.py b/src/mormonchannel_gtk.py
index 64762d3..fe8af91 100755
--- a/src/mormonchannel_gtk.py
+++ b/src/mormonchannel_gtk.py
@@ -2,14 +2,15 @@
 # -*- coding: utf-8 -*-
 
 """
-@todo Switch presenters to show Play when not active rather than Stop
-@todo Implement Jump TO
-@todo Implement highlighting of current track
 @todo Restructure so there is a windows/ folder with a file per source
 @todo Add additional sources
-@bug All connect's need disconnects or else we will leak a bunch of objects
 @todo Track recent
+@todo Audio seek bar
+@todo Persisted Pause
+@todo Favorites
+@todo Sleep timer
 @todo Reverse order option.  Toggle between playing ascending/descending chronological order
+@todo Podcast integration
 """
 
 from __future__ import with_statement
@@ -19,6 +20,8 @@ import logging
 import ConfigParser
 
 import gobject
+import dbus
+import dbus.mainloop.glib
 import gtk
 
 try:
@@ -32,7 +35,7 @@ import util.misc as misc_utils
 
 import imagestore
 import player
-import index
+import stream_index
 import windows
 
 
@@ -45,12 +48,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._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")
 
@@ -137,6 +139,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()