Changeset 8775 in orxonox.OLD for branches/terrain/src/lib/sound

Timestamp:

Jun 25, 2006, 11:30:59 AM (19 years ago)

Author:

ponder

Message:

• Applied a small change to sounrd_buffer and ogg_player in order to load the buffers correctly on big endian systems.
• Did a lot of cleanup for the terrain rendering system. Added destructors and constructors.
• The cameras clip-space has to be set to a very large range to display the skybox. The maximum clip distance for the terrain needs to be smaller.

Location:

branches/terrain/src/lib/sound

Files:

• ogg_player.cc (modified) (1 diff)
• sound_buffer.cc (modified) (1 diff)

branches/terrain/src/lib/sound/ogg_player.cc

@@ -399 +399 @@
     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*/
+#ifdef SDL_BIG_ENDIAN
+        int cnt = OGG_PLAYER_BUFFER_SIZE/2;
+        Uint16* wavBufferAsShorts = ( Uint16* )pcm;
+        for ( int i = 0; i < cnt; ++i, ++wavBufferAsShorts )
+                *wavBufferAsShorts = SDL_Swap16( *wavBufferAsShorts );
+#endif
     alBufferData(buffer, format, pcm, size, vorbisInfo->rate);
     if (DEBUG_LEVEL >= 3)

branches/terrain/src/lib/sound/sound_buffer.cc

@@ -76 +76 @@
     }
 #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 );
-                }
+        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),