Changeset 2966

Timestamp:

May 11, 2009, 2:30:54 PM (16 years ago)

Author:

erwin

Message:

moved files, modified to support multiple contexts

Location:

code/branches/sound/src

Files:

• orxonox/CMakeLists.txt (modified) (3 diffs)
• orxonox/objects/Level.cc (modified) (3 diffs)
• orxonox/objects/Level.h (modified) (1 diff)
• orxonox/sound (added)
• orxonox/sound/CMakeLists.txt (copied) (copied from code/branches/sound/src/sound/CMakeLists.txt) (2 diffs, 1 prop)
• orxonox/sound/SoundBase.cc (copied) (copied from code/branches/sound/src/sound/SoundBase.cc) (2 diffs, 1 prop)
• orxonox/sound/SoundBase.h (copied) (copied from code/branches/sound/src/sound/SoundBase.h) (1 diff, 1 prop)
• orxonox/sound/SoundManager.cc (copied) (copied from code/branches/sound/src/sound/SoundManager.cc) (4 diffs, 1 prop)
• orxonox/sound/SoundManager.h (copied) (copied from code/branches/sound/src/sound/SoundManager.h) (2 diffs, 1 prop)
• sound (deleted)

code/branches/sound/src/orxonox/CMakeLists.txt

@@ -31 +31 @@
 ADD_SUBDIRECTORY(overlays)
 ADD_SUBDIRECTORY(tools)
+ADD_SUBDIRECTORY(sound)
 GET_ALL_HEADER_FILES(ORXONOX_HDR_FILES)
 SET(ORXONOX_FILES ${ORXONOX_SRC_FILES} ${ORXONOX_HDR_FILES})
@@ -51 +52 @@
   ${CEGUILUA_LIBRARY}
   ${Boost_SYSTEM_LIBRARY}
+  ${OPENAL_LIBRARY}
+  ${ALUT_LIBRARY}
+  #${VORBISFILE_LIBRARY}
+  #${VORBIS_LIBRARY}
+  #${OGG_LIBRARY}
   ogreceguirenderer_orxonox
   tinyxml++_orxonox
@@ -58 +64 @@
   core
   network
-  sound
 )
 

code/branches/sound/src/orxonox/objects/Level.cc

@@ -57 +57 @@
         if (this->xmlfilename_.length() >= Core::getMediaPathString().length())
             this->xmlfilename_ = this->xmlfilename_.substr(Core::getMediaPathString().length());
+            
+        this->sndmgr_ = new SoundManager();
     }
 
@@ -68 +70 @@
             if (this->xmlfile_)
                 Loader::unload(this->xmlfile_);
+            
+            if(this->ambientsound_ != NULL)
+                delete this->ambientsound_;
+            
+            delete this->sndmgr_;
         }
     }
@@ -158 +165 @@
             {
                 this->ambientsound_ = new SoundBase();
-                this->sndmgr_.addSound(this->ambientsound_);
+                this->sndmgr_->addSound(this->ambientsound_);
             }
 

code/branches/sound/src/orxonox/objects/Level.h

@@ -73 +73 @@
             XMLFile*               xmlfile_;
             std::list<BaseObject*> objects_;
-            SoundManager           sndmgr_;
+            SoundManager*          sndmgr_;
             SoundBase*             ambientsound_;
     };

code/branches/sound/src/orxonox/sound/CMakeLists.txt

@@ -1 @@
- #
- #             ORXONOX - the hottest 3D action shooter ever to exist
- #                             > www.orxonox.net <
- #
- #        This program is free software; you can redistribute it and/or
- #         modify it under the terms of the GNU General Public License
- #        as published by the Free Software Foundation; either version 2
- #            of the License, or (at your option) any later version.
- #
- #       This program is distributed in the hope that it will be useful,
- #        but WITHOUT ANY WARRANTY; without even the implied warranty of
- #        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- #                 GNU General Public License for more details.
- #
- #   You should have received a copy of the GNU General Public License along
- #      with this program; if not, write to the Free Software Foundation,
- #     Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- #
-
-SET_SOURCE_FILES(SOUND_FILES
+ADD_SOURCE_FILES(ORXONOX_SRC_FILES
     SoundManager.h
     SoundBase.h
@@ -25 +6 @@
     SoundBase.cc
 )
-GENERATE_SOURCE_GROUPS(${SOUND_FILES})
 
-
-ADD_LIBRARY(sound SHARED ${SOUND_FILES})
-TARGET_LINK_LIBRARIES(sound
-  ${OPENAL_LIBRARY}
-  ${ALUT_LIBRARY}
-  #${VORBISFILE_LIBRARY}
-  #${VORBIS_LIBRARY}
-  #${OGG_LIBRARY}
-  core
-  util
-)
-
-ORXONOX_INSTALL(sound)

code/branches/sound/src/orxonox/sound/SoundBase.cc

@@ -40 +40 @@
         this->entity_ = NULL;
     }
