[Gnash-commit] gnash ChangeLog server/asobj/LoadVars.cpp

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  08/01/05 11:37:55

Modified files:
        .              : ChangeLog 
        server/asobj   : LoadVars.cpp 

Log message:
        cleanup VM accesses to not rely on the singleton.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5315&r2=1.5316
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/LoadVars.cpp?cvsroot=gnash&r1=1.33&r2=1.34

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5315
retrieving revision 1.5316
diff -u -b -r1.5315 -r1.5316
--- ChangeLog   5 Jan 2008 11:01:16 -0000       1.5315
+++ ChangeLog   5 Jan 2008 11:37:54 -0000       1.5316
@@ -1,5 +1,7 @@
 2008-01-05 Sandro Santilli <address@hidden>
 
+       * server/asobj/LoadVars.cpp: cleanup VM accesses to not rely on the
+         singleton.
        * testsuite/Makefile.am: remove tmpSharedObject on make clean.
        * libamf/sol.cpp (SOL::readFile): revert the fix to magic number
          consistency, it really seems it's us failign to swap bytes

Index: server/asobj/LoadVars.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/LoadVars.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- server/asobj/LoadVars.cpp   20 Nov 2007 12:04:55 -0000      1.33
+++ server/asobj/LoadVars.cpp   5 Jan 2008 11:37:55 -0000       1.34
@@ -302,7 +302,7 @@
                }
                else
                {
-                       
VM::get().getRoot().clear_interval_timer(_loadCheckerTimer);
+                       
getVM().getRoot().clear_interval_timer(_loadCheckerTimer);
                }
        }
 }
@@ -378,11 +378,13 @@
        typedef LoadVariablesThread::ValuesMap ValuesMap;
        using std::string;
 
+       string_table& st = getVM().getStringTable();
+
        ValuesMap& vals = lr.getValues();
        for  (ValuesMap::iterator it=vals.begin(), itEnd=vals.end();
                        it != itEnd; ++it)
        {
-               set_member(VM::get().getStringTable().find(it->first), 
as_value(it->second.c_str()));
+               set_member(st.find(it->first), as_value(it->second.c_str()));
                //log_msg("Setting %s == %s", it->first.c_str(), 
it->second.c_str());
        }
 
@@ -407,7 +409,7 @@
                        &LoadVars::checkLoads_wrapper, NULL);
                std::auto_ptr<Timer> timer(new Timer);
                timer->setInterval(*loadsChecker, 50, this);
-               _loadCheckerTimer = 
VM::get().getRoot().add_interval_timer(timer, true);
+               _loadCheckerTimer = getVM().getRoot().add_interval_timer(timer, 
true);
        }
 
        URL url(urlstr, get_base_url());