diff options
author | olipet <olivier.belanger@umontreal.ca> | 2007-08-23 20:17:30 (GMT) |
---|---|---|
committer | olipet <olivier.belanger@umontreal.ca> | 2007-08-23 20:17:30 (GMT) |
commit | f1ab961a9595c2fe73a5620b462c24543703354a (patch) | |
tree | 8d36354f1670215e7d43537eef152eb568a85eb8 /data | |
parent | f5a5d7f76270973e02aee5145d06c2ab980b60e6 (diff) | |
parent | 8b76bdb87e9be3479d3fc79bd660ad5385faebc7 (diff) |
Merge branch 'master' of git+ssh://olipet@dev.laptop.org/git/projects/pippy-activity
Conflicts:
sound/snd.py
Diffstat (limited to 'data')
-rw-r--r-- | data/sound/playWave | 2 | ||||
-rw-r--r-- | data/sound/sequence | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/data/sound/playWave b/data/sound/playWave index 8279c22..9988ac3 100644 --- a/data/sound/playWave +++ b/data/sound/playWave @@ -1,6 +1,6 @@ import sys sys.path.append('/usr/share/activities/Pippy.activity/sound') from snd import * -playWave(name='didjeridu', loop=True, dur=5) +playWave(name='didjeridu', loop=True, duration=5) audioOut() diff --git a/data/sound/sequence b/data/sound/sequence index f870094..683ea59 100644 --- a/data/sound/sequence +++ b/data/sound/sequence @@ -4,9 +4,9 @@ sys.path.append('/usr/share/activities/Pippy.activity/sound') from snd import * for i in range(25): pitch = random.randint(500,2000) - amp = 5000 - dur = 0.1 + amplitude = 5000 + duration = 0.1 starttime = i * 0.1 - playSine(pitch, amp, dur, starttime) + playSine(pitch, amplitude, duration, starttime) audioOut() |