Skip to content

Commit

Permalink
updated grab/release sounds, see #480
Browse files Browse the repository at this point in the history
  • Loading branch information
jbphet committed Mar 1, 2021
1 parent 2bc35ad commit 3d61f75
Show file tree
Hide file tree
Showing 10 changed files with 46 additions and 46 deletions.
4 changes: 2 additions & 2 deletions js/balloons-and-static-electricity/view/BalloonNode.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ import PitchedPopGenerator from '../../../../tambo/js/sound-generators/PitchedPo
import SoundClip from '../../../../tambo/js/sound-generators/SoundClip.js';
import soundManager from '../../../../tambo/js/soundManager.js';
import Utterance from '../../../../utterance-queue/js/Utterance.js';
import grabBalloonSound from '../../../sounds/balloon-grab-004_mp3.js';
import grabBalloonSound from '../../../sounds/balloon-grab-006_mp3.js';
import balloonHitsSweaterSound from '../../../sounds/balloon-hit-sweater_mp3.js';
import releaseBalloonSound from '../../../sounds/balloon-release-004_mp3.js';
import releaseBalloonSound from '../../../sounds/balloon-release-006_mp3.js';
import balloonHitsWallSound from '../../../sounds/wall-contact_mp3.js';
import balloonsAndStaticElectricity from '../../balloonsAndStaticElectricity.js';
import BASEA11yStrings from '../BASEA11yStrings.js';
Expand Down
Binary file removed sounds/balloon-grab-004.mp3
Binary file not shown.
21 changes: 0 additions & 21 deletions sounds/balloon-grab-004_mp3.js

This file was deleted.

Binary file added sounds/balloon-grab-006.mp3
Binary file not shown.
21 changes: 21 additions & 0 deletions sounds/balloon-grab-006_mp3.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
/* eslint-disable */
import asyncLoader from '../../phet-core/js/asyncLoader.js';
import base64SoundToByteArray from '../../tambo/js/base64SoundToByteArray.js';
import WrappedAudioBuffer from '../../tambo/js/WrappedAudioBuffer.js';
import phetAudioContext from '../../tambo/js/phetAudioContext.js';

const soundURI = 'data:audio/mpeg;base64,//swxAAABbwpImwkZFELDO189hhuAJBTwL8AGZhIEsM5VDAyAAjJ1Oi92IRQ4FnCPk0I08mj/0dv7v+XB8Hw+7p8TiAIzRDu921sAEhAxNxcy0eDWwTwHiJcc2hLZMjEYLFCTjESaS2hsPpVwWkam03AIMusPewCZRC1DFOt3iDnCHE/l3qHDBIeTTSRTu4/jgNsjiIpDZ8TJglu//syxAsAChyBOg7phUkJFWmlwZYpsKcWSqyLheeJP84r0rwlLkFgySiQURcHIVri2ciUKx4GDa45YPh1MimYPHjWnl3G2UmM23ejR9fU50gBhyCzgEFLLLcGHx4bJJBsiomdxwYqByoGxQQryLffjkXhM5jlxEDgKrJOZqGcMzNFWZFpsWM6qSM6mRa6f4QQMLLVhAKe1ssriACmSP/7MsQFAAjIfVutMQlxEAytvPYhTmMSWy4jsGyhrpDAvASEsfWPXi04PVhTQaNbHDC3T5hnTZC6DdLdS37VGpGmIkxAwhta9oiMoB0yxLZy6hVQlRph321tkArbQkYm4VwMZXi8PRfWR+9gF7k12wwOGk2dR8I4yiOoZ+jO7vYYFRq6NxRRM+ubsUlCJW276esq2h9alQAHJJH30AX/+zLEA4AH+ItNgDxh8SGSZiWEjSgLaLCYhr6UTgXI9UBHRq9hXNkKMqx1ZyxdYAcfQcFp1i2RBd9PK+vcjzBKMWRDQVDJR06ARE37HawCO5lZRKZyC3yjScZYQGejLtRlaIWRjB9lVpEmyh6ERI9qaEmbigIn9Zaq6kBfnmsP9S42wWuPCW2JYMnaxpU6JTs7OpBr/8mqAAASMUiH//swxAMABkEjFYWES/CTAGN0AYgGxgJAIioBMOB0YpZtjzznwAnyr8y/2ZGbPr9LPr9f//5r+RuhG+3//39CMDcAgpuSSSORwDDwlGFan4ir53Wd7Op/PeVzvyMRA1WC1YK1//huTEFNRTMuOTkuNaqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqq//syxBsDwAABpAAAACAAADSAAAAEqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqg==';
const soundByteArray = base64SoundToByteArray( phetAudioContext, soundURI );
const unlock = asyncLoader.createLock( soundURI );
const wrappedAudioBuffer = new WrappedAudioBuffer();
const onDecodeSuccess = decodedAudio => {
wrappedAudioBuffer.audioBufferProperty.set( decodedAudio );
unlock();
};
const onDecodeError = decodeError => {
console.warn( 'decode of audio data failed, using stubbed sound, error: ' + decodeError );
wrappedAudioBuffer.audioBufferProperty.set( phetAudioContext.createBuffer( 1, 0, phetAudioContext.sampleRate ) );
unlock();
};
phetAudioContext.decodeAudioData( soundByteArray.buffer, onDecodeSuccess, onDecodeError );
export default wrappedAudioBuffer;
Binary file removed sounds/balloon-release-004.mp3
Binary file not shown.
21 changes: 0 additions & 21 deletions sounds/balloon-release-004_mp3.js

