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
__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__)
),
}
- 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)
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)
_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
self.emit("error", err, debug)
-gobject.type_register(GSTStream)
+gobject.type_register(Stream)
_moduleLogger = logging.getLogger(__name__)
-class SimplePlayer(gobject.GObject):
+class Stream(gobject.GObject):
STATE_PLAY = "play"
STATE_PAUSE = "pause"
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
_moduleLogger.info("State: %s", state)
-gobject.type_register(GSTStream)
+gobject.type_register(Stream)
__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
"""