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

Fix up some small typos and avoid c++11's string::back()/pop_back() calls for now.

Browse Source
This commit is contained in:
Shyotl
2014-12-08 21:40:11 -06:00
parent ab4561aacc
commit e2cd11ccd7
4 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llaudio/llaudioengine_fmodex.cpp
View File

@@ -373,7 +373,7 @@ bool LLAudioEngine_FMODEX::init(const S32 num_channels, void* userdata)
if (NULL == getenv("LL_BAD_FMOD_OSS")) /*Flawfinder: ignore*/ if (NULL == getenv("LL_BAD_FMOD_OSS")) /*Flawfinder: ignore*/
{ {
LL_DEBUGS("AppInit") << "Trying OSS audio output..." << LL_ENDL; LL_DEBUGS("AppInit") << "Trying OSS audio output..." << LL_ENDL;
if((result = mSystem->setOutput(FMOD_OUTPUTTYPE_OSS) == FMOD_OK) && if((result = mSystem->setOutput(FMOD_OUTPUTTYPE_OSS)) == FMOD_OK &&
(result = mSystem->init(num_channels + 2, fmod_flags, 0)) == FMOD_OK) (result = mSystem->init(num_channels + 2, fmod_flags, 0)) == FMOD_OK)
{ {
LL_DEBUGS("AppInit") << "OSS audio output initialized OKAY" << LL_ENDL; LL_DEBUGS("AppInit") << "OSS audio output initialized OKAY" << LL_ENDL;

2
indra/llaudio/llaudioengine_fmodstudio.cpp
View File

@@ -372,7 +372,7 @@ bool LLAudioEngine_FMODSTUDIO::init(const S32 num_channels, void* userdata)
if (NULL == getenv("LL_BAD_FMOD_OSS")) /*Flawfinder: ignore*/ if (NULL == getenv("LL_BAD_FMOD_OSS")) /*Flawfinder: ignore*/
{ {
LL_DEBUGS("AppInit") << "Trying OSS audio output..." << LL_ENDL; LL_DEBUGS("AppInit") << "Trying OSS audio output..." << LL_ENDL;
if((result = mSystem->setOutput(FMOD_OUTPUTTYPE_OSS) == FMOD_OK) && if((result = mSystem->setOutput(FMOD_OUTPUTTYPE_OSS)) == FMOD_OK &&
(result = mSystem->init(num_channels + 2, fmod_flags, 0)) == FMOD_OK) (result = mSystem->init(num_channels + 2, fmod_flags, 0)) == FMOD_OK)
{ {
LL_DEBUGS("AppInit") << "OSS audio output initialized OKAY" << LL_ENDL; LL_DEBUGS("AppInit") << "OSS audio output initialized OKAY" << LL_ENDL;

22
indra/llaudio/llstreamingaudio_fmodex.cpp
View File

@@ -289,8 +289,8 @@ void LLStreamingAudio_FMODEX::update()
case(FMOD_TAGDATATYPE_STRING): case(FMOD_TAGDATATYPE_STRING):
{ {
std::string out = rawstr_to_utf8(std::string((char*)tag.data,tag.datalen)); std::string out = rawstr_to_utf8(std::string((char*)tag.data,tag.datalen));
if (out.length() && out.back() == 0) if (out.length() && out[out.size() - 1] == 0)
out.pop_back(); out.erase(out.size() - 1);
(*mMetaData)[name]=out; (*mMetaData)[name]=out;
llinfos << tag.name << "(RAW): " << out << llendl; llinfos << tag.name << "(RAW): " << out << llendl;
} }
@@ -301,8 +301,8 @@ void LLStreamingAudio_FMODEX::update()
if (tag.datalen > 3 && ((char*)tag.data)[0] == 0xEF && ((char*)tag.data)[1] == 0xBB && ((char*)tag.data)[2] == 0xBF) if (tag.datalen > 3 && ((char*)tag.data)[0] == 0xEF && ((char*)tag.data)[1] == 0xBB && ((char*)tag.data)[2] == 0xBF)
offs = 3; offs = 3;
std::string out((char*)tag.data + offs, tag.datalen - offs); std::string out((char*)tag.data + offs, tag.datalen - offs);
if (out.length() && out.back() == 0) if (out.length() && out[out.size() - 1] == 0)
out.pop_back(); out.erase(out.size() - 1);
(*mMetaData)[name] = out; (*mMetaData)[name] = out;
llinfos << tag.name << "(UTF8): " << out << llendl; llinfos << tag.name << "(UTF8): " << out << llendl;
} }
@@ -310,8 +310,8 @@ void LLStreamingAudio_FMODEX::update()
case(FMOD_TAGDATATYPE_STRING_UTF16): case(FMOD_TAGDATATYPE_STRING_UTF16):
{ {
std::string out = utf16input_to_utf8((char*)tag.data, tag.datalen, UTF16); std::string out = utf16input_to_utf8((char*)tag.data, tag.datalen, UTF16);
if (out.length() && out.back() == 0) if (out.length() && out[out.size() - 1] == 0)
out.pop_back(); out.erase(out.size() - 1);
(*mMetaData)[name] = out; (*mMetaData)[name] = out;
llinfos << tag.name << "(UTF16): " << out << llendl; llinfos << tag.name << "(UTF16): " << out << llendl;
} }
@@ -319,8 +319,8 @@ void LLStreamingAudio_FMODEX::update()
case(FMOD_TAGDATATYPE_STRING_UTF16BE): case(FMOD_TAGDATATYPE_STRING_UTF16BE):
{ {
std::string out = utf16input_to_utf8((char*)tag.data, tag.datalen, UTF16BE); std::string out = utf16input_to_utf8((char*)tag.data, tag.datalen, UTF16BE);
if (out.length() && out.back() == 0) if (out.length() && out[out.size() - 1] == 0)
out.pop_back(); out.erase(out.size() - 1);
(*mMetaData)[name] = out; (*mMetaData)[name] = out;
llinfos << tag.name << "(UTF16BE): " << out << llendl; llinfos << tag.name << "(UTF16BE): " << out << llendl;
} }
@@ -568,7 +568,7 @@ void LLStreamingAudio_FMODEX::setBufferSizes(U32 streambuffertime, U32 decodebuf
Check_FMOD_Error(mSystem->setStreamBufferSize(streambuffertime / 1000 * 128 * 128, FMOD_TIMEUNIT_RAWBYTES), "FMOD::System::setStreamBufferSize"); Check_FMOD_Error(mSystem->setStreamBufferSize(streambuffertime / 1000 * 128 * 128, FMOD_TIMEUNIT_RAWBYTES), "FMOD::System::setStreamBufferSize");
FMOD_ADVANCEDSETTINGS settings; FMOD_ADVANCEDSETTINGS settings;
memset(&settings,0,sizeof(settings)); memset(&settings,0,sizeof(settings));
settings.cbSize=sizeof(settings); settings.cbsize=sizeof(settings);
settings.defaultDecodeBufferSize = decodebuffertime;//ms settings.defaultDecodeBufferSize = decodebuffertime;//ms
Check_FMOD_Error(mSystem->setAdvancedSettings(&settings), "FMOD::System::setAdvancedSettings"); Check_FMOD_Error(mSystem->setAdvancedSettings(&settings), "FMOD::System::setAdvancedSettings");
} }
@@ -576,10 +576,10 @@ void LLStreamingAudio_FMODEX::setBufferSizes(U32 streambuffertime, U32 decodebuf
bool LLStreamingAudio_FMODEX::releaseDeadStreams() bool LLStreamingAudio_FMODEX::releaseDeadStreams()
{ {
// Kill dead internet streams, if possible // Kill dead internet streams, if possible
std::list<LLAudioStreamManagerFMODSTUDIO *>::iterator iter; std::list<LLAudioStreamManagerFMODEX *>::iterator iter;
for (iter = mDeadStreams.begin(); iter != mDeadStreams.end();) for (iter = mDeadStreams.begin(); iter != mDeadStreams.end();)
{ {
LLAudioStreamManagerFMODSTUDIO *streamp = *iter; LLAudioStreamManagerFMODEX *streamp = *iter;
if (streamp->stopStream()) if (streamp->stopStream())
{ {
llinfos << "Closed dead stream" << llendl; llinfos << "Closed dead stream" << llendl;

18
indra/llaudio/llstreamingaudio_fmodstudio.cpp
View File

@@ -142,7 +142,7 @@ LLStreamingAudio_FMODSTUDIO::LLStreamingAudio_FMODSTUDIO(FMOD::System *system) :
// Leave the net buffer properties at the default. // Leave the net buffer properties at the default.
//FSOUND_Stream_Net_SetBufferProperties(20000, 40, 80); //FSOUND_Stream_Net_SetBufferProperties(20000, 40, 80);
Check_FMOD_Error(system->createChannelGroup("stream", &mStreamGroup), "FMOD::System::createChannelGroup"); Check_FMOD_Error(mSystem->createChannelGroup("stream", &mStreamGroup), "FMOD::System::createChannelGroup");
FMOD_DSP_DESCRIPTION dspdesc; FMOD_DSP_DESCRIPTION dspdesc;
memset(&dspdesc, 0, sizeof(FMOD_DSP_DESCRIPTION)); //Zero out everything memset(&dspdesc, 0, sizeof(FMOD_DSP_DESCRIPTION)); //Zero out everything
@@ -353,8 +353,8 @@ void LLStreamingAudio_FMODSTUDIO::update()
case(FMOD_TAGDATATYPE_STRING): case(FMOD_TAGDATATYPE_STRING):
{ {
std::string out = rawstr_to_utf8(std::string((char*)tag.data,tag.datalen)); std::string out = rawstr_to_utf8(std::string((char*)tag.data,tag.datalen));
if (out.length() && out.back() == 0) if (out.length() && out[out.size() - 1] == 0)
out.pop_back(); out.erase(out.size() - 1);
(*mMetaData)[name]=out; (*mMetaData)[name]=out;
llinfos << tag.name << "(RAW): " << out << llendl; llinfos << tag.name << "(RAW): " << out << llendl;
} }
@@ -365,8 +365,8 @@ void LLStreamingAudio_FMODSTUDIO::update()
if (tag.datalen > 3 && ((char*)tag.data)[0] == 0xEF && ((char*)tag.data)[1] == 0xBB && ((char*)tag.data)[2] == 0xBF) if (tag.datalen > 3 && ((char*)tag.data)[0] == 0xEF && ((char*)tag.data)[1] == 0xBB && ((char*)tag.data)[2] == 0xBF)
offs = 3; offs = 3;
std::string out((char*)tag.data + offs, tag.datalen - offs); std::string out((char*)tag.data + offs, tag.datalen - offs);
if (out.length() && out.back() == 0) if (out.length() && out[out.size() - 1] == 0)
out.pop_back(); out.erase(out.size() - 1);
(*mMetaData)[name] = out; (*mMetaData)[name] = out;
llinfos << tag.name << "(UTF8): " << out << llendl; llinfos << tag.name << "(UTF8): " << out << llendl;
} }
@@ -374,8 +374,8 @@ void LLStreamingAudio_FMODSTUDIO::update()
case(FMOD_TAGDATATYPE_STRING_UTF16): case(FMOD_TAGDATATYPE_STRING_UTF16):
{ {
std::string out = utf16input_to_utf8((char*)tag.data, tag.datalen, UTF16); std::string out = utf16input_to_utf8((char*)tag.data, tag.datalen, UTF16);
if (out.length() && out.back() == 0) if (out.length() && out[out.size() - 1] == 0)
out.pop_back(); out.erase(out.size() - 1);
(*mMetaData)[name] = out; (*mMetaData)[name] = out;
llinfos << tag.name << "(UTF16): " << out << llendl; llinfos << tag.name << "(UTF16): " << out << llendl;
} }
@@ -383,8 +383,8 @@ void LLStreamingAudio_FMODSTUDIO::update()
case(FMOD_TAGDATATYPE_STRING_UTF16BE): case(FMOD_TAGDATATYPE_STRING_UTF16BE):
{ {
std::string out = utf16input_to_utf8((char*)tag.data, tag.datalen, UTF16BE); std::string out = utf16input_to_utf8((char*)tag.data, tag.datalen, UTF16BE);
if (out.length() && out.back() == 0) if (out.length() && out[out.size() - 1] == 0)
out.pop_back(); out.erase(out.size() - 1);
(*mMetaData)[name] = out; (*mMetaData)[name] = out;
llinfos << tag.name << "(UTF16BE): " << out << llendl; llinfos << tag.name << "(UTF16BE): " << out << llendl;
} }