diff options
| author | Chris Ball <cjb@pullcord.laptop.org> | 2007-08-29 18:02:36 (GMT) |
|---|---|---|
| committer | Chris Ball <cjb@pullcord.laptop.org> | 2007-08-29 18:02:36 (GMT) |
| commit | 0626f36c33c0ad136d0b6d5b854b01867fc54f66 (patch) | |
| tree | 71f84c8b68dde8ac19856efa27cdcf56fba82f19 /data | |
| parent | 5d5eb2e79d96668cef44b5c590c138467931fae1 (diff) | |
| parent | 4abe2c5be4ad04ccf9a9667d7f5f059d2bad7763 (diff) | |
Merge branch 'master' of git+ssh://dev.laptop.org/git/projects/pippy-activity
Diffstat (limited to 'data')
| -rw-r--r-- | data/sound/getSoundList | 2 | ||||
| -rw-r--r-- | data/sound/playSine | 2 | ||||
| -rw-r--r-- | data/sound/playWave | 2 | ||||
| -rw-r--r-- | data/sound/sequence | 2 | ||||
| -rw-r--r-- | data/sound/sndInfo | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/data/sound/getSoundList b/data/sound/getSoundList index 09876c1..44c026d 100644 --- a/data/sound/getSoundList +++ b/data/sound/getSoundList @@ -1,7 +1,7 @@ import sys from sugar.activity.activity import get_bundle_path sys.path.append(get_bundle_path() + '/sound') -from snd import * +from sound import * for sound in sorted(getSoundList()): print sound diff --git a/data/sound/playSine b/data/sound/playSine index a641b72..cd97576 100644 --- a/data/sound/playSine +++ b/data/sound/playSine @@ -1,7 +1,7 @@ import sys from sugar.activity.activity import get_bundle_path sys.path.append(get_bundle_path() + '/sound') -from snd import * +from sound import * playSine() audioOut() diff --git a/data/sound/playWave b/data/sound/playWave index 471ca31..27605bd 100644 --- a/data/sound/playWave +++ b/data/sound/playWave @@ -1,7 +1,7 @@ import sys from sugar.activity.activity import get_bundle_path sys.path.append(get_bundle_path() + '/sound') -from snd import * +from sound import * playWave(sound='didjeridu', loop=True, duration=5) audioOut() diff --git a/data/sound/sequence b/data/sound/sequence index 1bdc966..1577c9d 100644 --- a/data/sound/sequence +++ b/data/sound/sequence @@ -2,7 +2,7 @@ import sys import random from sugar.activity.activity import get_bundle_path sys.path.append(get_bundle_path() + '/sound') -from snd import * +from sound import * for i in range(25): pitch = random.randint(500,2000) diff --git a/data/sound/sndInfo b/data/sound/sndInfo index 0a337f9..529995e 100644 --- a/data/sound/sndInfo +++ b/data/sound/sndInfo @@ -1,6 +1,6 @@ import sys from sugar.activity.activity import get_bundle_path sys.path.append(get_bundle_path() + '/sound') -from snd import * +from sound import * print playSine.__doc__ |