Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Linux OSS was removed from fmodstudio. Also fix issue in linux manifest.

Browse Source
This commit is contained in:
Shyotl
2015-01-10 16:11:52 -06:00
parent b808caaa0e
commit c708408f64
2 changed files with 2 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
indra/llaudio/llaudioengine_fmodstudio.cpp
View File

@@ -368,27 +368,6 @@ bool LLAudioEngine_FMODSTUDIO::init(const S32 num_channels, void* userdata)
} }
} }
if (!audio_ok) 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; LL_WARNS("AppInit") << "Overall audio init failure." << LL_ENDL;
return false; 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; LL_INFOS("AppInit") << "Audio output: PulseAudio" << LL_ENDL; break;
case FMOD_OUTPUTTYPE_ALSA: case FMOD_OUTPUTTYPE_ALSA:
LL_INFOS("AppInit") << "Audio output: ALSA" << LL_ENDL; break; LL_INFOS("AppInit") << "Audio output: ALSA" << LL_ENDL; break;
case FMOD_OUTPUTTYPE_OSS:
LL_INFOS("AppInit") << "Audio output: OSS" << LL_ENDL; break;
default: default:
LL_INFOS("AppInit") << "Audio output: Unknown!" << LL_ENDL; break; LL_INFOS("AppInit") << "Audio output: Unknown!" << LL_ENDL; break;
}; };

4
indra/newview/viewer_manifest.py
View File

@@ -881,7 +881,7 @@ class Linux_i686Manifest(LinuxManifest):
self.end_prefix("lib") self.end_prefix("lib")
if (not self.standalone()) and self.prefix(src=self.args['configuration'], alt_build="../packages/lib/release", dst="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() self.end_prefix()
# Vivox runtimes # Vivox runtimes
@@ -933,7 +933,7 @@ class Linux_x86_64Manifest(LinuxManifest):
self.end_prefix("lib") self.end_prefix("lib")
if (not self.standalone()) and self.prefix(src=self.args['configuration'], alt_build="../packages/lib/release", dst="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() self.end_prefix()
# Vivox runtimes # Vivox runtimes