[Gnash-commit] gnash ChangeLog server/video_stream_instance.cp...

[Benjamin Wolsey]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Benjamin Wolsey <bwy>   08/06/16 16:24:04

Modified files:
        .              : ChangeLog 
        server         : video_stream_instance.cpp 
        server/asobj   : System.cpp 

Log message:
                * server/asobj/System.cpp, server/video_stream_instance.cpp: 
remove
                  reliance on VM::get().

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6944&r2=1.6945
http://cvs.savannah.gnu.org/viewcvs/gnash/server/video_stream_instance.cpp?cvsroot=gnash&r1=1.51&r2=1.52
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/System.cpp?cvsroot=gnash&r1=1.33&r2=1.34

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6944
retrieving revision 1.6945
diff -u -b -r1.6944 -r1.6945
--- ChangeLog   16 Jun 2008 16:06:14 -0000      1.6944
+++ ChangeLog   16 Jun 2008 16:24:02 -0000      1.6945
@@ -1,3 +1,8 @@
+2008-06-16 Benjamin Wolsey <address@hidden>
+
+       * server/asobj/System.cpp, server/video_stream_instance.cpp: remove
+         reliance on VM::get().
+
 2008-06-16 Sandro Santilli <address@hidden>
 
        * libmedia/ffmpeg/MediaParserFfmpeg.cpp: push encoded frames to

Index: server/video_stream_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/video_stream_instance.cpp,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -b -r1.51 -r1.52
--- server/video_stream_instance.cpp    25 May 2008 10:05:21 -0000      1.51
+++ server/video_stream_instance.cpp    16 Jun 2008 16:24:03 -0000      1.52
@@ -32,20 +32,20 @@
 
 namespace gnash {
 
-static as_object* getVideoInterface();
+static as_object* getVideoInterface(as_object& where);
 static void attachVideoInterface(as_object& o);
 static void attachVideoProperties(as_object& o);
 static as_value video_ctor(const fn_call& fn);
 static as_value video_attach(const fn_call& fn);
 static as_value video_clear(const fn_call& fn);
 
-static as_object* getVideoInterface()
+static as_object* getVideoInterface(as_object& where)
 {
        static boost::intrusive_ptr<as_object> proto;
        if ( proto == NULL )
        {
                proto = new as_object(getObjectInterface());
-               VM::get().addStatic(proto.get());
+               where.getVM().addStatic(proto.get());
 
                attachVideoInterface(*proto);
                //proto->init_member("constructor", new 
builtin_function(video_ctor));
@@ -169,7 +169,7 @@
                attachVideoProperties(*this);
        }
 
-       set_prototype(getVideoInterface());
+       set_prototype(getVideoInterface(*this));
 }
 
 video_stream_instance::~video_stream_instance()
@@ -273,8 +273,8 @@
 
        if ( cl == NULL )
        {
-               cl=new builtin_function(&video_ctor, getVideoInterface());
-               VM::get().addStatic(cl.get());
+               cl=new builtin_function(&video_ctor, getVideoInterface(global));
+               global.getVM().addStatic(cl.get());
 
                // replicate all interface to class, to be able to access
                // all methods as static functions

Index: server/asobj/System.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/System.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- server/asobj/System.cpp     13 Jun 2008 18:48:11 -0000      1.33
+++ server/asobj/System.cpp     16 Jun 2008 16:24:04 -0000      1.34
@@ -32,7 +32,7 @@
 
 namespace gnash {
 
-static const std::string& systemLanguage();
+static const std::string& systemLanguage(as_object& proto);
 
 static as_value system_security_allowdomain(const fn_call& fn);
 static as_value system_security_allowinsecuredomain(const fn_call& fn);
@@ -80,7 +80,7 @@
 }
 
 static as_object*
-getSystemCapabilitiesInterface()
+getSystemCapabilitiesInterface(as_object& o)
 {
        RcInitFile& rcfile = RcInitFile::getDefaultInstance();
 
@@ -91,11 +91,11 @@
     // "Windows XP", "Windows 2000", "Windows NT", "Windows 98/ME",
     // "Windows 95", "Windows CE", "Linux", "MacOS"
     // Override in gnashrc
-    VM& vm = VM::get();
+    VM& vm = o.getVM();
     
     const std::string os = vm.getOSName();
 
-    const std::string language = systemLanguage();
+    const std::string language = systemLanguage(o);
 
     // FIXME: these need to be implemented properly 
     // Does the NetStream object natively support SSL?
@@ -176,7 +176,7 @@
 
     // "LNX 9,0,22,0", "MAC 8,0,99,0"
     // Override in gnashrc
-    const std::string version = VM::get().getPlayerVersion();
+    const std::string version = vm.getPlayerVersion();
 
     // "Macromedia Windows", "Macromedia Linux", "Macromedia MacOS"
     // Override in gnashrc
@@ -278,7 +278,7 @@
 
        // Initialize Function prototype
        proto.init_member("security", getSystemSecurityInterface(proto));
-       proto.init_member("capabilities", getSystemCapabilitiesInterface());
+       proto.init_member("capabilities", 
getSystemCapabilitiesInterface(proto));
        proto.init_member("setClipboard", new 
builtin_function(system_setclipboard));
        proto.init_member("showSettings", vm.getNative(2107, 0));
 
@@ -397,7 +397,7 @@
 
 
 const std::string&
-systemLanguage()
+systemLanguage(as_object& proto)
 {
        // Two-letter language code ('en', 'de') corresponding to ISO 639-1
        // Chinese can be either zh-CN or zh-TW. English used to have a 
@@ -408,7 +408,7 @@
        // some scripts rely on there being only 20 possible languages. It could
        // be a run time option if it's important enough to care.
 
-       static std::string lang = VM::get().getSystemLanguage();
+       static std::string lang = proto.getVM().getSystemLanguage();
        
        const char* languages[] = {"en", "fr", "ko", "ja", "sv",
                                "de", "es", "it", "zh", "pt",