diff --git a/interface/resources/sounds/snap.wav b/interface/resources/sounds/snapshot/snap.wav similarity index 100% rename from interface/resources/sounds/snap.wav rename to interface/resources/sounds/snapshot/snap.wav diff --git a/scripts/system/assets/sounds/sound-print-photo.wav b/interface/resources/sounds/snapshot/sound-print-photo.wav similarity index 100% rename from scripts/system/assets/sounds/sound-print-photo.wav rename to interface/resources/sounds/snapshot/sound-print-photo.wav diff --git a/scripts/system/snapshot.js b/scripts/system/snapshot.js index 658d1c3ced..5690c91c76 100644 --- a/scripts/system/snapshot.js +++ b/scripts/system/snapshot.js @@ -275,7 +275,7 @@ function onMessage(message) { } } -var POLAROID_PRINT_SOUND = SoundCache.getSound(Script.resolvePath("assets/sounds/sound-print-photo.wav")); +var POLAROID_PRINT_SOUND = SoundCache.getSound(Script.resourcesPath() + "sounds/snapshot/sound-print-photo.wav"); var POLAROID_MODEL_URL = 'http://hifi-content.s3.amazonaws.com/alan/dev/Test/snapshot.fbx'; function printToPolaroid(image_url) { @@ -347,7 +347,7 @@ function fillImageDataFromPrevious() { story_id: previousStillSnapStoryID, blastButtonDisabled: previousStillSnapBlastingDisabled, hifiButtonDisabled: previousStillSnapHifiSharingDisabled, - errorPath: Script.resolvePath(Script.resourcesPath() + 'snapshot/img/no-image.jpg') + errorPath: Script.resourcesPath() + 'snapshot/img/no-image.jpg' }); } if (previousAnimatedSnapPath !== "") { @@ -356,7 +356,7 @@ function fillImageDataFromPrevious() { story_id: previousAnimatedSnapStoryID, blastButtonDisabled: previousAnimatedSnapBlastingDisabled, hifiButtonDisabled: previousAnimatedSnapHifiSharingDisabled, - errorPath: Script.resolvePath(Script.resourcesPath() + 'snapshot/img/no-image.jpg') + errorPath: Script.resourcesPath() + 'snapshot/img/no-image.jpg' }); } } @@ -473,7 +473,7 @@ function takeSnapshot() { Menu.setIsOptionChecked("Overlays", false); } - var snapActivateSound = SoundCache.getSound(Script.resolvePath("../../resources/sounds/snap.wav")); + var snapActivateSound = SoundCache.getSound(Script.resourcesPath() + "sounds/snapshot/snap.wav"); // take snapshot (with no notification) Script.setTimeout(function () { @@ -596,7 +596,7 @@ function processingGifStarted(pathStillSnapshot) { snapshotOptions = { containsGif: true, processingGif: true, - loadingGifPath: Script.resolvePath(Script.resourcesPath() + 'icons/loadingDark.gif'), + loadingGifPath: Script.resourcesPath() + 'icons/loadingDark.gif', canShare: canShare, isLoggedIn: isLoggedIn };