[Gnash-commit] gnash/server button_character_instance.cpp

[Vitaly Alexeev]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Vitaly Alexeev <alexeev>        06/11/24 10:38:03

Modified files:
        server         : button_character_instance.cpp 

Log message:
                * backend\render_handler_ogl.cpp: added "class YUV_video_ogl_NV"
                that uses opengl extensions for fast video rendering
                * server\swf\tag_loaders.cpp: fixed case of "sound_id < 0"
                * server\button_character_instance.cpp: fixed case of "sound_id 
< 0"
                * backend\sound_handler_sdl.cpp: sound is stereo now
                * server\asobj\NetStream (cpp, h): added "pause" & fixed bugs, 
                video is tested on FC4
                * win32\VC8\gnash.vcproj: added server\am dir
                * testsuite\samples\player.swf: added pause

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/server/button_character_instance.cpp?cvsroot=gnash&r1=1.17&r2=1.18

Patches:
Index: button_character_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/button_character_instance.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- button_character_instance.cpp       24 Nov 2006 09:04:24 -0000      1.17
+++ button_character_instance.cpp       24 Nov 2006 10:38:03 -0000      1.18
@@ -437,7 +437,8 @@
                                // character zero is considered as null 
character
                                if (bs.m_sound_id > 0)
                                {
-                                       
assert(m_def->m_sound->m_button_sounds[bi].m_sam != NULL);
+                                       if 
(m_def->m_sound->m_button_sounds[bi].m_sam != NULL)
+                                       {
                                        if (bs.m_sound_style.m_stop_playback)
                                        {
                                                
s->stop_sound(bs.m_sam->m_sound_handler_id);
@@ -450,6 +451,7 @@
                        }
                }
        }
+       }
 
        // @@ eh, should just be a lookup table.
        int     c = 0;