6 files changed, 47 insertions, 26 deletions

diff --git a/linden/indra/newview/llaudiosourcevo.cpp b/linden/indra/newview/llaudiosourcevo.cpp
index e668078..9c25d94 100644
--- a/linden/indra/newview/llaudiosourcevo.cpp
+++ b/linden/indra/newview/llaudiosourcevo.cpp
@@ -39,7 +39,7 @@
 #include "llviewerparcelmgr.h"
 
 LLAudioSourceVO::LLAudioSourceVO(const LLUUID &sound_id, const LLUUID& owner_id, const F32 gain, LLViewerObject *objectp)
-:       LLAudioSource(sound_id, owner_id, gain), 
+: LLAudioSource(sound_id, owner_id, gain, LLAudioEngine::AUDIO_TYPE_SFX), 
         mObjectp(objectp), 
         mActualGain(gain)
 {
diff --git a/linden/indra/newview/llpreviewsound.cpp b/linden/indra/newview/llpreviewsound.cpp
index 9ba6fd5..6b79bfb 100644
--- a/linden/indra/newview/llpreviewsound.cpp
+++ b/linden/indra/newview/llpreviewsound.cpp
@@ -106,7 +106,6 @@ void LLPreviewSound::auditionSound( void *userdata )
         if(item && gAudiop)
         {
                 LLVector3d lpos_global = gAgent.getPositionGlobal();
-                F32 volume = gSavedSettings.getBOOL("MuteSounds") ? 0.f : SOUND_GAIN * gSavedSettings.getF32("AudioLevelSFX");
-                gAudiop->triggerSound(item->getAssetUUID(), gAgent.getID(), volume, lpos_global);
+                gAudiop->triggerSound(item->getAssetUUID(), gAgent.getID(), SOUND_GAIN, LLAudioEngine::AUDIO_TYPE_UI, lpos_global);
         }
 }
diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp
index 636cf31..11e4ac5 100644
--- a/linden/indra/newview/llstartup.cpp
+++ b/linden/indra/newview/llstartup.cpp
@@ -583,28 +583,55 @@ bool idle_startup()
 
                 if (FALSE == gSavedSettings.getBOOL("NoAudio"))
                 {
-                        
-                gAudiop = (LLAudioEngine *) new LLAudioEngine_OpenAL();
+                        gAudiop = NULL;
+
+#ifdef LL_OPENAL
+                        if (!gAudiop
+#if !LL_WINDOWS
+                            && NULL == getenv("LL_BAD_OPENAL_DRIVER")
+#endif // !LL_WINDOWS
+                            )
+                        {
+                                gAudiop = (LLAudioEngine *) new LLAudioEngine_OpenAL();
+                        }
+#endif
+
+#ifdef LL_FMOD                  
+                        if (!gAudiop
+#if !LL_WINDOWS
+                            && NULL == getenv("LL_BAD_FMOD_DRIVER")
+#endif // !LL_WINDOWS
+                            )
+                        {
+                                gAudiop = (LLAudioEngine *) new LLAudioEngine_FMOD();
+                        }
+#endif
 
                         if (gAudiop)
                         {
-                                BOOL init = gAudiop->init(kAUDIO_NUM_SOURCES);
-                                if(!init)
+#if LL_WINDOWS
+                                // FMOD on Windows needs the window handle to stop playing audio
+                                // when window is minimized. JC
+                                void* window_handle = (HWND)gViewerWindow->getPlatformWindow();
+#else
+                                void* window_handle = NULL;
+#endif
+                                bool init = gAudiop->init(kAUDIO_NUM_SOURCES, window_handle);
+                                if(init)
                                 {
-                                        LL_WARNS("AppInit") << "Unable to initialize audio engine" << LL_ENDL;
-                                        gAudiop=NULL;
+                                        gAudiop->setMuted(TRUE);
                                 }
                                 else
                                 {
-                                        gAudiop->setMuted(TRUE);
-                                        LL_INFOS("AppInit") << "Audio Engine Initialized." << LL_ENDL;
+                                        LL_WARNS("AppInit") << "Unable to initialize audio engine" << LL_ENDL;
+                                        delete gAudiop;
+                                        gAudiop = NULL;
                                 }
                         }
                 }
