From 330aff8082382f55cfd2f48be346328347bb90ca Mon Sep 17 00:00:00 2001 From: Caitlin Hennessy Date: Fri, 1 Dec 2017 09:59:59 -0800 Subject: [PATCH] Restore 'play sound effect' name --- libs/music/_locales/music-jsdoc-strings.json | 8 ++++---- libs/music/_locales/music-strings.json | 4 ++-- libs/music/sounds.ts | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/libs/music/_locales/music-jsdoc-strings.json b/libs/music/_locales/music-jsdoc-strings.json index 3a616a81..2d67cdcf 100644 --- a/libs/music/_locales/music-jsdoc-strings.json +++ b/libs/music/_locales/music-jsdoc-strings.json @@ -11,10 +11,10 @@ "music.fromWAV": "Makes a sound bound to a buffer in WAV format.", "music.noteFrequency": "Get the frequency of a note.", "music.noteFrequency|param|name": "the note name, eg: Note.C", - "music.playSound": "Start playing a sound and don't wait for it to finish.", - "music.playSoundUntilDone": "Plays a sound", - "music.playSoundUntilDone|param|sound": "the sound to play", - "music.playSound|param|sound": "the sound to play", + "music.playSoundEffect": "Start playing a sound and don't wait for it to finish.", + "music.playSoundEffectUntilDone": "Plays a sound", + "music.playSoundEffectUntilDone|param|sound": "the sound to play", + "music.playSoundEffect|param|sound": "the sound to play", "music.playTone": "Play a tone through the speaker for some amount of time.", "music.playTone|param|frequency": "pitch of the tone to play in Hertz (Hz)", "music.playTone|param|ms": "tone duration in milliseconds (ms)", diff --git a/libs/music/_locales/music-strings.json b/libs/music/_locales/music-strings.json index 52485175..a74eae44 100644 --- a/libs/music/_locales/music-strings.json +++ b/libs/music/_locales/music-strings.json @@ -24,8 +24,8 @@ "music.beat|block": "%fraction|beat", "music.changeTempoBy|block": "change tempo by %value|(bpm)", "music.noteFrequency|block": "%note", - "music.playSoundUntilDone|block": "play sound %sound|until done", - "music.playSound|block": "play sound %sound", + "music.playSoundEffectUntilDone|block": "play sound effect %sound|until done", + "music.playSoundEffect|block": "play sound effect %sound", "music.playTone|block": "play tone|at %note=device_note|for %duration=device_beat", "music.rest|block": "rest|for %duration=device_beat", "music.ringTone|block": "ring tone|at %note=device_note", diff --git a/libs/music/sounds.ts b/libs/music/sounds.ts index fe5e6152..464b0e5f 100644 --- a/libs/music/sounds.ts +++ b/libs/music/sounds.ts @@ -260,9 +260,9 @@ namespace music { * Plays a sound * @param sound the sound to play */ - //% blockId=music_play_sound_until_done block="play sound %sound|until done" + //% blockId=music_play_sound_effect_until_done block="play sound effect %sound|until done" //% weight=98 - export function playSoundUntilDone(sound: Sound) { + export function playSoundEffectUntilDone(sound: Sound) { if (!sound) return; sound.play(); } @@ -281,9 +281,9 @@ namespace music { * Start playing a sound and don't wait for it to finish. * @param sound the sound to play */ - //% blockId=music_play_sound block="play sound %sound" + //% blockId=music_play_sound_effect block="play sound effect %sound" //% weight=99 - export function playSound(sound: Sound) { + export function playSoundEffect(sound: Sound) { control.runInBackground(() => sound.play()); } }