[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog server/parser/movie_def_impl.cp...
|
From: |
Zou Lunkai |
|
Subject: |
[Gnash-commit] gnash ChangeLog server/parser/movie_def_impl.cp... |
|
Date: |
Thu, 10 Apr 2008 03:52:08 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Zou Lunkai <zoulunkai> 08/04/10 03:52:08
Modified files:
. : ChangeLog
server/parser : movie_def_impl.cpp movie_def_impl.h
movie_definition.h sprite_definition.cpp
sprite_definition.h
server : sprite_instance.cpp
server/swf : PlaceObject2Tag.cpp RemoveObjectTag.cpp
Log message:
* server/parser/movie_def_impl.{h, cpp},
server/parser/movie_definition.h,
server/parser/sprite_definition.{h,cpp},
server/swf/PlaceObject2Tag.cpp, RemoveObjectTag.cpp,
server/sprite_instance.cpp: drop obsolete timeline
handling.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6232&r2=1.6233
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/movie_def_impl.cpp?cvsroot=gnash&r1=1.102&r2=1.103
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/movie_def_impl.h?cvsroot=gnash&r1=1.69&r2=1.70
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/movie_definition.h?cvsroot=gnash&r1=1.43&r2=1.44
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/sprite_definition.cpp?cvsroot=gnash&r1=1.31&r2=1.32
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/sprite_definition.h?cvsroot=gnash&r1=1.40&r2=1.41
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.499&r2=1.500
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/PlaceObject2Tag.cpp?cvsroot=gnash&r1=1.37&r2=1.38
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/RemoveObjectTag.cpp?cvsroot=gnash&r1=1.8&r2=1.9
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6232
retrieving revision 1.6233
diff -u -b -r1.6232 -r1.6233
--- ChangeLog 10 Apr 2008 00:41:06 -0000 1.6232
+++ ChangeLog 10 Apr 2008 03:52:06 -0000 1.6233
@@ -1,3 +1,10 @@
+2008-04-10 Zou Lunkai <address@hidden>
+ * server/parser/movie_def_impl.{h, cpp},
server/parser/movie_definition.h,
+ server/parser/sprite_definition.{h,cpp},
+ server/swf/PlaceObject2Tag.cpp, RemoveObjectTag.cpp,
+ server/sprite_instance.cpp: drop obsolete timeline
+ handling.
+
2008-04-09 Sandro Santilli <address@hidden>
* libbase/ref_counted.h, libbase/smart_ptr.h: const-correctness.
Index: server/parser/movie_def_impl.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/movie_def_impl.cpp,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -b -r1.102 -r1.103
--- server/parser/movie_def_impl.cpp 2 Apr 2008 01:05:02 -0000 1.102
+++ server/parser/movie_def_impl.cpp 10 Apr 2008 03:52:07 -0000 1.103
@@ -843,9 +843,6 @@
++_frames_loaded;
- // Close current frame definition in Timeline object
- _timeline.closeFrame();
-
if ( _frames_loaded > m_frame_count )
{
IF_VERBOSE_MALFORMED_SWF(
Index: server/parser/movie_def_impl.h
===================================================================
RCS file: /sources/gnash/gnash/server/parser/movie_def_impl.h,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -b -r1.69 -r1.70
--- server/parser/movie_def_impl.h 21 Jan 2008 20:56:01 -0000 1.69
+++ server/parser/movie_def_impl.h 10 Apr 2008 03:52:07 -0000 1.70
@@ -28,7 +28,6 @@
#include "bitmap_character_def.h" // for boost::intrusive_ptr visibility of
dtor
#include "resource.h" // for boost::intrusive_ptr visibility of dtor
#include "stream.h" // for get_bytes_loaded
-#include "Timeline.h" // for composition
#include "StringPredicates.h" // for case-insensitive string comparision
(ExportMap)
#include <map> // for CharacterDictionary
@@ -316,12 +315,6 @@
_bytes_loaded=bytes;
}
- /// Timeline depth info
- //
- /// TODO: move to base class ?
- ///
- Timeline _timeline;
-
/// A flag set to true when load cancelation is requested
bool _loadingCanceled;
@@ -575,33 +568,6 @@
return unused;
}
- // See dox in base class
- //
- // TODO: implement in base class ?
- //
- void addTimelineDepth(int depth)
- {
- _timeline.addDepth(depth);
- }
-
- // See dox in base class
- //
- // TODO: implement in base class ?
- //
- void removeTimelineDepth(int depth)
- {
- _timeline.removeDepth(depth);
- }
-
- // See dox in base class
- //
- // TODO: implement in base class ?
- //
- void getTimelineDepths(size_t frameno, std::vector<int>& depths)
- {
- _timeline.getFrameDepths(frameno, depths);
- }
-
protected:
#ifdef GNASH_USE_GC
Index: server/parser/movie_definition.h
===================================================================
RCS file: /sources/gnash/gnash/server/parser/movie_definition.h,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -b -r1.43 -r1.44
--- server/parser/movie_definition.h 21 Jan 2008 20:56:01 -0000 1.43
+++ server/parser/movie_definition.h 10 Apr 2008 03:52:07 -0000 1.44
@@ -521,53 +521,6 @@
{
}
- /// Add a depth to the timeline depth set in current frame
- //
- /// The default implementations is a no-op
- ///
- /// It is overridden by timeline-equipped definitions:
- /// - sprite_definition
- /// - movie_def_impl
- ///
- /// @param depth
- /// Depth of an instance placed by PlaceObject* tag.
- /// Assumed to be in the static zone (an assertion would fail
otherwise).
- ///
- virtual void addTimelineDepth(int /*depth*/) {}
-
- /// Remove a depth from the timeline depth set in current frame
- //
- /// The default implementations is a no-op
- ///
- /// It is overridden by timeline-equipped definitions:
- /// - sprite_definition
- /// - movie_def_impl
- ///
- /// @param depth
- /// Depth of an instance placed by PlaceObject* tag.
- /// Assumed to be in the static zone (an assertion would fail
otherwise).
- ///
- virtual void removeTimelineDepth(int /*depth*/) {}
-
- /// \brief
- /// Get the set of timeline depths supposed to contain
- /// an instance in the given frame (0-based)
- //
- /// The default implementations is a no-op
- ///
- /// PRECONDITIONS:
- /// - Target frame was completely parsed.
- ///
- /// @param frameno
- /// 0-based frame number we want to inspect.
- /// Assumed to be in the static zone.
- ///
- /// @param depths
- /// A vector to copy all frame depths to.
- ///
- virtual void getTimelineDepths(size_t /*frameno*/, std::vector<int>&
/*depths*/)
- {}
-
};
} // namespace gnash
Index: server/parser/sprite_definition.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/sprite_definition.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- server/parser/sprite_definition.cpp 9 Apr 2008 09:28:59 -0000 1.31
+++ server/parser/sprite_definition.cpp 10 Apr 2008 03:52:07 -0000 1.32
@@ -106,10 +106,6 @@
// show frame tag -- advance to the next frame.
++m_loading_frame;
- // Close current frame definition in Timeline object
- _timeline.closeFrame();
-
-
IF_VERBOSE_PARSE (
log_parse(_(" show_frame "
SIZET_FMT "/" SIZET_FMT
Index: server/parser/sprite_definition.h
===================================================================
RCS file: /sources/gnash/gnash/server/parser/sprite_definition.h,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -b -r1.40 -r1.41
--- server/parser/sprite_definition.h 9 Apr 2008 09:28:59 -0000 1.40
+++ server/parser/sprite_definition.h 10 Apr 2008 03:52:07 -0000 1.41
@@ -30,7 +30,6 @@
#include "stream.h"
#include "log.h"
#include "rect.h"
-#include "Timeline.h" // for composition
namespace gnash
{
@@ -82,33 +81,6 @@
return registeredClass.get();
}
- // See dox in base class
- //
- // TODO: implement in base class ?
- //
- void addTimelineDepth(int depth)
- {
- _timeline.addDepth(depth);
- }
-
- // See dox in base class
- //
- // TODO: implement in base class ?
- //
- void removeTimelineDepth(int depth)
- {
- _timeline.removeDepth(depth);
- }
-
- // See dox in base class
- //
- // TODO: implement in base class ?
- //
- void getTimelineDepths(size_t frameno, std::vector<int>& depths)
- {
- _timeline.getFrameDepths(frameno, depths);
- }
-
// overload from movie_definition
virtual float get_width_pixels() const { return 1; }
@@ -359,12 +331,6 @@
///
boost::intrusive_ptr<as_function> registeredClass;
- /// Timeline depth info
- //
- /// TODO: move to base class ?
- ///
- Timeline _timeline;
-
protected:
Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.499
retrieving revision 1.500
diff -u -b -r1.499 -r1.500
--- server/sprite_instance.cpp 9 Apr 2008 09:28:58 -0000 1.499
+++ server/sprite_instance.cpp 10 Apr 2008 03:52:07 -0000 1.500
@@ -50,7 +50,6 @@
#include "LoadVariablesThread.h"
#include "ExecutableCode.h" // for inheritance of ConstructEvent
#include "gnash.h" // for point class !
-#include "Timeline.h" // for restoreDisplayList
#include "Object.h" // for getObjectInterface
#include "DynamicShape.h" // for composition
#include "namedStrings.h"
Index: server/swf/PlaceObject2Tag.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf/PlaceObject2Tag.cpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- server/swf/PlaceObject2Tag.cpp 14 Mar 2008 20:57:01 -0000 1.37
+++ server/swf/PlaceObject2Tag.cpp 10 Apr 2008 03:52:08 -0000 1.38
@@ -558,16 +558,6 @@
ch->read(*in, tag);
m->addControlTag(ch);
-
- int depth = ch->getDepth();
- if ( depth < 0 && depth >= character::staticDepthOffset )
- {
- m->addTimelineDepth(depth);
- }
- else
- {
- log_debug("PlaceObject2Tag depth %d is out of static depth zone. Won't
register its TimelineDepth.", depth);
- }
}
} // namespace gnash::SWF
Index: server/swf/RemoveObjectTag.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf/RemoveObjectTag.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- server/swf/RemoveObjectTag.cpp 5 Mar 2008 03:56:03 -0000 1.8
+++ server/swf/RemoveObjectTag.cpp 10 Apr 2008 03:52:08 -0000 1.9
@@ -69,15 +69,6 @@
log_parse(_(" remove_object_2(%d)"), depth);
);
- if ( depth < 0 && depth >= character::staticDepthOffset )
- {
- m->removeTimelineDepth(depth);
- }
- else
- {
- log_debug("RemoveObjectTag depth %d is out of static depth zone. Won't
unregister its TimelineDepth.", depth);
- }
-
// Ownership transferred to movie_definition
m->addControlTag(t.release());
}
- [Gnash-commit] gnash ChangeLog server/parser/movie_def_impl.cp...,
Zou Lunkai <=