[Gnash-commit] gnash/server video_stream_instance.cpp video_st...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/06/19 09:26:55

Modified files:
        server         : video_stream_instance.cpp 
                         video_stream_instance.h sprite_instance.h 
                         character.h 

Log message:
                * server/video_stream_instance.{cpp,h}: implement
                  reachable resources marker.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/server/video_stream_instance.cpp?cvsroot=gnash&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/gnash/server/video_stream_instance.h?cvsroot=gnash&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.h?cvsroot=gnash&r1=1.122&r2=1.123
http://cvs.savannah.gnu.org/viewcvs/gnash/server/character.h?cvsroot=gnash&r1=1.83&r2=1.84

Patches:
Index: video_stream_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/video_stream_instance.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- video_stream_instance.cpp   6 Jun 2007 15:41:12 -0000       1.28
+++ video_stream_instance.cpp   19 Jun 2007 09:26:54 -0000      1.29
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // 
 
-// $Id: video_stream_instance.cpp,v 1.28 2007/06/06 15:41:12 tgc Exp $
+// $Id: video_stream_instance.cpp,v 1.29 2007/06/19 09:26:54 strk Exp $
 
 #include "sprite_instance.h"
 #include "video_stream_instance.h"
@@ -158,6 +158,7 @@
        _ns(NULL),
        m_decoder(NULL) // don't abort if m_def is null
 {
+       log_debug("video_stream_instance %p ctor", (void*)this);
        if ( m_def )
        {
                m_decoder = m_def->get_decoder();
@@ -277,4 +278,12 @@
        global.init_member("Video", cl.get());
 }
 
+#ifdef GNASH_USE_GC
+void
+video_stream_instance::markReachableResources() const
+{
+       if ( _ns ) _ns->setReachable();
+}
+#endif // GNASH_USE_GC
+
 } // end of namespace gnash

Index: video_stream_instance.h
===================================================================
RCS file: /sources/gnash/gnash/server/video_stream_instance.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- video_stream_instance.h     4 Jun 2007 19:21:20 -0000       1.15
+++ video_stream_instance.h     19 Jun 2007 09:26:54 -0000      1.16
@@ -16,7 +16,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 // 
-// $Id: video_stream_instance.h,v 1.15 2007/06/04 19:21:20 strk Exp $
+// $Id: video_stream_instance.h,v 1.16 2007/06/19 09:26:54 strk Exp $
 
 #ifndef GNASH_VIDEO_STREAM_INSTANCE_H
 #define GNASH_VIDEO_STREAM_INSTANCE_H
@@ -70,6 +70,18 @@
        /// Set the input stream for this video
        void setStream(boost::intrusive_ptr<NetStream> ns);
 
+protected:
+
+#ifdef GNASH_USE_GC
+       /// Mark video-specific reachable resources and invoke
+       /// the parent's class version (markCharacterReachable)
+       //
+       /// video-specific reachable resources are:
+       ///     - Associated NetStream if any (_ns) 
+       ///
+       virtual void markReachableResources() const;
+#endif // GNASH_USE_GC
+
 private:
 
        // m_video_source - A Camera object that is capturing video data or a 
NetStream object.

Index: sprite_instance.h
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.h,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -b -r1.122 -r1.123
--- sprite_instance.h   17 Jun 2007 22:09:24 -0000      1.122
+++ sprite_instance.h   19 Jun 2007 09:26:55 -0000      1.123
@@ -997,7 +997,7 @@
 
 #ifdef GNASH_USE_GC
        /// Mark sprite-specific reachable resources and invoke
-       /// the parent's class version (markCharacterReachableResources)
+       /// the parent's class version (markCharacterReachable)
        //
        /// sprite-specific reachable resources are:
        ///     - DisplayList items (current, backup and frame0 ones)

Index: character.h
===================================================================
RCS file: /sources/gnash/gnash/server/character.h,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -b -r1.83 -r1.84
--- character.h 15 Jun 2007 15:00:28 -0000      1.83
+++ character.h 19 Jun 2007 09:26:55 -0000      1.84
@@ -19,7 +19,7 @@
 //
 //
 
-/* $Id: character.h,v 1.83 2007/06/15 15:00:28 strk Exp $ */
+/* $Id: character.h,v 1.84 2007/06/19 09:26:55 strk Exp $ */
 
 #ifndef GNASH_CHARACTER_H
 #define GNASH_CHARACTER_H
@@ -157,7 +157,7 @@
 #ifdef GNASH_USE_GC
        /// Mark all reachable resources, override from as_object.
        //
-       /// The default implementation calls markCharacterReachableResources().
+       /// The default implementation calls markCharacterReachable().
        ///
        /// If a derived class provides access to more GC-managed
        /// resources, it should override this method and call