[Gnash-commit] gnash ChangeLog server/asobj/NetStream.cpp serv...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  08/05/15 08:25:23

Modified files:
        .              : ChangeLog 
        server/asobj   : NetStream.cpp NetStream.h 

Log message:
        drop unused as_environment member.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6603&r2=1.6604
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStream.cpp?cvsroot=gnash&r1=1.89&r2=1.90
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStream.h?cvsroot=gnash&r1=1.61&r2=1.62

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6603
retrieving revision 1.6604
diff -u -b -r1.6603 -r1.6604
--- ChangeLog   15 May 2008 07:57:59 -0000      1.6603
+++ ChangeLog   15 May 2008 08:25:17 -0000      1.6604
@@ -1,3 +1,7 @@
+2008-05-15 Sandro Santilli <address@hidden>
+
+       * server/asobj/NetStream.{cpp,h}: drop unused as_environment member.
+
 2008-05-15 Benjamin Wolsey <address@hidden>
 
        * libbase/image_filters.cpp: drop (hasn't been used or built since

Index: server/asobj/NetStream.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStream.cpp,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -b -r1.89 -r1.90
--- server/asobj/NetStream.cpp  21 Apr 2008 11:27:44 -0000      1.89
+++ server/asobj/NetStream.cpp  15 May 2008 08:25:20 -0000      1.90
@@ -68,7 +68,6 @@
        :
        as_object(getNetStreamInterface()),
        _netCon(NULL),
-       m_env(NULL),
        m_bufferTime(100), // The default size needed to begin playback of 
media is 100 miliseconds
        m_videoFrameFormat(gnash::render::videoFrameFormat()),
        m_newFrameReady(false),
@@ -104,7 +103,6 @@
                if ( ns )
                {
                        netstream_obj->setNetCon(ns);
-                       netstream_obj->setEnvironment(&fn.env());               
        
                }
                else
                {
@@ -640,8 +638,6 @@
 
        if ( m_statusHandler ) m_statusHandler->setReachable();
 
-       if ( m_env ) m_env->markReachableResources();
-
        // Invoke generic as_object marker
        markAsObjectReachable();
 }

Index: server/asobj/NetStream.h
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStream.h,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -b -r1.61 -r1.62
--- server/asobj/NetStream.h    21 Apr 2008 11:27:44 -0000      1.61
+++ server/asobj/NetStream.h    15 May 2008 08:25:21 -0000      1.62
@@ -122,15 +122,6 @@
        
        void processNotify(const std::string& funcname, as_object* 
metadata_obj);
 
-       /// The actionscript enviroment for the AS callbacks
-       //
-       /// TODO: research on safety of this: who's the owner of the 
as_environment ?
-       ///       can we be sure that the environment won't be prematurely 
deleted ?
-       ///       We'd need an as_environment::testInvariant() to call in our 
own
-       ///       testInvariant() method (also TODO).
-       ///
-       as_environment* m_env;
-
        // The size of the buffer in milliseconds
        boost::uint32_t m_bufferTime;
 
@@ -179,7 +170,6 @@
        /// Reachable resources are:
        ///     - associated NetConnection object (_netCon)
        ///     - onStatus event handler (m_statusHandler)
-       ///     - The associated as_environment (m_env)
        ///
        virtual void markReachableResources() const;
 
@@ -249,17 +239,6 @@
        /// Return true if the NetStream has an associated NetConnection
        bool isConnected() const { return _netCon != 0; }
 
-       /// Sets the AS Enviroment needed for eventhandlers
-       //
-       /// @param enviroment
-       ///     TODO: document ownership !!
-       ///
-       void setEnvironment(as_environment* env)
-       {
-               assert(env);
-               m_env = env;
-       }
-
        /// Specifies the number of milliseconds to buffer before starting to 
display the stream.
        //
        /// @param time