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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/08/08 20:08:59

Modified files:
        .              : ChangeLog 
        server         : sprite_instance.cpp sprite_instance.h 

Log message:
                * server/sprite_instance.cpp: drop set_variable() methods.
                  Have setVariables() call set_member directly (might change in 
the
                  future to call as_environment's set_variable, if we find out
                  variables in query string, FlashParams and loadVariable 
loaded text
                  files can contain path elements).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3968&r2=1.3969
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.305&r2=1.306
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.h?cvsroot=gnash&r1=1.127&r2=1.128

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3968
retrieving revision 1.3969
diff -u -b -r1.3968 -r1.3969
--- ChangeLog   8 Aug 2007 19:53:02 -0000       1.3968
+++ ChangeLog   8 Aug 2007 20:08:58 -0000       1.3969
@@ -1,5 +1,13 @@
 2007-08-08 Sandro Santilli <address@hidden>
 
+       * server/sprite_instance.cpp: drop set_variable() methods.
+         Have setVariables() call set_member directly (might change in the
+         future to call as_environment's set_variable, if we find out
+         variables in query string, FlashParams and loadVariable loaded text
+         files can contain path elements).
+
+2007-08-08 Sandro Santilli <address@hidden>
+
        * testsuite/actionscript.all/LoadVars.as: enabled tests erroneously
          committed disabled.
        * server/sprite_instance.cpp (processCompletedLoadVariableRequests):

Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.305
retrieving revision 1.306
diff -u -b -r1.305 -r1.306
--- server/sprite_instance.cpp  8 Aug 2007 19:32:36 -0000       1.305
+++ server/sprite_instance.cpp  8 Aug 2007 20:08:58 -0000       1.306
@@ -2236,52 +2236,6 @@
 
 }
 
-void sprite_instance::set_variable(const char* path_to_var,
-               const wchar_t* new_value)
-{
-       if (path_to_var == NULL)
-       {
-               log_error(_("NULL path_to_var passed to set_variable()"));
-               return;
-       }
-       if (new_value == NULL)
-       {
-               log_error(_("NULL passed to set_variable('%s',"
-                       " NULL)"), path_to_var);
-               return;
-       }
-
-       // should only be called on the root movie.
-       assert(m_parent == NULL);
-
-       std::string path(path_to_var);
-       as_value val(new_value);
-
-       m_as_environment.set_variable(path, val);
-}
-
-void sprite_instance::set_variable(const char* path_to_var,
-               const char* new_value)
-{
-           assert(m_parent == NULL);   // should only be called on the root 
movie.
-
-           if (path_to_var == NULL)
-               {
-                   log_error(_("NULL path_to_var passed to set_variable()"));
-                   return;
-               }
-           if (new_value == NULL)
-               {
-                   log_error(_("NULL passed to set_variable('%s', NULL)"), 
path_to_var);
-                   return;
-               }
-
-           std::string path(path_to_var);
-           as_value val(new_value);
-
-           m_as_environment.set_variable(path, val);
-}
-
 void sprite_instance::advance_sprite(float delta_time)
 {
        //GNASH_REPORT_FUNCTION;
@@ -3874,7 +3828,7 @@
        {
                const string& name = it->first;
                const string& val = it->second;
-               set_variable(name.c_str(), val.c_str());
+               set_member(name, val.c_str());
        }
 }
 

Index: server/sprite_instance.h
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.h,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -b -r1.127 -r1.128
--- server/sprite_instance.h    24 Jul 2007 13:08:56 -0000      1.127
+++ server/sprite_instance.h    8 Aug 2007 20:08:59 -0000       1.128
@@ -541,21 +541,9 @@
        // ActionScript support
        //
 
-
-       /// Set the named variable to the value
-       virtual void set_variable(const char* path_to_var,
-               const char* new_value);
-
-       /// Set the named variable to the wide value
-       //
-       /// TODO: check if worth deprecating
-       virtual void set_variable(const char* path_to_var,
-               const wchar_t* new_value);
-
        // See dox in as_object.h
        bool get_member(const std::string& name, as_value* val);
 
-               
        /// Set the named member to the value. 
        //
        /// Return true if we have that member; false otherwise.