diff options
| author | Morgan Collett <morgan.collett@gmail.com> | 2008-08-21 10:30:28 (GMT) |
|---|---|---|
| committer | Morgan Collett <morgan.collett@gmail.com> | 2008-08-21 10:30:28 (GMT) |
| commit | 5a7141344c60c99d819baa771552cc8061d3295a (patch) | |
| tree | e6a8519c147341f2afb37d49f5a60b12d61458b9 /Speak.activity | |
| parent | 48a6e2dff631c35081e592fdc8b3b36de0363281 (diff) | |
#7852: Fix crash on launch by using numpy
Diffstat (limited to 'Speak.activity')
| -rw-r--r-- | Speak.activity/MANIFEST | 8 | ||||
| -rw-r--r-- | Speak.activity/NEWS | 1 | ||||
| -rw-r--r-- | Speak.activity/fft_mouth.py | 9 |
3 files changed, 15 insertions, 3 deletions
diff --git a/Speak.activity/MANIFEST b/Speak.activity/MANIFEST index 4fdf708..e9e53b0 100644 --- a/Speak.activity/MANIFEST +++ b/Speak.activity/MANIFEST @@ -4,6 +4,12 @@ activity.py audio.py COPYING eye.py +fft_mouth.py +glasses.py mouth.py +NEWS setup.py -voice.py
\ No newline at end of file +voice.py +waveform_mouth.py +po/activity.pot +po/voice.pot diff --git a/Speak.activity/NEWS b/Speak.activity/NEWS new file mode 100644 index 0000000..f07baa1 --- /dev/null +++ b/Speak.activity/NEWS @@ -0,0 +1 @@ +* #7852: Fix crash on launch by using numpy (morgs) diff --git a/Speak.activity/fft_mouth.py b/Speak.activity/fft_mouth.py index 230b673..08564d8 100644 --- a/Speak.activity/fft_mouth.py +++ b/Speak.activity/fft_mouth.py @@ -25,8 +25,13 @@ from mouth import * -from Numeric import ceil -from FFT import * +# Newer OLPC builds (and Fedora) have numpy instead of numeric: +try: + from numpy.oldnumeric import ceil + from numpy.fft import * +except: + from Numeric import ceil + from FFT import * class FFTMouth(Mouth): def __init__(self, audioSource): |