From 6c73a9c43aca425c802cf44577e4aba579a0dc6d Mon Sep 17 00:00:00 2001 From: Bryan Schumaker Date: Sat, 30 Apr 2011 12:45:27 -0400 Subject: [PATCH] libsaria: Remove STOP event I can double up on the pause callback in place of a stop callback. --- libsaria/audio/__init__.py | 2 +- libsaria/controls.py | 2 +- ocarina/callbacks.py | 4 ---- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/libsaria/audio/__init__.py b/libsaria/audio/__init__.py index 0ac88e65..e605bbf0 100644 --- a/libsaria/audio/__init__.py +++ b/libsaria/audio/__init__.py @@ -50,7 +50,7 @@ def stop(): lock_audio() pipeline.stop() unlock_audio() - #do_notify_paused() + do_notify_paused() def seek(amount): lock_audio() diff --git a/libsaria/controls.py b/libsaria/controls.py index d869369d..aa70d46e 100644 --- a/libsaria/controls.py +++ b/libsaria/controls.py @@ -81,7 +81,7 @@ def toggle_play(): pause() def stop(): - return call("STOP", audio.stop) + audio.stop() def seek_forward(): libsaria.audio.seek_sec(5) diff --git a/ocarina/callbacks.py b/ocarina/callbacks.py index ffa7d32c..7b102e6f 100644 --- a/ocarina/callbacks.py +++ b/ocarina/callbacks.py @@ -18,10 +18,6 @@ def on_pause(*args): footer.on_pause() callbacks.on_pause = on_pause -def on_stop(*args): - footer.on_pause() -invite("POSTSTOP", on_stop) - def on_load(*args): footer.on_load() queue.refresh()