From: Ed Page <eopage@byu.net>
Date: Wed, 29 Sep 2010 02:56:13 +0000 (-0500)
Subject: Fixing a diablo and general issue
X-Git-Url: http://git.maemo.org/git/?p=watersofshiloah;a=commitdiff_plain;h=dca279633a4ecf56717becf6bcc7d7bb78926d26

Fixing a diablo and general issue
---

diff --git a/Makefile b/Makefile
index 3929b1f..5026a49 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@ SOURCE_PATH=src
 SOURCE=$(shell find $(SOURCE_PATH) -iname "*.py")
 PROGRAM=$(SOURCE_PATH)/watersofshiloah_gtk.py
 DATA_PATH=data
-DATA_TYPES=*.ini *.map *.glade *.png
+DATA_TYPES=*.ini *.map *.glade *.png *.gif
 DATA=$(foreach type, $(DATA_TYPES), $(shell find $(DATA_PATH) -iname "$(type)")) data/COPYING
 OBJ=$(SOURCE:.py=.pyc)
 BUILD_PATH=./build
diff --git a/src/constants.py b/src/constants.py
index 0d5ad42..f962652 100644
--- a/src/constants.py
+++ b/src/constants.py
@@ -2,7 +2,7 @@ import os
 
 __pretty_app_name__ = "Waters of Shiloah"
 __app_name__ = "watersofshiloah"
-__version__ = "1.0.0"
+__version__ = "1.0.2"
 __build__ = 0
 __app_magic__ = 0x1AFF5
 _data_path_ = os.path.join(os.path.expanduser("~"), ".%s" % __app_name__)
diff --git a/src/player.py b/src/player.py
index b1871cd..561b5c7 100644
--- a/src/player.py
+++ b/src/player.py
@@ -35,9 +35,9 @@ class Player(gobject.GObject):
 		),
 	}
 
-	STATE_PLAY = stream.GSTStream.STATE_PLAY
-	STATE_PAUSE = stream.GSTStream.STATE_PAUSE
-	STATE_STOP = stream.GSTStream.STATE_STOP
+	STATE_PLAY = stream.Stream.STATE_PLAY
+	STATE_PAUSE = stream.Stream.STATE_PAUSE
+	STATE_STOP = stream.Stream.STATE_STOP
 
 	def __init__(self, index):
 		gobject.GObject.__init__(self)
@@ -48,7 +48,7 @@ class Player(gobject.GObject):
 		self._calls = call_monitor.CallMonitor()
 		self._calls.connect("call_start", self._on_call_start)
 
-		self._stream = stream.GSTStream()
+		self._stream = stream.Stream()
 		self._stream.connect("state-change", self._on_stream_state)
 		self._stream.connect("eof", self._on_stream_eof)
 		self._stream.connect("error", self._on_stream_error)
diff --git a/src/stream_gst.py b/src/stream_gst.py
index 0b6d959..df37a63 100644
--- a/src/stream_gst.py
+++ b/src/stream_gst.py
@@ -9,7 +9,7 @@ import util.misc as misc_utils
 _moduleLogger = logging.getLogger(__name__)
 
 
-class GSTStream(gobject.GObject):
+class Stream(gobject.GObject):
 
 	# @bug Advertising state changes a bit early, should watch for GStreamer state change
 
@@ -143,4 +143,4 @@ class GSTStream(gobject.GObject):
 			self.emit("error", err, debug)
 
 
-gobject.type_register(GSTStream)
+gobject.type_register(Stream)
diff --git a/src/stream_osso.py b/src/stream_osso.py
index 92e0ede..b2b4cfd 100644
--- a/src/stream_osso.py
+++ b/src/stream_osso.py
@@ -9,7 +9,7 @@ import util.misc as misc_utils
 _moduleLogger = logging.getLogger(__name__)
 
 
-class SimplePlayer(gobject.GObject):
+class Stream(gobject.GObject):
 
 	STATE_PLAY = "play"
 	STATE_PAUSE = "pause"
@@ -45,9 +45,6 @@ class SimplePlayer(gobject.GObject):
 		self._elapsed = 0
 		self._duration = 0
 
-		#Event callbacks
-		self.on_playing_done = on_playing_done
-
 		session_bus = dbus.SessionBus()
 
 		# Get the osso-media-player proxy object
@@ -169,4 +166,4 @@ class SimplePlayer(gobject.GObject):
 		_moduleLogger.info("State: %s", state)
 
 
-gobject.type_register(GSTStream)
+gobject.type_register(Stream)
diff --git a/support/builddeb.py b/support/builddeb.py
index 6830a89..f1df6f1 100755
--- a/support/builddeb.py
+++ b/support/builddeb.py
@@ -27,9 +27,8 @@ __email__ = "eopage@byu.net"
 __version__ = constants.__version__
 __build__ = constants.__build__
 __changelog__ = """
-* Cut down on size of media
-* Attempting to get Maemo 4.1 working
-* Fixing a couple of issues for launching on Maemo 5
+* Another Diablo fix
+* Fixing a missing graphic
 """
 
 
diff --git a/www/watersofshiloah.deb b/www/watersofshiloah.deb
index 436701a..ce43cee 100644
Binary files a/www/watersofshiloah.deb and b/www/watersofshiloah.deb differ