[Gnash-commit] gnash ChangeLog configure.ac gui/Player.cpp mac...

[Tomas Groth]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Tomas Groth <tgc>       07/02/21 14:51:01

Modified files:
        .              : ChangeLog configure.ac 
        gui            : Player.cpp 
        macros         : ffmpeg.m4 
        server         : sound.cpp sound.h 
        server/asobj   : NetStreamFfmpeg.cpp SoundFfmpeg.cpp 
                         SoundMad.cpp 
        testsuite      : sound_handler_test.cpp 

Log message:
        * configure.ac, macros/ffmpeg.m4: Output warning when old ffmpeg-version
          detected. Will hopefully fix bug #16663.
        * gui/Player.cpp: Set the soundhandler to NULL when shutting down, Will
          hopefully fix bug #18545.
        * server/asobj/NetStreamFfmpeg.cpp, server/asobj/SoundFfmpeg.cpp,
          server/asobj/SoundMad.cpp: Disconnect cleanly from the soundhandler,
          if it exists.
        * server/sound.{cpp,h}: Made sound_stream_tag into a state tag.
        * testsuite/sound_handler_test.cpp: Increment the counting variables
          stopped_all and started_all.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2421&r2=1.2422
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.259&r2=1.260
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/Player.cpp?cvsroot=gnash&r1=1.41&r2=1.42
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/ffmpeg.m4?cvsroot=gnash&r1=1.29&r2=1.30
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sound.cpp?cvsroot=gnash&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sound.h?cvsroot=gnash&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStreamFfmpeg.cpp?cvsroot=gnash&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/SoundFfmpeg.cpp?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/SoundMad.cpp?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/sound_handler_test.cpp?cvsroot=gnash&r1=1.1&r2=1.2

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2421
retrieving revision 1.2422
diff -u -b -r1.2421 -r1.2422
--- ChangeLog   21 Feb 2007 13:22:36 -0000      1.2421
+++ ChangeLog   21 Feb 2007 14:51:00 -0000      1.2422
@@ -1,3 +1,16 @@
+2007-02-21 Tomas Groth Christensen <address@hidden>
+
+       * configure.ac, macros/ffmpeg.m4: Output warning when old ffmpeg-version
+         detected. Will hopefully fix bug #16663.
+       * gui/Player.cpp: Set the soundhandler to NULL when shutting down, Will
+         hopefully fix bug #18545.
+       * server/asobj/NetStreamFfmpeg.cpp, server/asobj/SoundFfmpeg.cpp,
+         server/asobj/SoundMad.cpp: Disconnect cleanly from the soundhandler,
+         if it exists.
+       * server/sound.{cpp,h}: Made sound_stream_tag into a state tag.
+       * testsuite/sound_handler_test.cpp: Increment the counting variables
+         stopped_all and started_all.
+
 2007-02-21 Sandro Santilli <address@hidden>
 
        * server/Makefile.am,

Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.259
retrieving revision 1.260
diff -u -b -r1.259 -r1.260
--- configure.ac        20 Feb 2007 12:50:26 -0000      1.259
+++ configure.ac        21 Feb 2007 14:51:00 -0000      1.260
@@ -15,7 +15,7 @@
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 dnl  
 
-dnl $Id: configure.ac,v 1.259 2007/02/20 12:50:26 strk Exp $
+dnl $Id: configure.ac,v 1.260 2007/02/21 14:51:00 tgc Exp $
 
 AC_PREREQ(2.50)
 AC_INIT(gnash, cvs)
@@ -1148,6 +1148,7 @@
     if test x"$mp3_decoder" = x"ffmpeg"; then
       if test x${ffmpeg_version} != xok; then
          echo "WARNING: You have version ${ffmpeg_version} of ffmpeg 
installed.\
+This version of ffmpeg may not work!\
 Version 51.29.0 or newer is highly recommended"
       fi
       if test x"$FFMPEG_LIBS" != x; then

Index: gui/Player.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/Player.cpp,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- gui/Player.cpp      24 Jan 2007 19:06:34 -0000      1.41
+++ gui/Player.cpp      21 Feb 2007 14:51:00 -0000      1.42
@@ -353,6 +353,10 @@
     // Clean up as much as possible, so valgrind will help find actual leaks.
     gnash::clear();
 
+       // By setting the soundhandler to NULL we avoid it being used
+       // after it's been de-referenced
+       gnash::set_sound_handler(NULL);
+
     return EXIT_SUCCESS;
 }
 

