[Gnash-commit] gnash ChangeLog server/as_environment.h server/...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/04/26 12:31:44

Modified files:
        .              : ChangeLog 
        server         : as_environment.h movie_root.h sprite_instance.h 
        server/vm      : action.cpp 

Log message:
                * server/as_environment.h, server/movie_root.h,
                  server/sprite_instance.h, server/vm/action.cpp:
                  Remove some unused code, remove Id tags from headers.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3006&r2=1.3007
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_environment.h?cvsroot=gnash&r1=1.45&r2=1.46
http://cvs.savannah.gnu.org/viewcvs/gnash/server/movie_root.h?cvsroot=gnash&r1=1.50&r2=1.51
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.h?cvsroot=gnash&r1=1.103&r2=1.104
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/action.cpp?cvsroot=gnash&r1=1.17&r2=1.18

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3006
retrieving revision 1.3007
diff -u -b -r1.3006 -r1.3007
--- ChangeLog   26 Apr 2007 12:10:18 -0000      1.3006
+++ ChangeLog   26 Apr 2007 12:31:44 -0000      1.3007
@@ -1,5 +1,11 @@
 2007-04-26 Sandro Santilli <address@hidden>
 
+       * server/as_environment.h, server/movie_root.h,
+         server/sprite_instance.h, server/vm/action.cpp:
+         Remove some unused code, remove Id tags from headers.
+
+2007-04-26 Sandro Santilli <address@hidden>
+
        * testsuite/misc-ming.all/key_event_testrunner.cpp: no more
          failures expected (thanks kai).
        * server/as_value.cpp (to_primitive): fix missing return

Index: server/as_environment.h
===================================================================
RCS file: /sources/gnash/gnash/server/as_environment.h,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -b -r1.45 -r1.46
--- server/as_environment.h     16 Apr 2007 16:47:29 -0000      1.45
+++ server/as_environment.h     26 Apr 2007 12:31:44 -0000      1.46
@@ -14,8 +14,6 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: as_environment.h,v 1.45 2007/04/16 16:47:29 strk Exp $ */
-
 #ifndef GNASH_AS_ENVIRONMENT_H
 #define GNASH_AS_ENVIRONMENT_H
 
@@ -109,7 +107,7 @@
 
        /// Get stack value at the given distance from bottom.
        //
