gnash-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Gnash-commit] gnash ChangeLog server/parser/movie_def_impl.cp...


From: Sandro Santilli
Subject: [Gnash-commit] gnash ChangeLog server/parser/movie_def_impl.cp...
Date: Thu, 15 Nov 2007 09:44:06 +0000

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/11/15 09:44:06

Modified files:
        .              : ChangeLog 
        server/parser  : movie_def_impl.cpp movie_def_impl.h 
                         movie_definition.h sprite_definition.h 

Log message:
        drop the obsoleted get_init_actions interface.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4867&r2=1.4868
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/movie_def_impl.cpp?cvsroot=gnash&r1=1.87&r2=1.88
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/movie_def_impl.h?cvsroot=gnash&r1=1.57&r2=1.58
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/movie_definition.h?cvsroot=gnash&r1=1.33&r2=1.34
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/sprite_definition.h?cvsroot=gnash&r1=1.32&r2=1.33

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4867
retrieving revision 1.4868
diff -u -b -r1.4867 -r1.4868
--- ChangeLog   15 Nov 2007 08:20:22 -0000      1.4867
+++ ChangeLog   15 Nov 2007 09:44:05 -0000      1.4868
@@ -1,5 +1,10 @@
 2007-11-15 Sandro Santilli <address@hidden>
 
+       * server/parser/: movie_definition.h, movie_def_impl.{cpp,h},
+         sprite_definition.h: drop the obsoleted get_init_actions interface.
+
+2007-11-15 Sandro Santilli <address@hidden>
+
        * testsuite/misc-swfc.all/Dejagnu.sc: make Dejagnu window automatic
          resize to let text fit in (autoSize).
        * server/sprite_instance.cpp: cleanup debugging output.

Index: server/parser/movie_def_impl.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/movie_def_impl.cpp,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -b -r1.87 -r1.88
--- server/parser/movie_def_impl.cpp    14 Nov 2007 13:23:47 -0000      1.87
+++ server/parser/movie_def_impl.cpp    15 Nov 2007 09:44:06 -0000      1.88
@@ -228,24 +228,7 @@
                {
                     delete *j;
                 }
-
-               //pl.clear(); // useless, as we're going to clean the whole map
         }
-       //m_playlist.clear(); // useless, as we're going to call it's 
destructor next 
-
-       // Release init action data.
-       for (PlayListMap::iterator i=m_init_action_list.begin(), 
e=m_init_action_list.end(); i!=e; ++i)
-       {
-               PlayList& pl = i->second;
-
-               for (PlayList::iterator j=pl.begin(), je=pl.end(); j!=je; ++j)
-               {
-                    delete *j;
-                }
-
-               //pl.clear(); // useless, as we're going to clean the whole map
-        }
-       //m_init_action_list.clear(); // useless, as we're going to call it's 
destructor next 
 
        // It's supposed to be cleaned up in read()
        // TODO: join with loader thread instead ?
@@ -500,11 +483,6 @@
        // TODO: This seems dangerous, check closely
        if(m_frame_count == 0) m_frame_count++;
 
-       // Allocate 1 more then the expected slots
-       // for actions, to make handling malformed SWF easier.
-       //m_playlist.resize(m_frame_count+1);
-       //m_init_action_list.resize(m_frame_count+1);
-
        IF_VERBOSE_PARSE(
                m_frame_size.print();
                log_parse(_("frame rate = %f, frames = " SIZET_FMT),
@@ -945,13 +923,12 @@
                log_error(_("Parsing exception: %s"), e.what());
        }
 
-       if ( ! m_playlist[_frames_loaded].empty() || ! 
m_init_action_list[_frames_loaded].empty() )
+       if ( ! m_playlist[_frames_loaded].empty() )
        {
                IF_VERBOSE_MALFORMED_SWF(
-               log_swferror(_(SIZET_FMT " action blocks and " SIZET_FMT " init 
action blocks are NOT followed by"
+               log_swferror(_(SIZET_FMT " control tags are NOT followed by"
                        " a SHOWFRAME tag"),
-                       m_playlist[_frames_loaded].size(),
-                       m_init_action_list[_frames_loaded].size());
+                       m_playlist[_frames_loaded].size());
                );
        }
 
@@ -997,7 +974,6 @@
                                m_frame_count);
                );
                //m_playlist.resize(_frames_loaded+1);
-               //m_init_action_list.resize(_frames_loaded+1);
        }
 
 #ifdef DEBUG_FRAMES_LOAD
@@ -1181,7 +1157,6 @@
        if ( m_init_action_defined.insert(cid).second )
        {
                add_execute_tag(e); // ownership transferred
-               //m_init_action_list[_frames_loaded].push_back(e);
        }
 }
 

Index: server/parser/movie_def_impl.h
===================================================================
RCS file: /sources/gnash/gnash/server/parser/movie_def_impl.h,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -b -r1.57 -r1.58
--- server/parser/movie_def_impl.h      30 Oct 2007 18:55:43 -0000      1.57
+++ server/parser/movie_def_impl.h      15 Nov 2007 09:44:06 -0000      1.58
@@ -215,8 +215,7 @@
        /// Movie control events for each frame.
        PlayListMap m_playlist;
 
-       /// Init actions for each frame.
-       PlayListMap m_init_action_list;
+       /// A map to track init actions ids (subsequent init actions for the 
same id have to be discarded)
        std::set<int> m_init_action_defined;
 
        /// 0-based frame #'s
@@ -522,15 +521,6 @@
                else return &(it->second);
        }
 
-       virtual const PlayList* get_init_actions(size_t frame_number)
-       {
-               assert(frame_number <= _frames_loaded);
-
-               PlayListMap::iterator it = 
m_init_action_list.find(frame_number);
-               if ( it == m_init_action_list.end() ) return NULL;
-               else return &(it->second);
-       }
-
        /// Calls readHeader() and completeLoad() in sequence.
        //
        /// @return false on failure

Index: server/parser/movie_definition.h
===================================================================
RCS file: /sources/gnash/gnash/server/parser/movie_definition.h,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- server/parser/movie_definition.h    10 Nov 2007 11:51:44 -0000      1.33
+++ server/parser/movie_definition.h    15 Nov 2007 09:44:06 -0000      1.34
@@ -241,19 +241,6 @@
                return 0;
        }
 
-       /// Return the list of init actions for given frame number
-       //
-       ///
-       /// @param frame_number
-       ///      Frame number, 0-based (ie: first frame is 0)
-       ///
-       /// @return NULL if the given frame has no init actions associated
-       ///         (this is the default behaviour)
-       ///
-       virtual const PlayList* get_init_actions(size_t /*frame_number*/) {
-               return NULL;
-       }
-
        /// Get the named exported resource, if we expose it.
        //
        /// @param symbol

Index: server/parser/sprite_definition.h
===================================================================
RCS file: /sources/gnash/gnash/server/parser/sprite_definition.h,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- server/parser/sprite_definition.h   30 Oct 2007 18:55:43 -0000      1.32
+++ server/parser/sprite_definition.h   15 Nov 2007 09:44:06 -0000      1.33
@@ -328,12 +328,6 @@
                else return &(it->second);
        }
 
-       // Sprites do not have init actions in their
-       // playlists!  Only the root movie
-       // (movie_def_impl) does (@@ correct?)
-       // .. no need to override as returning NULL is the default behaviour ..
-       //virtual const PlayList* get_init_actions(size_t /*frame_number*/)
-
        virtual const std::string& get_url() const
        {
                return m_movie_def->get_url();




reply via email to

[Prev in Thread] Current Thread [Next in Thread]