Changeset 2101 for code/branches/objecthierarchy/src/audio

Timestamp:

Nov 2, 2008, 12:09:55 AM (16 years ago)

Author:

rgrieder

Message:

Finally managed to have a master InputState which enables:

• Console always opens
• Debug overlay toggles visibility in gui mode too

Had to change several other code:

• ConfigFileManager uses special class instead of enum for ConfigFileType
• You can add an arbitrary config file and get the ConfigFileType
• ConfigFileManager is an Ogre singleton too. Created in Main.cc
• CommandLineArgument "optionsFile" specifies another file for command line arguments
• CommandLineArgument "settingsFile" declares the file used for settings (orxonox.ini)
• changed all fileNames to filenames
• "Loaded config file blah" now uses COUT(3) instead of COUT(0)
• fixed a bug in ConfigFileManager::load() that cause orxonox.ini to double its size after every call

Location:

code/branches/objecthierarchy/src/audio

Files:

• AudioBuffer.cc (modified) (2 diffs)
• AudioBuffer.h (modified) (1 diff)

code/branches/objecthierarchy/src/audio/AudioBuffer.cc

@@ -31 +31 @@
 namespace audio
 {
-    AudioBuffer::AudioBuffer(std::string fileName)
+    AudioBuffer::AudioBuffer(std::string filename)
     {
         // Load wav data into buffers.
@@ -40 +40 @@
 
         //FIXME deprecated; seems unneeded
-//        alutLoadWAVFile((ALbyte*)fileName.c_str(), &format, &data, &size, &freq, &loop);
+//        alutLoadWAVFile((ALbyte*)filename.c_str(), &format, &data, &size, &freq, &loop);
         alBufferData(buffer, format, data, size, freq);
         //FIXME deprecated; seems unneeded

code/branches/objecthierarchy/src/audio/AudioBuffer.h

@@ -40 +40 @@
     {
     public:
-        AudioBuffer(std::string fileName);
+        AudioBuffer(std::string filename);
         ~AudioBuffer();