From: Jack Jansen <jack.jansen@cwi.nl>
Date: Tue, 9 Jan 1996 17:15:57 +0000 (+0000)
Subject: - Fixed bug in getfillable()
X-Git-Tag: v1.4b1~430
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=195e33efa29db8eb4c5350572b5c92394db0c4a0;p=python

- Fixed bug in getfillable()
- Added setcallback() method to set a user-callback
---

diff --git a/Mac/Lib/Audio_mac.py b/Mac/Lib/Audio_mac.py
index fef7d6e745..d64bf4dc6b 100644
--- a/Mac/Lib/Audio_mac.py
+++ b/Mac/Lib/Audio_mac.py
@@ -9,9 +9,11 @@ class Play_Audio_mac:
 		self._sampwidth = 1
 		self._nchannels = 1
 		self._gc = []
+		self._usercallback = None
 
 	def __del__(self):
 		self.stop()
+		self._usercallback = None
 
 	def wait(self):
 		import time
@@ -75,6 +77,11 @@ class Play_Audio_mac:
 
 	def _callback(self, *args):
 		del self._gc[0]
+		if self._usercallback:
+			self._usercallback()
+			
+	def setcallback(self, callback):
+		self._usercallback = callback
 
 	def getfilled(self):
 		filled = 0
@@ -83,7 +90,7 @@ class Play_Audio_mac:
 		return filled / self._nchannels / self._sampwidth
 
 	def getfillable(self):
-		return self._qsize - self.getfilled()
+		return (self._qsize / self._nchannels / self._sampwidth) - self.getfilled()
 
 	def ulaw2lin(self, data):
 		import audioop