diff --git a/js/balloons-and-static-electricity/view/BalloonNode.js b/js/balloons-and-static-electricity/view/BalloonNode.js index 136f9ee4..6277bfc9 100644 --- a/js/balloons-and-static-electricity/view/BalloonNode.js +++ b/js/balloons-and-static-electricity/view/BalloonNode.js @@ -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'; diff --git a/sounds/balloon-grab-004.mp3 b/sounds/balloon-grab-004.mp3 deleted file mode 100644 index 848e5f5b..00000000 Binary files a/sounds/balloon-grab-004.mp3 and /dev/null differ diff --git a/sounds/balloon-grab-004_mp3.js b/sounds/balloon-grab-004_mp3.js deleted file mode 100644 index f1b8ca36..00000000 --- a/sounds/balloon-grab-004_mp3.js +++ /dev/null @@ -1,21 +0,0 @@ -/* 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,//swxAAAA5wREZRhgDGNGOs3NLACAADTcnxiAF6CAAAIOTPvSo4yf1Ah8+v//L//+D5Iss1122u20FolAYAADgOIYEMHBTF4SYEvOkDo7vnNDILYeu9irTmtgiB4JRiB0ChwvjIAvA+KgHNXXYHiaaB8A6S4v3wQyaReeIVV1//9OY0+mpJ40qf/+uvZTlSpF5xv/XSqAAWlu1tw//syxAMASGCDXb2WACkGCaplnaRpAADol7TMnPYo53AeIvOmvXKW3EJTLoch/hLHh1ZU6UwloZqTON91cV0kXfCxZauZWe5aXL02sGM27Z+OZwDAAAKgeNchkxHElhxHSaaSAIoX5Eog6k8/rAmjtcc8CiVpnnBGEAaBIqpa155ES4EVEm+iJLaS0idLcSnSg1/5qqUHL9pddawAw//7MsQEgAiUfWesMKrxCwyrdPYZTpSmtBK6GGGiMOgrt5czWwhYsnLB6cpE9pahXKvVHdqEE2DWK7KbmZJRCSKKKFGELGte0RGUA6ZYls5dQ2glNbZI20gK20ELCRgfgEZXmIuEylRd7A93PbrgSizdSxNosrDPjVfxD7u+igqNXRuKKJn1zdikoRK23fT1lW0PrVUEmW22RyNkgUL/+zLEBIAITItVoDxh8RoSKHTEjRzaLCYhr6UTgXI9UBHRq9hXNkKMqx1ZyxdYAcfQcFp1i2RBd9PK+vcjzBKMWRDQVDJR06ARE37Ha/0kge/eaW2xkCywKikbiYDKoJCStELIxg+yq0iTZXUMBnHASZuKAif1lqrqQF+eaw/1LjbBSRZZ1dZ0sCuSaCqwVlZWBj3/1gAEhaLrLIBA//swxAQDxDQDMaAMIDAAADSAAAAEDIjMjC21Yq7bCrtbOkWFzNuwzbt/57///01MQU1FMy45OS41VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV'; -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; \ No newline at end of file diff --git a/sounds/balloon-grab-006.mp3 b/sounds/balloon-grab-006.mp3 new file mode 100644 index 00000000..a98c4dcb Binary files /dev/null and b/sounds/balloon-grab-006.mp3 differ diff --git a/sounds/balloon-grab-006_mp3.js b/sounds/balloon-grab-006_mp3.js new file mode 100644 index 00000000..7565a833 --- /dev/null +++ b/sounds/balloon-grab-006_mp3.js @@ -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; \ No newline at end of file diff --git a/sounds/balloon-release-004.mp3 b/sounds/balloon-release-004.mp3 deleted file mode 100644 index 084a4e50..00000000 Binary files a/sounds/balloon-release-004.mp3 and /dev/null differ diff --git a/sounds/balloon-release-004_mp3.js b/sounds/balloon-release-004_mp3.js deleted file mode 100644 index d91a023c..00000000 --- a/sounds/balloon-release-004_mp3.js +++ /dev/null @@ -1,21 +0,0 @@ -/* 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,//swxAAABdQTF1TxgDFCDyx3NMACAAEsgogiAAIATBMGg/x6x6y5qsFwfD5Qo5OGBPIfDHu4YwwUdKO/4PwQ/D//63gBFaW2XW3Xa2CAAAAAMkmzAtw4OKTxJk28sdaqpfp2WntNfyP04iVCUBva+ecsQwMy+7Kzru8YuPoajlnfSWSSeNnLFu14COOBEqdipX2NAqohSuVy1ySO//syxAOACIBLd72DADENku51hhimAXX1dFcocp/26PbNPvTw2xORww4l7V6eTAe99Jp6xhBCCADD5Q5f4IBj3AgUc+sEHS/y583/Ua2m0sDFimAWjW4nJGgBaiO09QItkQYVRyy60ZPCkiA2xwVQMFPh2Ha/ef/ziS5ytp0W2WqySTyRn+datnKci4BIuEXyBbGBr/LVxC03+111kv/7MsQDgAhkP2+npGjxE4ynraMM4ACdL9ogAro4RKuSaSESIG2Oq80RCppOoxTw1UMNgIGTQ1Kq3h4tPLXFYmHETu/zqThURXJOuvIqJ4xStAAAShAZShcJ3DCUDkrCIW1GXjQU0AQAkoBAJEp0kNmofW6sbn8pU1KsHwq4JCBbNUkoM5hJ1Nyh3a7KbAkkXULOCs0pqwA7HWgoyAP/+zLEA4AIZDc9huGAQRAVZzDEDPCKgqMzHaBIw+Ig7OMxGJaNh5MlsDNpXQPu1Cjh5AqUWaDQ1DR9zQYYtglWwXQ8i4XXdnfc1L3rRA6NO0aG445EtZgDYSaHBDCkCKK4c0W4HmtgtJNJVSdjvpOlbhtYZEy7HnMvXKr9Uj+Uv+M+dGeBAdAoinZJ8TTzsyVTg0JrDyopS6ByORoA//swxAOBRSgJP6CIQDBOgpe09IxMQTARLmMHktUqRDZ2xRYeCxoKCwFERUJP/olSzf//1I9P5L3S2QADdJEmVICYke4dhYk//iotTEFNRTMuOTkuNVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV'; -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; \ No newline at end of file diff --git a/sounds/balloon-release-006.mp3 b/sounds/balloon-release-006.mp3 new file mode 100644 index 00000000..7f70c27c Binary files /dev/null and b/sounds/balloon-release-006.mp3 differ diff --git a/sounds/balloon-release-006_mp3.js b/sounds/balloon-release-006_mp3.js new file mode 100644 index 00000000..8e00e439 --- /dev/null +++ b/sounds/balloon-release-006_mp3.js @@ -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; \ No newline at end of file diff --git a/sounds/license.json b/sounds/license.json index d4542f16..a1065762 100644 --- a/sounds/license.json +++ b/sounds/license.json @@ -1,5 +1,5 @@ { - "balloon-grab-004.mp3": { + "balloon-grab-006.mp3": { "text": [ "Copyright 2002-2020 University of Colorado Boulder" ], @@ -15,7 +15,7 @@ "license": "contact phethelp@colorado.edu", "notes": "created by Ashton Morris (PhET Interactive Simulations)" }, - "balloon-release-004.mp3": { + "balloon-release-006.mp3": { "text": [ "Copyright 2002-2020 University of Colorado Boulder" ],