Changeset 6394 for code/branches/presentation2/src/orxonox/sound

Timestamp:

Dec 22, 2009, 2:07:44 PM (14 years ago)

Author:

rgrieder

Message:

std::string tweaks:

• Declared BLANKSTRING in UtilPrereqs.h as well (removed obsolete StringUtils.h includes to avoid dependencies)
• Using BLANKSTRING if const std::string& return type is possible
• Replaced a few (const) std::string arguments with const std::string&
• if (str == "") —> if (str.empty())
• std::string msg = name + "adsf"; —> const std::string& msg = name + "asdf";
• std::string asdf = object→getFooBar(); —> const std::string& asdf = object→getFooBar();
• std::string asdf = "asdf"; —> std::string asdf("asdf");
• ostream << "."; and name + "." —> ostream << '.'; and name + '.'
• str = ""; —> str.clear()
• std::string asdf = ""; —> std::string asdf;
• asdf_ = ""; (in c'tor) —> delete line

Location:

code/branches/presentation2/src/orxonox/sound

Files:

• AmbientSound.cc (modified) (1 diff)
• SoundBuffer.cc (modified) (1 diff)
• SoundManager.cc (modified) (2 diffs)

code/branches/presentation2/src/orxonox/sound/AmbientSound.cc

@@ -113 +113 @@
         if (GameMode::playsSound())
         {
-            std::string path = "ambient/" + MoodManager::getInstance().getMood() + "/" + source;
+            const std::string& path = "ambient/" + MoodManager::getInstance().getMood() + '/' + source;
             shared_ptr<ResourceInfo> fileInfo = Resource::getInfo(path);
             if (fileInfo != NULL)

code/branches/presentation2/src/orxonox/sound/SoundBuffer.cc

@@ -57 +57 @@
         DataStreamPtr dataStream = Resource::open(fileInfo);
 
-        std::string extension(this->filename_.substr(this->filename_.find_last_of('.') + 1));
+        const std::string& extension = this->filename_.substr(this->filename_.find_last_of('.') + 1);
         if (getLowercase(extension) == "ogg")
         {

code/branches/presentation2/src/orxonox/sound/SoundManager.cc

@@ -92 +92 @@
         {
             this->deviceNames_.push_back(devices);
-            COUT(4) << "\"" << devices << "\", ";
+            COUT(4) << '"' << devices << "\", ";
             devices += strlen(devices) + 1;
             if (*devices == '\0')
@@ -100 +100 @@
 
         // Open the selected device
-        COUT(3) << "Sound: Opening device \"" << renderDevice << "\"" << std::endl;
+        COUT(3) << "Sound: Opening device \"" << renderDevice << '\' << std::endl;
         this->device_ = alcOpenDevice(renderDevice.c_str());
 */