From 6e6705736e155d594085694a626e37f48ab9602f Mon Sep 17 00:00:00 2001 From: Bryan Schumaker Date: Sat, 30 Apr 2011 12:55:48 -0400 Subject: [PATCH] libsaria: Add a load_file() callback --- libsaria/audio/__init__.py | 2 +- libsaria/callbacks.py | 4 ++++ libsaria/controls.py | 2 +- ocarina/callbacks.py | 4 ++-- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/libsaria/audio/__init__.py b/libsaria/audio/__init__.py index 9fc202f1..280788fd 100644 --- a/libsaria/audio/__init__.py +++ b/libsaria/audio/__init__.py @@ -16,7 +16,7 @@ def load_file(file): lock_audio() pipeline.load_file("file", file) unlock_audio() - #callback.song_changed() + callbacks.load_file(file) def get_state(): lock_audio() diff --git a/libsaria/callbacks.py b/libsaria/callbacks.py index 615b6887..bca610dd 100644 --- a/libsaria/callbacks.py +++ b/libsaria/callbacks.py @@ -10,3 +10,7 @@ def play(): on_pause = null_cb def pause(): on_pause() + +on_load = null_cb +def load_file(file): + on_load(file) diff --git a/libsaria/controls.py b/libsaria/controls.py index aa70d46e..dc9a2fc3 100644 --- a/libsaria/controls.py +++ b/libsaria/controls.py @@ -105,4 +105,4 @@ def load(file): file = expand(file) if not exists(file): return False - return call("LOAD", audio.load_file, file) + audio.load_file(file) diff --git a/ocarina/callbacks.py b/ocarina/callbacks.py index 7b102e6f..92cb48e1 100644 --- a/ocarina/callbacks.py +++ b/ocarina/callbacks.py @@ -18,11 +18,11 @@ def on_pause(*args): footer.on_pause() callbacks.on_pause = on_pause -def on_load(*args): +def on_load(file): footer.on_load() queue.refresh() body.cur_page_goto() -invite("POSTLOAD", on_load) +callbacks.on_load = on_load def on_like(*args): footer.on_like()