This file was deleted.

Binary file added sounds/balloon-release-006.mp3
Binary file not shown.
21 changes: 21 additions & 0 deletions sounds/balloon-release-006_mp3.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
/* eslint-disable */
import asyncLoader from '../../phet-core/js/asyncLoader.js';
import base64SoundToByteArray from '../../tambo/js/base64SoundToByteArray.js';
import WrappedAudioBuffer from '../../tambo/js/WrappedAudioBuffer.js';
import phetAudioContext from '../../tambo/js/phetAudioContext.js';

const soundURI = 'data:audio/mpeg;base64,//swxAAABBQBUbQRgDF5E6l3OPAAKSkkl1sgEABxYPvBwEAQBAMPvg4CAIAgCAPn/4P///9AABGS2X0k02koQAAAABiwDINmbbGZ1Fphjom2xEn2/AODTSQgD3HZae01/LuY4HojoRnWVWZER41lh8eL3mrxdK2JHa3DTzW6eCnWSGwwLazG3TXp6Z9a/+SXvfY0CgWvAqhZjiSa//syxAQDCEwzSl2zAAEUiqhB16TQFYnTeZ1qIYaHoMKhlUfi77xenp6fu7JAZRrpgukcxziwuIwffnF0cuTdU+uTpd0ERIHf6jW02lgYsUpcBAVBAJmWjanBWgmR6bBigIoge5wqTaUa0SUAz9MpCNUM1XPapFeSNVtn2lzdEQZIRgbNiwbUXI6ypLiJ8cEUSjHf4cqACKWyOONJAf/7MsQEAAiUP12sJGcxBgysdPMNHgy0q8OENGzolOGeDgORIgbY6rzREKmk6jFPDVQw2AgZNDUqreHi08tcViYcRO7/OpOFRFck668ionjFK0RGfba2SRsICVPUCEEunSsceIrpoAgBJQYUNAnHIbNQ+t1Y3P5SpqVYPhVwSEC2apJQZzCTqblDv/qSLqFnBWaU1dUAzXes03KDgoL/+zLEBIAIXDdDg72AAQuHp7TBoNHOAshArHY0JzjMQkh8Mh5MlsDNpXQPu1Cjh5AqUWaDQ1DR9zQYYtglWwXQ8i4XXdnfc1L3rRA6NO0aHK5LW4UigAN09KhDCkCKI46gXB5rYLSTSVUnY76jInSlZVAnJ7WvNZN6Kfyb/hHtq7AxZI7H+q/07LX/p5r/yKncyQAUzgSWyfhhGgCC//swxAWABhjtKaKEUdCtlOMoEIl6tSl6t1pwkwsPLKJmETQiMmEhQhJ//+uGI2AC////yNqcAGI9P7UOrvbccRoIwybZiJmoc0LmFZhChZrF3F8nAnK39fQqGzWhh///lXEekS/KqkxBTUUzLjk5LjWqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqq//syxBqDwAABpAAAACAAADSAAAAEqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqg==';
const soundByteArray = base64SoundToByteArray( phetAudioContext, soundURI );
const unlock = asyncLoader.createLock( soundURI );
const wrappedAudioBuffer = new WrappedAudioBuffer();
const onDecodeSuccess = decodedAudio => {
wrappedAudioBuffer.audioBufferProperty.set( decodedAudio );
unlock();
};
const onDecodeError = decodeError => {
console.warn( 'decode of audio data failed, using stubbed sound, error: ' + decodeError );
wrappedAudioBuffer.audioBufferProperty.set( phetAudioContext.createBuffer( 1, 0, phetAudioContext.sampleRate ) );
unlock();
};
phetAudioContext.decodeAudioData( soundByteArray.buffer, onDecodeSuccess, onDecodeError );
export default wrappedAudioBuffer;
4 changes: 2 additions & 2 deletions sounds/license.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"balloon-grab-004.mp3": {
"balloon-grab-006.mp3": {
"text": [
"Copyright 2002-2020 University of Colorado Boulder"
],
Expand All @@ -15,7 +15,7 @@
"license": "contact [email protected]",
"notes": "created by Ashton Morris (PhET Interactive Simulations)"
},
"balloon-release-004.mp3": {
"balloon-release-006.mp3": {
"text": [
"Copyright 2002-2020 University of Colorado Boulder"
],
Expand Down

0 comments on commit 3d61f75

Please sign in to comment.