From c708408f64b53041e4ac284a5bbf40c829439462 Mon Sep 17 00:00:00 2001 From: Shyotl Date: Sat, 10 Jan 2015 16:11:52 -0600 Subject: [PATCH] Linux OSS was removed from fmodstudio. Also fix issue in linux manifest. --- indra/llaudio/llaudioengine_fmodstudio.cpp | 23 ---------------------- indra/newview/viewer_manifest.py | 4 ++-- 2 files changed, 2 insertions(+), 25 deletions(-) diff --git a/indra/llaudio/llaudioengine_fmodstudio.cpp b/indra/llaudio/llaudioengine_fmodstudio.cpp index 47d54fd3b..93541d3de 100644 --- a/indra/llaudio/llaudioengine_fmodstudio.cpp +++ b/indra/llaudio/llaudioengine_fmodstudio.cpp @@ -368,27 +368,6 @@ bool LLAudioEngine_FMODSTUDIO::init(const S32 num_channels, void* userdata) } } if (!audio_ok) - { - if (NULL == getenv("LL_BAD_FMOD_OSS")) /*Flawfinder: ignore*/ - { - LL_DEBUGS("AppInit") << "Trying OSS audio output..." << LL_ENDL; - if((result = mSystem->setOutput(FMOD_OUTPUTTYPE_OSS)) == FMOD_OK && - (result = mSystem->init(num_channels + 2, fmod_flags, 0)) == FMOD_OK) - { - LL_DEBUGS("AppInit") << "OSS audio output initialized OKAY" << LL_ENDL; - audio_ok = true; - } - else - { - Check_FMOD_Error(result, "OSS audio output FAILED to initialize"); - } - } - else - { - LL_DEBUGS("AppInit") << "OSS audio output SKIPPED" << LL_ENDL; - } - } - if (!audio_ok) { LL_WARNS("AppInit") << "Overall audio init failure." << LL_ENDL; return false; @@ -407,8 +386,6 @@ bool LLAudioEngine_FMODSTUDIO::init(const S32 num_channels, void* userdata) LL_INFOS("AppInit") << "Audio output: PulseAudio" << LL_ENDL; break; case FMOD_OUTPUTTYPE_ALSA: LL_INFOS("AppInit") << "Audio output: ALSA" << LL_ENDL; break; - case FMOD_OUTPUTTYPE_OSS: - LL_INFOS("AppInit") << "Audio output: OSS" << LL_ENDL; break; default: LL_INFOS("AppInit") << "Audio output: Unknown!" << LL_ENDL; break; }; diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 5d95a4d5e..e7b3268fa 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -881,7 +881,7 @@ class Linux_i686Manifest(LinuxManifest): self.end_prefix("lib") if (not self.standalone()) and self.prefix(src=self.args['configuration'], alt_build="../packages/lib/release", dst="lib"): - dylibs += self.add_extra_libraries() + self.add_extra_libraries() self.end_prefix() # Vivox runtimes @@ -933,7 +933,7 @@ class Linux_x86_64Manifest(LinuxManifest): self.end_prefix("lib") if (not self.standalone()) and self.prefix(src=self.args['configuration'], alt_build="../packages/lib/release", dst="lib"): - dylibs += self.add_extra_libraries() + self.add_extra_libraries() self.end_prefix() # Vivox runtimes