From c8c79272b6e3b6974217ab2d8bab54fda043c39f Mon Sep 17 00:00:00 2001
From: Bryan Schumaker <bjschuma@gmail.com>
Date: Tue, 23 Nov 2010 20:44:37 -0500
Subject: [PATCH] Moved play and pause to libsaria/controls.py

They have been moved from libsaria/audio/__init__.py.
---
 libsaria/audio/__init__.py   | 11 -----------
 libsaria/controls.py         | 14 +++++++++++---
 libsaria/sources/library.py  |  2 +-
 ocarina/components/button.py |  2 +-
 4 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/libsaria/audio/__init__.py b/libsaria/audio/__init__.py
index 0d02271b..99628867 100644
--- a/libsaria/audio/__init__.py
+++ b/libsaria/audio/__init__.py
@@ -39,17 +39,6 @@ def load(file):
 	return call("LOAD", audio.load, file)
 
 
-def play():
-	global audio
-	return call("PLAY", audio.play)
-
-
-def pause():
-	global audio
-	return call("PAUSE", audio.pause)
-libsaria.event.invite("PREEOS", pause)
-
-
 def stop():
 	global audio
 	return call("STOP", audio.stop)
diff --git a/libsaria/controls.py b/libsaria/controls.py
index d0cede90..c45720f3 100644
--- a/libsaria/controls.py
+++ b/libsaria/controls.py
@@ -1,15 +1,23 @@
 # Bryan Schumaker (11/23/2010)
 
-audio = None
-call  = None
+audio  = None
+call   = None
+invite = None
 
 def init():
 	global call
 	global audio
+	global invite
 
 	import libsaria
-	call = libsaria.event.call
+	call   = libsaria.event.call
+	invite = libsaria.event.invite
+
 	from audio import audio
+	invite("PREEOS", pause)
 
 def play():
 	return call("PLAY", audio.play)
+
+def pause():
+	return call("PAUSE", audio.pause)
diff --git a/libsaria/sources/library.py b/libsaria/sources/library.py
index 952dd073..3865d042 100644
--- a/libsaria/sources/library.py
+++ b/libsaria/sources/library.py
@@ -146,7 +146,7 @@ def inc_count(id):
 def play_id(id):
 	libsaria.sources.cur_lib_id = id
 	libsaria.audio.load(get_attrs(id, "filepath")[0])
-	libsaria.audio.play()
+	libsaria.controls.play()
 
 def filter(text):
 	global visible
diff --git a/ocarina/components/button.py b/ocarina/components/button.py
index 012d248f..46c6409b 100644
--- a/ocarina/components/button.py
+++ b/ocarina/components/button.py
@@ -53,7 +53,7 @@ class PauseButton(Button):
 		invite("POSTPAUSE", self.hide)
 		invite("POSTSTOP", self.hide)
 	def clicked(self, button):
-		LS.audio.pause()
+		LS.controls.pause()
 	def hide(self, paused):
 		if paused == True:
 			Button.hide(self)