mirror of https://github.com/python/cpython.git
Fixed use of aifc module.
This commit is contained in:
parent
7d6aa51b56
commit
d6b9ce961e
|
@ -378,12 +378,12 @@ def saveframes(vout, queue, done, mono, monotreshold, convertor):
|
|||
def initaudio(filename, stop, done):
|
||||
import thread, aifc
|
||||
afile = aifc.open(filename, 'w')
|
||||
afile.nchannels = AL.MONO
|
||||
afile.sampwidth = AL.SAMPLE_8
|
||||
afile.setnchannels(AL.MONO)
|
||||
afile.setsampwidth(AL.SAMPLE_8)
|
||||
params = [AL.INPUT_RATE, 0]
|
||||
al.getparams(AL.DEFAULT_DEVICE, params)
|
||||
print 'audio sampling rate =', params[1]
|
||||
afile.samprate = params[1]
|
||||
afile.setframerate(params[1])
|
||||
c = al.newconfig()
|
||||
c.setchannels(AL.MONO)
|
||||
c.setqueuesize(AQSIZE)
|
||||
|
@ -394,16 +394,12 @@ def initaudio(filename, stop, done):
|
|||
|
||||
# Thread to record audio samples
|
||||
|
||||
# XXX should use writesampsraw for efficiency, but then destroy doesn't
|
||||
# XXX seem to set the #samples in the header correctly
|
||||
|
||||
def audiorecord(afile, aport, stop, done):
|
||||
while not stop:
|
||||
data = aport.readsamps(AQSIZE/2)
|
||||
## afile.writesampsraw(data)
|
||||
afile.writesamps(data)
|
||||
afile.writesampsraw(data)
|
||||
del data
|
||||
afile.destroy()
|
||||
afile.close()
|
||||
print 'Done writing audio'
|
||||
done.release_lock()
|
||||
|
||||
|
|
|
@ -391,12 +391,12 @@ def record(v, info, filename, audiofilename, \
|
|||
def initaudio(filename, stop, start, done):
|
||||
import thread, aifc
|
||||
afile = aifc.open(filename, 'w')
|
||||
afile.nchannels = AL.MONO
|
||||
afile.sampwidth = AL.SAMPLE_8
|
||||
afile.setnchannels(AL.MONO)
|
||||
afile.setsampwidth(AL.SAMPLE_8)
|
||||
params = [AL.INPUT_RATE, 0]
|
||||
al.getparams(AL.DEFAULT_DEVICE, params)
|
||||
print 'audio sampling rate =', params[1]
|
||||
afile.samprate = params[1]
|
||||
afile.setframerate(params[1])
|
||||
c = al.newconfig()
|
||||
c.setchannels(AL.MONO)
|
||||
c.setqueuesize(AQSIZE)
|
||||
|
@ -407,9 +407,6 @@ def initaudio(filename, stop, start, done):
|
|||
|
||||
# Thread to record audio samples
|
||||
|
||||
# XXX should use writesampsraw for efficiency, but then destroy doesn't
|
||||
# XXX seem to set the #samples in the header correctly
|
||||
|
||||
def audiorecord(afile, aport, stop, start, done):
|
||||
start.release_lock()
|
||||
leeway = 4
|
||||
|
@ -417,10 +414,9 @@ def audiorecord(afile, aport, stop, start, done):
|
|||
if stop:
|
||||
leeway = leeway - 1
|
||||
data = aport.readsamps(AQSIZE/8)
|
||||
## afile.writesampsraw(data)
|
||||
afile.writesamps(data)
|
||||
afile.writesampsraw(data)
|
||||
del data
|
||||
afile.destroy()
|
||||
afile.close()
|
||||
print 'Done writing audio'
|
||||
done.release_lock()
|
||||
|
||||
|
|
Loading…
Reference in New Issue