From a5261a5fa8fad810ecb5c260d92c3e771822bf58 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Tue, 20 Feb 2024 23:46:23 +0100 Subject: Convert BOOL to bool in llui --- indra/newview/llpreviewsound.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llpreviewsound.cpp') diff --git a/indra/newview/llpreviewsound.cpp b/indra/newview/llpreviewsound.cpp index 105c5e8cbe..2fbbfdc40d 100644 --- a/indra/newview/llpreviewsound.cpp +++ b/indra/newview/llpreviewsound.cpp @@ -48,7 +48,7 @@ LLPreviewSound::LLPreviewSound(const LLSD& key) } // virtual -BOOL LLPreviewSound::postBuild() +bool LLPreviewSound::postBuild() { const LLInventoryItem* item = getItem(); if (item) -- cgit v1.2.3 From e2e37cced861b98de8c1a7c9c0d3a50d2d90e433 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Wed, 22 May 2024 21:25:21 +0200 Subject: Fix line endlings --- indra/newview/llpreviewsound.cpp | 200 +++++++++++++++++++-------------------- 1 file changed, 100 insertions(+), 100 deletions(-) (limited to 'indra/newview/llpreviewsound.cpp') diff --git a/indra/newview/llpreviewsound.cpp b/indra/newview/llpreviewsound.cpp index 797b676e17..eab40429f9 100644 --- a/indra/newview/llpreviewsound.cpp +++ b/indra/newview/llpreviewsound.cpp @@ -1,100 +1,100 @@ -/** - * @file llpreviewsound.cpp - * @brief LLPreviewSound class implementation - * - * $LicenseInfo:firstyear=2002&license=viewerlgpl$ - * Second Life Viewer Source Code - * Copyright (C) 2010, Linden Research, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; - * version 2.1 of the License only. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA - * $/LicenseInfo$ - */ - -#include "llviewerprecompiledheaders.h" - -#include "llaudioengine.h" -#include "llagent.h" // gAgent -#include "llbutton.h" -#include "llinventory.h" -#include "lllineeditor.h" -#include "llpreviewsound.h" -#include "llresmgr.h" -#include "llviewercontrol.h" -#include "llviewermessage.h" // send_guid_sound_trigger -#include "lluictrlfactory.h" - -extern LLAudioEngine* gAudiop; -extern LLAgent gAgent; - -const F32 SOUND_GAIN = 1.0f; - -LLPreviewSound::LLPreviewSound(const LLSD& key) - : LLPreview( key ) -{ -} - -// virtual -bool LLPreviewSound::postBuild() -{ - const LLInventoryItem* item = getItem(); - if (item) - { - getChild("desc")->setValue(item->getDescription()); - if (gAudiop) - { - gAudiop->preloadSound(item->getAssetUUID()); // preload the sound - } - } - - childSetAction("Sound play btn",&LLPreviewSound::playSound,this); - childSetAction("Sound audition btn",&LLPreviewSound::auditionSound,this); - - LLButton* button = getChild("Sound play btn"); - button->setSoundFlags(LLView::SILENT); - - button = getChild("Sound audition btn"); - button->setSoundFlags(LLView::SILENT); - - childSetCommitCallback("desc", LLPreview::onText, this); - getChild("desc")->setPrevalidate(&LLTextValidate::validateASCIIPrintableNoPipe); - - return LLPreview::postBuild(); -} - -// static -void LLPreviewSound::playSound( void *userdata ) -{ - LLPreviewSound* self = (LLPreviewSound*) userdata; - const LLInventoryItem *item = self->getItem(); - - if(item && gAudiop) - { - send_sound_trigger(item->getAssetUUID(), SOUND_GAIN); - } -} - -// static -void LLPreviewSound::auditionSound( void *userdata ) -{ - LLPreviewSound* self = (LLPreviewSound*) userdata; - const LLInventoryItem *item = self->getItem(); - - if(item && gAudiop) - { - gAudiop->triggerSound(item->getAssetUUID(), gAgent.getID(), SOUND_GAIN, LLAudioEngine::AUDIO_TYPE_SFX); - } -} +/** + * @file llpreviewsound.cpp + * @brief LLPreviewSound class implementation + * + * $LicenseInfo:firstyear=2002&license=viewerlgpl$ + * Second Life Viewer Source Code + * Copyright (C) 2010, Linden Research, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; + * version 2.1 of the License only. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA + * $/LicenseInfo$ + */ + +#include "llviewerprecompiledheaders.h" + +#include "llaudioengine.h" +#include "llagent.h" // gAgent +#include "llbutton.h" +#include "llinventory.h" +#include "lllineeditor.h" +#include "llpreviewsound.h" +#include "llresmgr.h" +#include "llviewercontrol.h" +#include "llviewermessage.h" // send_guid_sound_trigger +#include "lluictrlfactory.h" + +extern LLAudioEngine* gAudiop; +extern LLAgent gAgent; + +const F32 SOUND_GAIN = 1.0f; + +LLPreviewSound::LLPreviewSound(const LLSD& key) + : LLPreview( key ) +{ +} + +// virtual +bool LLPreviewSound::postBuild() +{ + const LLInventoryItem* item = getItem(); + if (item) + { + getChild("desc")->setValue(item->getDescription()); + if (gAudiop) + { + gAudiop->preloadSound(item->getAssetUUID()); // preload the sound + } + } + + childSetAction("Sound play btn",&LLPreviewSound::playSound,this); + childSetAction("Sound audition btn",&LLPreviewSound::auditionSound,this); + + LLButton* button = getChild("Sound play btn"); + button->setSoundFlags(LLView::SILENT); + + button = getChild("Sound audition btn"); + button->setSoundFlags(LLView::SILENT); + + childSetCommitCallback("desc", LLPreview::onText, this); + getChild("desc")->setPrevalidate(&LLTextValidate::validateASCIIPrintableNoPipe); + + return LLPreview::postBuild(); +} + +// static +void LLPreviewSound::playSound( void *userdata ) +{ + LLPreviewSound* self = (LLPreviewSound*) userdata; + const LLInventoryItem *item = self->getItem(); + + if(item && gAudiop) + { + send_sound_trigger(item->getAssetUUID(), SOUND_GAIN); + } +} + +// static +void LLPreviewSound::auditionSound( void *userdata ) +{ + LLPreviewSound* self = (LLPreviewSound*) userdata; + const LLInventoryItem *item = self->getItem(); + + if(item && gAudiop) + { + gAudiop->triggerSound(item->getAssetUUID(), gAgent.getID(), SOUND_GAIN, LLAudioEngine::AUDIO_TYPE_SFX); + } +} -- cgit v1.2.3