[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog server/asobj/NetStream.cpp serv... [gnash
From: |
Sandro Santilli |
Subject: |
[Gnash-commit] gnash ChangeLog server/asobj/NetStream.cpp serv... [gnash_0_8_3_branch] |
Date: |
Thu, 15 May 2008 08:25:59 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Branch: gnash_0_8_3_branch
Changes by: Sandro Santilli <strk> 08/05/15 08:25:58
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&only_with_tag=gnash_0_8_3_branch&r1=1.6573.2.9&r2=1.6573.2.10
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStream.cpp?cvsroot=gnash&only_with_tag=gnash_0_8_3_branch&r1=1.89.2.1&r2=1.89.2.2
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStream.h?cvsroot=gnash&only_with_tag=gnash_0_8_3_branch&r1=1.61.2.1&r2=1.61.2.2
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6573.2.9
retrieving revision 1.6573.2.10
diff -u -b -r1.6573.2.9 -r1.6573.2.10
--- ChangeLog 14 May 2008 10:47:55 -0000 1.6573.2.9
+++ ChangeLog 15 May 2008 08:25:53 -0000 1.6573.2.10
@@ -1,3 +1,7 @@
+2008-05-15 Sandro Santilli <address@hidden>
+
+ * server/asobj/NetStream.{cpp,h}: drop unused as_environment member.
+
2008-05-14 Sandro Santilli <address@hidden>
* server/dlist.cpp (mergeDisplayList): add assertion checking
Index: server/asobj/NetStream.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStream.cpp,v
retrieving revision 1.89.2.1
retrieving revision 1.89.2.2
diff -u -b -r1.89.2.1 -r1.89.2.2
--- server/asobj/NetStream.cpp 13 May 2008 23:57:40 -0000 1.89.2.1
+++ server/asobj/NetStream.cpp 15 May 2008 08:25:55 -0000 1.89.2.2
@@ -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
{
@@ -642,8 +640,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.2.1
retrieving revision 1.61.2.2
diff -u -b -r1.61.2.1 -r1.61.2.2
--- server/asobj/NetStream.h 13 May 2008 23:57:41 -0000 1.61.2.1
+++ server/asobj/NetStream.h 15 May 2008 08:25:56 -0000 1.61.2.2
@@ -124,15 +124,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;
@@ -181,7 +172,6 @@
/// Reachable resources are:
/// - associated NetConnection object (_netCon)
/// - onStatus event handler (m_statusHandler)
- /// - The associated as_environment (m_env)
///
virtual void markReachableResources() const;
@@ -251,17 +241,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
- [Gnash-commit] gnash ChangeLog server/asobj/NetStream.cpp serv... [gnash_0_8_3_branch],
Sandro Santilli <=