Changeset 3891 in orxonox.OLD

Timestamp:

Apr 19, 2005, 2:33:02 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: sound can be registered with the resource-Manager:
user load(fileName, RESOURCE_SOUND_EFFECT/MUSIC) to load

Location:

orxonox/branches/sound_engine/src/util

Files:

• resource_manager.cc (modified) (4 diffs)
• resource_manager.h (modified) (1 diff)

orxonox/branches/sound_engine/src/util/resource_manager.cc

@@ -19 +19 @@
 
 // different resource Types
+#include "sound_engine.h"
 #include "objModel.h"
 #include "primitive_model.h"
@@ -150 +151 @@
     tmpType = OBJ;
   else if (!strncmp(fileName+(strlen(fileName)-4), ".wav", 4))
-    tmpType = WAV;
+    {
+      tmpType = WAV;
+      PRINTF(2)("not determined of what type the resource is %s EFFECT OR MUSIC\n");
+    }
   else if (!strncmp(fileName+(strlen(fileName)-4), ".mp3", 4))
-    tmpType = MP3;
+    {
+      tmpType = MP3;
+      PRINTF(2)("not determined of what type the resource is %s EFFECT OR MUSIC\n");
+    }
   else if (!strncmp(fileName+(strlen(fileName)-4), ".ogg", 4))
-    tmpType = OGG;
+    {
+      tmpType = OGG;
+      PRINTF(2)("not determined of what type the resource is %s EFFECT OR MUSIC\n");
+    }
   else if (!strcmp(fileName, "cube") ||
            !strcmp(fileName, "sphere") ||
@@ -205 +215 @@
       switch(type)
         {
+        case RESOURCE_SOUND_EFFECT:
+          if(isFile(fullName))
+            tmpResource->pointer = new SoundEffect(fullName);
+          break;
+        case RESOURCE_SOUND_MUSIC:
+          if(isFile(fullName))
+            tmpResource->pointer = new Music(fullName);
+          break;
         case OBJ:
           if (param1)
@@ -342 +360 @@
           switch(resource->type)
             {
+            case RESOURCE_SOUND_EFFECT:
+            case RESOURCE_SOUND_MUSIC:
+              delete (Sound*)resource->pointer;
+              break;
             case OBJ:
             case PRIM:

orxonox/branches/sound_engine/src/util/resource_manager.h

@@ -19 +19 @@
 
 //! An eumerator for different fileTypes the resourceManager supports \todo WAV, MP3, OGG support
-enum ResourceType {OBJ, PRIM, WAV, MP3, OGG, TTF, IMAGE};
+enum ResourceType {OBJ,
+                   PRIM,
+                   WAV,
+                   MP3,
+                   OGG,
+                   TTF,
+                   IMAGE,
+                   RESOURCE_SOUND_EFFECT,
+                   RESOURCE_SOUND_MUSIC};
 //! An enumerator for different UNLOAD-types. 
 /**