anthonycicc/PySolFC
1
0
Fork 0
mirror of https://github.com/shlomif/PySolFC.git synced 2025-04-05 00:02:29 -04:00
Code Releases Activity

Fix OSS audio server

Browse source 
Strings converted to bytes where necessary to make it Python 3 compatible.
Added a check for availability of OSS interface.
This commit is contained in:
roderik 2018-03-10 22:57:15 +01:00
parent 08f5fd99c1
commit f0a94fd7f2
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
pysollib/pysolaudio.py
View file

@ -385,13 +385,13 @@ class OSSAudioServer:
def mainLoop(self):
while True:
s = os.read(self.pipe, 256)
ss = s.split('\0')
ss = s.split(b'\0')
if not ss[0]:
os._exit(0)
if ss[0] == 'break':
if ss[0] == b'break':
self._play_loop = False
continue
filename, priority, loop = ss[0], int(ss[1]), int(ss[2])
filename, priority, loop = ss[0].decode(), int(ss[1]), int(ss[2])
if loop:
self._play_loop = True
th = Thread(target=self.playLoop, args=(filename,))
@ -461,6 +461,8 @@ class OSSAudioClient(AbstractAudioClient):
def __init__(self):
AbstractAudioClient.__init__(self)
import ossaudiodev
if not os.path.exists('/dev/dsp'):
raise RuntimeError('OSS interface not available')
self.audiodev = ossaudiodev
def startServer(self):
@ -473,14 +475,17 @@ class OSSAudioClient(AbstractAudioClient):
def _playSample(self, filename, priority, loop, volume):
# print '_playSample:', filename, loop
os.write(self.pout, '%s\0%s\0%s\0' % (filename, priority, loop))
os.write(self.pout, b'%s\0%s\0%s\0' %
(filename.encode(),
str(priority).encode(),
str(loop).encode()))
return 1
def _stopSamples(self):
os.write(self.pout, 'break\0\0\0')
os.write(self.pout, b'break\0\0\0')
def _destroy(self):
os.write(self.pout, '\0\0\0')
os.write(self.pout, b'\0\0\0')
# ************************************************************************