-       /// bottom(0) is actual stack top
+       /// bottom(stack_size()-1) is actual stack top
        ///
        as_value& bottom(size_t index)
        {
@@ -151,14 +149,6 @@
        ///
        as_value get_variable(const std::string& varname) const;
 
-       /// Return the (possibly UNDEFINED) value of the named variable.
-       //
-       /// @param varname 
-       ///     Variable name. Can not contain path elements.
-       ///     TODO: should be case-insensitive up to SWF6.
-       ///
-       as_value get_variable_raw(const std::string& varname) const;
-
        /// \brief
        /// Delete a variable, w/out support for the path, using
        /// a ScopeStack.
@@ -514,6 +504,14 @@
        /// Movie target. 
        character* _original_target;
 
+       /// Return the (possibly UNDEFINED) value of the named variable.
+       //
+       /// @param varname 
+       ///     Variable name. Can not contain path elements.
+       ///     TODO: should be case-insensitive up to SWF6.
+       ///
+       as_value get_variable_raw(const std::string& varname) const;
+
        /// Given a variable name, set its value (no support for path)
        void set_variable_raw(const std::string& path, const as_value& val,
                const ScopeStack& with_stack);

Index: server/movie_root.h
===================================================================
RCS file: /sources/gnash/gnash/server/movie_root.h,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -b -r1.50 -r1.51
--- server/movie_root.h 26 Apr 2007 11:04:56 -0000      1.50
+++ server/movie_root.h 26 Apr 2007 12:31:44 -0000      1.51
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: movie_root.h,v 1.50 2007/04/26 11:04:56 zoulunkai Exp $ */
+/* $Id: movie_root.h,v 1.51 2007/04/26 12:31:44 strk Exp $ */
 
 /// \page events_handling Handling of user events
 ///
@@ -367,16 +367,6 @@
        void * get_userdata() { return m_userdata; }
        void set_userdata(void * ud ) { m_userdata = ud;  }
 
-       /// Delegate to wrapped movie_instance
-       void attach_display_callback(
-                       const char* path_to_object,
-                       void (*callback)(void* user_ptr),
-                       void* user_ptr)
-       {
-               _movie->attach_display_callback(path_to_object,
-                       callback, user_ptr);
-       }
-
        DSOEXPORT void notify_key_listeners(key::code k, bool down);
        void add_key_listener(as_object* listener);
        void remove_key_listener(as_object* listener);

Index: server/sprite_instance.h
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.h,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -b -r1.103 -r1.104
--- server/sprite_instance.h    26 Apr 2007 10:56:50 -0000      1.103
+++ server/sprite_instance.h    26 Apr 2007 12:31:44 -0000      1.104
@@ -17,7 +17,6 @@
 // 
 //
 
-/* $Id: sprite_instance.h,v 1.103 2007/04/26 10:56:50 zoulunkai Exp $ */
 
 // Stateful live Sprite instance
 
@@ -598,24 +597,6 @@
        virtual const char* call_method_args(const char* method_name,
                const char* method_arg_fmt, va_list args);
 
-       virtual void    attach_display_callback(
-               const char* path_to_object,
-               void (*callback)(void*), void* user_ptr)
-       {
-//                  GNASH_REPORT_FUNCTION;
-         
-               // should only be called on the root movie.
-               assert(m_parent == NULL);
-
-               as_value obj = 
m_as_environment.get_variable(std::string(path_to_object));
-               boost::intrusive_ptr<as_object> as_obj = obj.to_object();
-               boost::intrusive_ptr<character> ch = 
boost::dynamic_pointer_cast<character>(as_obj);
-               if (ch)
-               {
-                       ch->set_display_callback(callback, user_ptr);
-               }
-       }
-
        // inherited from character class, see dox in character.h
        as_environment& get_environment() {
                return m_as_environment;

Index: server/vm/action.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/action.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- server/vm/action.cpp        26 Apr 2007 10:56:50 -0000      1.17
+++ server/vm/action.cpp        26 Apr 2007 12:31:44 -0000      1.18
@@ -258,92 +258,17 @@
     return call_method(method, env, this_ptr, 0, env->get_top_index() + 1);
 }
 
+// Printf-like vararg interface for calling ActionScript.
+// Handy for external binding.
 const char*    call_method_parsed(
     as_environment* env,
     as_object* this_ptr,
     const char* method_name,
     const char* method_arg_fmt,
     va_list args)
-    // Printf-like vararg interface for calling ActionScript.
-    // Handy for external binding.
 {
     log_msg(_("FIXME(%d): %s"), __LINE__, __FUNCTION__);
 
-#if 0
-    static const int   BUFSIZE = 1000;
-    char       buffer[BUFSIZE];
-    std::vector<const char*>   tokens;
-
-    // Brutal crap parsing.  Basically null out any
-    // delimiter characters, so that the method name and
-    // args sit in the buffer as null-terminated C
-    // strings.  Leave an intial ' character as the first
-    // char in a string argument.
-    // Don't verify parens or matching quotes or anything.
-    {
-       strncpy(buffer, method_call, BUFSIZE);
-       buffer[BUFSIZE - 1] = '\0';
-       char*   p = buffer;
-
-       char    in_quote = 0;
-       bool    in_arg = false;
-       for (;; p++)
-           {
-               char    c = *p;
-               if (c == 0)
-                   {
-                       // End of string.
-                       break;
-                   }
-               else if (c == in_quote)
-                   {
-                       // End of quotation.
-                       assert(in_arg);
-                       *p = 0;
-                       in_quote = 0;
-                       in_arg = false;
-                   }
-               else if (in_arg)
-                   {
-                       if (in_quote == 0)
-                           {
-                               if (c == ')' || c == '(' || c == ',' || c == ' 
')
-                                   {
-                                       // End of arg.
-                                       *p = 0;
-                                       in_arg = false;
-                                   }
-                           }
-                   }
-               else
-                   {
-                       // Not in arg.  Watch for start of arg.
-                       assert(in_quote == 0);
-                       if (c == '\'' || c == '\"')
-                           {
-                               // Start of quote.
-                               in_quote = c;
-                               in_arg = true;
-                               *p = '\'';      // ' at the start of the arg, 
so later we know this is a string.
-                               tokens.push_back(p);
-                           }
-                       else if (c == ' ' || c == ',')
-                           {
-                               // Non-arg junk, null it out.
-                               *p = 0;
-                           }
-                       else
-                           {
-                               // Must be the start of a numeric arg.
-                               in_arg = true;
-                               tokens.push_back(p);
-                           }
-                   }
-           }
-    }
-#endif // 0
-
-
     // Parse va_list args
     int        starting_index = env->get_top_index();
     const char* p = method_arg_fmt;