Changeset 8293 in orxonox.OLD for trunk/src/lib/sound

Timestamp:

Jun 8, 2006, 11:11:37 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the osX-branche back here
merged with command:
svn merge ​https://svn.orxonox.net/orxonox/branches/osx . -r7763:HEAD

conflicts resolved, and everything is working as expected (or at least i hope so )

Location:

trunk/src/lib/sound

Files:

• ogg_player.cc (modified) (4 diffs)
• sound_buffer.cc (modified) (2 diffs)

trunk/src/lib/sound/ogg_player.cc

@@ -31 +31 @@
 
 #include "debug.h"
+
+#ifdef HAVE_SDL_SDL_H
+
+#include <SDL/SDL.h>
+#include <SDL/SDL_endian.h>
+
+#else
+
+#include <SDL.h>
+#include <SDL_endian.h>
+
+#endif
 
 namespace OrxSound
@@ -151 +163 @@
   bool OggPlayer::play()
   {
-    if (!(this->state & OggPlayer::FileOpened))
+    /*if (!(this->state & OggPlayer::FileOpened))
       return false;
 
@@ -161 +173 @@
     if (this->musicThreadID == NULL)
       return ((this->musicThreadID = SDL_CreateThread(OggPlayer::musicThread, (void*)this)) != NULL);
-    return true;
+    return true;*/
   }
 
@@ -385 +397 @@
     if(size == 0)
       return false;
-
+/*#ifdef SDL_BIG_ENDIAN
+                        int cnt = wavLength/2;
+                        Uint16* wavBufferAsShorts = ( Uint16* )wavBuffer;
+                        for ( int i = 0; i < cnt; ++i, ++wavBufferAsShorts )
+                                *wavBufferAsShorts = SDL_Swap16( *wavBufferAsShorts );
+#endif*/
     alBufferData(buffer, format, pcm, size, vorbisInfo->rate);
     if (DEBUG_LEVEL >= 3)

trunk/src/lib/sound/sound_buffer.cc

@@ -22 +22 @@
 #include "sdlincl.h"
 #include <cassert>
-
+#ifdef HAVE_SDL_SDL_H
+#include <SDL/SDL.h>
+#include <SDL/SDL_endian.h>
+#else
+#include <SDL.h>
+#include <SDL_endian.h>
+#endif
 namespace OrxSound
 {
@@ -67 +73 @@
       return false;
     }
-
-    alBufferData(this->bufferID, SoundBuffer::sdlAudioSpecToAlFormat(&wavSpec), wavBuffer, wavLength, wavSpec.freq);
+#if SDL_BYTEORDER == SDL_BIG_ENDIAN
+                if ( !( wavSpec.format == AUDIO_U8 || wavSpec.format == AUDIO_S8 ) ) {
+                        int cnt = wavLength/2;
+                        Uint16* wavBufferAsShorts = ( Uint16* )wavBuffer;
+                        for ( int i = 0; i < cnt; ++i, ++wavBufferAsShorts )
+                                *wavBufferAsShorts = SDL_Swap16( *wavBufferAsShorts );
+                }
+#endif
+    alBufferData(this->bufferID, SoundBuffer::sdlAudioSpecToAlFormat(&wavSpec), 
+                        wavBuffer, wavLength, wavSpec.freq);
+                        
     SDL_FreeWAV(wavBuffer);
     if (SoundEngine::checkError("Could not load Wave file", __LINE__))