[Orxonox-commit 1695] r6414 - in code/branches/pickup2/src: libraries/core orxonox/sound

[dafrick at orxonox.net]

Author: dafrick
Date: 2009-12-25 14:07:44 +0100 (Fri, 25 Dec 2009)
New Revision: 6414

Modified:
   code/branches/pickup2/src/libraries/core/DynLib.cc
   code/branches/pickup2/src/orxonox/sound/SoundManager.cc
Log:
Added changes to presentation2 here as well.

Modified: code/branches/pickup2/src/libraries/core/DynLib.cc
===================================================================
--- code/branches/pickup2/src/libraries/core/DynLib.cc	2009-12-25 13:06:28 UTC (rev 6413)
+++ code/branches/pickup2/src/libraries/core/DynLib.cc	2009-12-25 13:07:44 UTC (rev 6414)
@@ -69,7 +69,7 @@
         // Log library load
         COUT(2) << "Loading module " << mName << std::endl;
 
-        const std::string& name = mName;
+        std::string& name = mName;
 #ifdef ORXONOX_PLATFORM_LINUX
         // dlopen() does not add .so to the filename, like windows does for .dll
         if (name.substr(name.length() - 3, 3) != ".so")

Modified: code/branches/pickup2/src/orxonox/sound/SoundManager.cc
===================================================================
--- code/branches/pickup2/src/orxonox/sound/SoundManager.cc	2009-12-25 13:06:28 UTC (rev 6413)
+++ code/branches/pickup2/src/orxonox/sound/SoundManager.cc	2009-12-25 13:07:44 UTC (rev 6414)
@@ -607,7 +607,7 @@
                 break;
             }
         }
-        int used = std::max(this->usedSoundSources_.size(), this->minSources_);
+        int used = std::max((unsigned int)(this->usedSoundSources_.size()), this->minSources_);
         // Subtract those we added in the statement above trough std::max
         int available = (int)this->availableSoundSources_.size() - (used - (int)this->usedSoundSources_.size());
         // Delete sources again to free resources if appropriate (more than 50% more available than used)