[Gnash-commit] gnash ChangeLog backend/sound_handler_sdl.cpp s...

[Tomas Groth]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Tomas Groth <tgc>       06/10/17 22:00:38

Modified files:
        .              : ChangeLog 
        backend        : sound_handler_sdl.cpp 
        server/swf     : ASHandlers.cpp 

Log message:
        Removed call to GCC specific STL vector function, and Removed redundant 
soundstop in ActionGotoFrame().

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1274&r2=1.1275
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/sound_handler_sdl.cpp?cvsroot=gnash&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/ASHandlers.cpp?cvsroot=gnash&r1=1.75&r2=1.76

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1274
retrieving revision 1.1275
diff -u -b -r1.1274 -r1.1275
--- ChangeLog   17 Oct 2006 21:25:03 -0000      1.1274
+++ ChangeLog   17 Oct 2006 22:00:37 -0000      1.1275
@@ -1,3 +1,11 @@
+2006-10-17 Tomas Groth Christensen <address@hidden>
+
+       * backend/sound_handler_sdl.cpp: Removed call to GCC specific STL 
+       vector function.
+       * server/swf/ASHandlers.cpp: Removed redundant soundstop in 
+       ActionGotoFrame().
+
+
 2006-10-17 Markus Gothe <address@hidden>
 
        * server/as_enviroment.cpp: If MIPSPRO #pragma do_not_instantiate.

Index: backend/sound_handler_sdl.cpp
===================================================================
RCS file: /sources/gnash/gnash/backend/sound_handler_sdl.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- backend/sound_handler_sdl.cpp       17 Oct 2006 21:25:03 -0000      1.27
+++ backend/sound_handler_sdl.cpp       17 Oct 2006 22:00:38 -0000      1.28
@@ -577,16 +577,16 @@
 void use_envelopes(active_sound* sound, int length)
 {
        // Check if this is the time to use envelopes yet
-       if (sound->current_env == 0 && sound->envelopes->at(0).m_mark44 > 
sound->samples_played+length/2) {
+       if (sound->current_env == 0 && sound->envelopes->operator[](0).m_mark44 
> sound->samples_played+length/2) {
                return;
 
        // switch to the next envelope if needed and possible
-       } else if (sound->current_env < sound->envelopes->size()-1 && 
sound->envelopes->at(sound->current_env+1).m_mark44 >= sound->samples_played) {
+       } else if (sound->current_env < sound->envelopes->size()-1 && 
sound->envelopes->operator[](sound->current_env+1).m_mark44 >= 
sound->samples_played) {
                sound->current_env++;
        }
 
        // Current envelope position
-       int32_t cur_env_pos = sound->envelopes->at(sound->current_env).m_mark44;
+       int32_t cur_env_pos = 
sound->envelopes->operator[](sound->current_env).m_mark44;
 
        // Next envelope position
        int32_t next_env_pos = 0;
@@ -594,21 +594,21 @@
                // If there is no "next envelope" then set the next envelope 
start point to be unreachable
                next_env_pos = cur_env_pos + length;
        } else {
-               next_env_pos = 
sound->envelopes->at(sound->current_env+1).m_mark44;
+               next_env_pos = 
sound->envelopes->operator[](sound->current_env+1).m_mark44;
        }
 
        int startpos = 0;
        // Make sure we start adjusting at the right sample
-       if (sound->current_env == 0 && 
sound->envelopes->at(sound->current_env).m_mark44 > sound->samples_played) {
-               startpos = sound->raw_position + 
(sound->envelopes->at(sound->current_env).m_mark44 - sound->samples_played)*2;
+       if (sound->current_env == 0 && 
sound->envelopes->operator[](sound->current_env).m_mark44 > 
sound->samples_played) {
+               startpos = sound->raw_position + 
(sound->envelopes->operator[](sound->current_env).m_mark44 - 
sound->samples_played)*2;
        } else {
                startpos = sound->raw_position;
        }
        int16_t* data = (int16_t*) (sound->raw_data + startpos);
 
        for (int i=0; i < length/2; i+=2) {
-               float left = 
(float)sound->envelopes->at(sound->current_env).m_level0 / 32768.0;
-               float right = 
(float)sound->envelopes->at(sound->current_env).m_level1 / 32768.0;
+               float left = 
(float)sound->envelopes->operator[](sound->current_env).m_level0 / 32768.0;
+               float right = 
(float)sound->envelopes->operator[](sound->current_env).m_level1 / 32768.0;
 
                data[i] = (int16_t)(data[i] * left); // Left
                data[i+1] = (int16_t)(data[i+1] * right); // Right
@@ -620,7 +620,7 @@
                                // If there is no "next envelope" then set the 
next envelope start point to be unreachable
                                next_env_pos = cur_env_pos + length;
                        } else {
-                               next_env_pos = 
sound->envelopes->at(sound->current_env+1).m_mark44;
+                               next_env_pos = 
sound->envelopes->operator[](sound->current_env+1).m_mark44;
                        }
                }
        }

Index: server/swf/ASHandlers.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf/ASHandlers.cpp,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -b -r1.75 -r1.76
--- server/swf/ASHandlers.cpp   17 Oct 2006 16:13:45 -0000      1.75
+++ server/swf/ASHandlers.cpp   17 Oct 2006 22:00:38 -0000      1.76
@@ -34,7 +34,7 @@
 // forward this exception.
 //
 
-/* $Id: ASHandlers.cpp,v 1.75 2006/10/17 16:13:45 strk Exp $ */
+/* $Id: ASHandlers.cpp,v 1.76 2006/10/17 22:00:38 tgc Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -631,16 +631,6 @@
 
        size_t frame = code.read_int16(thread.pc+3);
 
-       // If the frame we goto isn't the next in line, all sounds are stopped.
-       if (env.get_target()->get_current_frame()+1 != frame) {
-
-               sound_handler* s = get_sound_handler();
-               if (s)
-               {
-                       s->stop_all_sounds();
-               }
-       }
-
        // 0-based already?
        //// Convert from 1-based to 0-based
        //frame--;