Index: macros/ffmpeg.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/ffmpeg.m4,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- macros/ffmpeg.m4    19 Feb 2007 21:45:41 -0000      1.29
+++ macros/ffmpeg.m4    21 Feb 2007 14:51:01 -0000      1.30
@@ -14,7 +14,7 @@
 dnl  along with this program; if not, write to the Free Software
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-dnl $Id: ffmpeg.m4,v 1.29 2007/02/19 21:45:41 tgc Exp $
+dnl $Id: ffmpeg.m4,v 1.30 2007/02/21 14:51:01 tgc Exp $
 
 AC_DEFUN([GNASH_PATH_FFMPEG],
 [
@@ -68,9 +68,17 @@
 dnl   fi
 
   ffmpeg_num_version=`$EGREP "define LIBAVCODEC_VERSION " ${topdir}/avcodec.h 
| cut -d ' ' -f 8 | tr -d '.'`
+  ffmpeg_version=`$EGREP "define LIBAVCODEC_VERSION " ${topdir}/avcodec.h | 
cut -d ' ' -f 8`
+
+  if test x"${ffmpeg_version}" = x ; then
+    ffmpeg_version=`$EGREP "define LIBAVCODEC_BUILD " ${topdir}/avcodec.h | 
cut -d ' ' -f 9`
+    ffmpeg_num_version=`$EGREP "define LIBAVCODEC_BUILD " ${topdir}/avcodec.h 
| cut -d ' ' -f 9`
+  fi
+
 dnl   AC_EGREP_HEADER(avcodec_decode_audio2, ${topdir}/avcodec.h, 
[avfound=yes], [avfound=no])
   if test $ffmpeg_num_version -lt 51110; then
     AC_MSG_WARN([Wrong ffmpeg/libavcodec version! 51.11.0 or greater required])
+    ffmpeg_version=
   else
     ffmpeg_version=ok
   fi

Index: server/sound.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sound.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- server/sound.cpp    21 Feb 2007 08:17:08 -0000      1.22
+++ server/sound.cpp    21 Feb 2007 14:51:01 -0000      1.23
@@ -132,7 +132,7 @@
 
 
 void
-start_stream_sound_tag::execute(sprite_instance* m)
+start_stream_sound_tag::execute_state(sprite_instance* m)
 {
        using globals::s_sound_handler;
        if (s_sound_handler)

Index: server/sound.h
===================================================================
RCS file: /sources/gnash/gnash/server/sound.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- server/sound.h      21 Feb 2007 08:17:08 -0000      1.7
+++ server/sound.h      21 Feb 2007 14:51:01 -0000      1.8
@@ -97,8 +97,13 @@
                /// Insert ourself into the movie.
                void    read(movie_definition* m, int handler_id, long start);
 
+               /// StartStreamSound is a "state" tag.
+               void    execute_state(sprite_instance* m);
 
-               void    execute(sprite_instance* m);
+               void execute(sprite_instance* m)
+               {
+                       execute_state(m);
+               }
        };
 
 }

Index: server/asobj/NetStreamFfmpeg.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStreamFfmpeg.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- server/asobj/NetStreamFfmpeg.cpp    19 Feb 2007 21:45:41 -0000      1.17
+++ server/asobj/NetStreamFfmpeg.cpp    21 Feb 2007 14:51:01 -0000      1.18
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: NetStreamFfmpeg.cpp,v 1.17 2007/02/19 21:45:41 tgc Exp $ */
+/* $Id: NetStreamFfmpeg.cpp,v 1.18 2007/02/21 14:51:01 tgc Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -113,11 +113,11 @@
 
        // When closing gnash before playback is finished, the soundhandler 
        // seems to be removed before netstream is destroyed.
-       /*sound_handler* s = get_sound_handler();
+       sound_handler* s = get_sound_handler();
        if (s != NULL)
        {
                s->detach_aux_streamer((void*) NULL);
-       }*/
+       }
 
        if (m_Frame) av_free(m_Frame);
        m_Frame = NULL;

Index: server/asobj/SoundFfmpeg.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/SoundFfmpeg.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- server/asobj/SoundFfmpeg.cpp        19 Feb 2007 21:45:41 -0000      1.2
+++ server/asobj/SoundFfmpeg.cpp        21 Feb 2007 14:51:01 -0000      1.3
@@ -343,12 +343,12 @@
                        audio_resample_close (resampleCtx);
                }
 
-               /*      if (isAttached) {
+               if (isAttached) {
                        sound_handler* s = get_sound_handler();
                        if (s) {
                                s->detach_aux_streamer(this);
                        }
-               }*/
+               }
        }
 }
 

Index: server/asobj/SoundMad.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/SoundMad.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- server/asobj/SoundMad.cpp   14 Feb 2007 20:41:48 -0000      1.1
+++ server/asobj/SoundMad.cpp   21 Feb 2007 14:51:01 -0000      1.2
@@ -330,12 +330,12 @@
        mad_frame_finish(&frame);
        mad_stream_finish(&stream);
 
-/*     if (isAttached) {
+       if (isAttached) {
                sound_handler* s = get_sound_handler();
                if (s) {
                        s->detach_aux_streamer(this);
                }
-       }*/
+       }
 
 }
 

Index: testsuite/sound_handler_test.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/sound_handler_test.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- testsuite/sound_handler_test.cpp    20 Feb 2007 16:37:19 -0000      1.1
+++ testsuite/sound_handler_test.cpp    21 Feb 2007 14:51:01 -0000      1.2
@@ -15,7 +15,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-// $Id: sound_handler_test.cpp,v 1.1 2007/02/20 16:37:19 tgc Exp $
+// $Id: sound_handler_test.cpp,v 1.2 2007/02/21 14:51:01 tgc Exp $
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -169,6 +169,8 @@
        sound->loop_count = loop_count;
 
        ++soundsPlaying;
+       sounddata->started++;
+       started_all++;
        sounddata->m_active_sounds.push_back(sound);
 
 }
@@ -199,6 +201,9 @@
                                soundsPlaying--;
                        }
                }
+               sounddata->stopped++;
+               stopped_all++;
+
        }
 
 }