[Orxonox-commit 1476] r6194 - in code/branches/presentation2/src: libraries/core orxonox/sound

[dafrick at orxonox.net]

Author: dafrick
Date: 2009-12-02 13:34:55 +0100 (Wed, 02 Dec 2009)
New Revision: 6194

Modified:
   code/branches/presentation2/src/libraries/core/CMakeLists.txt
   code/branches/presentation2/src/libraries/core/ConfigFileManager.h
   code/branches/presentation2/src/orxonox/sound/SoundManager.h
Log:
Some adjustments regarding tolua export and sound menu.

Modified: code/branches/presentation2/src/libraries/core/CMakeLists.txt
===================================================================
--- code/branches/presentation2/src/libraries/core/CMakeLists.txt	2009-12-02 12:09:14 UTC (rev 6193)
+++ code/branches/presentation2/src/libraries/core/CMakeLists.txt	2009-12-02 12:34:55 UTC (rev 6194)
@@ -85,6 +85,7 @@
   FIND_HEADER_FILES
   TOLUA_FILES
     CommandExecutor.h
+      ConfigFileManager.h
     Game.h
     Loader.h
     LuaState.h

Modified: code/branches/presentation2/src/libraries/core/ConfigFileManager.h
===================================================================
--- code/branches/presentation2/src/libraries/core/ConfigFileManager.h	2009-12-02 12:09:14 UTC (rev 6193)
+++ code/branches/presentation2/src/libraries/core/ConfigFileManager.h	2009-12-02 12:34:55 UTC (rev 6194)
@@ -39,8 +39,10 @@
 #include "util/OrxEnum.h"
 #include "util/Singleton.h"
 
+// tolua_begin
 namespace orxonox
 {
+    // tolua_end
     // Use int as config file type to have an arbitrary number of files
     struct ConfigFileType : OrxEnum<ConfigFileType>
     {
@@ -53,7 +55,7 @@
         static const int numberOfReservedTypes = 1024;
     };
 
-    _CoreExport bool config(const std::string& classname, const std::string& varname, const std::string& value);
+    _CoreExport bool config(const std::string& classname, const std::string& varname, const std::string& value); // tolua_export
     _CoreExport bool tconfig(const std::string& classname, const std::string& varname, const std::string& value);
     _CoreExport void reloadConfig();
     _CoreExport void saveConfig();
@@ -318,6 +320,6 @@
 
             static ConfigFileManager* singletonPtr_s;
     };
-}
+} // tolua_export
 
 #endif /* _ConfigFileManager_H__ */

Modified: code/branches/presentation2/src/orxonox/sound/SoundManager.h
===================================================================
--- code/branches/presentation2/src/orxonox/sound/SoundManager.h	2009-12-02 12:09:14 UTC (rev 6193)
+++ code/branches/presentation2/src/orxonox/sound/SoundManager.h	2009-12-02 12:34:55 UTC (rev 6194)
@@ -79,7 +79,7 @@
         void unregisterAmbientSound(AmbientSound* oldAmbient);
         void pauseAmbientSound(AmbientSound* ambient);
         
-        void setVolume(float vol, SoundType::Value type); // tolua_export
+        void setVolume(float vol, SoundType::Value type);
         float getVolume(SoundType::Value type); // tolua_export
         
         void toggleMute(SoundType::Value type); // tolua_export