+
     SoundBase::SoundBase(WorldEntity* entity)
     {
@@ -45 +46 @@
         this->buffer_ = 0;
         this->entity_ = entity;
+    }
+
+    SoundBase::~SoundBase()
+    {
+        alSourcei(this->source_, AL_BUFFER, 0);
+        alDeleteSources(1, &this->source_);
+        alDeleteBuffers(1, &this->buffer_);
     }
 

code/branches/sound/src/orxonox/sound/SoundBase.h

@@ -42 +42 @@
      *
      */
-    class SoundBase
+    class _OrxonoxExport SoundBase
     {
     public:
         SoundBase();
         SoundBase(WorldEntity* entity);
+        ~SoundBase();
 
         void attachToEntity(WorldEntity* entity);

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

@@ -37 +37 @@
 namespace orxonox
 {
+    ALCdevice* SoundManager::device_s = NULL;
+
     /**
      * Default constructor
@@ -42 +44 @@
     SoundManager::SoundManager()
     {
-        if(!alutInit(NULL,NULL)) {
+        if(!alutInitWithoutContext(NULL,NULL))
+        {
             COUT(2) << "OpenAL ALUT: " << alutGetErrorString(alutGetError()) << std::endl;
         }
+        else
+        {
+            COUT(4) << "OpenAL ALUT version:" << alutGetMajorVersion() << "." << alutGetMinorVersion() << std::endl;
+            COUT(4) << "OpenAL ALUT supported MIME types:" << alutGetMIMETypes(ALUT_LOADER_BUFFER) << std::endl;
+            if(SoundManager::device_s == NULL)
+            {
+                COUT(3) << "OpenAL: open sound device..." << std::endl;
+                SoundManager::device_s = alcOpenDevice(NULL);
+            }
 
-        COUT(4) << "OpenAL ALUT version:" << alutGetMajorVersion() << "." << alutGetMinorVersion() << std::endl;
-        COUT(4) << "OpenAL ALUT supported MIME types:" << alutGetMIMETypes(ALUT_LOADER_BUFFER) << std::endl;
+            if(SoundManager::device_s == NULL)
+            {
+                COUT(2) << "OpenAL: Could not open sound device" << std::endl;
+            }
+            else
+            {
+                this->context_ = alcCreateContext(SoundManager::device_s, NULL);
+                if(this->context_ == NULL)
+                {
+                    COUT(2) << "OpenAL: Could not create sound context";
+                }
+                else
+                {
+                    alcMakeContextCurrent(this->context_);
+                }
+            }
+        }
+    }
+
+    SoundManager::~SoundManager()
+    {
+        alcDestroyContext(this->context_);
+        alcCloseDevice(SoundManager::device_s);
+        alutExit();
     }
 
@@ -72 +106 @@
                 pos = i;
         }
-        
+
         delete (*pos);
         this->soundlist_.erase(pos);
@@ -110 +144 @@
             (*i)->update();
     }
-
-}  
+}

code/branches/sound/src/orxonox/sound/SoundManager.h

@@ -43 +43 @@
      *
      */
-    class SoundManager : public Tickable 
+    class _OrxonoxExport SoundManager : public Tickable 
     {
     public:
         SoundManager();
+        ~SoundManager();
         void addSound(SoundBase* sound);
         void removeSound(SoundBase* sound);
@@ -53 +54 @@
 
     private:
+        static ALCdevice* device_s;
+        ALCcontext* context_;
         std::list<SoundBase*> soundlist_;