-                else
-                {
-                        gAudiop = NULL;
-                }
+                
+                LL_INFOS("AppInit") << "Audio Engine Initialized." << LL_ENDL;
+
                 
                 if (LLTimer::knownBadTimer())
                 {
diff --git a/linden/indra/newview/llviewermessage.cpp b/linden/indra/newview/llviewermessage.cpp
index 0e39026..260265e 100644
--- a/linden/indra/newview/llviewermessage.cpp
+++ b/linden/indra/newview/llviewermessage.cpp
@@ -3308,8 +3308,7 @@ void process_sound_trigger(LLMessageSystem *msg, void **)
                 return;
         }
 
-        F32 volume = gSavedSettings.getBOOL("MuteSounds") ? 0.f : (gain * gSavedSettings.getF32("AudioLevelSFX"));
-        gAudiop->triggerSound(sound_id, owner_id, volume, pos_global);
+        gAudiop->triggerSound(sound_id, owner_id, gain, LLAudioEngine::AUDIO_TYPE_SFX, pos_global);
 }
 
 void process_preload_sound(LLMessageSystem *msg, void **user_data)
diff --git a/linden/indra/newview/llviewertexteditor.cpp b/linden/indra/newview/llviewertexteditor.cpp
index 8a55b3f..1dda1ca 100644
--- a/linden/indra/newview/llviewertexteditor.cpp
+++ b/linden/indra/newview/llviewertexteditor.cpp
@@ -1402,8 +1402,7 @@ void LLViewerTextEditor::openEmbeddedSound( LLInventoryItem* item )
         const F32 SOUND_GAIN = 1.0f;
         if(gAudiop)
         {
-                F32 volume = gSavedSettings.getBOOL("MuteSounds") ? 0.f : (SOUND_GAIN * gSavedSettings.getF32("AudioLevelSFX"));
-                gAudiop->triggerSound(item->getAssetUUID(), gAgentID, volume, lpos_global);
+                gAudiop->triggerSound(item->getAssetUUID(), gAgentID, SOUND_GAIN, LLAudioEngine::AUDIO_TYPE_UI, lpos_global);
         }
         showCopyToInvDialog( item );
 }
diff --git a/linden/indra/newview/llvoavatar.cpp b/linden/indra/newview/llvoavatar.cpp
index e480eb3..327cd57 100644
--- a/linden/indra/newview/llvoavatar.cpp
+++ b/linden/indra/newview/llvoavatar.cpp
@@ -3828,10 +3828,7 @@ BOOL LLVOAvatar::updateCharacter(LLAgent &agent)
 //                                                      AUDIO_STEP_LO_SPEED, AUDIO_STEP_HI_SPEED,
 //                                                      AUDIO_STEP_LO_GAIN, AUDIO_STEP_HI_GAIN );
 
-                        F32 ambient_volume = gSavedSettings.getF32("AudioLevelAmbient");
-                        F32 gain = gSavedSettings.getBOOL("MuteAmbient") 
-                                ? 0.f 
-                                : (.50f * ambient_volume * ambient_volume);
+                        const F32 STEP_VOLUME = 0.5f;
                         LLUUID& step_sound_id = getStepSound();
 
                         LLVector3d foot_pos_global = gAgent.getPosGlobalFromAgent(foot_pos_agent);
@@ -3839,7 +3836,7 @@ BOOL LLVOAvatar::updateCharacter(LLAgent &agent)
                         if (LLViewerParcelMgr::getInstance()->canHearSound(foot_pos_global)
                                 && !LLMuteList::getInstance()->isMuted(getID(), LLMute::flagObjectSounds))
                         {
-                                gAudiop->triggerSound(step_sound_id, getID(), gain, foot_pos_global);
+                                gAudiop->triggerSound(step_sound_id, getID(), STEP_VOLUME, LLAudioEngine::AUDIO_TYPE_AMBIENT, foot_pos_global);
                         }
                 }
         }
@@ -4819,8 +4816,8 @@ BOOL LLVOAvatar::processSingleAnimationStateChange( const LLUUID& anim_id, BOOL
                                         //else
                                         {
                                                 LLUUID sound_id = LLUUID(gSavedSettings.getString("UISndTyping"));
-                                                F32 volume = gSavedSettings.getBOOL("MuteSounds") ? 0.f : gSavedSettings.getF32("AudioLevelSFX");
-                                                gAudiop->triggerSound(sound_id, getID(), volume, char_pos_global);
+                                                gAudiop->triggerSound(sound_id, getID(), 1.0f, LLAudioEngine::AUDIO_TYPE_SFX, char_pos_global);
+
                                         }
                                 }
                         }